From c1d23b41c1aad1ae479eab04c2a74d35bfbcffdb Mon Sep 17 00:00:00 2001
From: Mateusz Pusz <mateusz.pusz@gmail.com>
Date: Thu, 1 Sep 2022 10:47:36 +0200
Subject: [PATCH] refactor: `pi`-based magnitude renamed to `mag_pi`

---
 src/core/include/units/generic/angle.h    | 2 +-
 src/core/include/units/magnitude.h        | 6 +++---
 test/unit_test/runtime/magnitude_test.cpp | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/core/include/units/generic/angle.h b/src/core/include/units/generic/angle.h
index 496faeed..a3f7ef34 100644
--- a/src/core/include/units/generic/angle.h
+++ b/src/core/include/units/generic/angle.h
@@ -33,7 +33,7 @@
 namespace units {
 
 struct radian : named_unit<radian, "rad"> {};
-struct rotation : named_scaled_unit<rotation, "rot", mag<2>() * pi, radian> {};
+struct rotation : named_scaled_unit<rotation, "rot", mag<2>() * mag_pi, radian> {};
 struct degree : named_scaled_unit<degree, basic_symbol_text{"°", "deg"}, mag<ratio{1, 360}>(), rotation> {};
 
 template<Unit U = radian>
diff --git a/src/core/include/units/magnitude.h b/src/core/include/units/magnitude.h
index 566861bf..0195cf8e 100644
--- a/src/core/include/units/magnitude.h
+++ b/src/core/include/units/magnitude.h
@@ -53,8 +53,8 @@ using factorizer = wheel_factorizer<4>;
  * GCC 10) which don't yet permit floating point NTTPs.
  */
 template<typename T>
-concept BaseRep = std::is_same_v<T, std::intmax_t> || std::is_same_v < std::remove_cvref_t<decltype(T::value)>,
-long double > ;
+concept BaseRep =
+  std::is_same_v<T, std::intmax_t> || std::is_same_v<std::remove_cvref_t<decltype(T::value)>, long double>;
 
 /**
  * @brief  A basis vector in our magnitude representation, raised to some rational power.
@@ -404,7 +404,7 @@ struct pi_base {
 /**
  * @brief  A convenient Magnitude constant for pi, which we can manipulate like a regular number.
  */
-inline constexpr Magnitude auto pi = magnitude<base_power<pi_base>{}>{};
+inline constexpr Magnitude auto mag_pi = magnitude<base_power<pi_base>{}>{};
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 // Magnitude equality implementation.
diff --git a/test/unit_test/runtime/magnitude_test.cpp b/test/unit_test/runtime/magnitude_test.cpp
index d4e17e9a..87f0c473 100644
--- a/test/unit_test/runtime/magnitude_test.cpp
+++ b/test/unit_test/runtime/magnitude_test.cpp
@@ -193,9 +193,9 @@ TEST_CASE("magnitude converts to numerical value")
 
   SECTION("pi to the 1 supplies correct values")
   {
-    check_same_type_and_value(get_value<float>(pi), std::numbers::pi_v<float>);
-    check_same_type_and_value(get_value<double>(pi), std::numbers::pi_v<double>);
-    check_same_type_and_value(get_value<long double>(pi), std::numbers::pi_v<long double>);
+    check_same_type_and_value(get_value<float>(mag_pi), std::numbers::pi_v<float>);
+    check_same_type_and_value(get_value<double>(mag_pi), std::numbers::pi_v<double>);
+    check_same_type_and_value(get_value<long double>(mag_pi), std::numbers::pi_v<long double>);
   }
 
   SECTION("pi to arbitrary power performs computations in most accurate type at compile time")