correct lint placement

STEllAR-GROUP · May 31, 2024 · 1a188f2 · 1a188f2
1 parent ef31254
commit 1a188f2
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 11 deletions.
diff --git a/libs/core/execution/tests/unit/algorithm_run_loop.cpp b/libs/core/execution/tests/unit/algorithm_run_loop.cpp
@@ -2117,10 +2117,11 @@ void test_keep_future_sender()
         try
         {
             // The move is intentional. sync_wait should throw.
-            // NOLINTNEXTLINE(bugprone-use-after-move)
 #ifdef HPX_HAVE_STDEXEC
+            // NOLINTNEXTLINE(bugprone-use-after-move)
             tt::sync_wait(ex::keep_future(std::move(f)));
 #else
+            // NOLINTNEXTLINE(bugprone-use-after-move)
             tt::sync_wait(sched, ex::keep_future(std::move(f)));
 #endif
             HPX_TEST(false);

diff --git a/libs/core/execution_base/tests/unit/get_env.cpp b/libs/core/execution_base/tests/unit/get_env.cpp
@@ -95,8 +95,7 @@ namespace mylib {
 
 #ifdef HPX_HAVE_STDEXEC
             return ex::make_env(
-                ex::get_env(rcv),
-                ex::with(receiver_env, std::string("42")));
+                ex::get_env(rcv), ex::with(receiver_env, std::string("42")));
 #else
             return ex::make_env<receiver_env_t>(
                 std::string("42"), ex::get_env(std::move(rcv)));
@@ -139,8 +138,7 @@ namespace mylib {
             receiver_3 rcv;
 #ifdef HPX_HAVE_STDEXEC
             return ex::make_env(
-                ex::get_env(rcv),
-                ex::with(receiver_env1, std::string("42")));
+                ex::get_env(rcv), ex::with(receiver_env1, std::string("42")));
 #else
             return ex::make_env<receiver_env1_t>(
                 std::string("42"), ex::get_env(std::move(rcv)));

diff --git a/libs/core/execution_base/tests/unit/stdexec.cpp b/libs/core/execution_base/tests/unit/stdexec.cpp
@@ -1,24 +1,23 @@
-//  Copyright (c) 2023 Isidoros Tsaousis-Seiras
+//  Copyright (c) 2024 Isidoros Tsaousis-Seiras
 //
 //  SPDX-License-Identifier: BSL-1.0
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <hpx/execution_base/stdexec_forward.hpp>
-#include <hpx/init.hpp>
 
 #include <hpx/modules/testing.hpp>
 
 #include <utility>
+#include <hpx/config.hpp>
 
 #ifdef HPX_HAVE_STDEXEC
-using namespace hpx::execution::experimental;
+#include <hpx/execution_base/stdexec_forward.hpp>
 
 int main()
 {
-    auto x = just(42);
+    auto x = hpx::execution::experimental::just(42);
 
-    auto [a] = sync_wait(std::move(x)).value();
+    auto [a] = hpx::execution::experimental::sync_wait(std::move(x)).value();
 
     HPX_TEST(a == 42);