Merge pull request #2133 from elBoberido/iox-2130-merge-dust-back-to-…

…hoofs

iox-#2130 Merge 'iceoryx_dust' back to 'iceoryx_hoofs'

.bazelversion

@@ -0,0 +1,2 @@
+6.4.0
+# NOTE: Bazel 7.0 errors out on 'buildifier_lint_check' with a hint to 'go_register_toolchains' in 'setup.bzl'

.cirrus.yaml

@@ -84,8 +84,6 @@ iox_prepare_test_binaries_for_cache_template: &IOX_PREPARE_TEST_BINARIES_FOR_CAC
   - mv build/hoofs/test/hoofs_mocktests iox-tests-bin
   - mv build/hoofs/test/hoofs_moduletests iox-tests-bin
   - mv build/hoofs/test/hoofs_integrationtests iox-tests-bin
-  - mv build/dust/test/dust_moduletests iox-tests-bin
-  - mv build/dust/test/dust_integrationtests iox-tests-bin
   - mv build/posh/test/posh_moduletests iox-tests-bin
   - mv build/posh/test/posh_integrationtests iox-tests-bin
   - mv build/binding_c/test/binding_c_moduletests iox-tests-bin
@@ -95,8 +93,6 @@ iox_run_tests_template: &IOX_RUN_TESTS
   - ./hoofs_mocktests
   - ./hoofs_moduletests
   - ./hoofs_integrationtests
-  - ./dust_moduletests
-  - ./dust_integrationtests
   - ./posh_moduletests
   - ./posh_integrationtests
   - ./binding_c_moduletests

.clang-tidy-diff-scans.txt

@@ -3,6 +3,9 @@
 ./iceoryx_hoofs/test/moduletests/test_cxx*
 ./iceoryx_hoofs/source/cxx/*
 
+./iceoryx_hoofs/cli/**/*
+./iceoryx_hoofs/test/moduletests/test_cli_*
+
 ./iceoryx_hoofs/memory/**/*
 ./iceoryx_hoofs/test/moduletests/test_memory_*
 
@@ -26,7 +29,7 @@
 
 ./iceoryx_hoofs/posix/**/*
 
-./iceoryx_hoofs/container/include/iox/**/*
+./iceoryx_hoofs/container/**/*
 ./iceoryx_hoofs/test/moduletests/test_container_*
 
 ./iceoryx_hoofs/vocabulary/**/*

README.md

@@ -104,7 +104,6 @@ Please see the [Quality Declaration](./QUALITY_DECLARATION.md) for details of th
 |-----------------------|:-------------:|:-----------------:|:---------------------------------------:|
 | iceoryx_hoofs         | 2             | 1+                | 1                                       |
 | iceoryx_posh          | 2             | 1+, 2             | 1                                       |
-| iceoryx_dust          | 2             | 2                 | 2                                       |
 | iceoryx_binding_c     | 2             | 2                 | 2                                       |
 | iceoryx_examples      | 5             | 4                 | 4                                       |
 | iceoryx_introspection | 5             | 4                 | 4                                       |

doc/design/diagrams/iceoryx_components_diagram_v3_0_0.puml

@@ -55,17 +55,6 @@ package iceoryx_hoofs  {
    }
 }
 
