chore: Remove duplicate PropertyKey enum

nova_vm/src/heap.rs

@@ -37,16 +37,14 @@ use self::{
     indexes::{BaseIndex, FunctionIndex, NumberIndex, ObjectIndex, StringIndex},
     math::initialize_math_object,
     number::{initialize_number_heap, NumberHeapData},
-    object::{
-        initialize_object_heap, ObjectEntry, ObjectHeapData, PropertyDescriptor, PropertyKey,
-    },
+    object::{initialize_object_heap, ObjectEntry, ObjectHeapData, PropertyDescriptor},
     regexp::{initialize_regexp_heap, RegExpHeapData},
     string::initialize_string_heap,
     symbol::{initialize_symbol_heap, SymbolHeapData},
 };
 use crate::{
     execution::{Environments, Realm, RealmIdentifier},
-    types::{Function, Number, Object, String, StringHeapData, Value},
+    types::{Function, Number, Object, PropertyKey, String, StringHeapData, Value},
 };
 use wtf8::{Wtf8, Wtf8Buf};
 
@@ -275,7 +273,7 @@ impl<'ctx, 'host> Heap<'ctx, 'host> {
         &mut self,
         name: Value,
         length: u8,
-        uses_arguments: bool,
+        _uses_arguments: bool,
         // behaviour: Behaviour,
     ) -> FunctionIndex {
         let entries = vec![

nova_vm/src/heap/array.rs

@@ -1,18 +1,17 @@
+use super::{
+    element_array::ElementsVector,
+    function::FunctionHeapData,
+    heap_constants::WellKnownSymbolIndexes,
+    indexes::{FunctionIndex, ObjectIndex},
+    object::ObjectEntry,
+};
 use crate::{
     execution::JsResult,
     heap::{
         heap_constants::{get_constructor_index, BuiltinObjectIndexes},
         Heap, PropertyDescriptor,
     },
-    types::{Object, Value},
-};
-
-use super::{
-    element_array::ElementsVector,
-    function::FunctionHeapData,
-    heap_constants::WellKnownSymbolIndexes,
-    indexes::{FunctionIndex, ObjectIndex},
-    object::{ObjectEntry, PropertyKey},
+    types::{Object, PropertyKey, Value},
 };
 
 #[derive(Debug, Clone, Copy)]

nova_vm/src/heap/array_buffer.rs

@@ -1,16 +1,13 @@
 use super::{
-    function::FunctionHeapData,
-    heap_constants::WellKnownSymbolIndexes,
-    indexes::{ArrayBufferIndex, ObjectIndex},
-    object::{ObjectEntry, PropertyKey},
+    function::FunctionHeapData, heap_constants::WellKnownSymbolIndexes, indexes::ObjectIndex,
+    object::ObjectEntry,
 };
 use crate::{
-    execution::JsResult,
     heap::{
         heap_constants::{get_constructor_index, BuiltinObjectIndexes},
         Heap, PropertyDescriptor,
     },
-    types::{Object, Value},
+    types::{Object, PropertyKey, Value},
 };
 use std::{
     alloc::{alloc_zeroed, handle_alloc_error, Layout},

nova_vm/src/heap/bigint.rs

@@ -3,9 +3,9 @@ use crate::{
     execution::JsResult,
     heap::{
         heap_constants::{get_constructor_index, BuiltinObjectIndexes},
-        FunctionHeapData, Heap, ObjectEntry, PropertyDescriptor, PropertyKey,
+        FunctionHeapData, Heap, ObjectEntry, PropertyDescriptor,
     },
-    types::{Object, Value},
+    types::{Object, PropertyKey, Value},
 };
 use num_bigint_dig::BigInt;
 

nova_vm/src/heap/boolean.rs

@@ -1,15 +1,11 @@
+use super::{object::ObjectEntry, Heap};
 use crate::{
     execution::JsResult,
     heap::{
         heap_constants::{get_constructor_index, BuiltinObjectIndexes},
         FunctionHeapData, PropertyDescriptor,
     },
-    types::{Object, Value},
-};
-
-use super::{
-    object::{ObjectEntry, PropertyKey},
-    Heap,
+    types::{Object, PropertyKey, Value},
 };
 
 pub fn initialize_boolean_heap(heap: &mut Heap) {

nova_vm/src/heap/date.rs

@@ -1,20 +1,18 @@
-use std::time::SystemTime;
-
+use super::{
+    function::FunctionHeapData,
+    heap_constants::WellKnownSymbolIndexes,
+    indexes::{FunctionIndex, ObjectIndex},
+    object::ObjectEntry,
+};
 use crate::{
     execution::JsResult,
     heap::{
         heap_constants::{get_constructor_index, BuiltinObjectIndexes},
         Heap, PropertyDescriptor,
     },
-    types::{Object, Value},
-};
-
-use super::{
-    function::FunctionHeapData,
-    heap_constants::WellKnownSymbolIndexes,
-    indexes::{FunctionIndex, ObjectIndex},
-    object::{ObjectEntry, PropertyKey},
+    types::{Object, PropertyKey, Value},
 };
+use std::time::SystemTime;
 
 #[derive(Debug, Clone, Copy)]
 pub struct DateHeapData {

nova_vm/src/heap/element_array.rs

@@ -1,10 +1,10 @@
 use super::{
     indexes::{ElementIndex, FunctionIndex},
-    object::{ObjectEntry, PropertyDescriptor, PropertyKey},
+    object::{ObjectEntry, PropertyDescriptor},
 };
-use crate::{types::Value, Heap};
+use crate::types::{PropertyKey, Value};
 use core::panic;
-use std::{collections::HashMap, mem::MaybeUninit, num::NonZeroU16, vec};
+use std::{collections::HashMap, mem::MaybeUninit, num::NonZeroU16};
 
 #[derive(Debug, Clone, Copy)]
 pub enum ElementArrayKey {
@@ -789,8 +789,8 @@ impl ElementArrays {
             let (maybe_descriptor, maybe_value) =
                 ElementDescriptor::from_property_descriptor(value);
             let key = match key {
+                PropertyKey::Integer(data) => Value::Integer(data),
                 PropertyKey::SmallString(data) => Value::SmallString(data),
-                PropertyKey::Smi(data) => Value::from(data),
                 PropertyKey::String(data) => Value::String(data),
                 PropertyKey::Symbol(data) => Value::Symbol(data),
             };

nova_vm/src/heap/error.rs

@@ -1,16 +1,15 @@
+use super::{
+    function::FunctionHeapData,
+    indexes::{FunctionIndex, ObjectIndex},
+    object::ObjectEntry,
+};
 use crate::{
     execution::JsResult,
     heap::{
         heap_constants::{get_constructor_index, BuiltinObjectIndexes},
         Heap, PropertyDescriptor,
     },
-    types::{Object, Value},
-};
-
-use super::{
-    function::FunctionHeapData,
-    indexes::{FunctionIndex, ObjectIndex},
-    object::{ObjectEntry, PropertyKey},
+    types::{Object, PropertyKey, Value},
 };
 
 #[derive(Debug, Clone, Copy)]

nova_vm/src/heap/function.rs

@@ -1,17 +1,15 @@
+use super::{
+    heap_constants::WellKnownSymbolIndexes,
+    indexes::{FunctionIndex, ObjectIndex},
+    object::ObjectEntry,
+};
 use crate::{
-    builtins::Behaviour,
     execution::JsResult,
     heap::{
         heap_constants::{get_constructor_index, BuiltinObjectIndexes},
         Heap, PropertyDescriptor,
     },
-    types::{Object, Value},
-};
-
-use super::{
-    heap_constants::WellKnownSymbolIndexes,
-    indexes::{FunctionIndex, ObjectIndex},
-    object::{ObjectEntry, PropertyKey},
+    types::{Object, PropertyKey, Value},
 };
 
 #[derive(Debug, Clone)]

nova_vm/src/heap/heap_bits.rs

@@ -1,14 +1,12 @@
-use std::sync::atomic::AtomicBool;
-
-use crate::types::Value;
-
 use super::{
     indexes::{
         ArrayBufferIndex, ArrayIndex, BigIntIndex, DateIndex, ElementIndex, ErrorIndex,
         FunctionIndex, NumberIndex, ObjectIndex, RegExpIndex, StringIndex, SymbolIndex,
     },
     Heap,
 };
+use crate::types::Value;
+use std::sync::atomic::AtomicBool;
 
 pub struct HeapBits {
     pub e_2_4: Box<[AtomicBool]>,

nova_vm/src/heap/heap_gc.rs

@@ -1,7 +1,3 @@
-use std::sync::atomic::Ordering;
-
-use crate::types::Value;
-
 use super::{
     element_array::ElementArrayKey,
     heap_bits::{HeapBits, WorkQueues},
@@ -11,6 +7,8 @@ use super::{
     },
     ElementsVector, Heap,
 };
+use crate::types::Value;
+use std::sync::atomic::Ordering;
 
 pub fn heap_gc(heap: &mut Heap) {
     let bits = HeapBits::new(heap);

nova_vm/src/heap/math.rs

@@ -1,10 +1,12 @@
-use crate::{execution::JsResult, types::Value};
-
 use super::{
     heap_constants::WellKnownSymbolIndexes,
-    object::{ObjectEntry, PropertyDescriptor, PropertyKey},
+    object::{ObjectEntry, PropertyDescriptor},
     Heap,
 };
+use crate::{
+    execution::JsResult,
+    types::{PropertyKey, Value},
+};
 
 pub(super) fn initialize_math_object(heap: &mut Heap) {
     let e = Value::from_f64(heap, std::f64::consts::E);

nova_vm/src/heap/number.rs

@@ -1,14 +1,11 @@
-use super::{
-    object::{ObjectEntry, PropertyKey},
-    Heap,
-};
+use super::{object::ObjectEntry, Heap};
 use crate::{
     execution::JsResult,
     heap::{
         heap_constants::{get_constructor_index, BuiltinObjectIndexes},
         FunctionHeapData, PropertyDescriptor,
     },
-    types::{Object, Value},
+    types::{Object, PropertyKey, Value},
 };
 
 #[derive(Debug, Clone, Copy)]

nova_vm/src/heap/object.rs

@@ -1,15 +1,14 @@
 use super::{
     element_array::ElementsVector,
-    indexes::{FunctionIndex, ObjectIndex, StringIndex, SymbolIndex},
+    indexes::{FunctionIndex, ObjectIndex, SymbolIndex},
 };
 use crate::{
     execution::JsResult,
     heap::{
         heap_constants::{get_constructor_index, BuiltinObjectIndexes},
         FunctionHeapData, Heap,
     },
-    types::{Object, Value},
-    SmallString,
+    types::{Object, PropertyKey, Value},
 };
 use std::{fmt::Debug, vec};
 
@@ -34,7 +33,7 @@ impl ObjectEntry {
         let key = PropertyKey::from_str(heap, name);
         let name = match key {
             PropertyKey::SmallString(data) => Value::SmallString(data.clone()),
-            PropertyKey::Smi(_) => unreachable!("No prototype functions should have SMI names"),
+            PropertyKey::Integer(_) => unreachable!("No prototype functions should have SMI names"),
             PropertyKey::String(idx) => Value::String(idx),
             PropertyKey::Symbol(idx) => Value::Symbol(idx),
         };
@@ -78,24 +77,6 @@ impl ObjectEntry {
     }
 }
 
-#[derive(Debug)]
-pub enum PropertyKey {
-    SmallString(SmallString),
-    Smi(i32),
-    String(StringIndex),
-    Symbol(SymbolIndex),
-}
-
-impl PropertyKey {
-    pub fn from_str(heap: &mut Heap, str: &str) -> Self {
-        if let Ok(ascii_string) = SmallString::try_from(str) {
-            PropertyKey::SmallString(ascii_string)
-        } else {
-            PropertyKey::String(heap.alloc_string(str))
-        }
-    }
-}
-
 #[derive(Debug)]
 pub enum PropertyDescriptor {
     Data {

nova_vm/src/heap/regexp.rs

@@ -1,17 +1,16 @@
+use super::{
+    function::FunctionHeapData,
+    heap_constants::WellKnownSymbolIndexes,
+    indexes::{FunctionIndex, ObjectIndex},
+    object::ObjectEntry,
+};
 use crate::{
     execution::JsResult,
     heap::{
         heap_constants::{get_constructor_index, BuiltinObjectIndexes},
         Heap, PropertyDescriptor,
     },
-    types::{Object, Value},
-};
-
-use super::{
-    function::FunctionHeapData,
-    heap_constants::WellKnownSymbolIndexes,
-    indexes::{FunctionIndex, ObjectIndex},
-    object::{ObjectEntry, PropertyKey},
+    types::{Object, PropertyKey, Value},
 };
 
 #[derive(Debug, Clone, Copy)]

nova_vm/src/heap/symbol.rs

@@ -1,15 +1,14 @@
+use super::{
+    indexes::{FunctionIndex, StringIndex, SymbolIndex},
+    object::ObjectEntry,
+};
 use crate::{
     execution::JsResult,
     heap::{
         heap_constants::{get_constructor_index, BuiltinObjectIndexes, WellKnownSymbolIndexes},
         FunctionHeapData, Heap, PropertyDescriptor,
     },
-    types::{Object, Value},
-};
-
-use super::{
-    indexes::{FunctionIndex, StringIndex, SymbolIndex},
-    object::{ObjectEntry, PropertyKey},
+    types::{Object, PropertyKey, Value},
 };
 
 #[derive(Debug, Clone, Copy)]