Skip to content

Commit

Permalink
Update to use dep: for features
Browse files Browse the repository at this point in the history
From Rust 1.60, now we can use this to bring order to the rayon
situation (previously renamed to rayon_).
  • Loading branch information
bluss committed Aug 1, 2024
1 parent ec0ffa6 commit 71e359a
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 8 deletions.
12 changes: 6 additions & 6 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,11 @@ num-integer = { version = "0.1.39", default-features = false }
num-traits = { version = "0.2", default-features = false }
num-complex = { version = "0.4", default-features = false }

# Use via the `rayon` crate feature!
rayon_ = { version = "1.0.3", optional = true, package = "rayon" }
rayon = { version = "1.10.0", optional = true }

approx = { version = "0.5", optional = true , default-features = false }

# Use via the `blas` crate feature!
# Use via the `blas` crate feature
cblas-sys = { version = "0.1.4", optional = true, default-features = false }
libc = { version = "0.2.82", optional = true }

Expand All @@ -56,10 +55,11 @@ default = ["std"]

# Enable blas usage
# See README for more instructions
blas = ["cblas-sys", "libc"]
blas = ["dep:cblas-sys", "dep:libc"]

serde = ["dep:serde"]
# Old name for the serde feature
serde-1 = ["serde"]
serde-1 = ["dep:serde"]

# These features are used for testing
test = []
Expand All @@ -68,7 +68,7 @@ test = []
docs = ["approx", "serde", "rayon"]

std = ["num-traits/std", "matrixmultiply/std"]
rayon = ["rayon_", "std"]
rayon = ["dep:rayon", "std"]

matrixmultiply-threading = ["matrixmultiply/threading"]

Expand Down
2 changes: 0 additions & 2 deletions src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1583,8 +1583,6 @@ where

// parallel methods
#[cfg(feature = "rayon")]
extern crate rayon_ as rayon;
#[cfg(feature = "rayon")]
pub mod parallel;

mod impl_1d;
Expand Down

0 comments on commit 71e359a

Please sign in to comment.