-' DUST: Deemed Useful Software Thingies
-' Library containing modern C++ STL constructs with quality level 2
-package iceoryx_dust  {
-   frame "dust library" {
-      component "Containers" <<module>> as additional_containers
-      component "Filesystem" <<module>> as additional_filesystem
-      component "Buffers" <<module>> as additional_buffers
-      component "Inter-process communication" <<module>> as additional_ipc
-   }
-}
-
 ' POSH: POSIX SHared memory
 ' Publish/subscribe IPC communication infrastructure based on shared memory
 package iceoryx_posh {
@@ -128,10 +117,7 @@ package iceoryx_introspection  {
 }
 
 iceoryx_hoofs  ..>  iceoryx_platform  : use
-iceoryx_dust  ..>  iceoryx_platform  : use
 iceoryx_posh  ..>  iceoryx_hoofs  : use
-iceoryx_dust  ..>  iceoryx_hoofs : use
-iceoryx_posh  ..>  iceoryx_dust : use
 iceoryx_dds  ..>  iceoryx_posh  : use
 iceoryx_rs  ..>  iceoryx_posh  : use
 automotive_soa  ..>  iceoryx_posh  : use

doc/design/diagrams/iceoryx_software_layers_v3_0_0.puml

@@ -18,24 +18,19 @@ skinparam frame {
 }
 
 [iceoryx_platform]
-[iceoryx_dust]
 [iceoryx_hoofs]
 [iceoryx_posh]
 [iceoryx_binding_c]
 [C user app]
 [C++ user app]
 
-note right of iceoryx_platform : Basic platform support library with quality level 1+
-note top of iceoryx_hoofs : Basic building block library with quality level 1+
-note top of iceoryx_dust : Basic building block library with quality level 2
+note right of iceoryx_platform : Basic platform support library
+note top of iceoryx_hoofs : Basic building block library
 note top of iceoryx_posh : Shared memory transport (POsix SHared memory)
 note right of iceoryx_binding_c : C API for iceoryx_posh
 
 [iceoryx_hoofs]  ..>  [iceoryx_platform]
-[iceoryx_dust]  ..>  [iceoryx_platform]
 [iceoryx_posh]  ..>  [iceoryx_hoofs]
-[iceoryx_dust]  ..>  [iceoryx_hoofs]
-[iceoryx_posh]  ..>  [iceoryx_dust]
 [iceoryx_binding_c]  ..>  [iceoryx_posh]
 [C user app]  ..>  [iceoryx_binding_c]
 [C++ user app]  ..>  [iceoryx_posh]

doc/design/move_and_copy_helper.md

@@ -149,4 +149,4 @@ void Test::copy_and_move_impl(RhsType&& rhs)
 
 For more examples, see
 
-- `iceoryx_dust/container/detail/fixed_position_container.inl`
+- `iceoryx_hoofs/container/detail/fixed_position_container.inl`

doc/website/release-notes/iceoryx-unreleased.md

@@ -147,6 +147,7 @@
 - `SignalHandler` returns an `iox::expected` in `registerSignalHandler` [\#1196](https://github.com/eclipse-iceoryx/iceoryx/issues/1196)
 - Remove the unused `PosixRights` struct [\#1556](https://github.com/eclipse-iceoryx/iceoryx/issues/1556)
 - Move quality level 2 classes to new package `iceoryx_dust` [\#590](https://github.com/eclipse-iceoryx/iceoryx/issues/590)
+    - moved back to `hoofs`
 - Remove unused classes from `iceoryx_hoofs` [\#590](https://github.com/eclipse-iceoryx/iceoryx/issues/590)
   - `cxx::PoorMansHeap`
   - Other `internal` classes
@@ -168,25 +169,31 @@
 - Replace uses of `std::cout`, `std::cerr` with the iceoryx logger [\#1756](https://github.com/eclipse-iceoryx/iceoryx/issues/1756)
 - Move `IOX_NO_DISCARD`, `IOX_FALLTHROUGH` and `IOX_MAYBE_UNUSED` to `iceoryx_platform` [\#1726](https://github.com/eclipse-iceoryx/iceoryx/issues/1726)
 - Move `cxx::static_storage` from `iceoryx_hoofs` to `iceoryx_dust` [\#1732](https://github.com/eclipse-iceoryx/iceoryx/issues/1732)
+    - moved back to `hoofs`
 - Remove `algorithm::uniqueMergeSortedContainers` from `algorithm.hpp`
 - Move `std::string` conversion function to `iceoryx_dust` [\#1612](https://github.com/eclipse-iceoryx/iceoryx/issues/1612)
+    - moved back to `hoofs`
 - The posix call `unlink` is directly used in `UnixDomainSocket` [\#1622](https://github.com/eclipse-iceoryx/iceoryx/issues/1622)
 - Wrap all C calls in posixCall in IntrospectionApp [\#1692](https://github.com/eclipse-iceoryx/iceoryx/issues/1692)
 - Move `std::chrono` dependency to `iceoryx_dust` [\#536](https://github.com/eclipse-iceoryx/iceoryx/issues/536)
+    - moved back to `hoofs`
 - Move `std::string` dependency from `iox::string` to `std_string_support.hpp` in `iceoryx_dust` [\#1612](https://github.com/eclipse-iceoryx/iceoryx/issues/1612)
+    - moved back to `hoofs`
 - Better align `iox::expected` with `std::expected` [\#1969](https://github.com/eclipse-iceoryx/iceoryx/issues/1969)
 - Use logger for "RouDi is ready for clients" message [\#1994](https://github.com/eclipse-iceoryx/iceoryx/issues/1994)
 - Speed up posh tests [#1030](https://github.com/eclipse-iceoryx/iceoryx/issues/1030)
 - Roudi Environment independent from Googletest [#1533](https://github.com/eclipse-iceoryx/iceoryx/issues/1533)
 - Move test class for ctor and assignment operators to hoofs testing [#2041](https://github.com/eclipse-iceoryx/iceoryx/issues/2041)
 - Refactor `FixedPositionContainer` and move to `dust` [#2044](https://github.com/eclipse-iceoryx/iceoryx/issues/2044)
+    - final location is `hoofs`
 - Cleanup or Remove ObjectPool [#66](https://github.com/eclipse-iceoryx/iceoryx/issues/66)
 - Improve process is alive detection [#1361](https://github.com/eclipse-iceoryx/iceoryx/issues/1361)
     - only partially
     - IPC call is replaced with heartbeat via shared memory
 - Removed IOX_INTERNAL_MAX_NUMBER_OF_NOTIFIERS and made IOX_MAX_NUMBER_OF_NOTIFIERS configurable again [#2083](https://github.com/eclipse-iceoryx/iceoryx/issues/2083)
 - Setting IOX_NO_DISCARD in QNX [#638](https://github.com/eclipse-iceoryx/iceoryx/issues/638)
 - Replace `iox::byte_t` with std::byte [#1900](https://github.com/eclipse-iceoryx/iceoryx/issues/1900)
+- Merge `iceoryx_dust` back to `iceoryx_hoofs` [#2130](https://github.com/eclipse-iceoryx/iceoryx/issues/2130)
 
 **Workflow:**
 
@@ -958,7 +965,7 @@
 
     ```
 
-42. Move multiple classes from `iceoryx_hoofs` to `iceoryx_dust`
+42. ~~Move multiple classes from `iceoryx_hoofs` to `iceoryx_dust`~~ They are still in `iceoryx_hoofs` but the include path changed nevertheless
 
     ```cpp
     // before
@@ -997,7 +1004,7 @@
     #include "iceoryx_hoofs/internal/objectpool/objectpool.hpp"
 
     // after
-    #include "iceoryx_dust/cxx/objectpool.hpp"
+    // fully removed
     ```
 
     ```cpp
@@ -1048,7 +1055,7 @@
     #include "iox/detail/convert.hpp"
     ```
 
-43. Move the conversions functions for `std::string` to `iceoryx_dust`:
+43. ~~Move the conversions functions for `std::string` to `iceoryx_dust`:~~ They are still in `iceoryx_hoofs` but the include path changed nevertheless
 
     ```cpp
     // before
@@ -1135,7 +1142,7 @@
     std::byte m_size;
     ```
 
-48. Move conversion methods from `duration.hpp` to `iceoryx_dust`
+48. ~~Move conversion methods from `duration.hpp` to `iceoryx_dust`~~ They are still in `iceoryx_hoofs` but the include path changed nevertheless
 
     ```cpp
     // before