From 0d00be067aa9b65f2f897bbefe75d5b48901fa2b Mon Sep 17 00:00:00 2001
From: Mateusz Pusz <mateusz.pusz@gmail.com>
Date: Tue, 1 Oct 2024 21:37:31 +0200
Subject: [PATCH] refactor: `convertible(U1, U2)` implementation simplified

---
 src/core/include/mp-units/framework/unit.h | 23 +++++++---------------
 1 file changed, 7 insertions(+), 16 deletions(-)

diff --git a/src/core/include/mp-units/framework/unit.h b/src/core/include/mp-units/framework/unit.h
index 6982f667..6194b845 100644
--- a/src/core/include/mp-units/framework/unit.h
+++ b/src/core/include/mp-units/framework/unit.h
@@ -130,17 +130,18 @@ using type_list_of_unit_less = expr_less<T1, T2, unit_less>;
 // Even though it is not exported, it is visible to the other module via ADL
 [[nodiscard]] consteval auto get_canonical_unit(Unit auto u) { return detail::get_canonical_unit_impl(u, u); }
 
-namespace detail {
-
-template<Unit U1, Unit U2>
-[[nodiscard]] consteval bool have_same_canonical_reference_unit(U1 u1, U2 u2)
+// convertible
+template<Unit From, Unit To>
+[[nodiscard]] consteval bool convertible(From from, To to)
 {
-  if constexpr (is_same_v<U1, U2>)
+  if constexpr (is_same_v<From, To>)
     return true;
   else
-    return is_same_v<decltype(get_canonical_unit(u1).reference_unit), decltype(get_canonical_unit(u2).reference_unit)>;
+    return is_same_v<decltype(get_canonical_unit(from).reference_unit),
+                     decltype(get_canonical_unit(to).reference_unit)>;
 }
 
+namespace detail {
 
 struct unit_interface {
   /**
@@ -670,16 +671,6 @@ inline constexpr auto ppm = parts_per_million;
 // clang-format on
 
 
-// convertible
-template<Unit From, Unit To>
-[[nodiscard]] consteval bool convertible(From from, To to)
-{
-  if constexpr (is_same_v<From, To>)
-    return true;
-  else
-    return detail::have_same_canonical_reference_unit(from, to);
-}
-
 // Common unit
 [[nodiscard]] consteval Unit auto get_common_unit(Unit auto u) { return u; }