Skip to content
This repository was archived by the owner on Feb 17, 2025. It is now read-only.

Commit 6b6ed6a

Browse files
youknowoneyouknowone
committed
Upgrade malachite to 0.5.0
1 parent d8c6dd1 commit 6b6ed6a

File tree

4 files changed

+44
-34
lines changed

4 files changed

+44
-34
lines changed

‎Cargo.toml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "malachite-bigint"
3-
version = "0.2.3"
3+
version = "0.5.0"
44
authors = ["Steve Shi <shikangzhi@gmail.com>"]
55
edition = "2021"
66
license = "LGPL-3.0-only"
@@ -9,7 +9,7 @@ repository = "https://github.com/RustPython/malachite-bigint"
99
rust-version = "1.74.0"
1010

1111
[dependencies]
12-
malachite = "0.4.22"
12+
malachite = { version = "0.5.0", git = "https://github.com/mhogrefe/malachite.git" }
1313
num-traits = { version = "0.2.19", default-features = false, features = ["i128"] }
1414
num-integer = { version = "0.1.46", default-features = false, features = ["i128"] }
1515
derive_more = { version = "1.0.0", features = ["display", "from", "into"] }

‎src/bigint.rs‎

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
11
use derive_more::{Binary, Display, From, Into, LowerHex, Octal, UpperHex};
22
use malachite::{
3-
num::{
4-
arithmetic::traits::{
5-
Abs, DivRem, DivRound, DivisibleBy, FloorRoot, Mod, Parity, UnsignedAbs,
3+
base::{
4+
num::{
5+
arithmetic::traits::{
6+
Abs, DivRem, DivRound, DivisibleBy, FloorRoot, Mod, Parity, UnsignedAbs,
7+
},
8+
conversion::traits::{RoundingInto, ToStringBase},
9+
logic::traits::BitAccess,
610
},
7-
conversion::traits::{RoundingInto, ToStringBase},
8-
logic::traits::BitAccess,
11+
rounding_modes::RoundingMode,
912
},
10-
rounding_modes::RoundingMode,
1113
Integer,
1214
};
1315
use num_integer::Roots;
@@ -208,7 +210,7 @@ impl From<BigUint> for BigInt {
208210
impl Zero for BigInt {
209211
#[inline]
210212
fn zero() -> Self {
211-
Self(<Integer as malachite::num::basic::traits::Zero>::ZERO)
213+
Self(<Integer as malachite::base::num::basic::traits::Zero>::ZERO)
212214
}
213215

214216
#[inline]
@@ -220,7 +222,7 @@ impl Zero for BigInt {
220222
impl One for BigInt {
221223
#[inline]
222224
fn one() -> Self {
223-
Self(<Integer as malachite::num::basic::traits::One>::ONE)
225+
Self(<Integer as malachite::base::num::basic::traits::One>::ONE)
224226
}
225227
}
226228

@@ -514,7 +516,7 @@ impl BigInt {
514516

515517
#[inline]
516518
pub fn sign(&self) -> Sign {
517-
match <_ as malachite::num::arithmetic::traits::Sign>::sign(&self.0) {
519+
match <_ as malachite::base::num::arithmetic::traits::Sign>::sign(&self.0) {
518520
Ordering::Less => Minus,
519521
Ordering::Equal => NoSign,
520522
Ordering::Greater => Plus,

‎src/biguint.rs‎

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,17 @@
11
use derive_more::{Binary, Display, From, Into, LowerHex, Octal, UpperHex};
22
use malachite::{
3-
num::{
4-
arithmetic::traits::{
5-
DivRem, DivRound, DivisibleBy, FloorRoot, Gcd, Lcm, Mod, ModPow, Parity,
3+
base::{
4+
num::{
5+
arithmetic::traits::{
6+
DivRem, DivRound, DivisibleBy, FloorRoot, Gcd, Lcm, Mod, ModPow, Parity,
7+
},
8+
conversion::traits::{
9+
Digits, FromStringBase, PowerOf2Digits, RoundingInto, ToStringBase,
10+
},
11+
logic::traits::{BitAccess, BitIterable, CountOnes, SignificantBits},
612
},
7-
conversion::traits::{Digits, FromStringBase, PowerOf2Digits, RoundingInto, ToStringBase},
8-
logic::traits::{BitAccess, BitIterable, CountOnes, SignificantBits},
13+
rounding_modes::RoundingMode,
914
},
10-
rounding_modes::RoundingMode,
1115
Natural,
1216
};
1317
use num_integer::Roots;
@@ -179,7 +183,7 @@ impl FromPrimitive for BigUint {
179183
impl Zero for BigUint {
180184
#[inline]
181185
fn zero() -> Self {
182-
Self(<Natural as malachite::num::basic::traits::Zero>::ZERO)
186+
Self(<Natural as malachite::base::num::basic::traits::Zero>::ZERO)
183187
}
184188

185189
#[inline]
@@ -191,7 +195,7 @@ impl Zero for BigUint {
191195
impl One for BigUint {
192196
#[inline]
193197
fn one() -> Self {
194-
Self(<Natural as malachite::num::basic::traits::One>::ONE)
198+
Self(<Natural as malachite::base::num::basic::traits::One>::ONE)
195199
}
196200
}
197201

‎src/macros.rs‎

Lines changed: 19 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -274,25 +274,26 @@ macro_rules! forward_assign_primitive_into {
274274
macro_rules! forward_pow_primitive {
275275
($lhs:ty, $rhs:ty) => {
276276
impl_binary_op!($lhs, $rhs, $lhs, Pow, pow, |lhs: $lhs, rhs: $rhs| {
277-
<_ as malachite::num::arithmetic::traits::Pow<u64>>::pow(lhs.0, rhs as _).into()
277+
<_ as malachite::base::num::arithmetic::traits::Pow<u64>>::pow(lhs.0, rhs as _).into()
278278
});
279279
impl_binary_op!(&$lhs, $rhs, $lhs, Pow, pow, |lhs: &$lhs, rhs: $rhs| {
280-
<_ as malachite::num::arithmetic::traits::Pow<u64>>::pow(&lhs.0, rhs as _).into()
280+
<_ as malachite::base::num::arithmetic::traits::Pow<u64>>::pow(&lhs.0, rhs as _).into()
281281
});
282282
impl_binary_op!($lhs, &$rhs, $lhs, Pow, pow, |lhs: $lhs, rhs: &$rhs| {
283-
<_ as malachite::num::arithmetic::traits::Pow<u64>>::pow(lhs.0, *rhs as _).into()
283+
<_ as malachite::base::num::arithmetic::traits::Pow<u64>>::pow(lhs.0, *rhs as _).into()
284284
});
285285
impl_binary_op!(&$lhs, &$rhs, $lhs, Pow, pow, |lhs: &$lhs, rhs: &$rhs| {
286-
<_ as malachite::num::arithmetic::traits::Pow<u64>>::pow(&lhs.0, *rhs as _).into()
286+
<_ as malachite::base::num::arithmetic::traits::Pow<u64>>::pow(&lhs.0, *rhs as _).into()
287287
});
288288
};
289289
}
290290

291291
macro_rules! forward_pow_biguint {
292292
($lhs:ty) => {
293293
impl_binary_op!($lhs, BigUint, $lhs, Pow, pow, |lhs: $lhs, rhs: BigUint| {
294-
let exp = malachite::num::conversion::traits::SaturatingFrom::saturating_from(&rhs.0);
295-
<_ as malachite::num::arithmetic::traits::Pow<u64>>::pow(lhs.0, exp).into()
294+
let exp =
295+
malachite::base::num::conversion::traits::SaturatingFrom::saturating_from(&rhs.0);
296+
<_ as malachite::base::num::arithmetic::traits::Pow<u64>>::pow(lhs.0, exp).into()
296297
});
297298
impl_binary_op!(
298299
&$lhs,
@@ -301,9 +302,10 @@ macro_rules! forward_pow_biguint {
301302
Pow,
302303
pow,
303304
|lhs: &$lhs, rhs: BigUint| {
304-
let exp =
305-
malachite::num::conversion::traits::SaturatingFrom::saturating_from(&rhs.0);
306-
<_ as malachite::num::arithmetic::traits::Pow<u64>>::pow(&lhs.0, exp).into()
305+
let exp = malachite::base::num::conversion::traits::SaturatingFrom::saturating_from(
306+
&rhs.0,
307+
);
308+
<_ as malachite::base::num::arithmetic::traits::Pow<u64>>::pow(&lhs.0, exp).into()
307309
}
308310
);
309311
impl_binary_op!(
@@ -313,9 +315,10 @@ macro_rules! forward_pow_biguint {
313315
Pow,
314316
pow,
315317
|lhs: $lhs, rhs: &BigUint| {
316-
let exp =
317-
malachite::num::conversion::traits::SaturatingFrom::saturating_from(&rhs.0);
318-
<_ as malachite::num::arithmetic::traits::Pow<u64>>::pow(lhs.0, exp).into()
318+
let exp = malachite::base::num::conversion::traits::SaturatingFrom::saturating_from(
319+
&rhs.0,
320+
);
321+
<_ as malachite::base::num::arithmetic::traits::Pow<u64>>::pow(lhs.0, exp).into()
319322
}
320323
);
321324
impl_binary_op!(
@@ -325,9 +328,10 @@ macro_rules! forward_pow_biguint {
325328
Pow,
326329
pow,
327330
|lhs: &$lhs, rhs: &BigUint| {
328-
let exp =
329-
malachite::num::conversion::traits::SaturatingFrom::saturating_from(&rhs.0);
330-
<_ as malachite::num::arithmetic::traits::Pow<u64>>::pow(&lhs.0, exp).into()
331+
let exp = malachite::base::num::conversion::traits::SaturatingFrom::saturating_from(
332+
&rhs.0,
333+
);
334+
<_ as malachite::base::num::arithmetic::traits::Pow<u64>>::pow(&lhs.0, exp).into()
331335
}
332336
);
333337
};

0 commit comments

Comments
 (0)