From cee4be2b67dc1b17995f419ad7e34d13cb68a0be Mon Sep 17 00:00:00 2001
From: Chip Hogg <chogg@aurora.tech>
Date: Mon, 10 Jan 2022 14:28:02 -0500
Subject: [PATCH] Simplify namespaces and canonicalize formatting

The motivation for the `mag` sub-namespace was to distinguish something
like `mag::product_t<...>` from `dim::product_t<...>`, based on the
idioms of Aurora Units.  However, we have no need for a `product_t` type
trait, since we can just use `operator*()`, so we can eliminate this
sub-namespace.
---
 src/core/include/units/magnitude.h        | 7 +++----
 test/unit_test/runtime/magnitude_test.cpp | 8 +++-----
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/src/core/include/units/magnitude.h b/src/core/include/units/magnitude.h
index 6443cfbe..4ce8f137 100644
--- a/src/core/include/units/magnitude.h
+++ b/src/core/include/units/magnitude.h
@@ -26,7 +26,7 @@
 #include <cstdint>
 #include <numbers>
 
-namespace units::mag {
+namespace units {
 
 /**
  * @brief  Any type which can be used as a basis vector in a BasePower.
@@ -339,8 +339,7 @@ constexpr Magnitude auto as_magnitude() {
     / detail::prime_factorization_v<R.den>;
 }
 
-namespace detail
-{
+namespace detail {
 // Default implementation.
 template<std::intmax_t N>
   requires (N > 0)
@@ -358,4 +357,4 @@ template<>
 struct prime_factorization<1> { static constexpr magnitude<> value{}; };
 } // namespace detail
 
-} // namespace units::mag
+} // namespace units
diff --git a/test/unit_test/runtime/magnitude_test.cpp b/test/unit_test/runtime/magnitude_test.cpp
index 536f8fed..df1afee7 100644
--- a/test/unit_test/runtime/magnitude_test.cpp
+++ b/test/unit_test/runtime/magnitude_test.cpp
@@ -25,8 +25,7 @@
 #include <catch2/catch.hpp>
 #include <type_traits>
 
-namespace units::mag
-{
+namespace units {
 
 // A set of non-standard bases for testing purposes.
 struct noninteger_base { static constexpr long double value = 1.234L; };
@@ -216,8 +215,7 @@ TEST_CASE("Can raise Magnitudes to rational powers")
   }
 }
 
-namespace detail
-{
+namespace detail {
 
 TEST_CASE("Prime helper functions")
 {
@@ -375,4 +373,4 @@ TEST_CASE("strictly_increasing")
 
 } // namespace detail
 
-} // namespace units::mag
+} // namespace units