Merge branch 'main' into strip-wbfs

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"
@@ -566,7 +560,7 @@ checksum = "cf5a574dadd7941adeaa71823ecba5e28331b8313fb2e1c6a5c7e5981ea53ad6"
 name = "nod"
 version = "2.0.0-alpha.3"
 dependencies = [
- "adler",
+ "adler2",
  "aes",
  "base16ct",
  "block-padding",
@@ -626,11 +620,11 @@ dependencies = [
 
 [[package]]
 name = "nu-ansi-term"
-version = "0.50.1"
+version = "0.50.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4a28e057d01f97e61255210fcff094d74ed0466038633e95017f5beb68e4399"
+checksum = "7957b9740744892f114936ab4a57b3f487491bbeafaf8083688b16841a4240e5"
 dependencies = [
- "windows-sys 0.52.0",
+ "windows-sys 0.60.2",
 ]
 
 [[package]]

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.1"
 base16ct = "0.2"
 bytes = "1.10"

nod/src/io/gcz.rs

@@ -5,7 +5,7 @@ use std::{
     sync::Arc,
 };
 
-use adler::adler32_slice;
+use adler2::adler32_slice;
 use bytes::{BufMut, Bytes, BytesMut};
 use zerocopy::{FromBytes, FromZeros, Immutable, IntoBytes, KnownLayout, little_endian::*};