From a9ba0b8bb0e6ac0dfb0244aeaee9a69997e2328d Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 19 Mar 2026 05:33:02 +0000 Subject: [PATCH 1/3] chore(deps): update rust crate rand_distr to 0.6 --- Cargo.lock | 30 ++++++++++++++++++++++++++++-- Cargo.toml | 2 +- 2 files changed, 29 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 6560dec6ff2..ebbcf1cea09 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -7136,6 +7136,16 @@ dependencies = [ "rand_core 0.9.5", ] +[[package]] +name = "rand" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc266eb313df6c5c09c1c7b1fbe2510961e5bcd3add930c1e31f7ed9da0feff8" +dependencies = [ + "getrandom 0.4.2", + "rand_core 0.10.0", +] + [[package]] name = "rand_chacha" version = "0.3.1" @@ -7174,6 +7184,12 @@ dependencies = [ "getrandom 0.3.4", ] +[[package]] +name = "rand_core" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c8d0fd677905edcbeedbf2edb6494d676f0e98d54d5cf9bda0b061cb8fb8aba" + [[package]] name = "rand_distr" version = "0.4.3" @@ -7194,6 +7210,16 @@ dependencies = [ "rand 0.9.2", ] +[[package]] +name = "rand_distr" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4d431c2703ccf129de4d45253c03f49ebb22b97d6ad79ee3ecfc7e3f4862c1d8" +dependencies = [ + "num-traits", + "rand 0.10.0", +] + [[package]] name = "rand_xoshiro" version = "0.6.0" @@ -7221,7 +7247,7 @@ dependencies = [ "indicatif", "lance-bench", "rand 0.9.2", - "rand_distr 0.5.1", + "rand_distr 0.6.0", "tokio", "vortex-bench", ] @@ -9750,7 +9776,7 @@ dependencies = [ "primitive-types", "prost 0.14.3", "rand 0.9.2", - "rand_distr 0.5.1", + "rand_distr 0.6.0", "rstest", "rstest_reuse", "rustc-hash", diff --git a/Cargo.toml b/Cargo.toml index df46b95653f..0d98061f0e5 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -198,7 +198,7 @@ pyo3-bytes = "0.5" pyo3-log = "0.13.0" quote = "1.0.41" rand = "0.9.0" -rand_distr = "0.5" +rand_distr = "0.6" ratatui = { version = "0.30", default-features = false } regex = "1.11.0" regex-automata = "0.4" From 433e03154bc96d9be74fb7eeba1814f342459e3e Mon Sep 17 00:00:00 2001 From: Robert Kruszewski Date: Wed, 18 Mar 2026 22:58:43 -0700 Subject: [PATCH 2/3] imports Signed-off-by: Robert Kruszewski --- Cargo.lock | 79 +++++++++++++++---- Cargo.toml | 4 +- benchmarks/random-access-bench/src/main.rs | 2 +- encodings/alp/benches/alp_compress.rs | 2 +- .../fastlanes/benches/bitpacking_take.rs | 2 +- .../fastlanes/benches/compute_between.rs | 2 +- .../src/bitpacking/array/bitpack_compress.rs | 2 +- .../fastlanes/src/bitpacking/compute/take.rs | 2 +- encodings/fsst/benches/fsst_compress.rs | 2 +- encodings/fsst/src/canonical.rs | 2 +- encodings/fsst/src/test_utils.rs | 2 +- .../runend/benches/run_end_null_count.rs | 2 +- vortex-array/benches/chunk_array_builder.rs | 2 +- vortex-array/benches/compare.rs | 2 +- vortex-array/benches/dict_mask.rs | 2 +- .../benches/dict_unreferenced_mask.rs | 2 +- vortex-array/benches/scalar_at_struct.rs | 2 +- vortex-array/benches/scalar_subtract.rs | 2 +- vortex-array/benches/search_sorted.rs | 2 +- vortex-array/benches/take_fsl.rs | 2 +- vortex-array/benches/take_patches.rs | 2 +- vortex-array/benches/take_struct.rs | 2 +- vortex-array/benches/varbinview_compact.rs | 2 +- vortex-array/src/arrays/dict/array.rs | 2 +- vortex-array/src/arrays/dict_test.rs | 2 +- vortex-array/src/builders/bool.rs | 2 +- vortex-bench/src/datasets/feature_vectors.rs | 2 +- vortex-bench/src/datasets/nested_lists.rs | 2 +- vortex-bench/src/datasets/nested_structs.rs | 2 +- .../src/datasets/struct_list_of_ints.rs | 2 +- vortex-bench/src/polarsignals/data.rs | 2 +- vortex-btrblocks/benches/compress.rs | 2 +- vortex-btrblocks/benches/compress_listview.rs | 2 +- .../src/compressor/integer/mod.rs | 9 +-- vortex-btrblocks/src/sample.rs | 2 +- .../common_encoding_tree_throughput.rs | 2 +- vortex/benches/pipeline.rs | 2 +- vortex/benches/single_encoding_throughput.rs | 2 +- 38 files changed, 103 insertions(+), 59 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index ebbcf1cea09..5a81988247d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -16,7 +16,7 @@ checksum = "b169f7a6d4742236a0a00c541b845991d0ac43e546831af1249753ab4c3aa3a0" dependencies = [ "cfg-if", "cipher", - "cpufeatures", + "cpufeatures 0.2.17", ] [[package]] @@ -827,8 +827,13 @@ dependencies = [ "arrayvec", "cc", "cfg-if", +<<<<<<< HEAD "constant_time_eq", "cpufeatures", +======= + "constant_time_eq 0.4.2", + "cpufeatures 0.2.17", +>>>>>>> b256ccfb7 (imports) ] [[package]] @@ -1124,6 +1129,17 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" +[[package]] +name = "chacha20" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f8d983286843e49675a4b7a2d174efe136dc93a18d69130dd18198a6c167601" +dependencies = [ + "cfg-if", + "cpufeatures 0.3.0", + "rand_core 0.10.0", +] + [[package]] name = "chrono" version = "0.4.44" @@ -1583,6 +1599,33 @@ dependencies = [ ] [[package]] +<<<<<<< HEAD +======= +name = "cpufeatures" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b2a41393f66f16b0823bb79094d54ac5fbd34ab292ddafb9a0456ac9f87d201" +dependencies = [ + "libc", +] + +[[package]] +name = "crc" +version = "3.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5eb8a2a1cd12ab0d987a5d5e825195d372001a4094a0376319d5a0ad71c1ba0d" +dependencies = [ + "crc-catalog", +] + +[[package]] +name = "crc-catalog" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19d374276b40fb8bbdee95aef7c7fa6b5316ec764510eb64b8dd0e2ed0d7e7f5" + +[[package]] +>>>>>>> b256ccfb7 (imports) name = "crc32fast" version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4041,6 +4084,7 @@ dependencies = [ "js-sys", "libc", "r-efi 6.0.0", + "rand_core 0.10.0", "wasip2", "wasip3", "wasm-bindgen", @@ -7142,6 +7186,7 @@ version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bc266eb313df6c5c09c1c7b1fbe2510961e5bcd3add930c1e31f7ed9da0feff8" dependencies = [ + "chacha20", "getrandom 0.4.2", "rand_core 0.10.0", ] @@ -7246,7 +7291,7 @@ dependencies = [ "clap", "indicatif", "lance-bench", - "rand 0.9.2", + "rand 0.10.0", "rand_distr 0.6.0", "tokio", "vortex-bench", @@ -8187,7 +8232,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" dependencies = [ "cfg-if", - "cpufeatures", + "cpufeatures 0.2.17", "digest", ] @@ -8198,7 +8243,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a7507d819769d01a365ab707794a4084392c824f54a7a6a7862f8c3d0892b283" dependencies = [ "cfg-if", - "cpufeatures", + "cpufeatures 0.2.17", "digest", ] @@ -9681,7 +9726,7 @@ dependencies = [ "fastlanes", "mimalloc", "parquet", - "rand 0.9.2", + "rand 0.10.0", "serde_json", "tokio", "tracing", @@ -9724,7 +9769,7 @@ dependencies = [ "itertools 0.14.0", "num-traits", "prost 0.14.3", - "rand 0.9.2", + "rand 0.10.0", "rstest", "rustc-hash", "vortex-array", @@ -9759,7 +9804,7 @@ dependencies = [ "enum-iterator", "flatbuffers", "futures", - "getrandom 0.3.4", + "getrandom 0.4.2", "goldenfile", "half", "humansize", @@ -9775,7 +9820,7 @@ dependencies = [ "pin-project-lite", "primitive-types", "prost 0.14.3", - "rand 0.9.2", + "rand 0.10.0", "rand_distr 0.6.0", "rstest", "rstest_reuse", @@ -9822,7 +9867,7 @@ dependencies = [ "noodles-vcf", "parking_lot", "parquet", - "rand 0.9.2", + "rand 0.10.0", "regex", "reqwest 0.12.28", "serde", @@ -9849,11 +9894,11 @@ version = "0.1.0" dependencies = [ "codspeed-divan-compat", "enum-iterator", - "getrandom 0.3.4", + "getrandom 0.4.2", "itertools 0.14.0", "num-traits", "pco", - "rand 0.9.2", + "rand 0.10.0", "rstest", "rustc-hash", "test-with", @@ -10113,7 +10158,7 @@ dependencies = [ "lending-iterator", "num-traits", "prost 0.14.3", - "rand 0.9.2", + "rand 0.10.0", "rstest", "vortex-alp", "vortex-array", @@ -10151,7 +10196,7 @@ dependencies = [ "bytes", "flatbuffers", "futures", - "getrandom 0.3.4", + "getrandom 0.4.2", "itertools 0.14.0", "kanal", "moka", @@ -10204,7 +10249,7 @@ dependencies = [ "codspeed-divan-compat", "fsst-rs", "prost 0.14.3", - "rand 0.9.2", + "rand 0.10.0", "rstest", "vortex-array", "vortex-buffer", @@ -10249,7 +10294,7 @@ dependencies = [ "bytes", "custom-labels", "futures", - "getrandom 0.3.4", + "getrandom 0.4.2", "glob", "handle", "itertools 0.14.0", @@ -10361,7 +10406,7 @@ dependencies = [ name = "vortex-metrics" version = "0.1.0" dependencies = [ - "getrandom 0.3.4", + "getrandom 0.4.2", "parking_lot", "sketches-ddsketch 0.4.0", ] @@ -10433,7 +10478,7 @@ dependencies = [ "itertools 0.14.0", "num-traits", "prost 0.14.3", - "rand 0.9.2", + "rand 0.10.0", "rstest", "vortex-array", "vortex-buffer", diff --git a/Cargo.toml b/Cargo.toml index 0d98061f0e5..5bd51a4b995 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -197,7 +197,7 @@ pyo3 = { version = "0.27.0" } pyo3-bytes = "0.5" pyo3-log = "0.13.0" quote = "1.0.41" -rand = "0.9.0" +rand = "0.10.0" rand_distr = "0.6" ratatui = { version = "0.30", default-features = false } regex = "1.11.0" @@ -298,7 +298,7 @@ vortex-tui = { path = "./vortex-tui" } [workspace.dependencies.getrandom_v03] features = ["wasm_js"] package = "getrandom" -version = "0.3.1" +version = "0.4.0" [workspace.lints.rust] let_underscore_drop = "deny" diff --git a/benchmarks/random-access-bench/src/main.rs b/benchmarks/random-access-bench/src/main.rs index 83b79823a16..b53dda29179 100644 --- a/benchmarks/random-access-bench/src/main.rs +++ b/benchmarks/random-access-bench/src/main.rs @@ -9,7 +9,7 @@ use anyhow::Result; use clap::Parser; use clap::ValueEnum; use indicatif::ProgressBar; -use rand::Rng; +use rand::RngExt; use rand::SeedableRng; use rand::rngs::StdRng; use rand_distr::Distribution; diff --git a/encodings/alp/benches/alp_compress.rs b/encodings/alp/benches/alp_compress.rs index 8569307f7ea..a67583fd72a 100644 --- a/encodings/alp/benches/alp_compress.rs +++ b/encodings/alp/benches/alp_compress.rs @@ -4,7 +4,7 @@ #![allow(clippy::unwrap_used)] use divan::Bencher; -use rand::Rng; +use rand::RngExt; use rand::SeedableRng as _; use rand::rngs::StdRng; use vortex_alp::ALPFloat; diff --git a/encodings/fastlanes/benches/bitpacking_take.rs b/encodings/fastlanes/benches/bitpacking_take.rs index f9522d3bfc9..23e857777f7 100644 --- a/encodings/fastlanes/benches/bitpacking_take.rs +++ b/encodings/fastlanes/benches/bitpacking_take.rs @@ -5,7 +5,7 @@ #![allow(clippy::cast_possible_truncation)] use divan::Bencher; -use rand::Rng; +use rand::RngExt; use rand::SeedableRng; use rand::distr::Uniform; use rand::prelude::StdRng; diff --git a/encodings/fastlanes/benches/compute_between.rs b/encodings/fastlanes/benches/compute_between.rs index f6c389cb228..48cbae73216 100644 --- a/encodings/fastlanes/benches/compute_between.rs +++ b/encodings/fastlanes/benches/compute_between.rs @@ -3,7 +3,7 @@ #![expect(clippy::unwrap_used)] use num_traits::NumCast; -use rand::Rng; +use rand::RngExt; use rand::rngs::StdRng; use vortex_alp::ALPArray; use vortex_alp::alp_encode; diff --git a/encodings/fastlanes/src/bitpacking/array/bitpack_compress.rs b/encodings/fastlanes/src/bitpacking/array/bitpack_compress.rs index 5f6ad1dbbf0..a3542d1d6a0 100644 --- a/encodings/fastlanes/src/bitpacking/array/bitpack_compress.rs +++ b/encodings/fastlanes/src/bitpacking/array/bitpack_compress.rs @@ -380,7 +380,7 @@ fn bytes_per_exception(ptype: PType) -> usize { #[cfg(feature = "_test-harness")] pub mod test_harness { - use rand::Rng as _; + use rand::RngExt; use rand::rngs::StdRng; use vortex_array::ArrayRef; use vortex_array::IntoArray; diff --git a/encodings/fastlanes/src/bitpacking/compute/take.rs b/encodings/fastlanes/src/bitpacking/compute/take.rs index de3d30f948d..4405645ace3 100644 --- a/encodings/fastlanes/src/bitpacking/compute/take.rs +++ b/encodings/fastlanes/src/bitpacking/compute/take.rs @@ -147,7 +147,7 @@ fn take_primitive( #[cfg(test)] #[allow(clippy::cast_possible_truncation)] mod test { - use rand::Rng; + use rand::RngExt; use rand::distr::Uniform; use rand::rng; use rstest::rstest; diff --git a/encodings/fsst/benches/fsst_compress.rs b/encodings/fsst/benches/fsst_compress.rs index 444dff1b5ad..96854f824a6 100644 --- a/encodings/fsst/benches/fsst_compress.rs +++ b/encodings/fsst/benches/fsst_compress.rs @@ -6,7 +6,7 @@ use std::sync::LazyLock; use divan::Bencher; -use rand::Rng; +use rand::RngExt; use rand::SeedableRng; use rand::rngs::StdRng; use vortex_array::IntoArray; diff --git a/encodings/fsst/src/canonical.rs b/encodings/fsst/src/canonical.rs index b5474d1d923..aabd0e14027 100644 --- a/encodings/fsst/src/canonical.rs +++ b/encodings/fsst/src/canonical.rs @@ -88,7 +88,7 @@ pub(crate) fn fsst_decode_views( mod tests { use std::sync::LazyLock; - use rand::Rng; + use rand::RngExt; use rand::SeedableRng; use rand::prelude::StdRng; use vortex_array::ArrayRef; diff --git a/encodings/fsst/src/test_utils.rs b/encodings/fsst/src/test_utils.rs index b078229b7c1..701a41828c5 100644 --- a/encodings/fsst/src/test_utils.rs +++ b/encodings/fsst/src/test_utils.rs @@ -3,7 +3,7 @@ #![allow(clippy::unwrap_used)] -use rand::Rng; +use rand::RngExt; use rand::SeedableRng; use rand::prelude::StdRng; use vortex_array::ArrayRef; diff --git a/encodings/runend/benches/run_end_null_count.rs b/encodings/runend/benches/run_end_null_count.rs index a7cf310d1fa..d85683a4c92 100644 --- a/encodings/runend/benches/run_end_null_count.rs +++ b/encodings/runend/benches/run_end_null_count.rs @@ -4,7 +4,7 @@ #![allow(clippy::unwrap_used)] use divan::Bencher; -use rand::Rng; +use rand::RngExt; use rand::SeedableRng; use rand::rngs::StdRng; use vortex_array::DynArray; diff --git a/vortex-array/benches/chunk_array_builder.rs b/vortex-array/benches/chunk_array_builder.rs index 5fbcbf475be..e37e26dd526 100644 --- a/vortex-array/benches/chunk_array_builder.rs +++ b/vortex-array/benches/chunk_array_builder.rs @@ -4,7 +4,7 @@ use std::sync::LazyLock; use divan::Bencher; -use rand::Rng; +use rand::RngExt; use rand::SeedableRng; use rand::prelude::StdRng; use vortex_array::ArrayRef; diff --git a/vortex-array/benches/compare.rs b/vortex-array/benches/compare.rs index 1194e6cf97a..3f07c0cfe93 100644 --- a/vortex-array/benches/compare.rs +++ b/vortex-array/benches/compare.rs @@ -4,7 +4,7 @@ #![allow(clippy::unwrap_used)] use divan::Bencher; -use rand::Rng; +use rand::RngExt; use rand::SeedableRng; use rand::distr::Uniform; use rand::prelude::StdRng; diff --git a/vortex-array/benches/dict_mask.rs b/vortex-array/benches/dict_mask.rs index 60ecc0b9c53..9f0be5e585d 100644 --- a/vortex-array/benches/dict_mask.rs +++ b/vortex-array/benches/dict_mask.rs @@ -4,7 +4,7 @@ #![allow(clippy::unwrap_used)] use divan::Bencher; -use rand::Rng; +use rand::RngExt; use rand::SeedableRng; use rand::rngs::StdRng; use vortex_array::IntoArray; diff --git a/vortex-array/benches/dict_unreferenced_mask.rs b/vortex-array/benches/dict_unreferenced_mask.rs index a33c3ac6550..7a4b3a93c6e 100644 --- a/vortex-array/benches/dict_unreferenced_mask.rs +++ b/vortex-array/benches/dict_unreferenced_mask.rs @@ -4,7 +4,7 @@ #![allow(clippy::unwrap_used)] use divan::Bencher; -use rand::Rng; +use rand::RngExt; use rand::SeedableRng; use rand::rngs::StdRng; use vortex_array::IntoArray; diff --git a/vortex-array/benches/scalar_at_struct.rs b/vortex-array/benches/scalar_at_struct.rs index cc446836f99..3a54dea249e 100644 --- a/vortex-array/benches/scalar_at_struct.rs +++ b/vortex-array/benches/scalar_at_struct.rs @@ -4,7 +4,7 @@ #![allow(clippy::unwrap_used)] use divan::Bencher; -use rand::Rng; +use rand::RngExt; use rand::SeedableRng; use rand::distr::Uniform; use rand::rngs::StdRng; diff --git a/vortex-array/benches/scalar_subtract.rs b/vortex-array/benches/scalar_subtract.rs index fa04240a0b4..701a9f533e7 100644 --- a/vortex-array/benches/scalar_subtract.rs +++ b/vortex-array/benches/scalar_subtract.rs @@ -4,7 +4,7 @@ #![allow(clippy::unwrap_used)] use divan::Bencher; -use rand::Rng; +use rand::RngExt; use rand::SeedableRng; use rand::distr::Uniform; use rand::rngs::StdRng; diff --git a/vortex-array/benches/search_sorted.rs b/vortex-array/benches/search_sorted.rs index 86cdf774645..31ed741765a 100644 --- a/vortex-array/benches/search_sorted.rs +++ b/vortex-array/benches/search_sorted.rs @@ -4,7 +4,7 @@ #![allow(clippy::unwrap_used)] use divan::Bencher; -use rand::Rng; +use rand::RngExt; use rand::SeedableRng; use rand::distr::Uniform; use rand::prelude::StdRng; diff --git a/vortex-array/benches/take_fsl.rs b/vortex-array/benches/take_fsl.rs index 383ef192bcb..e22a18f5210 100644 --- a/vortex-array/benches/take_fsl.rs +++ b/vortex-array/benches/take_fsl.rs @@ -11,7 +11,7 @@ #![allow(clippy::unwrap_used)] use divan::Bencher; -use rand::Rng; +use rand::RngExt; use rand::SeedableRng; use rand::rngs::StdRng; use vortex_array::DynArray; diff --git a/vortex-array/benches/take_patches.rs b/vortex-array/benches/take_patches.rs index 31084c9a0a2..5360aa57c7e 100644 --- a/vortex-array/benches/take_patches.rs +++ b/vortex-array/benches/take_patches.rs @@ -5,7 +5,7 @@ #![allow(clippy::cast_possible_truncation)] use divan::Bencher; -use rand::Rng; +use rand::RngExt; use rand::SeedableRng; use rand::rngs::StdRng; use vortex_array::ArrayRef; diff --git a/vortex-array/benches/take_struct.rs b/vortex-array/benches/take_struct.rs index ec268be60ab..96acd2e01ef 100644 --- a/vortex-array/benches/take_struct.rs +++ b/vortex-array/benches/take_struct.rs @@ -4,7 +4,7 @@ #![allow(clippy::unwrap_used)] use divan::Bencher; -use rand::Rng; +use rand::RngExt; use rand::SeedableRng; use rand::distr::Uniform; use rand::rngs::StdRng; diff --git a/vortex-array/benches/varbinview_compact.rs b/vortex-array/benches/varbinview_compact.rs index ec0ebefb207..489be8d852d 100644 --- a/vortex-array/benches/varbinview_compact.rs +++ b/vortex-array/benches/varbinview_compact.rs @@ -2,7 +2,7 @@ // SPDX-FileCopyrightText: Copyright the Vortex contributors use divan::Bencher; -use rand::Rng; +use rand::RngExt; use rand::SeedableRng; use rand::rngs::StdRng; use vortex_array::ArrayRef; diff --git a/vortex-array/src/arrays/dict/array.rs b/vortex-array/src/arrays/dict/array.rs index 59662528240..ac9bd1edb2e 100644 --- a/vortex-array/src/arrays/dict/array.rs +++ b/vortex-array/src/arrays/dict/array.rs @@ -229,7 +229,7 @@ impl DictArray { mod test { #[allow(unused_imports)] use itertools::Itertools; - use rand::Rng; + use rand::RngExt; use rand::SeedableRng; use rand::distr::Distribution; use rand::distr::StandardUniform; diff --git a/vortex-array/src/arrays/dict_test.rs b/vortex-array/src/arrays/dict_test.rs index 4e648e09850..8402b66c670 100644 --- a/vortex-array/src/arrays/dict_test.rs +++ b/vortex-array/src/arrays/dict_test.rs @@ -3,7 +3,7 @@ #![allow(clippy::unwrap_used)] -use rand::Rng; +use rand::RngExt; use rand::SeedableRng; use rand::distr::Alphanumeric; use rand::distr::Distribution; diff --git a/vortex-array/src/builders/bool.rs b/vortex-array/src/builders/bool.rs index cd8001948d1..7e4b979fcda 100644 --- a/vortex-array/src/builders/bool.rs +++ b/vortex-array/src/builders/bool.rs @@ -143,7 +143,7 @@ impl ArrayBuilder for BoolBuilder { #[cfg(test)] mod tests { - use rand::Rng; + use rand::RngExt; use rand::SeedableRng; use rand::prelude::StdRng; use vortex_error::VortexResult; diff --git a/vortex-bench/src/datasets/feature_vectors.rs b/vortex-bench/src/datasets/feature_vectors.rs index 4928c0df326..7e0bc61bccc 100644 --- a/vortex-bench/src/datasets/feature_vectors.rs +++ b/vortex-bench/src/datasets/feature_vectors.rs @@ -15,7 +15,7 @@ use arrow_schema::Field; use arrow_schema::Schema; use async_trait::async_trait; use parquet::arrow::ArrowWriter; -use rand::Rng; +use rand::RngExt; use rand::SeedableRng; use rand::rngs::StdRng; diff --git a/vortex-bench/src/datasets/nested_lists.rs b/vortex-bench/src/datasets/nested_lists.rs index 5f0fbac80f5..b1461d66b42 100644 --- a/vortex-bench/src/datasets/nested_lists.rs +++ b/vortex-bench/src/datasets/nested_lists.rs @@ -14,7 +14,7 @@ use arrow_schema::Field; use arrow_schema::Schema; use async_trait::async_trait; use parquet::arrow::ArrowWriter; -use rand::Rng; +use rand::RngExt; use rand::SeedableRng; use rand::rngs::StdRng; diff --git a/vortex-bench/src/datasets/nested_structs.rs b/vortex-bench/src/datasets/nested_structs.rs index b3f362ed904..a7edff7e5dc 100644 --- a/vortex-bench/src/datasets/nested_structs.rs +++ b/vortex-bench/src/datasets/nested_structs.rs @@ -15,7 +15,7 @@ use arrow_schema::Fields; use arrow_schema::Schema; use async_trait::async_trait; use parquet::arrow::ArrowWriter; -use rand::Rng; +use rand::RngExt; use rand::SeedableRng; use rand::rngs::StdRng; diff --git a/vortex-bench/src/datasets/struct_list_of_ints.rs b/vortex-bench/src/datasets/struct_list_of_ints.rs index e27f0763b84..34588df5b11 100644 --- a/vortex-bench/src/datasets/struct_list_of_ints.rs +++ b/vortex-bench/src/datasets/struct_list_of_ints.rs @@ -8,7 +8,7 @@ use anyhow::Result; use arrow_array::RecordBatch; use async_trait::async_trait; use parquet::arrow::ArrowWriter; -use rand::Rng; +use rand::RngExt; use rand::SeedableRng; use rand::rngs::StdRng; use vortex::array::ArrayRef; diff --git a/vortex-bench/src/polarsignals/data.rs b/vortex-bench/src/polarsignals/data.rs index 021f3fb6c48..ed00f938cb9 100644 --- a/vortex-bench/src/polarsignals/data.rs +++ b/vortex-bench/src/polarsignals/data.rs @@ -22,7 +22,7 @@ use arrow_schema::Schema; use parquet::arrow::ArrowWriter; use parquet::basic::Compression; use parquet::file::properties::WriterProperties; -use rand::Rng; +use rand::RngExt; use rand::SeedableRng; use rand::rngs::StdRng; diff --git a/vortex-btrblocks/benches/compress.rs b/vortex-btrblocks/benches/compress.rs index 1e0c9f2e1c2..18a48881678 100644 --- a/vortex-btrblocks/benches/compress.rs +++ b/vortex-btrblocks/benches/compress.rs @@ -9,7 +9,7 @@ mod benchmarks { use divan::Bencher; use divan::counter::BytesCount; use divan::counter::ItemsCount; - use rand::RngCore; + use rand::Rng; use rand::SeedableRng; use rand::prelude::StdRng; use vortex_array::ArrayRef; diff --git a/vortex-btrblocks/benches/compress_listview.rs b/vortex-btrblocks/benches/compress_listview.rs index 5925a3dbc0b..11f5f92437e 100644 --- a/vortex-btrblocks/benches/compress_listview.rs +++ b/vortex-btrblocks/benches/compress_listview.rs @@ -10,7 +10,7 @@ mod benchmarks { use divan::Bencher; use divan::counter::BytesCount; use divan::counter::ItemsCount; - use rand::Rng; + use rand::RngExt; use rand::SeedableRng; use rand::prelude::StdRng; use vortex_array::ArrayRef; diff --git a/vortex-btrblocks/src/compressor/integer/mod.rs b/vortex-btrblocks/src/compressor/integer/mod.rs index 7e1f7b5d776..2c46e4cdd80 100644 --- a/vortex-btrblocks/src/compressor/integer/mod.rs +++ b/vortex-btrblocks/src/compressor/integer/mod.rs @@ -886,7 +886,7 @@ mod tests { use std::iter; use itertools::Itertools; - use rand::RngCore; + use rand::Rng; use rand::SeedableRng; use rand::rngs::StdRng; use vortex_array::DynArray; @@ -1074,6 +1074,9 @@ mod tests { mod scheme_selection_tests { use std::iter; + use rand::Rng; + use rand::SeedableRng; + use rand::rngs::StdRng; use vortex_array::arrays::Constant; use vortex_array::arrays::Dict; use vortex_array::arrays::PrimitiveArray; @@ -1148,10 +1151,6 @@ mod scheme_selection_tests { #[test] fn test_dict_compressed() -> VortexResult<()> { - use rand::RngCore; - use rand::SeedableRng; - use rand::rngs::StdRng; - let mut codes = Vec::with_capacity(65_535); let numbers: Vec = [0, 10, 50, 100, 1000, 3000] .into_iter() diff --git a/vortex-btrblocks/src/sample.rs b/vortex-btrblocks/src/sample.rs index 11a0e1b1512..25ff4d0f527 100644 --- a/vortex-btrblocks/src/sample.rs +++ b/vortex-btrblocks/src/sample.rs @@ -1,7 +1,7 @@ // SPDX-License-Identifier: Apache-2.0 // SPDX-FileCopyrightText: Copyright the Vortex contributors -use rand::Rng; +use rand::RngExt; use rand::SeedableRng; use rand::prelude::StdRng; use vortex_array::ArrayRef; diff --git a/vortex/benches/common_encoding_tree_throughput.rs b/vortex/benches/common_encoding_tree_throughput.rs index b60a6f87bd2..4d88546d2df 100644 --- a/vortex/benches/common_encoding_tree_throughput.rs +++ b/vortex/benches/common_encoding_tree_throughput.rs @@ -11,7 +11,7 @@ use divan::Bencher; #[cfg(not(codspeed))] use divan::counter::BytesCount; use mimalloc::MiMalloc; -use rand::Rng; +use rand::RngExt; use rand::SeedableRng; use vortex::array::ArrayRef; use vortex::array::DynArray; diff --git a/vortex/benches/pipeline.rs b/vortex/benches/pipeline.rs index d34e89cc27d..d6c668e0607 100644 --- a/vortex/benches/pipeline.rs +++ b/vortex/benches/pipeline.rs @@ -116,7 +116,7 @@ use divan::Bencher; use fastlanes::BitPacking; -use rand::Rng; +use rand::RngExt; use rand::SeedableRng; use rand::rngs::StdRng; use vortex_alp::ALPFloat; diff --git a/vortex/benches/single_encoding_throughput.rs b/vortex/benches/single_encoding_throughput.rs index 50ceaf7fbdb..720293158e3 100644 --- a/vortex/benches/single_encoding_throughput.rs +++ b/vortex/benches/single_encoding_throughput.rs @@ -9,7 +9,7 @@ use divan::Bencher; #[cfg(not(codspeed))] use divan::counter::BytesCount; use mimalloc::MiMalloc; -use rand::Rng; +use rand::RngExt; use rand::SeedableRng; use rand::prelude::IndexedRandom; use rand::rngs::StdRng; From 6a9e40517a10a7f636c062b8b624a763371807af Mon Sep 17 00:00:00 2001 From: Robert Kruszewski Date: Wed, 18 Mar 2026 23:00:17 -0700 Subject: [PATCH 3/3] lock Signed-off-by: Robert Kruszewski --- Cargo.lock | 23 ----------------------- 1 file changed, 23 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 5a81988247d..a050dd61ce3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -827,13 +827,8 @@ dependencies = [ "arrayvec", "cc", "cfg-if", -<<<<<<< HEAD "constant_time_eq", - "cpufeatures", -======= - "constant_time_eq 0.4.2", "cpufeatures 0.2.17", ->>>>>>> b256ccfb7 (imports) ] [[package]] @@ -1599,8 +1594,6 @@ dependencies = [ ] [[package]] -<<<<<<< HEAD -======= name = "cpufeatures" version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1610,22 +1603,6 @@ dependencies = [ ] [[package]] -name = "crc" -version = "3.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5eb8a2a1cd12ab0d987a5d5e825195d372001a4094a0376319d5a0ad71c1ba0d" -dependencies = [ - "crc-catalog", -] - -[[package]] -name = "crc-catalog" -version = "2.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19d374276b40fb8bbdee95aef7c7fa6b5316ec764510eb64b8dd0e2ed0d7e7f5" - -[[package]] ->>>>>>> b256ccfb7 (imports) name = "crc32fast" version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index"