From 96676ae95e1e41af8045e2df7ad82978ff2a9d6b Mon Sep 17 00:00:00 2001 From: nazeh Date: Fri, 29 Dec 2023 23:47:55 +0300 Subject: [PATCH] chore: clippy and remove varu64 --- Cargo.lock | 50 +----------------------------------------------- mast/Cargo.toml | 1 - mast/src/node.rs | 11 +---------- 3 files changed, 2 insertions(+), 60 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 1a18f3b..18db7be 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -163,12 +163,6 @@ dependencies = [ "subtle", ] -[[package]] -name = "doc-comment" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10" - [[package]] name = "errno" version = "0.3.8" @@ -257,7 +251,6 @@ dependencies = [ "proptest", "redb", "tempfile", - "varu64", ] [[package]] @@ -419,44 +412,12 @@ dependencies = [ "wait-timeout", ] -[[package]] -name = "snafu" -version = "0.6.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eab12d3c261b2308b0d80c26fffb58d17eba81a4be97890101f416b478c79ca7" -dependencies = [ - "doc-comment", - "snafu-derive", -] - -[[package]] -name = "snafu-derive" -version = "0.6.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1508efa03c362e23817f96cde18abed596a25219a8b2c66e8db33c03543d315b" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[package]] name = "subtle" version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" -[[package]] -name = "syn" -version = "1.0.109" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - [[package]] name = "syn" version = "2.0.39" @@ -498,7 +459,7 @@ checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn", ] [[package]] @@ -519,15 +480,6 @@ version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" -[[package]] -name = "varu64" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd0b4bcb210ab3a048eda9a938508b072e474af2838994e77976c817e51af1e3" -dependencies = [ - "snafu", -] - [[package]] name = "version_check" version = "0.9.4" diff --git a/mast/Cargo.toml b/mast/Cargo.toml index 17b4ff9..a8cfed1 100644 --- a/mast/Cargo.toml +++ b/mast/Cargo.toml @@ -8,7 +8,6 @@ edition = "2021" [dependencies] blake3 = "1.5.0" redb = "1.4.0" -varu64 = "0.7.0" [dev-dependencies] proptest = "1.4.0" diff --git a/mast/src/node.rs b/mast/src/node.rs index c11089a..68334aa 100644 --- a/mast/src/node.rs +++ b/mast/src/node.rs @@ -195,8 +195,7 @@ impl Node { let key_length_encoding_length = len_encoding_length(key_length); let val_length_encoding_length = len_encoding_length(val_length); - let header = 0_u8 - | (key_length_encoding_length << 4) + let header = (key_length_encoding_length << 4) | (val_length_encoding_length << 2) | ((self.left.is_some() as u8) << 1) | (self.right.is_some() as u8); @@ -242,14 +241,6 @@ fn hash(bytes: &[u8]) -> Hash { hasher.finalize() } -fn varu64_decode(bytes: &[u8]) -> (&[u8], &[u8]) { - let (len, remaining) = varu64::decode(bytes).unwrap(); - let value = &remaining[..len as usize]; - let rest = &remaining[value.len()..]; - - (value, rest) -} - fn decode_node(data: (u64, &[u8])) -> Node { let (ref_count, encoded_node) = data;