Skip to content

Commit a8b02c8

Browse files
programmerjakeprogrammerjake
committed
format code
1 parent 3f086bc commit a8b02c8

17 files changed

+217
-352
lines changed

‎src/algebraic_numbers.rs

Lines changed: 19 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,26 @@
11
// SPDX-License-Identifier: LGPL-2.1-or-later
22
// See Notices.txt for copyright information
33

4-
use crate::interval_arithmetic::DyadicFractionInterval;
5-
use crate::polynomial::Polynomial;
6-
use crate::traits::AlwaysExactDiv;
7-
use crate::traits::AlwaysExactDivAssign;
8-
use crate::traits::CeilLog2;
9-
use crate::traits::ExactDiv;
10-
use crate::traits::ExactDivAssign;
11-
use crate::traits::FloorLog2;
12-
use crate::util::DebugAsDisplay;
13-
use crate::util::Sign;
14-
use num_bigint::BigInt;
15-
use num_bigint::BigUint;
4+
use crate::{
5+
interval_arithmetic::DyadicFractionInterval,
6+
polynomial::Polynomial,
7+
traits::{AlwaysExactDiv, AlwaysExactDivAssign, CeilLog2, ExactDiv, ExactDivAssign, FloorLog2},
8+
util::{DebugAsDisplay, Sign},
9+
};
10+
use num_bigint::{BigInt, BigUint};
1611
use num_integer::Integer;
1712
use num_rational::Ratio;
18-
use num_traits::Num;
19-
use num_traits::One;
20-
use num_traits::Pow;
21-
use num_traits::Signed;
22-
use num_traits::ToPrimitive;
23-
use num_traits::Zero;
24-
use std::borrow::Cow;
25-
use std::cmp::Ordering;
26-
use std::error::Error;
27-
use std::fmt;
28-
use std::hash;
29-
use std::mem;
30-
use std::ops::Add;
31-
use std::ops::AddAssign;
32-
use std::ops::Deref;
33-
use std::ops::DerefMut;
34-
use std::ops::Div;
35-
use std::ops::DivAssign;
36-
use std::ops::Mul;
37-
use std::ops::MulAssign;
38-
use std::ops::Neg;
39-
use std::ops::Rem;
40-
use std::ops::RemAssign;
41-
use std::ops::Sub;
42-
use std::ops::SubAssign;
13+
use num_traits::{Num, One, Pow, Signed, ToPrimitive, Zero};
14+
use std::{
15+
borrow::Cow,
16+
cmp::Ordering,
17+
error::Error,
18+
fmt, hash, mem,
19+
ops::{
20+
Add, AddAssign, Deref, DerefMut, Div, DivAssign, Mul, MulAssign, Neg, Rem, RemAssign, Sub,
21+
SubAssign,
22+
},
23+
};
4324

