Skip to content

Commit

Permalink
reverting supercrate import changes
Browse files Browse the repository at this point in the history
  • Loading branch information
@mhogrefe
mhogrefe committed Feb 3, 2025
1 parent bea1594 commit 3c71c6c
Show file tree
Hide file tree
Showing 10 changed files with 40 additions and 60 deletions.
28 changes: 14 additions & 14 deletions Cargo.lock
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ edition = "2021"
rust-version = "1.83.0"

[workspace.dependencies]
malachite-base = { version = "0.4.21", path = 'malachite-base' }
malachite-nz = { version = "0.4.21", path = 'malachite-nz', default_features = false }
malachite-q = { version = "0.4.21", path = 'malachite-q' }
malachite-float = { version = "0.4.21", path = 'malachite-float' }
malachite-base = { version = "0.4.22", path = 'malachite-base' }
malachite-nz = { version = "0.4.22", path = 'malachite-nz', default_features = false }
malachite-q = { version = "0.4.22", path = 'malachite-q' }
malachite-float = { version = "0.4.22", path = 'malachite-float' }

[profile.release]
lto = "fat"
Expand Down
4 changes: 2 additions & 2 deletions docs/index.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,14 +55,14 @@ Malachite uses `no_std`, unless the `random`, `test_build`, or `bin_build` featu
To use Malachite, add the following to your project's `Cargo.toml` file:
```yaml
[dependencies.malachite]
version = "0.4.21"
version = "0.4.22"
```

By default, all of Malachite's features are included, but you can opt out of some of them. For
example, if you want to use `Natural` and `Integer` but not `Rational`, you can instead use
```yaml
[dependencies.malachite]
version = "0.4.21"
version = "0.4.22"
default-features = false
features = [ "naturals_and_integers" ]
```
Expand Down
2 changes: 1 addition & 1 deletion malachite-base/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "malachite-base"
version = "0.4.21"
version = "0.4.22"
authors = ["Mikhail Hogrefe <mikhailhogrefe@gmail.com>"]
rust-version.workspace = true
edition.workspace = true
Expand Down
6 changes: 3 additions & 3 deletions malachite-criterion-bench/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
[package]
name = "malachite-criterion-bench"
version = "0.4.21"
version = "0.4.22"
authors = ["Mikhail Hogrefe <mikhailhogrefe@gmail.com>"]
autobenches = false
rust-version.workspace = true
edition.workspace = true

[dependencies]
malachite-base = { version = "0.4.21", path = "../malachite-base" }
malachite-nz = { version = "0.4.21", default-features = false, path = "../malachite-nz" }
malachite-base = { version = "0.4.22", path = "../malachite-base" }
malachite-nz = { version = "0.4.22", default-features = false, path = "../malachite-nz" }
num = "0.4.1"
rug = { version = "1.21.0", default-features = false, features = ["integer", "serde"] }

Expand Down
8 changes: 4 additions & 4 deletions malachite-float/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "malachite-float"
version = "0.4.21"
version = "0.4.22"
authors = ["Mikhail Hogrefe <mikhailhogrefe@gmail.com>"]
rust-version.workspace = true
edition.workspace = true
Expand All @@ -22,9 +22,9 @@ path = "src/bin.rs"

[dependencies]
itertools = { version = "0.11.0", default-features = false, features = ["use_alloc"] }
malachite-base = { version = "0.4.21", default-features = false, path = "../malachite-base" }
malachite-nz = { version = "0.4.21", default-features = false, features = ["float_helpers"], path = "../malachite-nz" }
malachite-q = { version = "0.4.21", default-features = false, path = "../malachite-q" }
malachite-base = { version = "0.4.22", default-features = false, path = "../malachite-base" }
malachite-nz = { version = "0.4.22", default-features = false, features = ["float_helpers"], path = "../malachite-nz" }
malachite-q = { version = "0.4.22", default-features = false, path = "../malachite-q" }
serde = { version = "1.0.188", optional = true, default-features = false, features = ["alloc", "derive"] }

