From 99ac0edbc93d7ff4f2015ff43c285ec920922d26 Mon Sep 17 00:00:00 2001 From: Ivan Kalinin Date: Wed, 6 Nov 2024 14:29:33 +0100 Subject: [PATCH] chore: fix clippy warnings --- src/abi/ty.rs | 4 ++++ src/dict/mod.rs | 12 ++++++------ 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/abi/ty.rs b/src/abi/ty.rs index cf50bdec..1e4acf02 100644 --- a/src/abi/ty.rs +++ b/src/abi/ty.rs @@ -202,7 +202,9 @@ impl std::borrow::Borrow> for WithoutName { /// An iterator that flattens the first-level tuple. #[derive(Clone)] pub enum NamedAbiTypeFlatten { + #[doc(hidden)] Single(Option), + #[doc(hidden)] Tuple(Vec), } @@ -765,7 +767,9 @@ impl Hash for WithoutName { /// An iterator that flattens the first-level tuple. #[derive(Clone)] pub enum AbiTypeFlatten { + #[doc(hidden)] Single(Option), + #[doc(hidden)] Tuple(Vec), } diff --git a/src/dict/mod.rs b/src/dict/mod.rs index 43ebc646..5341e432 100644 --- a/src/dict/mod.rs +++ b/src/dict/mod.rs @@ -510,12 +510,12 @@ fn write_label_parts( let hml_long_len = 2 + bits_for_len + remaining_bits; let hml_same_len = 3 + bits_for_len; - if hml_same_len < hml_long_len && hml_same_len < hml_short_len { - if pfx.is_data_empty() || matches!(pfx.test_uniform(), Some(p) if p == bit) { - if rem.is_data_empty() || matches!(rem.test_uniform(), Some(r) if r == bit) { - return write_hml_same(bit, remaining_bits, bits_for_len, label); - } - } + if hml_same_len < hml_long_len + && hml_same_len < hml_short_len + && (pfx.is_data_empty() || matches!(pfx.test_uniform(), Some(p) if p == bit)) + && (rem.is_data_empty() || matches!(rem.test_uniform(), Some(r) if r == bit)) + { + return write_hml_same(bit, remaining_bits, bits_for_len, label); } if hml_short_len <= MAX_BIT_LEN && hml_short_len <= hml_long_len {