]> git.lizzy.rs Git - rust.git/commitdiff
Rollup merge of #87723 - frogtd:patch-3, r=JohnTitor
authorYuki Okushi <jtitor@2k36.org>
Tue, 3 Aug 2021 23:05:55 +0000 (08:05 +0900)
committerGitHub <noreply@github.com>
Tue, 3 Aug 2021 23:05:55 +0000 (08:05 +0900)
Use .contains instead of manual reimplementation.

It's also significantly easier to read.

library/core/src/num/mod.rs

index 6c43d6d62128e71be7944f8ce9e35850920b6038..9788404dd05bf58f6c18ba5ac18e8d2735595595 100644 (file)
@@ -847,7 +847,7 @@ fn from_str_radix<T: FromStrRadixHelper>(src: &str, radix: u32) -> Result<T, Par
     use self::ParseIntError as PIE;
 
     assert!(
-        radix >= 2 && radix <= 36,
+        (2..=36).contains(&radix),
         "from_str_radix_int: must lie in the range `[2, 36]` - found {}",
         radix
     );