From 94d87adc9e2de88e79acc5f440cf08363e3d10f8 Mon Sep 17 00:00:00 2001 From: Aleksey Loginov Date: Tue, 26 Dec 2023 17:40:51 +0300 Subject: [PATCH 1/2] get rid of unused headers --- src/rpp/rpp/disposables/callback_disposable.hpp | 3 +-- src/rpp/rpp/disposables/composite_disposable.hpp | 1 - src/rpp/rpp/disposables/details/base_disposable.hpp | 1 - src/rpp/rpp/disposables/disposable_wrapper.hpp | 1 - src/rpp/rpp/disposables/fwd.hpp | 2 -- src/rpp/rpp/disposables/interface_composite_disposable.hpp | 2 -- src/rpp/rpp/utils/functors.hpp | 1 - 7 files changed, 1 insertion(+), 10 deletions(-) diff --git a/src/rpp/rpp/disposables/callback_disposable.hpp b/src/rpp/rpp/disposables/callback_disposable.hpp index f3d897f13..6e7442e10 100644 --- a/src/rpp/rpp/disposables/callback_disposable.hpp +++ b/src/rpp/rpp/disposables/callback_disposable.hpp @@ -11,14 +11,13 @@ #pragma once #include - #include namespace rpp { /** * @brief Disposable invokes underlying callable on disposing. - * + * * @ingroup disposables */ template diff --git a/src/rpp/rpp/disposables/composite_disposable.hpp b/src/rpp/rpp/disposables/composite_disposable.hpp index 244de868d..ae41b93e0 100644 --- a/src/rpp/rpp/disposables/composite_disposable.hpp +++ b/src/rpp/rpp/disposables/composite_disposable.hpp @@ -18,7 +18,6 @@ #include #include -#include namespace rpp { diff --git a/src/rpp/rpp/disposables/details/base_disposable.hpp b/src/rpp/rpp/disposables/details/base_disposable.hpp index b025eeef4..9e89ad54d 100644 --- a/src/rpp/rpp/disposables/details/base_disposable.hpp +++ b/src/rpp/rpp/disposables/details/base_disposable.hpp @@ -11,7 +11,6 @@ #pragma once #include - #include #include diff --git a/src/rpp/rpp/disposables/disposable_wrapper.hpp b/src/rpp/rpp/disposables/disposable_wrapper.hpp index ceecf7c77..99d6a9778 100644 --- a/src/rpp/rpp/disposables/disposable_wrapper.hpp +++ b/src/rpp/rpp/disposables/disposable_wrapper.hpp @@ -11,7 +11,6 @@ #pragma once #include - #include #include diff --git a/src/rpp/rpp/disposables/fwd.hpp b/src/rpp/rpp/disposables/fwd.hpp index 4abbd24e5..9fffc4b10 100644 --- a/src/rpp/rpp/disposables/fwd.hpp +++ b/src/rpp/rpp/disposables/fwd.hpp @@ -12,8 +12,6 @@ #include -#include - namespace rpp { struct interface_disposable; diff --git a/src/rpp/rpp/disposables/interface_composite_disposable.hpp b/src/rpp/rpp/disposables/interface_composite_disposable.hpp index 7c09e0bbe..e670c5003 100644 --- a/src/rpp/rpp/disposables/interface_composite_disposable.hpp +++ b/src/rpp/rpp/disposables/interface_composite_disposable.hpp @@ -14,8 +14,6 @@ #include #include -#include - namespace rpp { struct interface_composite_disposable : public interface_disposable diff --git a/src/rpp/rpp/utils/functors.hpp b/src/rpp/rpp/utils/functors.hpp index 360ceba3b..65419294d 100644 --- a/src/rpp/rpp/utils/functors.hpp +++ b/src/rpp/rpp/utils/functors.hpp @@ -10,7 +10,6 @@ #pragma once -#include #include namespace rpp::utils From e86461d91a43f1075acd583632d4b465f76fc675 Mon Sep 17 00:00:00 2001 From: Aleksey Loginov Date: Tue, 26 Dec 2023 17:46:02 +0300 Subject: [PATCH 2/2] remove unused headers --- .../observers/details/disposable_strategy.hpp | 5 ++--- src/rpp/rpp/observers/observer.hpp | 2 -- src/rpp/rpp/operators/combine_latest.hpp | 1 - src/rpp/rpp/operators/first.hpp | 2 -- src/rpp/rpp/operators/flat_map.hpp | 5 ++--- src/rpp/rpp/operators/last.hpp | 1 - src/rpp/rpp/operators/map.hpp | 1 - src/rpp/rpp/operators/merge.hpp | 2 -- src/rpp/rpp/operators/repeat.hpp | 1 - src/rpp/rpp/operators/scan.hpp | 4 +--- src/rpp/rpp/operators/with_latest_from.hpp | 1 - src/rpp/rpp/schedulers/current_thread.hpp | 20 +++++++++---------- src/rpp/rpp/schedulers/details/queue.hpp | 1 - src/rpp/rpp/subjects/details/base_subject.hpp | 2 +- src/rpp/rpp/utils/tuple.hpp | 1 - 15 files changed, 15 insertions(+), 34 deletions(-) diff --git a/src/rpp/rpp/observers/details/disposable_strategy.hpp b/src/rpp/rpp/observers/details/disposable_strategy.hpp index d69c4b7c3..0935acffc 100644 --- a/src/rpp/rpp/observers/details/disposable_strategy.hpp +++ b/src/rpp/rpp/observers/details/disposable_strategy.hpp @@ -16,7 +16,6 @@ #include #include -#include namespace rpp::details::observers { @@ -29,7 +28,7 @@ class atomic_bool : m_value{other.m_value.load(std::memory_order::seq_cst)} {} - bool test() const noexcept + bool test() const noexcept { // just need atomicity, not guarding anything return m_value.load(std::memory_order::seq_cst); @@ -50,7 +49,7 @@ class non_atomic_bool non_atomic_bool() = default; non_atomic_bool(non_atomic_bool&& other) noexcept = default; - bool test() const noexcept + bool test() const noexcept { return m_value; } diff --git a/src/rpp/rpp/observers/observer.hpp b/src/rpp/rpp/observers/observer.hpp index 7d965f695..7ab80c0a2 100644 --- a/src/rpp/rpp/observers/observer.hpp +++ b/src/rpp/rpp/observers/observer.hpp @@ -22,8 +22,6 @@ #include #include -#include -#include namespace rpp::details { diff --git a/src/rpp/rpp/operators/combine_latest.hpp b/src/rpp/rpp/operators/combine_latest.hpp index 3561f0894..2cf6eb287 100644 --- a/src/rpp/rpp/operators/combine_latest.hpp +++ b/src/rpp/rpp/operators/combine_latest.hpp @@ -19,7 +19,6 @@ #include #include -#include namespace rpp::operators::details { diff --git a/src/rpp/rpp/operators/first.hpp b/src/rpp/rpp/operators/first.hpp index 7169ccd77..838960ea7 100644 --- a/src/rpp/rpp/operators/first.hpp +++ b/src/rpp/rpp/operators/first.hpp @@ -15,8 +15,6 @@ #include #include -#include - namespace rpp::operators::details { template diff --git a/src/rpp/rpp/operators/flat_map.hpp b/src/rpp/rpp/operators/flat_map.hpp index 30b297d15..a846d8604 100644 --- a/src/rpp/rpp/operators/flat_map.hpp +++ b/src/rpp/rpp/operators/flat_map.hpp @@ -16,7 +16,6 @@ namespace rpp::operators::details { - template struct flat_map_t { @@ -58,9 +57,9 @@ namespace rpp::operators } * * @details Actually it makes `map(callable)` and then `merge`. - * @details Note that flat_map merges the emissions of these Observables, so that they may interleave. + * @details Note that flat_map merges the emissions of these Observables, so that they may interleave. * - * @param callable function that returns an observable for each item emitted by the source observable. + * @param callable function that returns an observable for each item emitted by the source observable. * @warning #include * * @ingroup transforming_operators diff --git a/src/rpp/rpp/operators/last.hpp b/src/rpp/rpp/operators/last.hpp index 869818fcd..de187f3ff 100644 --- a/src/rpp/rpp/operators/last.hpp +++ b/src/rpp/rpp/operators/last.hpp @@ -15,7 +15,6 @@ #include #include -#include #include namespace rpp::operators::details diff --git a/src/rpp/rpp/operators/map.hpp b/src/rpp/rpp/operators/map.hpp index 716a72f0f..7ae7aa03d 100644 --- a/src/rpp/rpp/operators/map.hpp +++ b/src/rpp/rpp/operators/map.hpp @@ -15,7 +15,6 @@ #include #include -#include #include namespace rpp::operators::details diff --git a/src/rpp/rpp/operators/merge.hpp b/src/rpp/rpp/operators/merge.hpp index b2a17639b..b4c9a24a8 100644 --- a/src/rpp/rpp/operators/merge.hpp +++ b/src/rpp/rpp/operators/merge.hpp @@ -20,8 +20,6 @@ #include #include -#include -#include namespace rpp::operators::details { diff --git a/src/rpp/rpp/operators/repeat.hpp b/src/rpp/rpp/operators/repeat.hpp index 797e6e6d7..544392fc7 100644 --- a/src/rpp/rpp/operators/repeat.hpp +++ b/src/rpp/rpp/operators/repeat.hpp @@ -16,7 +16,6 @@ #include #include -#include namespace rpp::operators::details { diff --git a/src/rpp/rpp/operators/scan.hpp b/src/rpp/rpp/operators/scan.hpp index b89667bbf..512619715 100644 --- a/src/rpp/rpp/operators/scan.hpp +++ b/src/rpp/rpp/operators/scan.hpp @@ -15,10 +15,8 @@ #include #include -#include "rpp/utils/constraints.hpp" -#include "rpp/utils/utils.hpp" +#include -#include #include namespace rpp::operators::details diff --git a/src/rpp/rpp/operators/with_latest_from.hpp b/src/rpp/rpp/operators/with_latest_from.hpp index 09fbe873e..441c6451b 100644 --- a/src/rpp/rpp/operators/with_latest_from.hpp +++ b/src/rpp/rpp/operators/with_latest_from.hpp @@ -19,7 +19,6 @@ #include #include -#include namespace rpp::operators::details { diff --git a/src/rpp/rpp/schedulers/current_thread.hpp b/src/rpp/rpp/schedulers/current_thread.hpp index e585ec9f4..5c7ee26db 100644 --- a/src/rpp/rpp/schedulers/current_thread.hpp +++ b/src/rpp/rpp/schedulers/current_thread.hpp @@ -17,8 +17,6 @@ #include #include -#include - namespace rpp::schedulers { /** @@ -34,7 +32,7 @@ namespace rpp::schedulers * worker.schedule([&worker](const auto& handler) * { * std::cout << "Task 1 starts" << std::endl; - * + * * worker.schedule([&worker](const auto& handler) * { * std::cout << "Task 2 starts" << std::endl; @@ -46,13 +44,13 @@ namespace rpp::schedulers * std::cout << "Task 2 ends" << std::endl; * return rpp::schedulers::optional_delay_from_now{}; * }, handler); - * + * * worker.schedule([](const auto&) * { * std::cout << "Task 3" << std::endl; * return rpp::schedulers::optional_delay_from_now{}; * }, handler); - * + * * std::cout << "Task 1 ends" << std::endl; * return rpp::schedulers::optional_delay_from_now{}; * }, handler); @@ -64,20 +62,20 @@ namespace rpp::schedulers * - "Task 2 ends" * - "Task 3" * - "Task 4" - * + * * @par How to use it properly? * To have any visible impact you need to use it at least **twice** during same observable. For example, `rpp::source::just` source uses it as default scheduler as well as `rpp::operators::merge` operator (which just "owns" it during subscription). * * For example, this one * \code{.cpp} - * rpp::source::just(1, 2, 3) - * | rpp::operators::merge_with(rpp::source::just(4, 5, 6)) + * rpp::source::just(1, 2, 3) + * | rpp::operators::merge_with(rpp::source::just(4, 5, 6)) * | rpp::operators::subscribe([](int v) { std::cout << v << " "; }); * \endcode * Procedes output `1 4 2 5 3 6` due to `merge_with` takes ownership over this scheduler during subscription, both sources schedule their first emissions into scheduler, then `merge_with` frees scheduler and it starts to proceed scheduled actions. As a result it continues interleaving of values. In case of usingg `rpp::schedulers::immediate` it would be: * \code{.cpp} - * rpp::source::just(rpp::schedulers::immediate{}, 1, 2, 3) - * | rpp::operators::merge_with(rpp::source::just(rpp::schedulers::immediate{}, 4, 5, 6)) + * rpp::source::just(rpp::schedulers::immediate{}, 1, 2, 3) + * | rpp::operators::merge_with(rpp::source::just(rpp::schedulers::immediate{}, 4, 5, 6)) * | rpp::operators::subscribe([](int v) { std::cout << v << " "; }); * \endcode * With output `1 2 3 4 5 6` @@ -153,7 +151,7 @@ class current_thread if (!timepoint || handler.is_disposed()) return drain_queue(queue); } - else + else { timepoint = now() + duration; } diff --git a/src/rpp/rpp/schedulers/details/queue.hpp b/src/rpp/rpp/schedulers/details/queue.hpp index 606e3125e..3f186a9bb 100644 --- a/src/rpp/rpp/schedulers/details/queue.hpp +++ b/src/rpp/rpp/schedulers/details/queue.hpp @@ -22,7 +22,6 @@ #include #include #include -#include #include namespace rpp::schedulers::details diff --git a/src/rpp/rpp/subjects/details/base_subject.hpp b/src/rpp/rpp/subjects/details/base_subject.hpp index 789d9e798..35e3b5490 100644 --- a/src/rpp/rpp/subjects/details/base_subject.hpp +++ b/src/rpp/rpp/subjects/details/base_subject.hpp @@ -13,7 +13,7 @@ #include -#include "rpp/disposables/fwd.hpp" +#include namespace rpp::subjects::details { diff --git a/src/rpp/rpp/utils/tuple.hpp b/src/rpp/rpp/utils/tuple.hpp index 3ac829616..2fbfdb8e8 100644 --- a/src/rpp/rpp/utils/tuple.hpp +++ b/src/rpp/rpp/utils/tuple.hpp @@ -13,7 +13,6 @@ #include #include -#include #include #include