From 9c6229302dfbf1fe69d75c67827b7a996acd6d93 Mon Sep 17 00:00:00 2001
From: Mateusz Pusz <mateusz.pusz@gmail.com>
Date: Sat, 16 Nov 2019 18:27:31 +0100
Subject: [PATCH] Small code cleanup

---
 src/include/units/bits/concepts.h         |  2 +-
 src/include/units/bits/hacks.h            |  2 +-
 src/include/units/bits/numeric_concepts.h |  6 +++---
 src/include/units/quantity.h              | 11 +++++++----
 4 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/src/include/units/bits/concepts.h b/src/include/units/bits/concepts.h
index 78d67ec4..44b07f31 100644
--- a/src/include/units/bits/concepts.h
+++ b/src/include/units/bits/concepts.h
@@ -32,7 +32,7 @@ namespace units {
   namespace detail {
 
     template<typename T, typename U = T>
-    concept basic_arithmetic = // exposition only 
+    concept basic_arithmetic = // exposition only
       std::magma<std::ranges::plus, T, U> &&
       std::magma<std::ranges::minus, T, U> &&
       std::magma<std::ranges::times, T, U> &&
diff --git a/src/include/units/bits/hacks.h b/src/include/units/bits/hacks.h
index 92b71eb5..da702863 100644
--- a/src/include/units/bits/hacks.h
+++ b/src/include/units/bits/hacks.h
@@ -43,8 +43,8 @@
 namespace std {
 
   // concepts
-  using concepts::common_with;
   using concepts::common_reference_with;
+  using concepts::common_with;
   using concepts::constructible_from;
   using concepts::convertible_to;
   using concepts::default_constructible;
diff --git a/src/include/units/bits/numeric_concepts.h b/src/include/units/bits/numeric_concepts.h
index 361d6a29..5ccbe997 100644
--- a/src/include/units/bits/numeric_concepts.h
+++ b/src/include/units/bits/numeric_concepts.h
@@ -265,7 +265,7 @@ namespace std {
     }
 
     struct times {
-      template<class T, detail::multiplicable_with <T> U>
+      template<class T, detail::multiplicable_with<T> U>
       constexpr decltype(auto) operator()(T&& t, U&& u) const
       { return std::forward<T>(t) * std::forward<U>(u); }
 
@@ -290,7 +290,7 @@ namespace std {
     }
 
     struct divided_by {
-      template<class T, detail::divisible_with <T> U>
+      template<class T, detail::divisible_with<T> U>
       constexpr decltype(auto) operator()(T&& t, U&& u) const
       { return std::forward<T>(t) / std::forward<U>(u); }
     };
@@ -312,7 +312,7 @@ namespace std {
     }
 
     struct modulus {
-      template<class T, detail::modulo_with <T> U>
+      template<class T, detail::modulo_with<T> U>
       constexpr decltype(auto) operator()(T&& t, U&& u) const
       { return std::forward<T>(t) % std::forward<U>(u); }
     };
diff --git a/src/include/units/quantity.h b/src/include/units/quantity.h
index 536d5847..7429151c 100644
--- a/src/include/units/quantity.h
+++ b/src/include/units/quantity.h
@@ -205,7 +205,7 @@ namespace units {
 
     template<Scalar Value>
       requires detail::safe_convertible<Value, rep>
-    constexpr explicit quantity(const Value& r): value_{static_cast<rep>(r)}
+    constexpr explicit quantity(const Value& v): value_{static_cast<rep>(v)}
     {
     }
 
@@ -369,7 +369,8 @@ namespace units {
 
   template<typename U1, typename Rep1, typename U2, typename Rep2>
   [[nodiscard]] constexpr Quantity AUTO operator-(const quantity<U1, Rep1>& lhs, const quantity<U2, Rep2>& rhs)
-      requires same_dim<typename U1::dimension, typename U2::dimension> && detail::basic_arithmetic<Rep1, Rep2>
+      requires same_dim<typename U1::dimension, typename U2::dimension> &&
+               detail::basic_arithmetic<Rep1, Rep2>
   {
     using common_rep = decltype(lhs.count() - rhs.count());
     using ret = common_quantity<quantity<U1, Rep1>, quantity<U2, Rep2>, common_rep>;
@@ -394,7 +395,8 @@ namespace units {
 
   template<typename U1, typename Rep1, typename U2, typename Rep2>
   [[nodiscard]] constexpr Scalar AUTO operator*(const quantity<U1, Rep1>& lhs, const quantity<U2, Rep2>& rhs)
-      requires same_dim<typename U1::dimension, dim_invert<typename U2::dimension>> && detail::basic_arithmetic<Rep1, Rep2>
+      requires same_dim<typename U1::dimension, dim_invert<typename U2::dimension>> &&
+               detail::basic_arithmetic<Rep1, Rep2>
   {
     using common_rep = decltype(lhs.count() * rhs.count());
     using ratio = ratio_multiply<typename U1::ratio, typename U2::ratio>;
@@ -439,7 +441,8 @@ namespace units {
 
   template<typename U1, typename Rep1, typename U2, typename Rep2>
   [[nodiscard]] constexpr Scalar AUTO operator/(const quantity<U1, Rep1>& lhs, const quantity<U2, Rep2>& rhs)
-    requires same_dim<typename U1::dimension, typename U2::dimension>  && detail::basic_arithmetic<Rep1, Rep2>
+    requires same_dim<typename U1::dimension, typename U2::dimension>  &&
+             detail::basic_arithmetic<Rep1, Rep2>
   {
     Expects(rhs != std::remove_cvref_t<decltype(rhs)>(0));