From 04f507b7174c7d2bcddaa340c7e7241ea9569c71 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Renault?= Date: Wed, 8 Jan 2025 11:33:14 +0100 Subject: [PATCH 1/3] Upgrade compatible dependencies --- Cargo.toml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 049c291..4ff8c89 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -9,21 +9,21 @@ edition = "2018" license = "MIT" [dependencies] -bytemuck = { version = "1.16.1", features = ["derive"] } +bytemuck = { version = "1.21.0", features = ["derive"] } byteorder = "1.5.0" either = { version = "1.13.0", default-features = false } flate2 = { version = "1.0", optional = true } lz4_flex = { version = "0.11.3", optional = true } rayon = { version = "1.10.0", optional = true } snap = { version = "1.1.1", optional = true } -tempfile = { version = "3.10.1", optional = true } -zstd = { version = "0.13.1", optional = true } +tempfile = { version = "3.15.0", optional = true } +zstd = { version = "0.13.2", optional = true } [dev-dependencies] criterion = { version = "0.3", features = ["html_reports"] } quickcheck = "0.9" rand = "0.8.5" -grenad-0-4 = { version = "0.4.6", package = "grenad" } +grenad-0-4 = { version = "0.4.7", package = "grenad" } [[bench]] name = "index-levels" From aab0a28c12e9ba6fff6843d606fe554c183a80c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Renault?= Date: Wed, 8 Jan 2025 11:33:24 +0100 Subject: [PATCH 2/3] Upgrade incompatible dependencies --- Cargo.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 4ff8c89..2e48cc3 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -20,8 +20,8 @@ tempfile = { version = "3.15.0", optional = true } zstd = { version = "0.13.2", optional = true } [dev-dependencies] -criterion = { version = "0.3", features = ["html_reports"] } -quickcheck = "0.9" +criterion = { version = "0.5", features = ["html_reports"] } +quickcheck = "1.0" rand = "0.8.5" grenad-0-4 = { version = "0.4.7", package = "grenad" } From cbba89ff8951735a3b21fc700708def6cf9cc52e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Renault?= Date: Wed, 8 Jan 2025 11:37:15 +0100 Subject: [PATCH 3/3] Make clippy happy --- src/sorter.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sorter.rs b/src/sorter.rs index cc42b16..8a36dd6 100644 --- a/src/sorter.rs +++ b/src/sorter.rs @@ -386,7 +386,7 @@ impl EntryBoundAlignedBuffer { /// Allocates a new buffer of the given size, it is correctly aligned to store `EntryBound`s. fn new(size: usize) -> EntryBoundAlignedBuffer { let entry_bound_size = size_of::(); - let size = (size + entry_bound_size - 1) / entry_bound_size * entry_bound_size; + let size = size.div_ceil(entry_bound_size) * entry_bound_size; let layout = Layout::from_size_align(size, align_of::()).unwrap(); let ptr = unsafe { alloc(layout) }; let Some(ptr) = NonNull::new(ptr) else {