Reduce changes to original code

Author: ChaiTRex

library/core/src/num/uint_macros.rs

@@ -1491,18 +1491,25 @@ macro_rules! uint_impl {
                       without modifying the original"]
         #[inline]
         pub const fn checked_ilog(self, base: Self) -> Option<u32> {
-            // Preconditions for calling inner function `slow_ilog`:
-            //
-            // 1: base >= 2
-            // 2: x >= base
-            #[inline(always)]
-            const fn slow_ilog(x: $SelfT, base: $SelfT) -> u32 {
-                // Since x >= base, n >= 1
+            if core::intrinsics::is_val_statically_known(base) {
+                if base == 2 {
+                    return self.checked_ilog2();
+                } else if base == 10 {
+                    return self.checked_ilog10();
+                }
+            }
+
+            if self <= 0 || base <= 1 {
+                None
+            } else if self < base {
+                Some(0)
+            } else {
+                // Since base >= self, n >= 1
                 let mut n = 1;
                 let mut r = base;
 
                 // Optimization for 128 bit wide integers.
-                if <$SelfT>::BITS == 128 {
+                if Self::BITS == 128 {
                     // The following is a correct lower bound for ⌊log(base,self)⌋ because
                     //
                     // log(base,self) = log(2,self) / log(2,base)
@@ -1511,59 +1518,15 @@ macro_rules! uint_impl {
                     // hence
                     //
                     // ⌊log(base,self)⌋ ≥ ⌊ ⌊log(2,self)⌋ / (⌊log(2,base)⌋ + 1) ⌋ .
-                    n = x.ilog2() / (base.ilog2() + 1);
+                    n = self.ilog2() / (base.ilog2() + 1);
                     r = base.pow(n);
                 }
 
-                while r <= x / base {
+                while r <= self / base {
                     n += 1;
                     r *= base;
                 }
-                n
-            }
-
-            if core::intrinsics::is_val_statically_known(self) {
-                if self <= 0 {
-                    None
-                } else if core::intrinsics::is_val_statically_known(base) {
-                    if base <= 1 { // precondition 1
-                        None
-                    } else if self < base { // precondition 2
-                        Some(0)
-                    } else if base == 2 {
-                        self.checked_ilog2()
-                    } else if base == 10 {
-                        self.checked_ilog10()
-                    } else { // all preconditions satisfied
-                        Some(slow_ilog(self, base))
-                    }
-                } else if base <= 1 { // precondition 1
-                    None
-                } else if self < base { // precondition 2
-                    Some(0)
-                } else { // all preconditions satisfied
-                    Some(slow_ilog(self, base))
-                }
-            } else if core::intrinsics::is_val_statically_known(base) {
-                if base <= 1 { // precondition 1
-                    None
-                } else if base == 2 {
-                    self.checked_ilog2()
-                } else if base == 10 {
-                    self.checked_ilog10()
-                } else if self <= 0 {
-                    None
-                } else if self < base { // precondition 2
-                    Some(0)
-                } else { // all preconditions satisfied
-                    Some(slow_ilog(self, base))
-                }
-            } else if self <= 0 || base <= 1 { // precondition 1
-                None
-            } else if self < base { // precondition 2
-                Some(0)
-            } else { // all preconditions satisfied
-                Some(slow_ilog(self, base))
+                Some(n)
             }
         }