diff --git a/Cargo.lock b/Cargo.lock index e2069db87..8a0a6b3d0 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1251,19 +1251,6 @@ dependencies = [ "itertools 0.10.5", ] -[[package]] -name = "crossbeam" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1137cd7e7fc0fb5d3c5a8678be38ec56e819125d8d7907411fe24ccb943faca8" -dependencies = [ - "crossbeam-channel", - "crossbeam-deque", - "crossbeam-epoch", - "crossbeam-queue", - "crossbeam-utils", -] - [[package]] name = "crossbeam-channel" version = "0.5.13" @@ -2621,7 +2608,7 @@ dependencies = [ "big_s", "bincode", "bumpalo", - "crossbeam", + "crossbeam-channel", "csv", "derive_builder 0.20.0", "dump", @@ -3629,7 +3616,6 @@ dependencies = [ "candle-transformers", "charabia", "concat-arrays", - "crossbeam", "crossbeam-channel", "csv", "deserr", @@ -4750,8 +4736,9 @@ dependencies = [ [[package]] name = "roaring" -version = "0.10.6" -source = "git+https://github.com/RoaringBitmap/roaring-rs?branch=clone-iter-slice#8ff028e484fb6192a0acf5a669eaf18c30cada6e" +version = "0.10.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f81dc953b2244ddd5e7860cb0bb2a790494b898ef321d4aff8e260efab60cc88" dependencies = [ "bytemuck", "byteorder", diff --git a/Cargo.toml b/Cargo.toml index 5e53dbfa5..89a17d8fc 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -43,6 +43,3 @@ opt-level = 3 opt-level = 3 [profile.dev.package.roaring] opt-level = 3 - -[patch.crates-io] -roaring = { git = "https://github.com/RoaringBitmap/roaring-rs", branch = "clone-iter-slice" } diff --git a/crates/benchmarks/Cargo.toml b/crates/benchmarks/Cargo.toml index eec30ea3f..ccd256546 100644 --- a/crates/benchmarks/Cargo.toml +++ b/crates/benchmarks/Cargo.toml @@ -24,7 +24,7 @@ tempfile = "3.14.0" criterion = { version = "0.5.1", features = ["html_reports"] } rand = "0.8.5" rand_chacha = "0.3.1" -roaring = "0.10.6" +roaring = "0.10.7" [build-dependencies] anyhow = "1.0.86" diff --git a/crates/dump/Cargo.toml b/crates/dump/Cargo.toml index f9d2a9a0b..679a97b4e 100644 --- a/crates/dump/Cargo.toml +++ b/crates/dump/Cargo.toml @@ -17,7 +17,7 @@ http = "1.1.0" meilisearch-types = { path = "../meilisearch-types" } once_cell = "1.19.0" regex = "1.10.5" -roaring = { version = "0.10.6", features = ["serde"] } +roaring = { version = "0.10.7", features = ["serde"] } serde = { version = "1.0.204", features = ["derive"] } serde_json = { version = "1.0.120", features = ["preserve_order"] } tar = "0.4.41" diff --git a/crates/index-scheduler/Cargo.toml b/crates/index-scheduler/Cargo.toml index 657dd6dfe..ad4c1b4b9 100644 --- a/crates/index-scheduler/Cargo.toml +++ b/crates/index-scheduler/Cargo.toml @@ -24,7 +24,7 @@ meilisearch-types = { path = "../meilisearch-types" } page_size = "0.6.0" raw-collections = { git = "https://github.com/meilisearch/raw-collections.git", version = "0.1.0" } rayon = "1.10.0" -roaring = { version = "0.10.6", features = ["serde"] } +roaring = { version = "0.10.7", features = ["serde"] } serde = { version = "1.0.204", features = ["derive"] } serde_json = { version = "1.0.120", features = ["preserve_order"] } synchronoise = "1.0.1" @@ -45,7 +45,7 @@ bumpalo = "3.16.0" [dev-dependencies] arroy = "0.5.0" big_s = "1.0.2" -crossbeam = "0.8.4" +crossbeam-channel = "0.5.13" insta = { version = "1.39.0", features = ["json", "redactions"] } maplit = "1.0.2" meili-snap = { path = "../meili-snap" } diff --git a/crates/index-scheduler/src/lib.rs b/crates/index-scheduler/src/lib.rs index cef24c1ea..1a1c71bae 100644 --- a/crates/index-scheduler/src/lib.rs +++ b/crates/index-scheduler/src/lib.rs @@ -407,7 +407,7 @@ pub struct IndexScheduler { /// /// See [self.breakpoint()](`IndexScheduler::breakpoint`) for an explanation. #[cfg(test)] - test_breakpoint_sdr: crossbeam::channel::Sender<(Breakpoint, bool)>, + test_breakpoint_sdr: crossbeam_channel::Sender<(Breakpoint, bool)>, /// A list of planned failures within the [`tick`](IndexScheduler::tick) method of the index scheduler. /// @@ -476,7 +476,7 @@ impl IndexScheduler { /// Create an index scheduler and start its run loop. pub fn new( options: IndexSchedulerOptions, - #[cfg(test)] test_breakpoint_sdr: crossbeam::channel::Sender<(Breakpoint, bool)>, + #[cfg(test)] test_breakpoint_sdr: crossbeam_channel::Sender<(Breakpoint, bool)>, #[cfg(test)] planned_failures: Vec<(usize, tests::FailureLocation)>, ) -> Result { std::fs::create_dir_all(&options.tasks_path)?; @@ -2237,7 +2237,7 @@ mod tests { use std::time::Instant; use big_s::S; - use crossbeam::channel::RecvTimeoutError; + use crossbeam_channel::RecvTimeoutError; use file_store::File; use insta::assert_json_snapshot; use maplit::btreeset; @@ -2289,7 +2289,7 @@ mod tests { configuration: impl Fn(&mut IndexSchedulerOptions), ) -> (Self, IndexSchedulerHandle) { let tempdir = TempDir::new().unwrap(); - let (sender, receiver) = crossbeam::channel::bounded(0); + let (sender, receiver) = crossbeam_channel::bounded(0); let indexer_config = IndexerConfig { skip_index_budget: true, ..Default::default() }; @@ -2421,7 +2421,7 @@ mod tests { pub struct IndexSchedulerHandle { _tempdir: TempDir, index_scheduler: IndexScheduler, - test_breakpoint_rcv: crossbeam::channel::Receiver<(Breakpoint, bool)>, + test_breakpoint_rcv: crossbeam_channel::Receiver<(Breakpoint, bool)>, last_breakpoint: Breakpoint, } diff --git a/crates/meilisearch-auth/Cargo.toml b/crates/meilisearch-auth/Cargo.toml index ae0095ab4..591a40158 100644 --- a/crates/meilisearch-auth/Cargo.toml +++ b/crates/meilisearch-auth/Cargo.toml @@ -17,7 +17,7 @@ hmac = "0.12.1" maplit = "1.0.2" meilisearch-types = { path = "../meilisearch-types" } rand = "0.8.5" -roaring = { version = "0.10.6", features = ["serde"] } +roaring = { version = "0.10.7", features = ["serde"] } serde = { version = "1.0.204", features = ["derive"] } serde_json = { version = "1.0.120", features = ["preserve_order"] } sha2 = "0.10.8" diff --git a/crates/meilisearch-types/Cargo.toml b/crates/meilisearch-types/Cargo.toml index 349c06080..aca06a018 100644 --- a/crates/meilisearch-types/Cargo.toml +++ b/crates/meilisearch-types/Cargo.toml @@ -25,7 +25,7 @@ fst = "0.4.7" memmap2 = "0.9.4" milli = { path = "../milli" } raw-collections = { git = "https://github.com/meilisearch/raw-collections.git", version = "0.1.0" } -roaring = { version = "0.10.6", features = ["serde"] } +roaring = { version = "0.10.7", features = ["serde"] } serde = { version = "1.0.204", features = ["derive"] } serde-cs = "0.2.4" serde_json = "1.0.120" diff --git a/crates/meilisearch/Cargo.toml b/crates/meilisearch/Cargo.toml index 2884f0c9c..8e134ebd0 100644 --- a/crates/meilisearch/Cargo.toml +++ b/crates/meilisearch/Cargo.toml @@ -103,7 +103,7 @@ tracing-subscriber = { version = "0.3.18", features = ["json"] } tracing-trace = { version = "0.1.0", path = "../tracing-trace" } tracing-actix-web = "0.7.11" build-info = { version = "1.7.0", path = "../build-info" } -roaring = "0.10.2" +roaring = "0.10.7" mopa-maintained = "0.2.3" [dev-dependencies] diff --git a/crates/milli/Cargo.toml b/crates/milli/Cargo.toml index 798a4ea19..b66dec9a4 100644 --- a/crates/milli/Cargo.toml +++ b/crates/milli/Cargo.toml @@ -42,7 +42,7 @@ obkv = "0.3.0" once_cell = "1.19.0" ordered-float = "4.2.1" rayon = "1.10.0" -roaring = { version = "0.10.6", features = ["serde"] } +roaring = { version = "0.10.7", features = ["serde"] } rstar = { version = "0.12.0", features = ["serde"] } serde = { version = "1.0.204", features = ["derive"] } serde_json = { version = "1.0.120", features = ["preserve_order", "raw_value"] } @@ -99,7 +99,6 @@ rustc-hash = "2.0.0" uell = "0.1.0" enum-iterator = "2.1.0" bbqueue = { git = "https://github.com/kerollmops/bbqueue" } -crossbeam = "0.8.4" [dev-dependencies] mimalloc = { version = "0.1.43", default-features = false }