From 98bee053ef9741f8968441cb6d06b9b85f2c7c9b Mon Sep 17 00:00:00 2001
From: Trevor Gross <tmgross@umich.edu>
Date: Thu, 30 Jan 2025 12:52:35 +0000
Subject: [PATCH] Fix hex float trait recursion problem

---
 .../libm/src/math/support/hex_float.rs        | 30 ++++---------------
 1 file changed, 5 insertions(+), 25 deletions(-)

diff --git a/library/compiler-builtins/libm/src/math/support/hex_float.rs b/library/compiler-builtins/libm/src/math/support/hex_float.rs
index da41622f2967..ebc4f7c64fab 100644
--- a/library/compiler-builtins/libm/src/math/support/hex_float.rs
+++ b/library/compiler-builtins/libm/src/math/support/hex_float.rs
@@ -245,29 +245,21 @@ fn fmt_any_hex<F: Float>(x: &F, f: &mut fmt::Formatter<'_>) -> fmt::Result {
     write!(f, "0x{leading}{sig:0mwidth$x}p{exponent:+}")
 }
 
-#[cfg(f16_enabled)]
-impl fmt::LowerHex for Hexf<f16> {
+impl<F: Float> fmt::LowerHex for Hexf<F> {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         fmt_any_hex(&self.0, f)
     }
 }
 
-impl fmt::LowerHex for Hexf<f32> {
+impl<F: Float> fmt::LowerHex for Hexf<(F, F)> {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        fmt_any_hex(&self.0, f)
+        write!(f, "({:x}, {:x})", Hexf(self.0.0), Hexf(self.0.1))
     }
 }
 
-impl fmt::LowerHex for Hexf<f64> {
+impl<F: Float> fmt::LowerHex for Hexf<(F, i32)> {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        fmt_any_hex(&self.0, f)
-    }
-}
-
-#[cfg(f128_enabled)]
-impl fmt::LowerHex for Hexf<f128> {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        fmt_any_hex(&self.0, f)
+        write!(f, "({:x}, {:x})", Hexf(self.0.0), Hexf(self.0.1))
     }
 }
 
@@ -277,18 +269,6 @@ impl fmt::LowerHex for Hexf<i32> {
     }
 }
 
-impl<T1, T2> fmt::LowerHex for Hexf<(T1, T2)>
-where
-    T1: Copy,
-    T2: Copy,
-    Hexf<T1>: fmt::LowerHex,
-    Hexf<T2>: fmt::LowerHex,
-{
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        write!(f, "({:x}, {:x})", Hexf(self.0.0), Hexf(self.0.1))
-    }
-}
-
 impl<T> fmt::Debug for Hexf<T>
 where
     Hexf<T>: fmt::LowerHex,