From afcc1874fead38c9c383ea8f48d833cb39e81f07 Mon Sep 17 00:00:00 2001
From: Jeff <dev@jeffa.io>
Date: Sat, 15 Feb 2025 15:52:27 -0500
Subject: [PATCH] Clean up

---
 dust-lang/src/type.rs           |  4 ++--
 dust-lang/src/vm/action/add.rs  |  7 +++----
 dust-lang/src/vm/action/jump.rs |  5 +----
 dust-lang/src/vm/action/less.rs |  5 +----
 dust-lang/src/vm/action/mod.rs  |  3 ---
 dust-lang/src/vm/call_frame.rs  | 26 +-------------------------
 dust-lang/src/vm/thread.rs      |  2 +-
 7 files changed, 9 insertions(+), 43 deletions(-)

diff --git a/dust-lang/src/type.rs b/dust-lang/src/type.rs
index e35ec24..6125e75 100644
--- a/dust-lang/src/type.rs
+++ b/dust-lang/src/type.rs
@@ -82,7 +82,7 @@ impl Type {
             | (Type::Float, Type::Float)
             | (Type::Integer, Type::Integer)
             | (Type::None, Type::None)
-            | (Type::String { .. }, Type::String { .. }) => return Ok(()),
+            | (Type::String, Type::String) => return Ok(()),
             (
                 Type::Generic(GenericType {
                     concrete_type: left,
@@ -264,7 +264,7 @@ impl Ord for Type {
             (Type::SelfFunction, Type::SelfFunction) => Ordering::Equal,
             (Type::SelfFunction, _) => Ordering::Greater,
             (Type::String, Type::String) => Ordering::Equal,
-            (Type::String { .. }, _) => Ordering::Greater,
+            (Type::String, _) => Ordering::Greater,
             (Type::Struct(left_struct), Type::Struct(right_struct)) => {
                 left_struct.cmp(right_struct)
             }
diff --git a/dust-lang/src/vm/action/add.rs b/dust-lang/src/vm/action/add.rs
index ab23c5c..6023ed0 100644
--- a/dust-lang/src/vm/action/add.rs
+++ b/dust-lang/src/vm/action/add.rs
@@ -1,12 +1,11 @@
 use tracing::trace;
 
 use crate::{
-    instruction::{InstructionFields, TypeCode},
-    vm::{call_frame::PointerCache, Register, Thread},
-    DustString,
+    instruction::InstructionFields,
+    vm::{Register, Thread},
 };
 
-pub fn add_integers(ip: &mut usize, instruction: &InstructionFields, thread: &mut Thread) {
+pub fn add_integers(_: &mut usize, instruction: &InstructionFields, thread: &mut Thread) {
     trace!("ADD: Run and cache pointers");
 
     let destination = instruction.a_field as usize;
diff --git a/dust-lang/src/vm/action/jump.rs b/dust-lang/src/vm/action/jump.rs
index 0365942..a584c78 100644
--- a/dust-lang/src/vm/action/jump.rs
+++ b/dust-lang/src/vm/action/jump.rs
@@ -1,9 +1,6 @@
 use tracing::trace;
 
-use crate::{
-    instruction::InstructionFields,
-    vm::{call_frame::PointerCache, Thread},
-};
+use crate::{instruction::InstructionFields, vm::Thread};
 
 pub fn jump(ip: &mut usize, instruction: &InstructionFields, _: &mut Thread) {
     let offset = instruction.b_field as usize;
diff --git a/dust-lang/src/vm/action/less.rs b/dust-lang/src/vm/action/less.rs
index 6fc22a8..254f692 100644
--- a/dust-lang/src/vm/action/less.rs
+++ b/dust-lang/src/vm/action/less.rs
@@ -1,9 +1,6 @@
 use tracing::trace;
 
-use crate::{
-    instruction::{InstructionFields, TypeCode},
-    vm::{call_frame::PointerCache, Thread},
-};
+use crate::{instruction::InstructionFields, vm::Thread};
 
 pub fn less_integers(ip: &mut usize, instruction: &InstructionFields, thread: &mut Thread) {
     trace!("LESS unoptimized");
diff --git a/dust-lang/src/vm/action/mod.rs b/dust-lang/src/vm/action/mod.rs
index dd94ff1..a10f4e7 100644
--- a/dust-lang/src/vm/action/mod.rs
+++ b/dust-lang/src/vm/action/mod.rs
@@ -15,7 +15,6 @@ use std::{
 
 use crate::{
     instruction::{InstructionFields, TypeCode},
-    vm::call_frame::PointerCache,
     AbstractList, ConcreteValue, Operation, Value,
 };
 
@@ -319,8 +318,6 @@ impl Display for Action {
 
 pub type ActionLogic = fn(&mut usize, &InstructionFields, &mut Thread);
 
-fn no_op(_: &mut usize, _: &InstructionFields, _: &mut Thread) {}
-
 fn point(_: &mut usize, instruction: &InstructionFields, thread: &mut Thread) {
     let destination = instruction.a_field as usize;
     let to = instruction.b_field as usize;
diff --git a/dust-lang/src/vm/call_frame.rs b/dust-lang/src/vm/call_frame.rs
index 750f30b..2bbf4c1 100644
--- a/dust-lang/src/vm/call_frame.rs
+++ b/dust-lang/src/vm/call_frame.rs
@@ -1,10 +1,9 @@
 use std::{
     fmt::{self, Debug, Display, Formatter},
-    ptr,
     rc::Rc,
 };
 
-use smallvec::{SmallVec, smallvec};
+use smallvec::{smallvec, SmallVec};
 
 use crate::{AbstractList, Chunk, DustString, Function};
 
@@ -143,26 +142,3 @@ impl Display for Pointer {
         }
     }
 }
-
-#[derive(Debug, Clone, Copy)]
-pub struct PointerCache {
-    pub integer_mut: *mut i64,
-    pub integer_left: *const i64,
-    pub integer_right: *const i64,
-}
-
-impl PointerCache {
-    pub fn new() -> Self {
-        Self {
-            integer_mut: ptr::null_mut(),
-            integer_left: ptr::null(),
-            integer_right: ptr::null(),
-        }
-    }
-}
-
-impl Default for PointerCache {
-    fn default() -> Self {
-        Self::new()
-    }
-}
diff --git a/dust-lang/src/vm/thread.rs b/dust-lang/src/vm/thread.rs
index 0394329..b77f620 100644
--- a/dust-lang/src/vm/thread.rs
+++ b/dust-lang/src/vm/thread.rs
@@ -4,7 +4,7 @@ use tracing::{info, trace};
 
 use crate::{
     instruction::InstructionFields,
-    vm::{action::ActionSequence, Action, CallFrame},
+    vm::{action::ActionSequence, CallFrame},
     AbstractList, Chunk, ConcreteValue, DustString, Span, Value,
 };