From 2d643c7a08c07fd30907634a0989f632b45f606d Mon Sep 17 00:00:00 2001 From: kay-lambdadelta Date: Wed, 15 Oct 2025 12:37:25 -0500 Subject: [PATCH 1/2] upgrade adler to adler2 --- Cargo.lock | 8 +------- nod/Cargo.toml | 5 +++-- nod/src/io/gcz.rs | 3 +-- 3 files changed, 5 insertions(+), 11 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 8efd4ff..9e09923 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2,12 +2,6 @@ # It is not intended for manual editing. version = 4 -[[package]] -name = "adler" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" - [[package]] name = "adler2" version = "2.0.1" @@ -559,7 +553,7 @@ checksum = "cf5a574dadd7941adeaa71823ecba5e28331b8313fb2e1c6a5c7e5981ea53ad6" name = "nod" version = "2.0.0-alpha.3" dependencies = [ - "adler", + "adler2", "aes", "base16ct", "bytes", diff --git a/nod/Cargo.toml b/nod/Cargo.toml index b64f22c..4357ec2 100644 --- a/nod/Cargo.toml +++ b/nod/Cargo.toml @@ -18,13 +18,13 @@ categories = ["command-line-utilities", "parser-implementations"] default = ["compress-bzip2", "compress-lzma", "compress-zlib", "compress-zstd"] compress-bzip2 = ["bzip2"] compress-lzma = ["liblzma", "liblzma-sys"] -compress-zlib = ["adler", "miniz_oxide"] +compress-zlib = ["adler2", "miniz_oxide"] compress-zstd = ["zstd", "zstd-safe"] openssl = ["dep:openssl"] openssl-vendored = ["openssl", "openssl/vendored"] [dependencies] -adler = { version = "1.0", optional = true } +adler2 = { version = "2.0", optional = true } aes = "0.9.0-rc.0" base16ct = "0.2" bytes = "1.10" @@ -52,3 +52,4 @@ xxhash-rust = { version = "0.8", features = ["xxh64"] } zerocopy = { workspace = true } zstd = { version = "0.13", optional = true, default-features = false } zstd-safe = { version = "7.2", optional = true, default-features = false } + diff --git a/nod/src/io/gcz.rs b/nod/src/io/gcz.rs index eb00033..575404f 100644 --- a/nod/src/io/gcz.rs +++ b/nod/src/io/gcz.rs @@ -4,8 +4,7 @@ use std::{ mem::size_of, sync::Arc, }; - -use adler::adler32_slice; +use adler2::adler32_slice; use bytes::{BufMut, Bytes, BytesMut}; use zerocopy::{FromBytes, FromZeros, Immutable, IntoBytes, KnownLayout, little_endian::*}; From 07f70ac356b9756cf9ddcc2da816122ecf0b73c8 Mon Sep 17 00:00:00 2001 From: Luke Street Date: Wed, 15 Oct 2025 13:54:09 -0600 Subject: [PATCH 2/2] Fix formatting issue & update tracing-subscriber --- Cargo.lock | 76 +++++++---------------------------------------- nod/src/io/gcz.rs | 1 + 2 files changed, 11 insertions(+), 66 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 9e09923..cc99dc3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -502,11 +502,11 @@ dependencies = [ [[package]] name = "matchers" -version = "0.1.0" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558" +checksum = "d1525a2a28c7f4fa0fc98bb91ae755d1e2d1505079e05539e35bc876b5d65ae9" dependencies = [ - "regex-automata 0.1.10", + "regex-automata", ] [[package]] @@ -612,12 +612,11 @@ dependencies = [ [[package]] name = "nu-ansi-term" -version = "0.46.0" +version = "0.50.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84" +checksum = "7957b9740744892f114936ab4a57b3f487491bbeafaf8083688b16841a4240e5" dependencies = [ - "overload", - "winapi", + "windows-sys 0.60.2", ] [[package]] @@ -693,12 +692,6 @@ dependencies = [ "vcpkg", ] -[[package]] -name = "overload" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" - [[package]] name = "pin-project-lite" version = "0.2.16" @@ -773,27 +766,6 @@ version = "5.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f" -[[package]] -name = "regex" -version = "1.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191" -dependencies = [ - "aho-corasick", - "memchr", - "regex-automata 0.4.9", - "regex-syntax 0.8.5", -] - -[[package]] -name = "regex-automata" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" -dependencies = [ - "regex-syntax 0.6.29", -] - [[package]] name = "regex-automata" version = "0.4.9" @@ -802,15 +774,9 @@ checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908" dependencies = [ "aho-corasick", "memchr", - "regex-syntax 0.8.5", + "regex-syntax", ] -[[package]] -name = "regex-syntax" -version = "0.6.29" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" - [[package]] name = "regex-syntax" version = "0.8.5" @@ -990,14 +956,14 @@ dependencies = [ [[package]] name = "tracing-subscriber" -version = "0.3.19" +version = "0.3.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8189decb5ac0fa7bc8b96b7cb9b2701d60d48805aca84a238004d665fcc4008" +checksum = "2054a14f5307d601f88daf0553e1cbf472acc4f2c51afab632431cdcd72124d5" dependencies = [ "matchers", "nu-ansi-term", "once_cell", - "regex", + "regex-automata", "sharded-slab", "smallvec", "thread_local", @@ -1156,28 +1122,6 @@ dependencies = [ "wasm-bindgen", ] -[[package]] -name = "winapi" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" -dependencies = [ - "winapi-i686-pc-windows-gnu", - "winapi-x86_64-pc-windows-gnu", -] - -[[package]] -name = "winapi-i686-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" - -[[package]] -name = "winapi-x86_64-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" - [[package]] name = "windows" version = "0.61.3" diff --git a/nod/src/io/gcz.rs b/nod/src/io/gcz.rs index 575404f..7325363 100644 --- a/nod/src/io/gcz.rs +++ b/nod/src/io/gcz.rs @@ -4,6 +4,7 @@ use std::{ mem::size_of, sync::Arc, }; + use adler2::adler32_slice; use bytes::{BufMut, Bytes, BytesMut}; use zerocopy::{FromBytes, FromZeros, Immutable, IntoBytes, KnownLayout, little_endian::*};