Merge pull request rust-lang#736 from tgross35/fix-abs-diff

tgross35 · web-flow · commit cd4b4a6cbf78 · 2024-12-22T17:25:43.000-05:00
Fix a bug in `abs_diff`
diff --git a/library/compiler-builtins/src/int/mod.rs b/library/compiler-builtins/src/int/mod.rs
@@ -240,11 +240,7 @@ macro_rules! int_impl {
             }
 
             fn abs_diff(self, other: Self) -> Self {
-                if self < other {
-                    other.wrapping_sub(self)
-                } else {
-                    self.wrapping_sub(other)
-                }
+                self.abs_diff(other)
             }
 
             int_impl_common!($uty);
@@ -277,7 +273,7 @@ macro_rules! int_impl {
             }
 
             fn abs_diff(self, other: Self) -> $uty {
-                self.wrapping_sub(other).wrapping_abs() as $uty
+                self.abs_diff(other)
             }
 
             int_impl_common!($ity);

Original file line number	Diff line number	Diff line change
`@@ -240,11 +240,7 @@ macro_rules! int_impl {`
`240`	`240`	`}`
`241`	`241`
`242`	`242`	`fn abs_diff(self, other: Self) -> Self {`
`243`		`- if self < other {`
`244`		`- other.wrapping_sub(self)`
`245`		`- } else {`
`246`		`- self.wrapping_sub(other)`
`247`		`- }`
	`243`	`+ self.abs_diff(other)`
`248`	`244`	`}`
`249`	`245`
`250`	`246`	`int_impl_common!($uty);`
`@@ -277,7 +273,7 @@ macro_rules! int_impl {`
`277`	`273`	`}`
`278`	`274`
`279`	`275`	`fn abs_diff(self, other: Self) -> $uty {`
`280`		`- self.wrapping_sub(other).wrapping_abs() as $uty`
	`276`	`+ self.abs_diff(other)`
`281`	`277`	`}`
`282`	`278`
`283`	`279`	`int_impl_common!($ity);`