Clean up const-hack from #58044

jumbatm · jumbatm · commit 91c2f78b504e · 2019-12-27T23:21:32.000+10:00
diff --git a/src/libcore/num/mod.rs b/src/libcore/num/mod.rs
@@ -1709,8 +1709,13 @@ assert_eq!(", stringify!($SelfT), "::MIN.overflowing_neg(), (", stringify!($Self
             #[inline]
             #[stable(feature = "wrapping", since = "1.7.0")]
             #[rustc_const_stable(feature = "const_int_methods", since = "1.32.0")]
+            #[allow_internal_unstable(const_if_match)]
             pub const fn overflowing_neg(self) -> (Self, bool) {
-                ((!self).wrapping_add(1), self == Self::min_value())
+                if self == Self::min_value() {
+                    (Self::min_value(), true)
+                } else {
+                    (-self, false)
+                }
             }
         }
 

Original file line number	Diff line number	Diff line change
`@@ -1709,8 +1709,13 @@ assert_eq!(", stringify!($SelfT), "::MIN.overflowing_neg(), (", stringify!($Self`
`1709`	`1709`	`#[inline]`
`1710`	`1710`	`#[stable(feature = "wrapping", since = "1.7.0")]`
`1711`	`1711`	`#[rustc_const_stable(feature = "const_int_methods", since = "1.32.0")]`
	`1712`	`+ #[allow_internal_unstable(const_if_match)]`
`1712`	`1713`	`pub const fn overflowing_neg(self) -> (Self, bool) {`
`1713`		`- ((!self).wrapping_add(1), self == Self::min_value())`
	`1714`	`+ if self == Self::min_value() {`
	`1715`	`+ (Self::min_value(), true)`
	`1716`	`+ } else {`
	`1717`	`+ (-self, false)`
	`1718`	`+ }`
`1714`	`1719`	`}`
`1715`	`1720`	`}`
`1716`	`1721`