Integrate malachite-bigint to malachite repository

mhogrefe · Feb 14, 2025 · 950bf5d · 950bf5d
1 parent 7da3f02
commit 950bf5d
Show file tree

Hide file tree

Showing 10 changed files with 88 additions and 235 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,5 +1,5 @@
 [workspace]
-members = ['malachite', 'malachite-base', 'malachite-float', 'malachite-nz', 'malachite-q', 'malachite-criterion-bench']
+members = ['malachite', 'malachite-base', 'malachite-bigint', 'malachite-float', 'malachite-nz', 'malachite-q', 'malachite-criterion-bench']
 resolver = "2"
 
 [workspace.package]

diff --git a/malachite-bigint/.github/workflows/rust.yml b/malachite-bigint/.github/workflows/rust.yml
diff --git a/malachite-bigint/.gitignore b/malachite-bigint/.gitignore
diff --git a/malachite-bigint/Cargo.toml b/malachite-bigint/Cargo.toml
@@ -2,14 +2,16 @@
 name = "malachite-bigint"
 version = "0.5.0"
 authors = ["Steve Shi <shikangzhi@gmail.com>"]
-edition = "2021"
+rust-version.workspace = true
+edition.workspace = true
 license = "LGPL-3.0-only"
 description = "A drop-in num-bigint replacement based on malachite"
-repository = "https://github.com/RustPython/malachite-bigint"
-rust-version = "1.74.0"
+repository = "https://github.com/mhogrefe/malachite"
 
 [dependencies]
-malachite = { version = "0.5.0", git = "https://github.com/mhogrefe/malachite.git" }
+malachite-base = { version = "0.5.0", path = "../malachite-base" }
+malachite-nz = { version = "0.5.0", path = "../malachite-nz" }
+
 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/malachite-bigint/LICENSE b/malachite-bigint/LICENSE
diff --git a/malachite-bigint/src/bigint.rs b/malachite-bigint/src/bigint.rs
@@ -1,17 +1,15 @@
 use derive_more::{Binary, Display, From, Into, LowerHex, Octal, UpperHex};
-use malachite::{
-    base::{
-        num::{
-            arithmetic::traits::{
-                Abs, DivRem, DivRound, DivisibleBy, FloorRoot, Mod, Parity, UnsignedAbs,
-            },
-            conversion::traits::{RoundingInto, ToStringBase},
-            logic::traits::BitAccess,
+use malachite_base::{
+    num::{
+        arithmetic::traits::{
+            Abs, DivRem, DivRound, DivisibleBy, FloorRoot, Mod, Parity, UnsignedAbs,
         },
-        rounding_modes::RoundingMode,
+        conversion::traits::{RoundingInto, ToStringBase},
+        logic::traits::BitAccess,
     },
-    Integer,
+    rounding_modes::RoundingMode,
 };
+use malachite_nz::integer::Integer;
 use num_integer::Roots;
 use num_traits::{
     CheckedAdd, CheckedDiv, CheckedMul, CheckedSub, FromPrimitive, Num, One, Pow, Signed,
@@ -210,7 +208,7 @@ impl From<BigUint> for BigInt {
 impl Zero for BigInt {
     #[inline]
     fn zero() -> Self {
-        Self(<Integer as malachite::base::num::basic::traits::Zero>::ZERO)
+        Self(<Integer as malachite_base::num::basic::traits::Zero>::ZERO)
     }
 
     #[inline]
@@ -222,7 +220,7 @@ impl Zero for BigInt {
 impl One for BigInt {
     #[inline]
     fn one() -> Self {
-        Self(<Integer as malachite::base::num::basic::traits::One>::ONE)
+        Self(<Integer as malachite_base::num::basic::traits::One>::ONE)
     }
 }
 
@@ -516,7 +514,7 @@ impl BigInt {
 
     #[inline]
     pub fn sign(&self) -> Sign {
-        match <_ as malachite::base::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,