removed raw_entry().from_key(name) in favor of contains_key for b…

…etter benchmark results

clarity/src/vm/analysis/type_checker/v2_05/contexts.rs

@@ -61,14 +61,14 @@ impl ContractContext {
     }
 
     pub fn check_name_used(&self, name: &str) -> CheckResult<()> {
-        if self.variable_types.raw_entry().from_key(name).is_some()
-            || self.persisted_variable_types.raw_entry().from_key(name).is_some()
-            || self.private_function_types.raw_entry().from_key(name).is_some()
-            || self.public_function_types.raw_entry().from_key(name).is_some()
+        if self.variable_types.contains_key(name)
+            || self.persisted_variable_types.contains_key(name)
+            || self.private_function_types.contains_key(name)
+            || self.public_function_types.contains_key(name)
             || self.fungible_tokens.contains(name)
-            || self.non_fungible_tokens.raw_entry().from_key(name).is_some()
-            || self.traits.raw_entry().from_key(name).is_some()
-            || self.map_types.raw_entry().from_key(name).is_some()
+            || self.non_fungible_tokens.contains_key(name)
+            || self.traits.contains_key(name)
+            || self.map_types.contains_key(name)
         {
             Err(CheckError::new(CheckErrors::NameAlreadyUsed(
                 name.to_string(),

clarity/src/vm/analysis/type_checker/v2_1/contexts.rs

@@ -51,7 +51,7 @@ impl TraitContext {
 
     pub fn is_name_used(&self, name: &str) -> bool {
         match self {
-            Self::Clarity1(map) => map.raw_entry().from_key(name).is_some(),
+            Self::Clarity1(map) => map.contains_key(name),
             Self::Clarity2 { defined, all: _ } => defined.contains(name),
         }
     }
@@ -168,14 +168,14 @@ impl ContractContext {
     }
 
     pub fn check_name_used(&self, name: &str) -> CheckResult<()> {
-        if self.variable_types.raw_entry().from_key(name).is_some()
-            || self.persisted_variable_types.raw_entry().from_key(name).is_some()
-            || self.private_function_types.raw_entry().from_key(name).is_some()
-            || self.public_function_types.raw_entry().from_key(name).is_some()
+        if self.variable_types.contains_key(name)
+            || self.persisted_variable_types.contains_key(name)
+            || self.private_function_types.contains_key(name)
+            || self.public_function_types.contains_key(name)
             || self.fungible_tokens.contains(name)
-            || self.non_fungible_tokens.raw_entry().from_key(name).is_some()
+            || self.non_fungible_tokens.contains_key(name)            
             || self.traits.is_name_used(name)
-            || self.map_types.raw_entry().from_key(name).is_some()
+            || self.map_types.contains_key(name)
         {
             Err(CheckError::new(CheckErrors::NameAlreadyUsed(
                 name.to_string(),

clarity/src/vm/ast/mod.rs

@@ -612,7 +612,7 @@ mod test {
 
                 for expr in ast.iter() {
                     depth_traverse::<_, _, ()>(expr, |x| {
-                        assert!(!visited.raw_entry().from_key(&x.id).is_some());
+                        assert!(!visited.contains_key(&x.id));
                         visited.insert(x.id, true);
                         Ok(())
                     })

clarity/src/vm/contexts.rs

@@ -1825,10 +1825,10 @@ impl ContractContext {
 
     pub fn is_name_used(&self, name: &str) -> bool {
         is_reserved(name, self.get_clarity_version())
-            || self.variables.raw_entry().from_key(name).is_some()
-            || self.functions.raw_entry().from_key(name).is_some()
+            || self.variables.contains_key(name)
+            || self.functions.contains_key(name)
             || self.persisted_names.contains(name)
-            || self.defined_traits.raw_entry().from_key(name).is_some()
+            || self.defined_traits.contains_key(name)
     }
 
     pub fn get_clarity_version(&self) -> &ClarityVersion {