Fix various detail

README.md

@@ -4,7 +4,7 @@ SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 -->
 
 <!-- markdownlint-disable line-length -->
-[![Library Status](https://raw.githubusercontent.com/bemanproject/beman/refs/heads/main/images/badges/beman_badge-beman_library_under_development.svg)](https://github.com/bemanproject/beman/blob/main/docs/beman_library_maturity_model.md#the-beman-library-maturity-model)![Standard Target](https://github.com/bemanproject/beman/blob/main/images/badges/cpp26.svg)[![Coverage](https://coveralls.io/repos/github/bemanproject/task/badge.svg?branch=main)](https://coveralls.io/github/bemanproject/task?branch=main)[![Compiler Explorer Example](https://img.shields.io/badge/Try%20it%20on%20Compiler%20Explorer-grey?logo=compilerexplorer&logoColor=67c52a)](https://godbolt.org/z/e1sjsT46r)
+[![Library Status](https://raw.githubusercontent.com/bemanproject/beman/refs/heads/main/images/badges/beman_badge-beman_library_under_development.svg)](https://github.com/bemanproject/beman/blob/main/docs/beman_library_maturity_model.md#the-beman-library-maturity-model)![Standard Target](https://github.com/bemanproject/beman/blob/main/images/badges/cpp26.svg)[![Coverage](https://coveralls.io/repos/github/bemanproject/task/badge.svg?branch=main)](https://coveralls.io/github/bemanproject/task?branch=main)[![Compiler Explorer Example](https://img.shields.io/badge/Try%20it%20on%20Compiler%20Explorer-grey?logo=compilerexplorer&logoColor=67c52a)](https://godbolt.org/z/anYY59nYd)
 <!-- markdownlint-restore -->
 
 `beman::execution::task<T, Context>` is a class template which
@@ -29,8 +29,8 @@ using sender/receiver facilities to implement version of `hello,
 world`:
 
 ```cpp
-#include <beman/task/task.hpp>
-#include <beman/execution/execution.hpp>
+#include <beman/task.hpp>
+#include <beman/execution.hpp>
 #include <iostream>
 
 namespace ex = beman::execution;

examples/affinity.cpp

@@ -1,8 +1,8 @@
 // examples/affinity.cpp                                               -*-C++-*-
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#include <beman/execution/execution.hpp>
-#include <beman/task/task.hpp>
+#include <beman/execution.hpp>
+#include <beman/task.hpp>
 #include "demo_thread_loop.hpp"
 #include <iostream>
 #include <cassert>

examples/aggregate_return.cpp

@@ -1,8 +1,8 @@
 // examples/aggregate_return.cpp                                      -*-C++-*-
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#include <beman/execution/execution.hpp>
-#include <beman/task/task.hpp>
+#include <beman/execution.hpp>
+#include <beman/task.hpp>
 
 namespace ex = beman::execution;
 

examples/alloc.cpp

@@ -7,8 +7,8 @@
 #include <cassert>
 #include <cstdlib>
 #include <memory_resource>
-#include <beman/execution/execution.hpp>
-#include <beman/task/task.hpp>
+#include <beman/execution.hpp>
+#include <beman/task.hpp>
 
 namespace ex = beman::execution;
 

examples/async_lock.cpp

@@ -8,8 +8,8 @@
 #include <mutex>
 #include <string>
 #include <condition_variable>
-#include <beman/execution/execution.hpp>
-#include <beman/task/task.hpp>
+#include <beman/execution.hpp>
+#include <beman/task.hpp>
 
 namespace ex = beman::execution;
 

examples/co_await_result.cpp

@@ -1,8 +1,8 @@
 // examples/co_await_result.cpp                                        -*-C++-*-
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#include <beman/task/task.hpp>
-#include <beman/execution/execution.hpp>
+#include <beman/task.hpp>
+#include <beman/execution.hpp>
 #include <iostream>
 #include <cassert>
 

examples/container.cpp

@@ -1,8 +1,8 @@
 // examples/container.cpp                                              -*-C++-*-
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#include <beman/task/task.hpp>
-#include <beman/execution/execution.hpp>
+#include <beman/task.hpp>
+#include <beman/execution.hpp>
 #include <iostream>
 #include <vector>
 #include <cassert>

examples/cppnow_affinity.cpp

@@ -1,9 +1,9 @@
 // examples/cppnow_affinity.cpp                                       -*-C++-*-
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#include <beman/task/task.hpp>
-#include <beman/execution/execution.hpp>
-#include <beman/execution/stop_token.hpp>
+#include <beman/task.hpp>
+#include <beman/execution.hpp>
+#include <beman/stop_token.hpp>
 #include "demo_thread_loop.hpp"
 #include <condition_variable>
 #include <iostream>

examples/cppnow_allocator.cpp

@@ -1,8 +1,8 @@
 // examples/cppnow_alloctor.cpp                                       -*-C++-*-
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#include <beman/task/task.hpp>
-#include <beman/execution/execution.hpp>
+#include <beman/task.hpp>
+#include <beman/execution.hpp>
 #include <memory>
 #include <memory_resource>
 

examples/cppnow_basic.cpp

@@ -1,8 +1,8 @@
 // examples/cppnow_basic.cpp                                          -*-C++-*-
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#include <beman/task/task.hpp>
-#include <beman/execution/execution.hpp>
+#include <beman/task.hpp>
+#include <beman/execution.hpp>
 #include <coroutine>
 #include <iostream>
 

examples/cppnow_cancel.cpp

@@ -2,8 +2,8 @@
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 // ----------------------------------------------------------------------------
 
-#include <beman/task/task.hpp>
-#include <beman/execution/execution.hpp>
+#include <beman/task.hpp>
+#include <beman/execution.hpp>
 
 namespace ex = beman::execution;
 

examples/cppnow_errors.cpp

@@ -1,8 +1,8 @@
 // examples/cppnow_errors.cpp                                         -*-C++-*-
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#include <beman/task/task.hpp>
-#include <beman/execution/execution.hpp>
+#include <beman/task.hpp>
+#include <beman/execution.hpp>
 #include <expected>
 #include <iostream>
 #include <concepts>

examples/cppnow_query.cpp

@@ -1,8 +1,8 @@
 // examples/cppnow_query.cpp                                          -*-C++-*-
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#include <beman/task/task.hpp>
-#include <beman/execution/execution.hpp>
+#include <beman/task.hpp>
+#include <beman/execution.hpp>
 #include <iostream>
 
 namespace ex  = beman::execution;

examples/cppnow_result_types.cpp

@@ -1,8 +1,8 @@
 // examples/cppnow_result_types.cpp                                   -*-C++-*-
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#include <beman/task/task.hpp>
-#include <beman/execution/execution.hpp>
+#include <beman/task.hpp>
+#include <beman/execution.hpp>
 #include <tuple>
 
 namespace ex = beman::execution;

examples/cppnow_return.cpp

@@ -1,8 +1,8 @@
 // examples/cppnow_return.cpp                                         -*-C++-*-
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#include <beman/task/task.hpp>
-#include <beman/execution/execution.hpp>
+#include <beman/task.hpp>
+#include <beman/execution.hpp>
 #include <iostream>
 
 namespace ex = beman::execution;

examples/cppnow_stop_token.cpp

@@ -1,9 +1,9 @@
 // examples/cppnow_stop_token.cpp                                     -*-C++-*-
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#include <beman/task/task.hpp>
-#include <beman/execution/execution.hpp>
-#include <beman/execution/stop_token.hpp>
+#include <beman/task.hpp>
+#include <beman/execution.hpp>
+#include <beman/stop_token.hpp>
 #include <chrono>
 #include <iostream>
 #include <thread>

examples/cppnow_with_error.cpp

@@ -1,8 +1,8 @@
 // examples/cppnow_with_error.cpp                                     -*-C++-*-
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#include <beman/task/task.hpp>
-#include <beman/execution/execution.hpp>
+#include <beman/task.hpp>
+#include <beman/execution.hpp>
 #include <iostream>
 #include <cassert>
 

examples/customize.cpp

@@ -1,8 +1,8 @@
 // examples/customize.cpp                                             -*-C++-*-
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#include <beman/execution/execution.hpp>
-#include <beman/task/task.hpp>
+#include <beman/execution.hpp>
+#include <beman/task.hpp>
 #include <iostream>
 #include <utility>
 #include <cassert>

examples/dangling_references.cpp

@@ -1,8 +1,8 @@
 // examples/dangling_references.cpp                                   -*-C++-*-
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#include <beman/execution/execution.hpp>
-#include <beman/task/task.hpp>
+#include <beman/execution.hpp>
+#include <beman/task.hpp>
 #include <utility>
 #include <functional>
 #include <string>

examples/environment.cpp

@@ -2,9 +2,9 @@
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
 #ifndef _MSC_VER
-#include <beman/task/task.hpp>
-#include <beman/execution/execution.hpp>
-#include <beman/net/net.hpp>
+#include <beman/task.hpp>
+#include <beman/execution.hpp>
+#include <beman/net.hpp>
 #include <chrono>
 #include <string>
 #include <thread>

examples/error.cpp

@@ -3,8 +3,8 @@
 
 #include <iostream>
 #include <system_error>
-#include <beman/execution/execution.hpp>
-#include <beman/task/task.hpp>
+#include <beman/execution.hpp>
+#include <beman/task.hpp>
 
 namespace ex = beman::execution;
 

examples/escaped_exception.cpp

@@ -1,8 +1,8 @@
 // examples/escaped_exception.cpp                                     -*-C++-*-
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#include <beman/task/task.hpp>
-#include <beman/execution/execution.hpp>
+#include <beman/task.hpp>
+#include <beman/execution.hpp>
 #include <iostream>
 #include <exception>
 

examples/friendly.cpp

@@ -6,8 +6,8 @@
 #include <coroutine>
 #include <exception>
 #include <system_error>
-#include <beman/execution/execution.hpp>
-#include <beman/task/task.hpp>
+#include <beman/execution.hpp>
+#include <beman/task.hpp>
 
 namespace ex = beman::execution;
 

examples/into_optional.cpp

@@ -5,8 +5,8 @@
 #include <optional>
 #include <tuple>
 #include <system_error>
-#include <beman/execution/execution.hpp>
-#include <beman/task/task.hpp>
+#include <beman/execution.hpp>
+#include <beman/task.hpp>
 
 namespace ex = beman::execution;
 

examples/loop.cpp

@@ -3,8 +3,8 @@
 
 #include <iostream>
 #include <string>
-#include <beman/execution/execution.hpp>
-#include <beman/task/task.hpp>
+#include <beman/execution.hpp>
+#include <beman/task.hpp>
 #include <iostream>
 
 namespace ex = beman::execution;

examples/query.cpp

@@ -1,8 +1,8 @@
 // examples/query.cpp                                                  -*-C++-*-
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#include <beman/execution/execution.hpp>
-#include <beman/task/task.hpp>
+#include <beman/execution.hpp>
+#include <beman/task.hpp>
 #include <concepts>
 #include <iostream>
 #include <cassert>

examples/result_example.cpp

@@ -1,8 +1,8 @@
 // examples/result_example.cpp                                         -*-C++-*-
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#include <beman/task/task.hpp>
-#include <beman/execution/execution.hpp>
+#include <beman/task.hpp>
+#include <beman/execution.hpp>
 #include <cassert>
 
 namespace ex = beman::execution;

examples/rvalue_task.cpp

@@ -1,8 +1,8 @@
 // examples/rvalue_task.cpp                                           -*-C++-*-
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#include <beman/execution/execution.hpp>
-#include <beman/task/task.hpp>
+#include <beman/execution.hpp>
+#include <beman/task.hpp>
 
 namespace ex = beman::execution;
 

examples/stop.cpp

@@ -1,9 +1,9 @@
 // examples/stop.cpp                                                   -*-C++-*-
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#include <beman/execution/execution.hpp>
-#include <beman/execution/stop_token.hpp>
-#include <beman/task/task.hpp>
+#include <beman/execution.hpp>
+#include <beman/stop_token.hpp>
+#include <beman/task.hpp>
 #include <iostream>
 #include <chrono>
 #include <thread>

examples/task_scheduler.cpp

@@ -1,8 +1,8 @@
 // examples/task_scheduler.cpp                                         -*-C++-*-
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#include <beman/task/task.hpp>
-#include <beman/execution/execution.hpp>
+#include <beman/task.hpp>
+#include <beman/execution.hpp>
 #include <iostream>
 #include <cstdlib>
 

include/beman/task.hpp

@@ -0,0 +1,9 @@
+// include/beman/task.hpp                                             -*-C++-*-
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+
+#ifndef INCLUDED_INCLUDE_BEMAN_TASK
+#define INCLUDED_INCLUDE_BEMAN_TASK
+
+#include <beman/task/task.hpp>
+
+#endif

include/beman/task/detail/allocator_of.hpp

@@ -12,7 +12,7 @@
 namespace beman::task::detail {
 /*!
  * \brief Utility to get an allocator type from a context
- * \headerfile beman/task/task.hpp <beman/task/task.hpp>
+ * \headerfile beman/task.hpp <beman/task.hpp>
  * \internal
  */
 template <typename>

include/beman/task/detail/allocator_support.hpp

@@ -16,7 +16,7 @@
 namespace beman::task::detail {
 /*!
  * \brief Utility adding allocator support to type by embedding the allocator
- * \headerfile beman/task/task.hpp <beman/task/task.hpp>
+ * \headerfile beman/task.hpp <beman/task.hpp>
  *
  * To add allocator support using this class just publicly inherit from
  * allocator_support<Allocator, YourPromiseType>. This utility is probably

include/beman/task/detail/find_allocator.hpp

@@ -11,7 +11,7 @@
 namespace beman::task::detail {
 /*!
  * \brief Utility locating an allocator_arg/allocator pair
- * \headerfile beman/task/task.hpp <beman/task/task.hpp>
+ * \headerfile beman/task.hpp <beman/task.hpp>
  * \internal
  */
 template <typename Allocator>

include/beman/task/detail/poly.hpp

@@ -14,7 +14,7 @@
 namespace beman::task::detail {
 /*!
  * \brief Utility providing small object optimization and type erasure.
- * \headerfile beman/task/task.hpp <beman/task/task.hpp>
+ * \headerfile beman/task.hpp <beman/task.hpp>
  * \internal
  */
 template <typename Base, std::size_t Size = 4u * sizeof(void*)>