Skip to content

Commit 477947b

Browse files
akuberaakubera
committed
Fix clippy lints
1 parent b797393 commit 477947b

13 files changed

+46
-38
lines changed

‎src/arithmetic/cbrt.rs

+10-5
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,16 @@ pub(crate) fn impl_cbrt_uint_scale(
4646

4747
let (mut new_scale, remainder) = shifted_scale.div_rem(&3);
4848

49-
if remainder > 0 {
50-
new_scale += 1;
51-
exp_shift += (3 - remainder) as u64;
52-
} else if remainder < 0 {
53-
exp_shift += remainder.neg() as u64;
49+
match remainder.cmp(&0) {
50+
Ordering::Greater => {
51+
new_scale += 1;
52+
exp_shift += (3 - remainder) as u64;
53+
}
54+
Ordering::Less => {
55+
exp_shift += remainder.neg() as u64;
56+
}
57+
Ordering::Equal => {
58+
}
5459
}
5560

5661
// clone-on-write copy of digits

‎src/arithmetic/mod.rs

+1
Original file line numberDiff line numberDiff line change
@@ -145,6 +145,7 @@ pub(crate) fn abs_diff(x: i64, y: i64) -> u64 {
145145
}
146146

147147
#[cfg(not(rustc_1_60))]
148+
#[allow(dead_code)]
148149
pub(crate) fn abs_diff(x: i64, y: i64) -> u64 {
149150
(x as i128 - y as i128).to_u64().unwrap_or(0)
150151
}

‎src/arithmetic/sqrt.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ use crate::*;
55

66
pub(crate) fn impl_sqrt(n: &BigUint, scale: i64, ctx: &Context) -> BigDecimal {
77
// Calculate the number of digits and the difference compared to the scale
8-
let num_digits = count_decimal_digits_uint(&n);
8+
let num_digits = count_decimal_digits_uint(n);
99
let scale_diff = BigInt::from(num_digits) - scale;
1010

1111
// Calculate the number of wanted digits and the exponent we need to raise the original value to

‎src/impl_fmt.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ fn dynamically_format_decimal(
109109
// use exponential form if decimal point is outside
110110
// the upper and lower thresholds of the decimal,
111111
// and precision was not requested
112-
if matches!(f.precision(), None) && leading_zero_threshold < leading_zero_count {
112+
if f.precision().is_none() && leading_zero_threshold < leading_zero_count {
113113
format_exponential(this, f, abs_int, "E")
114114
} else if trailing_zero_threshold < trailing_zeros {
115115
// non-scientific notation
@@ -122,7 +122,7 @@ fn dynamically_format_decimal(
122122

123123
pub(crate) struct FullScaleFormatter<'a>(pub BigDecimalRef<'a>);
124124

125-
impl<'a> fmt::Display for FullScaleFormatter<'a> {
125+
impl fmt::Display for FullScaleFormatter<'_> {
126126
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
127127
let n = self.0;
128128
let non_negative = matches!(n.sign, Sign::Plus | Sign::NoSign);
@@ -222,7 +222,7 @@ fn zero_right_pad_integer_ascii_digits(
222222

223223
// did not explicitly request precision, so we'll only
224224
// implicitly right-pad if less than this threshold.
225-
if matches!(target_scale, None) && integer_zero_count > 20 {
225+
if target_scale.is_none() && integer_zero_count > 20 {
226226
// no padding
227227
return;
228228
}

‎src/impl_num.rs

+6-6
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ impl ToPrimitive for BigDecimal {
126126
}
127127
}
128128

129-
impl<'a> ToPrimitive for BigDecimalRef<'a> {
129+
impl ToPrimitive for BigDecimalRef<'_> {
130130
fn to_i64(&self) -> Option<i64> {
131131
match self.sign() {
132132
Sign::Plus if self.scale == 0 => self.digits.to_i64(),
@@ -237,9 +237,9 @@ impl<'a> ToPrimitive for BigDecimalRef<'a> {
237237
None => {
238238
// exponenent too big for i32: return appropriate infinity
239239
let result = if self.sign != Sign::Minus {
240-
stdlib::f64::INFINITY
240+
f64::INFINITY
241241
} else {
242-
stdlib::f64::NEG_INFINITY
242+
f64::NEG_INFINITY
243243
};
244244
result.into()
245245
}
@@ -331,9 +331,9 @@ mod test {
331331
impl_case!(case_zero: 0.0);
332332
impl_case!(case_neg_zero: -0.0);
333333
impl_case!(case_875en6: 0.000875);
334-
impl_case!(case_f64_min: stdlib::f64::MIN);
335-
impl_case!(case_f64_max: stdlib::f64::MAX);
336-
impl_case!(case_f64_min_pos: stdlib::f64::MIN_POSITIVE);
334+
impl_case!(case_f64_min: f64::MIN);
335+
impl_case!(case_f64_max: f64::MAX);
336+
impl_case!(case_f64_min_pos: f64::MIN_POSITIVE);
337337
impl_case!(case_pi: stdlib::f64::consts::PI);
338338
impl_case!(case_neg_e: -stdlib::f64::consts::E);
339339
impl_case!(case_1en500: 1e-500);

‎src/impl_ops.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -449,7 +449,7 @@ impl Neg for BigDecimal {
449449
}
450450
}
451451

452-
impl<'a> Neg for &'a BigDecimal {
452+
impl Neg for &BigDecimal {
453453
type Output = BigDecimal;
454454

455455
#[inline]

‎src/impl_ops_add.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -95,15 +95,15 @@ impl Add<BigDecimal> for BigInt {
9595
}
9696
}
9797

98-
impl<'a> Add<&'a BigDecimal> for BigInt {
98+
impl Add<&BigDecimal> for BigInt {
9999
type Output = BigDecimal;
100100

101101
fn add(self, rhs: &BigDecimal) -> BigDecimal {
102102
BigDecimal::from(self) + rhs
103103
}
104104
}
105105

106-
impl<'a> Add<BigDecimalRef<'a>> for BigInt {
106+
impl Add<BigDecimalRef<'_>> for BigInt {
107107
type Output = BigDecimal;
108108

109109
fn add(self, rhs: BigDecimalRef<'_>) -> BigDecimal {
@@ -121,7 +121,7 @@ impl Add<BigDecimal> for &BigInt {
121121
}
122122
}
123123

124-
impl<'a> Add<&'a BigDecimal> for &BigInt {
124+
impl Add<&BigDecimal> for &BigInt {
125125
type Output = BigDecimal;
126126

127127
#[inline]
@@ -130,7 +130,7 @@ impl<'a> Add<&'a BigDecimal> for &BigInt {
130130
}
131131
}
132132

133-
impl<'a> Add<BigDecimalRef<'a>> for &BigInt {
133+
impl Add<BigDecimalRef<'_>> for &BigInt {
134134
type Output = BigDecimal;
135135

136136
#[inline]

‎src/impl_ops_div.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ impl<'a> Div<&'a BigDecimal> for BigDecimal {
5656

5757
forward_ref_val_binop!(impl Div for BigDecimal, div);
5858

59-
impl<'a, 'b> Div<&'b BigDecimal> for &'a BigDecimal {
59+
impl Div<&BigDecimal> for &BigDecimal {
6060
type Output = BigDecimal;
6161

6262
#[inline]

‎src/impl_ops_mul.rs

+10-10
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ impl<'a> Mul<&'a BigDecimal> for BigDecimal {
4242
}
4343
}
4444

45-
impl<'a> Mul<BigDecimal> for &'a BigDecimal {
45+
impl Mul<BigDecimal> for &BigDecimal {
4646
type Output = BigDecimal;
4747

4848
#[inline]
@@ -51,7 +51,7 @@ impl<'a> Mul<BigDecimal> for &'a BigDecimal {
5151
}
5252
}
5353

54-
impl<'a, 'b> Mul<&'b BigDecimal> for &'a BigDecimal {
54+
impl Mul<&BigDecimal> for &BigDecimal {
5555
type Output = BigDecimal;
5656

5757
#[inline]
@@ -77,7 +77,7 @@ impl Mul<BigInt> for BigDecimal {
7777
}
7878
}
7979

80-
impl<'a> Mul<&'a BigInt> for BigDecimal {
80+
impl Mul<&BigInt> for BigDecimal {
8181
type Output = BigDecimal;
8282

8383
#[inline]
@@ -87,7 +87,7 @@ impl<'a> Mul<&'a BigInt> for BigDecimal {
8787
}
8888
}
8989

90-
impl<'a> Mul<BigInt> for &'a BigDecimal {
90+
impl Mul<BigInt> for &BigDecimal {
9191
type Output = BigDecimal;
9292

9393
#[inline]
@@ -97,7 +97,7 @@ impl<'a> Mul<BigInt> for &'a BigDecimal {
9797
}
9898
}
9999

100-
impl<'a, 'b> Mul<&'a BigInt> for &'b BigDecimal {
100+
impl Mul<&BigInt> for &BigDecimal {
101101
type Output = BigDecimal;
102102

103103
#[inline]
@@ -128,7 +128,7 @@ impl Mul<BigDecimal> for BigInt {
128128
}
129129
}
130130

131-
impl<'a> Mul<BigDecimal> for &'a BigInt {
131+
impl Mul<BigDecimal> for &BigInt {
132132
type Output = BigDecimal;
133133

134134
#[inline]
@@ -147,7 +147,7 @@ impl<'a> Mul<BigDecimal> for &'a BigInt {
147147
}
148148
}
149149

150-
impl<'a, 'b> Mul<&'a BigDecimal> for &'b BigInt {
150+
impl Mul<&BigDecimal> for &BigInt {
151151
type Output = BigDecimal;
152152

153153
#[inline]
@@ -163,7 +163,7 @@ impl<'a, 'b> Mul<&'a BigDecimal> for &'b BigInt {
163163
}
164164
}
165165

166-
impl<'a> Mul<&'a BigDecimal> for BigInt {
166+
impl Mul<&BigDecimal> for BigInt {
167167
type Output = BigDecimal;
168168

169169
#[inline]
@@ -181,7 +181,7 @@ impl<'a> Mul<&'a BigDecimal> for BigInt {
181181

182182
forward_val_assignop!(impl MulAssign for BigDecimal, mul_assign);
183183

184-
impl<'a> MulAssign<&'a BigDecimal> for BigDecimal {
184+
impl MulAssign<&BigDecimal> for BigDecimal {
185185
#[inline]
186186
fn mul_assign(&mut self, rhs: &BigDecimal) {
187187
if rhs.is_one() {
@@ -192,7 +192,7 @@ impl<'a> MulAssign<&'a BigDecimal> for BigDecimal {
192192
}
193193
}
194194

195-
impl<'a> MulAssign<&'a BigInt> for BigDecimal {
195+
impl MulAssign<&BigInt> for BigDecimal {
196196
#[inline]
197197
fn mul_assign(&mut self, rhs: &BigInt) {
198198
if rhs.is_one() {

‎src/impl_ops_rem.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ impl Rem<BigDecimal> for BigDecimal {
1717
}
1818
}
1919

20-
impl<'a> Rem<&'a BigDecimal> for BigDecimal {
20+
impl Rem<&BigDecimal> for BigDecimal {
2121
type Output = BigDecimal;
2222

2323
#[inline]
@@ -35,7 +35,7 @@ impl<'a> Rem<&'a BigDecimal> for BigDecimal {
3535
}
3636
}
3737

38-
impl<'a> Rem<BigDecimal> for &'a BigDecimal {
38+
impl Rem<BigDecimal> for &BigDecimal {
3939
type Output = BigDecimal;
4040

4141
#[inline]
@@ -55,7 +55,7 @@ impl<'a> Rem<BigDecimal> for &'a BigDecimal {
5555
}
5656
}
5757

58-
impl<'a, 'b> Rem<&'b BigDecimal> for &'a BigDecimal {
58+
impl Rem<&BigDecimal> for &BigDecimal {
5959
type Output = BigDecimal;
6060

6161
#[inline]

‎src/impl_trait_from_str.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ mod tests {
2222
fn $name() {
2323
let dec = BigDecimal::from_str($input).unwrap();
2424
assert_eq!(dec.int_val, $int.into());
25-
assert_eq!(dec.scale, -$exp);
25+
assert_eq!(dec.scale, -($exp));
2626
}
2727
};
2828
}

‎src/lib.rs

+5-2
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,14 @@
4343
#![allow(clippy::style)]
4444
#![allow(clippy::excessive_precision)]
4545
#![allow(clippy::unreadable_literal)]
46+
#![allow(clippy::unusual_byte_groupings)]
47+
#![allow(clippy::needless_late_init)]
4648
#![allow(clippy::needless_return)]
4749
#![allow(clippy::suspicious_arithmetic_impl)]
4850
#![allow(clippy::suspicious_op_assign_impl)]
4951
#![allow(clippy::redundant_field_names)]
5052
#![allow(clippy::approx_constant)]
53+
#![allow(clippy::wrong_self_convention)]
5154
#![cfg_attr(test, allow(clippy::useless_vec))]
5255
#![allow(unused_imports)]
5356

@@ -1984,12 +1987,12 @@ mod bigdecimal_tests {
19841987
];
19851988

19861989
for s in true_vals {
1987-
let d = BigDecimal::from_str(&s).unwrap();
1990+
let d = BigDecimal::from_str(s).unwrap();
19881991
assert!(d.is_integer());
19891992
}
19901993

19911994
for s in false_vals {
1992-
let d = BigDecimal::from_str(&s).unwrap();
1995+
let d = BigDecimal::from_str(s).unwrap();
19931996
assert!(!d.is_integer());
19941997
}
19951998
}

‎src/with_std.rs

-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ mod stdlib {
1616
slice,
1717
str,
1818
string,
19-
i8,
2019
f32,
2120
f64,
2221
};

0 commit comments

Comments
 (0)