4425
pub trait IntoRationalExponent {
4526
fn into_rational_exponent(self) -> Ratio<BigInt>;
@@ -1527,8 +1508,7 @@ impl<E: IntoRationalExponent> Pow<E> for &'_ RealAlgebraicNumber {
15271508
#[cfg(test)]
15281509
mod tests {
15291510
use super::*;
1530-
use crate::util::tests::test_checked_op_helper;
1531-
use crate::util::tests::test_op_helper;
1511+
use crate::util::tests::{test_checked_op_helper, test_op_helper};
15321512
use num_integer::Roots;
15331513

15341514
fn r(n: i128, d: i128) -> Ratio<BigInt> {

‎src/array2d.rs

Lines changed: 10 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -4,22 +4,16 @@
44
// FIXME: remove when module made public again
55
#![allow(dead_code)]
66

7-
use std::borrow::Borrow;
8-
use std::borrow::BorrowMut;
9-
use std::fmt;
10-
use std::iter::FusedIterator;
11-
use std::ops::Bound;
12-
use std::ops::Index;
13-
use std::ops::IndexMut;
14-
use std::ops::Range;
15-
use std::ops::RangeBounds;
16-
use std::ops::RangeFrom;
17-
use std::ops::RangeFull;
18-
use std::ops::RangeInclusive;
19-
use std::ops::RangeTo;
20-
use std::ops::RangeToInclusive;
21-
use std::slice;
22-
use std::vec;
7+
use std::{
8+
borrow::{Borrow, BorrowMut},
9+
fmt,
10+
iter::FusedIterator,
11+
ops::{
12+
Bound, Index, IndexMut, Range, RangeBounds, RangeFrom, RangeFull, RangeInclusive, RangeTo,
13+
RangeToInclusive,
14+
},
15+
slice, vec,
16+
};
2317

2418
mod private {
2519
pub(crate) trait SealedData {}

‎src/interval_arithmetic.rs

Lines changed: 21 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,23 @@
11
// SPDX-License-Identifier: LGPL-2.1-or-later
22
// See Notices.txt for copyright information
33

4-
use crate::traits::AlwaysExactDiv;
5-
use crate::traits::AlwaysExactDivAssign;
6-
use crate::traits::CeilLog2;
7-
use crate::traits::ExactDiv;
8-
use crate::traits::ExactDivAssign;
9-
use crate::traits::FloorLog2;
10-
use crate::traits::IntervalUnion;
11-
use crate::traits::IntervalUnionAssign;
12-
use crate::util::DebugAsDisplay;
13-
use num_bigint::BigInt;
14-
use num_bigint::BigUint;
4+
use crate::{
5+
traits::{
6+
AlwaysExactDiv, AlwaysExactDivAssign, CeilLog2, ExactDiv, ExactDivAssign, FloorLog2,
7+
IntervalUnion, IntervalUnionAssign,
8+
},
9+
util::DebugAsDisplay,
10+
};
11+
use num_bigint::{BigInt, BigUint};
1512
use num_integer::Integer;
1613
use num_rational::Ratio;
17-
use num_traits::FromPrimitive;
18-
use num_traits::One;
19-
use num_traits::Pow;
20-
use num_traits::Signed;
21-
use num_traits::ToPrimitive;
22-
use num_traits::Zero;
23-
use std::borrow::Cow;
24-
use std::fmt;
25-
use std::mem;
26-
use std::ops::Add;
27-
use std::ops::AddAssign;
28-
use std::ops::Div;
29-
use std::ops::DivAssign;
30-
use std::ops::Mul;
31-
use std::ops::MulAssign;
32-
use std::ops::Neg;
33-
use std::ops::Sub;
34-
use std::ops::SubAssign;
35-
use std::sync::Arc;
36-
use std::sync::RwLock;
14+
use num_traits::{FromPrimitive, One, Pow, Signed, ToPrimitive, Zero};
15+
use std::{
16+
borrow::Cow,
17+
fmt, mem,
18+
ops::{Add, AddAssign, Div, DivAssign, Mul, MulAssign, Neg, Sub, SubAssign},
19+
sync::{Arc, RwLock},
20+
};
3721

3822
fn convert_log2_denom_floor(numer: &mut BigInt, old_log2_denom: usize, new_log2_denom: usize) {
3923
if new_log2_denom >= old_log2_denom {
@@ -1320,15 +1304,13 @@ impl<E: Integer> Pow<E> for &'_ DyadicFractionInterval {
13201304
#[cfg(test)]
13211305
mod tests {
13221306
use super::*;
1323-
use crate::util::tests::test_checked_op_helper;
1324-
use crate::util::tests::test_op_helper;
1325-
use crate::util::tests::test_unary_op_helper;
1307+
use crate::util::tests::{test_checked_op_helper, test_op_helper, test_unary_op_helper};
13261308
use num_traits::ToPrimitive;
1327-
use std::borrow::Borrow;
1328-
use std::borrow::BorrowMut;
1329-
use std::convert::TryInto;
1330-
use std::ops::Deref;
1331-
use std::ops::DerefMut;
1309+
use std::{
1310+
borrow::{Borrow, BorrowMut},
1311+
convert::TryInto,
1312+
ops::{Deref, DerefMut},
1313+
};
13321314

13331315
type DFI = DyadicFractionInterval;
13341316

‎src/lattice.rs

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,14 @@
44
// FIXME: remove when module made public again
55
#![allow(dead_code)]
66

7-
use crate::array2d::Array2DOwned;
8-
use crate::array2d::Array2DSlice;
7+
use crate::array2d::{Array2DOwned, Array2DSlice};
98
use num_integer::Integer;
109
use num_rational::Ratio;
11-
use num_traits::FromPrimitive;
12-
use num_traits::NumAssign;
13-
use num_traits::NumRef;
14-
use num_traits::Signed;
15-
use num_traits::Zero;
16-
use std::cmp::Ordering;
17-
use std::ops::Add;
18-
use std::ops::Mul;
19-
use std::ops::RangeTo;
10+
use num_traits::{FromPrimitive, NumAssign, NumRef, Signed, Zero};
11+
use std::{
12+
cmp::Ordering,
13+
ops::{Add, Mul, RangeTo},
14+
};
2015

2116
pub(crate) fn inner_product<'a, L, R, T>(a: Array2DSlice<'a, L>, b: Array2DSlice<'a, R>) -> T
2217
where
@@ -186,8 +181,7 @@ where
186181
mod tests {
187182
use super::*;
188183
use num_bigint::BigInt;
189-
use num_traits::One;
190-
use num_traits::Pow;
184+
use num_traits::{One, Pow};
191185

192186
#[test]
193187
fn test_gram_schmidt() {

‎src/mod_int.rs

Lines changed: 20 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,26 @@
11
// SPDX-License-Identifier: LGPL-2.1-or-later
22
// See Notices.txt for copyright information
33

4-
use crate::polynomial::DivisorIsOne;
5-
use crate::polynomial::PolynomialCoefficient;
6-
use crate::polynomial::PolynomialReducingFactorSupported;
7-
use crate::traits::AlwaysExactDiv;
8-
use crate::traits::AlwaysExactDivAssign;
9-
use crate::traits::ExactDiv;
10-
use crate::traits::ExactDivAssign;
11-
use crate::traits::ExtendedGCD;
12-
use crate::traits::ExtendedGCDResult;
13-
use crate::traits::GCD;
14-
use crate::util::BaseAndExponent;
15-
use num_bigint::BigInt;
16-
use num_bigint::BigUint;
4+
use crate::{
5+
polynomial::{DivisorIsOne, PolynomialCoefficient, PolynomialReducingFactorSupported},
6+
traits::{
7+
AlwaysExactDiv, AlwaysExactDivAssign, ExactDiv, ExactDivAssign, ExtendedGCD,
8+
ExtendedGCDResult, GCD,
9+
},
10+
util::BaseAndExponent,
11+
};
12+
use num_bigint::{BigInt, BigUint};
1713
use num_integer::Integer;
18-
use num_traits::CheckedAdd;
19-
use num_traits::CheckedDiv;
20-
use num_traits::CheckedMul;
21-
use num_traits::CheckedSub;
22-
use num_traits::FromPrimitive;
23-
use num_traits::One;
24-
use num_traits::ToPrimitive;
25-
use num_traits::Zero;
26-
use std::borrow::Borrow;
27-
use std::borrow::Cow;
28-
use std::convert::identity;
29-
use std::convert::TryInto;
30-
use std::fmt;
31-
use std::hash::Hash;
32-
use std::ops::Add;
33-
use std::ops::AddAssign;
34-
use std::ops::Deref;
35-
use std::ops::Div;
36-
use std::ops::DivAssign;
37-
use std::ops::Mul;
38-
use std::ops::MulAssign;
39-
use std::ops::Neg;
40-
use std::ops::Sub;
41-
use std::ops::SubAssign;
14+
use num_traits::{
15+
CheckedAdd, CheckedDiv, CheckedMul, CheckedSub, FromPrimitive, One, ToPrimitive, Zero,
16+
};
17+
use std::{
18+
borrow::{Borrow, Cow},
19+
convert::{identity, TryInto},
20+
fmt,
21+
hash::Hash,
22+
ops::{Add, AddAssign, Deref, Div, DivAssign, Mul, MulAssign, Neg, Sub, SubAssign},
23+
};
4224

4325
pub trait ModularReduce: Clone + Eq {
4426
fn modular_reduce_assign<M: Modulus<Self>>(&mut self, modulus: M);
@@ -1272,8 +1254,7 @@ where
12721254
#[cfg(test)]
12731255
mod tests {
12741256
use super::*;
1275-
use crate::util::tests::test_op_helper;
1276-
use crate::util::tests::test_unary_op_helper;
1257+
use crate::util::tests::{test_op_helper, test_unary_op_helper};
12771258

12781259
fn test_overflow_for_type<
12791260
T: Modulus<T> + ModularReduce + Sub<Output = T> + Copy + Into<BigInt> + fmt::Debug,

‎src/polynomial.rs

Lines changed: 14 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,22 @@
11
// SPDX-License-Identifier: LGPL-2.1-or-later
22
// See Notices.txt for copyright information
3-
use crate::traits::AlwaysExactDivAssign;
4-
use crate::traits::CharacteristicZero;
5-
use crate::traits::ExactDiv;
6-
use crate::traits::ExactDivAssign;
7-
use crate::traits::GCDAndLCM;
8-
use crate::traits::RingCharacteristic;
9-
use crate::traits::GCD;
3+
use crate::traits::{
4+
AlwaysExactDivAssign, CharacteristicZero, ExactDiv, ExactDivAssign, GCDAndLCM,
5+
RingCharacteristic, GCD,
6+
};
107
use num_bigint::BigInt;
118
use num_integer::Integer;
129
use num_rational::Ratio;
13-
use num_traits::FromPrimitive;
14-
use num_traits::NumAssign;
15-
use num_traits::One;
16-
use num_traits::Pow;
17-
use num_traits::Signed;
18-
use num_traits::ToPrimitive;
19-
use num_traits::Zero;
20-
use std::borrow::Cow;
21-
use std::error::Error;
22-
use std::fmt;
23-
use std::hash;
24-
use std::iter::FromIterator;
25-
use std::mem;
26-
use std::ops::Neg;
27-
use std::ops::{Add, AddAssign, Mul, MulAssign, Sub, SubAssign};
28-
use std::slice;
29-
use std::vec;
10+
use num_traits::{FromPrimitive, NumAssign, One, Pow, Signed, ToPrimitive, Zero};
11+
use std::{
12+
borrow::Cow,
13+
error::Error,
14+
fmt, hash,
15+
iter::FromIterator,
16+
mem,
17+
ops::{Add, AddAssign, Mul, MulAssign, Neg, Sub, SubAssign},
18+
slice, vec,
19+
};
3020

3121
mod add_sub;
3222
mod distinct_degree_factorization;

‎src/polynomial/add_sub.rs

Lines changed: 10 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,16 @@
22
// See Notices.txt for copyright information
33

44
// use super::util::{pairwise_op_eq_move, pairwise_op_eq_ref, pairwise_op_ref_ref};
5-
use crate::polynomial::Polynomial;
6-
use crate::polynomial::PolynomialCoefficient;
7-
use crate::traits::ExactDiv;
8-
use crate::traits::GCDAndLCM;
9-
use crate::traits::GCD;
10-
use num_traits::CheckedAdd;
11-
use num_traits::CheckedSub;
12-
use num_traits::One;
13-
use num_traits::Zero;
14-
use std::borrow::Cow;
15-
use std::mem;
16-
use std::ops::Neg;
17-
use std::ops::Sub;
18-
use std::ops::SubAssign;
19-
use std::ops::{Add, AddAssign};
5+
use crate::{
6+
polynomial::{Polynomial, PolynomialCoefficient},
7+
traits::{ExactDiv, GCDAndLCM, GCD},
8+
};
9+
use num_traits::{CheckedAdd, CheckedSub, One, Zero};
10+
use std::{
11+
borrow::Cow,
12+
mem,
13+
ops::{Add, AddAssign, Neg, Sub, SubAssign},
14+
};
2015

2116
fn add_sub_assign<T: PolynomialCoefficient, AddSubAssign: Fn(&mut T::Element, T::Element)>(
2217
lhs: &mut Polynomial<T>,

‎src/polynomial/distinct_degree_factorization.rs

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,14 @@
11
// SPDX-License-Identifier: LGPL-2.1-or-later
22
// See Notices.txt for copyright information
33

4-
use crate::mod_int::ModularInteger;
5-
use crate::mod_int::ModularReducePow;
6-
use crate::mod_int::Modulus;
7-
use crate::mod_int::PrimeModulus;
8-
use crate::polynomial::Polynomial;
9-
use crate::traits::ExtendedGCD;
10-
use crate::traits::GCD;
4+
use crate::{
5+
mod_int::{ModularInteger, ModularReducePow, Modulus, PrimeModulus},
6+
polynomial::Polynomial,
7+
traits::{ExtendedGCD, GCD},
8+
};
119
use num_integer::Integer;
1210
use num_traits::Zero;
13-
use std::fmt;
14-
use std::hash::Hash;
11+
use std::{fmt, hash::Hash};
1512

1613
impl<V, M> Polynomial<ModularInteger<V, M>>
1714
where

0 commit comments

Comments
 (0)