From 9ff45c3b0fc70afac54f73a2e237ced815fbd819 Mon Sep 17 00:00:00 2001 From: Jeff Bencin Date: Tue, 27 Feb 2024 15:56:46 -0500 Subject: [PATCH] chore: Address Brice's PR comments --- .../src/vm/analysis/type_checker/v2_05/natives/sequences.rs | 5 +++-- .../src/vm/analysis/type_checker/v2_1/natives/sequences.rs | 5 +++-- clarity/src/vm/database/structures.rs | 3 +-- clarity/src/vm/types/mod.rs | 2 +- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/clarity/src/vm/analysis/type_checker/v2_05/natives/sequences.rs b/clarity/src/vm/analysis/type_checker/v2_05/natives/sequences.rs index df85af20b..81d52bb23 100644 --- a/clarity/src/vm/analysis/type_checker/v2_05/natives/sequences.rs +++ b/clarity/src/vm/analysis/type_checker/v2_05/natives/sequences.rs @@ -74,9 +74,10 @@ pub fn check_special_map( args.len(), )?; - let mut func_args = Vec::with_capacity(args.len()); + let iter = args[1..].iter(); + let mut func_args = Vec::with_capacity(iter.len()); let mut min_args = u32::MAX; - for arg in args[1..].iter() { + for arg in iter { let argument_type = checker.type_check(arg, context)?; let entry_type = match argument_type { TypeSignature::SequenceType(sequence) => { diff --git a/clarity/src/vm/analysis/type_checker/v2_1/natives/sequences.rs b/clarity/src/vm/analysis/type_checker/v2_1/natives/sequences.rs index be38425c2..52ceca66b 100644 --- a/clarity/src/vm/analysis/type_checker/v2_1/natives/sequences.rs +++ b/clarity/src/vm/analysis/type_checker/v2_1/natives/sequences.rs @@ -74,9 +74,10 @@ pub fn check_special_map( args.len(), )?; - let mut func_args = Vec::with_capacity(args.len()); + let iter = args[1..].iter(); + let mut func_args = Vec::with_capacity(iter.len()); let mut min_args = u32::MAX; - for arg in args[1..].iter() { + for arg in iter { let argument_type = checker.type_check(arg, context)?; let entry_type = match argument_type { TypeSignature::SequenceType(sequence) => { diff --git a/clarity/src/vm/database/structures.rs b/clarity/src/vm/database/structures.rs index effa4ac35..53c7fbd68 100644 --- a/clarity/src/vm/database/structures.rs +++ b/clarity/src/vm/database/structures.rs @@ -169,8 +169,7 @@ type Result = std::result::Result; impl ClaritySerializable for STXBalance { #[allow(clippy::expect_used)] fn serialize(&self) -> String { - let size = std::mem::size_of::(); - let mut buffer = Vec::with_capacity(size); + let mut buffer = Vec::new(); match self { STXBalance::Unlocked { amount } => { buffer diff --git a/clarity/src/vm/types/mod.rs b/clarity/src/vm/types/mod.rs index 64c10fd40..cc3cbeeba 100644 --- a/clarity/src/vm/types/mod.rs +++ b/clarity/src/vm/types/mod.rs @@ -1038,7 +1038,7 @@ impl Value { .chars() .map(|char| { let mut encoded_char = vec![0u8; char.len_utf8()]; - char.encode_utf8(&mut encoded_char[..]); + char.encode_utf8(&mut encoded_char); encoded_char }) .collect::>();