From 0174c4f91199f18ccf8a5ee22adced975e94c39c Mon Sep 17 00:00:00 2001 From: Jeong YunWon Date: Fri, 14 Feb 2025 16:09:10 +0900 Subject: [PATCH] Upgrade malachite to 0.5.0 --- Cargo.toml | 4 ++-- src/bigint.rs | 20 +++++++++++--------- src/biguint.rs | 20 ++++++++++++-------- src/macros.rs | 34 +++++++++++++++++++--------------- 4 files changed, 44 insertions(+), 34 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 5e6bd2c..6b51d7a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "malachite-bigint" -version = "0.2.3" +version = "0.5.0" authors = ["Steve Shi "] edition = "2021" license = "LGPL-3.0-only" @@ -9,7 +9,7 @@ repository = "https://github.com/RustPython/malachite-bigint" rust-version = "1.74.0" [dependencies] -malachite = "0.4.22" +malachite = { version = "0.5.0", git = "https://github.com/mhogrefe/malachite.git" } num-traits = { version = "0.2.19", default-features = false, features = ["i128"] } num-integer = { version = "0.1.46", default-features = false, features = ["i128"] } derive_more = { version = "1.0.0", features = ["display", "from", "into"] } diff --git a/src/bigint.rs b/src/bigint.rs index e568d53..58091c4 100644 --- a/src/bigint.rs +++ b/src/bigint.rs @@ -1,13 +1,15 @@ use derive_more::{Binary, Display, From, Into, LowerHex, Octal, UpperHex}; use malachite::{ - num::{ - arithmetic::traits::{ - Abs, DivRem, DivRound, DivisibleBy, FloorRoot, Mod, Parity, UnsignedAbs, + base::{ + num::{ + arithmetic::traits::{ + Abs, DivRem, DivRound, DivisibleBy, FloorRoot, Mod, Parity, UnsignedAbs, + }, + conversion::traits::{RoundingInto, ToStringBase}, + logic::traits::BitAccess, }, - conversion::traits::{RoundingInto, ToStringBase}, - logic::traits::BitAccess, + rounding_modes::RoundingMode, }, - rounding_modes::RoundingMode, Integer, }; use num_integer::Roots; @@ -208,7 +210,7 @@ impl From for BigInt { impl Zero for BigInt { #[inline] fn zero() -> Self { - Self(::ZERO) + Self(::ZERO) } #[inline] @@ -220,7 +222,7 @@ impl Zero for BigInt { impl One for BigInt { #[inline] fn one() -> Self { - Self(::ONE) + Self(::ONE) } } @@ -514,7 +516,7 @@ impl BigInt { #[inline] pub fn sign(&self) -> Sign { - match <_ as malachite::num::arithmetic::traits::Sign>::sign(&self.0) { + match <_ as malachite::base::num::arithmetic::traits::Sign>::sign(&self.0) { Ordering::Less => Minus, Ordering::Equal => NoSign, Ordering::Greater => Plus, diff --git a/src/biguint.rs b/src/biguint.rs index a08677f..86ed8ea 100644 --- a/src/biguint.rs +++ b/src/biguint.rs @@ -1,13 +1,17 @@ use derive_more::{Binary, Display, From, Into, LowerHex, Octal, UpperHex}; use malachite::{ - num::{ - arithmetic::traits::{ - DivRem, DivRound, DivisibleBy, FloorRoot, Gcd, Lcm, Mod, ModPow, Parity, + base::{ + num::{ + arithmetic::traits::{ + DivRem, DivRound, DivisibleBy, FloorRoot, Gcd, Lcm, Mod, ModPow, Parity, + }, + conversion::traits::{ + Digits, FromStringBase, PowerOf2Digits, RoundingInto, ToStringBase, + }, + logic::traits::{BitAccess, BitIterable, CountOnes, SignificantBits}, }, - conversion::traits::{Digits, FromStringBase, PowerOf2Digits, RoundingInto, ToStringBase}, - logic::traits::{BitAccess, BitIterable, CountOnes, SignificantBits}, + rounding_modes::RoundingMode, }, - rounding_modes::RoundingMode, Natural, }; use num_integer::Roots; @@ -179,7 +183,7 @@ impl FromPrimitive for BigUint { impl Zero for BigUint { #[inline] fn zero() -> Self { - Self(::ZERO) + Self(::ZERO) } #[inline] @@ -191,7 +195,7 @@ impl Zero for BigUint { impl One for BigUint { #[inline] fn one() -> Self { - Self(::ONE) + Self(::ONE) } } diff --git a/src/macros.rs b/src/macros.rs index 1287b25..e3e0101 100644 --- a/src/macros.rs +++ b/src/macros.rs @@ -274,16 +274,16 @@ macro_rules! forward_assign_primitive_into { macro_rules! forward_pow_primitive { ($lhs:ty, $rhs:ty) => { impl_binary_op!($lhs, $rhs, $lhs, Pow, pow, |lhs: $lhs, rhs: $rhs| { - <_ as malachite::num::arithmetic::traits::Pow>::pow(lhs.0, rhs as _).into() + <_ as malachite::base::num::arithmetic::traits::Pow>::pow(lhs.0, rhs as _).into() }); impl_binary_op!(&$lhs, $rhs, $lhs, Pow, pow, |lhs: &$lhs, rhs: $rhs| { - <_ as malachite::num::arithmetic::traits::Pow>::pow(&lhs.0, rhs as _).into() + <_ as malachite::base::num::arithmetic::traits::Pow>::pow(&lhs.0, rhs as _).into() }); impl_binary_op!($lhs, &$rhs, $lhs, Pow, pow, |lhs: $lhs, rhs: &$rhs| { - <_ as malachite::num::arithmetic::traits::Pow>::pow(lhs.0, *rhs as _).into() + <_ as malachite::base::num::arithmetic::traits::Pow>::pow(lhs.0, *rhs as _).into() }); impl_binary_op!(&$lhs, &$rhs, $lhs, Pow, pow, |lhs: &$lhs, rhs: &$rhs| { - <_ as malachite::num::arithmetic::traits::Pow>::pow(&lhs.0, *rhs as _).into() + <_ as malachite::base::num::arithmetic::traits::Pow>::pow(&lhs.0, *rhs as _).into() }); }; } @@ -291,8 +291,9 @@ macro_rules! forward_pow_primitive { macro_rules! forward_pow_biguint { ($lhs:ty) => { impl_binary_op!($lhs, BigUint, $lhs, Pow, pow, |lhs: $lhs, rhs: BigUint| { - let exp = malachite::num::conversion::traits::SaturatingFrom::saturating_from(&rhs.0); - <_ as malachite::num::arithmetic::traits::Pow>::pow(lhs.0, exp).into() + let exp = + malachite::base::num::conversion::traits::SaturatingFrom::saturating_from(&rhs.0); + <_ as malachite::base::num::arithmetic::traits::Pow>::pow(lhs.0, exp).into() }); impl_binary_op!( &$lhs, @@ -301,9 +302,10 @@ macro_rules! forward_pow_biguint { Pow, pow, |lhs: &$lhs, rhs: BigUint| { - let exp = - malachite::num::conversion::traits::SaturatingFrom::saturating_from(&rhs.0); - <_ as malachite::num::arithmetic::traits::Pow>::pow(&lhs.0, exp).into() + let exp = malachite::base::num::conversion::traits::SaturatingFrom::saturating_from( + &rhs.0, + ); + <_ as malachite::base::num::arithmetic::traits::Pow>::pow(&lhs.0, exp).into() } ); impl_binary_op!( @@ -313,9 +315,10 @@ macro_rules! forward_pow_biguint { Pow, pow, |lhs: $lhs, rhs: &BigUint| { - let exp = - malachite::num::conversion::traits::SaturatingFrom::saturating_from(&rhs.0); - <_ as malachite::num::arithmetic::traits::Pow>::pow(lhs.0, exp).into() + let exp = malachite::base::num::conversion::traits::SaturatingFrom::saturating_from( + &rhs.0, + ); + <_ as malachite::base::num::arithmetic::traits::Pow>::pow(lhs.0, exp).into() } ); impl_binary_op!( @@ -325,9 +328,10 @@ macro_rules! forward_pow_biguint { Pow, pow, |lhs: &$lhs, rhs: &BigUint| { - let exp = - malachite::num::conversion::traits::SaturatingFrom::saturating_from(&rhs.0); - <_ as malachite::num::arithmetic::traits::Pow>::pow(&lhs.0, exp).into() + let exp = malachite::base::num::conversion::traits::SaturatingFrom::saturating_from( + &rhs.0, + ); + <_ as malachite::base::num::arithmetic::traits::Pow>::pow(&lhs.0, exp).into() } ); };