serde_json = { version = "1.0.105", optional = true }
Expand Down
4 changes: 2 additions & 2 deletions malachite-nz/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "malachite-nz"
version = "0.4.21"
version = "0.4.22"
authors = ["Mikhail Hogrefe <mikhailhogrefe@gmail.com>"]
rust-version.workspace = true
edition.workspace = true
Expand All @@ -23,7 +23,7 @@ path = "src/bin.rs"
[dependencies]
itertools = { version = "0.11.0", default-features = false, features = ["use_alloc"] }
libm = { version = "0.2.8", default-features = false }
malachite-base = { version = "0.4.21", default-features = false, path = "../malachite-base" }
malachite-base = { version = "0.4.22", default-features = false, path = "../malachite-base" }
serde = { version = "1.0.188", optional = true, default-features = false, features = ["alloc", "derive"] }

indoc = { version = "2.0.4", optional = true}
Expand Down
6 changes: 3 additions & 3 deletions malachite-q/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "malachite-q"
version = "0.4.21"
version = "0.4.22"
authors = ["Mikhail Hogrefe <mikhailhogrefe@gmail.com>"]
rust-version.workspace = true
edition.workspace = true
Expand All @@ -22,8 +22,8 @@ path = "src/bin.rs"

[dependencies]
itertools = { version = "0.11.0", default-features = false, features = ["use_alloc"] }
malachite-base = { version = "0.4.21", default-features = false, path = "../malachite-base" }
malachite-nz = { version = "0.4.21", default-features = false, path = "../malachite-nz" }
malachite-base = { version = "0.4.22", default-features = false, path = "../malachite-base" }
malachite-nz = { version = "0.4.22", default-features = false, path = "../malachite-nz" }
serde = { version = "1.0.188", optional = true, default-features = false, features = ["alloc", "derive"] }

serde_json = { version = "1.0.105", optional = true }
Expand Down
10 changes: 5 additions & 5 deletions malachite/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "malachite"
version = "0.4.21"
version = "0.4.22"
authors = ["Mikhail Hogrefe <mikhailhogrefe@gmail.com>"]
rust-version.workspace = true
edition.workspace = true
Expand All @@ -13,10 +13,10 @@ keywords = ["mathematics", "math", "numerics", "bignum"]
categories = ["mathematics"]

[dependencies]
malachite-base = { version = "0.4.21", default-features = false, path = "../malachite-base" }
malachite-nz = { version = "0.4.21", default-features = false, optional = true, path = "../malachite-nz" }
malachite-q = { version = "0.4.21", default-features = false, optional = true, path = "../malachite-q" }
malachite-float = { version = "0.4.21", default-features = false, optional = true, path = "../malachite-float" }
malachite-base = { version = "0.4.22", default-features = false, path = "../malachite-base" }
malachite-nz = { version = "0.4.22", default-features = false, optional = true, path = "../malachite-nz" }
malachite-q = { version = "0.4.22", default-features = false, optional = true, path = "../malachite-q" }
malachite-float = { version = "0.4.22", default-features = false, optional = true, path = "../malachite-float" }
serde = { version = "1.0.188", optional = true, features = ["derive"] }
embed-doc-image = { version = "0.1.4", optional = true }

Expand Down
24 changes: 2 additions & 22 deletions malachite/src/lib.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,7 @@
// 3 of the License, or (at your option) any later version. See <https://www.gnu.org/licenses/>.

#![cfg_attr(not(feature = "random"), no_std)]

/// This module contains various functions that support the other crates. This includes many
/// numeric traits and their implementation for primitive numeric types, as well as many functions
/// for exhaustively and randomly generating values of many types.
pub mod base {
pub use malachite_base::*;
}
pub use malachite_base::*;

#[cfg(feature = "naturals_and_integers")]
#[cfg(feature = "rationals")]
Expand All @@ -27,18 +21,4 @@ pub use malachite_nz::natural::Natural;
pub use malachite_nz::*;
#[cfg(feature = "naturals_and_integers")]
#[cfg(feature = "rationals")]
/// [`Rational`](rational::Rational), a type representing rational numbers with arbitrarily large
/// numerators and denominators.
pub mod rational {
pub use malachite_q::*;
}

/// Various types and constants dependent on whether Malachite is built using 32-bit limbs or
/// 64-bit limbs. `Limb` is the type such that `Vec`s of limbs are used to represent the bits of a
/// [`Natural`].
pub mod platform {
#[cfg(feature = "32_bit_limbs")]
pub use malachite_nz::platform_32::*;
#[cfg(not(feature = "32_bit_limbs"))]
pub use malachite_nz::platform_64::*;
}
pub use malachite_q::Rational;

0 comments on commit 3c71c6c

Please sign in to comment.