Skip to content

Commit c992166

Browse files
cuvipercuviper
committed
Fix clippy::legacy_numeric_constants
1 parent 29c4d04 commit c992166

File tree

13 files changed

+36
-60
lines changed

13 files changed

+36
-60
lines changed

‎ci/big_quickcheck/src/lib.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ fn quickcheck_signed_eq_symmetric(a: BigInt, b: BigInt) -> bool {
4242

4343
#[test]
4444
fn quickcheck_arith_primitive() {
45-
let gen = Gen::new(usize::max_value());
45+
let gen = Gen::new(usize::MAX);
4646
let mut qc = QuickCheck::new().gen(gen);
4747

4848
fn test_unsigned_add_primitive(a: usize, b: usize) -> TestResult {
@@ -280,7 +280,7 @@ fn quickcheck_signed_conversion(a: BigInt, radix: u8) -> TestResult {
280280

281281
#[test]
282282
fn quicktest_shift() {
283-
let gen = Gen::new(usize::max_value());
283+
let gen = Gen::new(usize::MAX);
284284
let mut qc = QuickCheck::new().gen(gen);
285285

286286
fn test_shr_unsigned(a: u64, shift: u8) -> TestResult {
@@ -317,7 +317,7 @@ fn quicktest_shift() {
317317

318318
#[test]
319319
fn quickcheck_modpow() {
320-
let gen = Gen::new(usize::max_value());
320+
let gen = Gen::new(usize::MAX);
321321
let mut qc = QuickCheck::new().gen(gen);
322322

323323
fn simple_modpow(base: &BigInt, exponent: &BigInt, modulus: &BigInt) -> BigInt {
@@ -360,7 +360,7 @@ fn quickcheck_modpow() {
360360

361361
#[test]
362362
fn quickcheck_modinv() {
363-
let gen = Gen::new(usize::max_value());
363+
let gen = Gen::new(usize::MAX);
364364
let mut qc = QuickCheck::new().gen(gen);
365365

366366
fn test_modinv(value: i128, modulus: i128) -> TestResult {
@@ -417,7 +417,7 @@ fn quickcheck_modinv() {
417417

418418
#[test]
419419
fn quickcheck_to_float_equals_i128_cast() {
420-
let gen = Gen::new(usize::max_value());
420+
let gen = Gen::new(usize::MAX);
421421
let mut qc = QuickCheck::new().gen(gen).tests(1_000_000);
422422

423423
fn to_f32_equals_i128_cast(value: i128) -> bool {

‎ci/big_serde/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ fn bad_size_hint<T: Debug + DeserializeOwned + One + PartialEq + Serialize>(
155155
assert_tokens(&T::one(), &tokens);
156156

157157
tokens[prefix.len()] = Token::Seq {
158-
len: Some(usize::max_value()),
158+
len: Some(usize::MAX),
159159
};
160160

161161
catch_unwind(|| assert_ser_tokens(&T::one(), &tokens)).unwrap_err();

‎src/bigint.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@ use core::fmt;
88
use core::hash;
99
use core::ops::{Neg, Not};
1010
use core::str;
11-
use core::{i128, u128};
12-
use core::{i64, u64};
1311

1412
use num_integer::{Integer, Roots};
1513
use num_traits::{ConstZero, Num, One, Pow, Signed, Zero};

‎src/bigint/convert.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ impl ToPrimitive for BigInt {
5050
let m: u64 = 1 << 63;
5151
match n.cmp(&m) {
5252
Less => Some(-(n as i64)),
53-
Equal => Some(core::i64::MIN),
53+
Equal => Some(i64::MIN),
5454
Greater => None,
5555
}
5656
}
@@ -67,7 +67,7 @@ impl ToPrimitive for BigInt {
6767
let m: u128 = 1 << 127;
6868
match n.cmp(&m) {
6969
Less => Some(-(n as i128)),
70-
Equal => Some(core::i128::MIN),
70+
Equal => Some(i128::MIN),
7171
Greater => None,
7272
}
7373
}
@@ -179,7 +179,7 @@ impl From<i64> for BigInt {
179179
if n >= 0 {
180180
BigInt::from(n as u64)
181181
} else {
182-
let u = core::u64::MAX - (n as u64) + 1;
182+
let u = u64::MAX - (n as u64) + 1;
183183
BigInt {
184184
sign: Minus,
185185
data: BigUint::from(u),
@@ -194,7 +194,7 @@ impl From<i128> for BigInt {
194194
if n >= 0 {
195195
BigInt::from(n as u128)
196196
} else {
197-
let u = core::u128::MAX - (n as u128) + 1;
197+
let u = u128::MAX - (n as u128) + 1;
198198
BigInt {
199199
sign: Minus,
200200
data: BigUint::from(u),

‎src/biguint.rs

Lines changed: 15 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ use core::fmt;
88
use core::hash;
99
use core::mem;
1010
use core::str;
11-
use core::{u32, u64, u8};
1211

1312
use num_integer::{Integer, Roots};
1413
use num_traits::{ConstZero, Num, One, Pow, ToPrimitive, Unsigned, Zero};
@@ -410,7 +409,7 @@ impl Roots for BigUint {
410409
_ => {
411410
// Try to guess by scaling down such that it does fit in `f64`.
412411
// With some (x * 2ⁿᵏ), its nth root ≈ (ⁿ√x * 2ᵏ)
413-
let extra_bits = bits - (core::f64::MAX_EXP as u64 - 1);
412+
let extra_bits = bits - (f64::MAX_EXP as u64 - 1);
414413
let root_scale = Integer::div_ceil(&extra_bits, &n64);
415414
let scale = root_scale * n64;
416415
if scale < bits && bits - scale > n64 {
@@ -458,7 +457,7 @@ impl Roots for BigUint {
458457
_ => {
459458
// Try to guess by scaling down such that it does fit in `f64`.
460459
// With some (x * 2²ᵏ), its sqrt ≈ (√x * 2ᵏ)
461-
let extra_bits = bits - (core::f64::MAX_EXP as u64 - 1);
460+
let extra_bits = bits - (f64::MAX_EXP as u64 - 1);
462461
let root_scale = (extra_bits + 1) / 2;
463462
let scale = root_scale * 2;
464463
(self >> scale).sqrt() << root_scale
@@ -499,7 +498,7 @@ impl Roots for BigUint {
499498
_ => {
500499
// Try to guess by scaling down such that it does fit in `f64`.
501500
// With some (x * 2³ᵏ), its cbrt ≈ (∛x * 2ᵏ)
502-
let extra_bits = bits - (core::f64::MAX_EXP as u64 - 1);
501+
let extra_bits = bits - (f64::MAX_EXP as u64 - 1);
503502
let root_scale = (extra_bits + 2) / 3;
504503
let scale = root_scale * 3;
505504
(self >> scale).cbrt() << root_scale
@@ -1032,9 +1031,7 @@ impl BigUint {
10321031
// Note: we're saturating `digit_index` and `new_len` -- any such case is guaranteed to
10331032
// fail allocation, and that's more consistent than adding our own overflow panics.
10341033
let bits_per_digit = u64::from(big_digit::BITS);
1035-
let digit_index = (bit / bits_per_digit)
1036-
.to_usize()
1037-
.unwrap_or(core::usize::MAX);
1034+
let digit_index = (bit / bits_per_digit).to_usize().unwrap_or(usize::MAX);
10381035
let bit_mask = (1 as BigDigit) << (bit % bits_per_digit);
10391036
if value {
10401037
if digit_index >= self.data.len() {
@@ -1176,28 +1173,17 @@ cfg_digit!(
11761173
fn test_u32_u128() {
11771174
assert_eq!(u32_from_u128(0u128), (0, 0, 0, 0));
11781175
assert_eq!(
1179-
u32_from_u128(u128::max_value()),
1180-
(
1181-
u32::max_value(),
1182-
u32::max_value(),
1183-
u32::max_value(),
1184-
u32::max_value()
1185-
)
1176+
u32_from_u128(u128::MAX),
1177+
(u32::MAX, u32::MAX, u32::MAX, u32::MAX)
11861178
);
11871179

1188-
assert_eq!(
1189-
u32_from_u128(u32::max_value() as u128),
1190-
(0, 0, 0, u32::max_value())
1191-
);
1180+
assert_eq!(u32_from_u128(u32::MAX as u128), (0, 0, 0, u32::MAX));
11921181

1193-
assert_eq!(
1194-
u32_from_u128(u64::max_value() as u128),
1195-
(0, 0, u32::max_value(), u32::max_value())
1196-
);
1182+
assert_eq!(u32_from_u128(u64::MAX as u128), (0, 0, u32::MAX, u32::MAX));
11971183

11981184
assert_eq!(
1199-
u32_from_u128((u64::max_value() as u128) + u32::max_value() as u128),
1200-
(0, 1, 0, u32::max_value() - 1)
1185+
u32_from_u128((u64::MAX as u128) + u32::MAX as u128),
1186+
(0, 1, 0, u32::MAX - 1)
12011187
);
12021188

12031189
assert_eq!(u32_from_u128(36_893_488_151_714_070_528), (0, 2, 1, 0));
@@ -1209,11 +1195,11 @@ fn test_u128_u32_roundtrip() {
12091195
let values = vec![
12101196
0u128,
12111197
1u128,
1212-
u64::max_value() as u128 * 3,
1213-
u32::max_value() as u128,
1214-
u64::max_value() as u128,
1215-
(u64::max_value() as u128) + u32::max_value() as u128,
1216-
u128::max_value(),
1198+
u64::MAX as u128 * 3,
1199+
u32::MAX as u128,
1200+
u64::MAX as u128,
1201+
(u64::MAX as u128) + u32::MAX as u128,
1202+
u128::MAX,
12171203
];
12181204

12191205
for val in &values {

‎src/biguint/addition.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ impl AddAssign<u128> for BigUint {
194194
cfg_digit!(
195195
#[inline]
196196
fn add_assign(&mut self, other: u128) {
197-
if other <= u128::from(u64::max_value()) {
197+
if other <= u128::from(u64::MAX) {
198198
*self += other as u64
199199
} else {
200200
let (a, b, c, d) = super::u32_from_u128(other);

‎src/biguint/convert.rs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ fn from_inexact_bitwise_digits_le(v: &[u8], bits: u8) -> BigUint {
6969
let total_bits = (v.len() as u64).saturating_mul(bits.into());
7070
let big_digits = Integer::div_ceil(&total_bits, &big_digit::BITS.into())
7171
.to_usize()
72-
.unwrap_or(core::usize::MAX);
72+
.unwrap_or(usize::MAX);
7373
let mut data = Vec::with_capacity(big_digits);
7474

7575
let mut d = 0;
@@ -245,7 +245,7 @@ impl Num for BigUint {
245245
b'a'..=b'z' => b - b'a' + 10,
246246
b'A'..=b'Z' => b - b'A' + 10,
247247
b'_' => continue,
248-
_ => core::u8::MAX,
248+
_ => u8::MAX,
249249
};
250250
if d < radix as u8 {
251251
v.push(d);
@@ -372,8 +372,8 @@ impl ToPrimitive for BigUint {
372372
let mantissa = high_bits_to_u64(self);
373373
let exponent = self.bits() - u64::from(fls(mantissa));
374374

375-
if exponent > core::f32::MAX_EXP as u64 {
376-
Some(core::f32::INFINITY)
375+
if exponent > f32::MAX_EXP as u64 {
376+
Some(f32::INFINITY)
377377
} else {
378378
Some((mantissa as f32) * 2.0f32.powi(exponent as i32))
379379
}
@@ -384,8 +384,8 @@ impl ToPrimitive for BigUint {
384384
let mantissa = high_bits_to_u64(self);
385385
let exponent = self.bits() - u64::from(fls(mantissa));
386386

387-
if exponent > core::f64::MAX_EXP as u64 {
388-
Some(core::f64::INFINITY)
387+
if exponent > f64::MAX_EXP as u64 {
388+
Some(f64::INFINITY)
389389
} else {
390390
Some((mantissa as f64) * 2.0f64.powi(exponent as i32))
391391
}
@@ -607,7 +607,7 @@ pub(super) fn to_bitwise_digits_le(u: &BigUint, bits: u8) -> Vec<u8> {
607607
let digits_per_big_digit = big_digit::BITS / bits;
608608
let digits = Integer::div_ceil(&u.bits(), &u64::from(bits))
609609
.to_usize()
610-
.unwrap_or(core::usize::MAX);
610+
.unwrap_or(usize::MAX);
611611
let mut res = Vec::with_capacity(digits);
612612

613613
for mut r in u.data[..last_i].iter().cloned() {
@@ -633,7 +633,7 @@ fn to_inexact_bitwise_digits_le(u: &BigUint, bits: u8) -> Vec<u8> {
633633
let mask: BigDigit = (1 << bits) - 1;
634634
let digits = Integer::div_ceil(&u.bits(), &u64::from(bits))
635635
.to_usize()
636-
.unwrap_or(core::usize::MAX);
636+
.unwrap_or(usize::MAX);
637637
let mut res = Vec::with_capacity(digits);
638638

639639
let mut r = 0;

‎src/biguint/shift.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ fn biguint_shr<T: PrimInt>(n: Cow<'_, BigUint>, shift: T) -> BigUint {
5858
return n.into_owned();
5959
}
6060
let bits = T::from(big_digit::BITS).unwrap();
61-
let digits = (shift / bits).to_usize().unwrap_or(core::usize::MAX);
61+
let digits = (shift / bits).to_usize().unwrap_or(usize::MAX);
6262
let shift = (shift % bits).to_u8().unwrap();
6363
biguint_shr2(n, digits, shift)
6464
}

‎tests/bigint.rs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,6 @@ use std::hash::{BuildHasher, Hash, Hasher};
88
use std::iter::repeat;
99
use std::ops::Neg;
1010
use std::{f32, f64};
11-
use std::{i128, u128};
12-
use std::{i16, i32, i64, i8, isize};
13-
use std::{u16, u32, u64, u8, usize};
1411

1512
use num_integer::Integer;
1613
use num_traits::{

‎tests/bigint_bitwise.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
use num_bigint::{BigInt, Sign, ToBigInt};
22
use num_traits::ToPrimitive;
3-
use std::{i32, i64, u32};
43

54
enum ValueVec {
65
N,

‎tests/biguint.rs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,9 @@ use num_integer::Integer;
66
use std::cmp::Ordering::{Equal, Greater, Less};
77
use std::collections::hash_map::RandomState;
88
use std::hash::{BuildHasher, Hash, Hasher};
9-
use std::i64;
109
use std::iter::repeat;
1110
use std::str::FromStr;
1211
use std::{f32, f64};
13-
use std::{i128, u128};
14-
use std::{u16, u32, u64, u8, usize};
1512

1613
use num_traits::{
1714
pow, CheckedAdd, CheckedDiv, CheckedMul, CheckedSub, Euclid, FromBytes, FromPrimitive, Num,

‎tests/consts/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ pub const SUM_TRIPLES: &[(&[u32], &[u32], &[u32])] = &[
1616
(&[1, 2, 2, 1], &[N1, N2], &[0, 1, 3, 1]),
1717
];
1818

19-
pub const M: u32 = ::std::u32::MAX;
19+
pub const M: u32 = u32::MAX;
2020
pub const MUL_TRIPLES: &[(&[u32], &[u32], &[u32])] = &[
2121
(&[], &[], &[]),
2222
(&[], &[1], &[]),

‎tests/roots.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
mod biguint {
22
use num_bigint::BigUint;
33
use num_traits::{One, Zero};
4-
use std::{i32, u32};
54

65
fn check<T: Into<BigUint>>(x: T, n: u32) {
76
let x: BigUint = x.into();

0 commit comments

Comments
 (0)