wip: remove unused code, fix up warnings

Author: andogq

src/ir/hir.rs

@@ -282,12 +282,9 @@ mod statement {
 
     #[derive(Clone, Debug)]
     pub enum DeclarationTy {
-        #[cfg_attr(
-            not(test),
-            expect(
-                dead_code,
-                reason = "will be used when variable declarations can be explicitly typed."
-            )
+        #[expect(
+            dead_code,
+            reason = "will be used when variable declarations can be explicitly typed."
         )]
         Type(TypeId),
         Inferred(ExpressionId),

src/ir/thir.rs

@@ -1,55 +1,22 @@
-use crate::{
-    prelude::*,
-    ty::{TypeVarId, TypeVars},
-};
+use crate::prelude::*;
 
 use hir::*;
 
-#[derive(Clone, Debug)]
 pub struct Thir<'hir> {
-    pub hir: &'hir Hir,
-    pub types: HashMap<TypeVarId, TypeId>,
-    pub type_vars: TypeVars,
-}
-
-impl Deref for Thir<'_> {
-    type Target = Hir;
-
-    fn deref(&self) -> &Self::Target {
-        self.hir
-    }
-}
-
-impl<'hir> Thir<'hir> {
-    pub fn new(hir: &'hir Hir, types: HashMap<TypeVarId, TypeId>, type_vars: TypeVars) -> Self {
-        Self {
-            hir,
-            types,
-            type_vars,
-        }
-    }
-
-    pub fn type_of(&self, id: impl Into<TypeVar>) -> TypeId {
-        let var = self.type_vars.get(id.into());
-        self.types[&var]
-    }
-}
-
-pub struct Thir2<'hir> {
     pub hir: &'hir Hir,
     pub identifier_tys: BTreeMap<IdentifierBindingId, TypeId>,
     pub expression_tys: IndexedVec<ExpressionId, TypeId>,
 }
 
-impl Deref for Thir2<'_> {
+impl Deref for Thir<'_> {
     type Target = Hir;
 
     fn deref(&self) -> &Self::Target {
         self.hir
     }
 }
 
-impl<'hir> Thir2<'hir> {
+impl<'hir> Thir<'hir> {
     pub fn new(
         hir: &'hir Hir,
         identifiers_tys: BTreeMap<IdentifierBindingId, TypeId>,
@@ -68,17 +35,17 @@ impl<'hir> Thir2<'hir> {
 }
 
 pub trait ThirIndex: Copy {
-    fn type_of(self, thir: &Thir2<'_>) -> TypeId;
+    fn type_of(self, thir: &Thir<'_>) -> TypeId;
 }
 
 impl ThirIndex for IdentifierBindingId {
-    fn type_of(self, thir: &Thir2<'_>) -> TypeId {
+    fn type_of(self, thir: &Thir<'_>) -> TypeId {
         thir.identifier_tys[&self]
     }
 }
 
 impl ThirIndex for ExpressionId {
-    fn type_of(self, thir: &Thir2<'_>) -> TypeId {
+    fn type_of(self, thir: &Thir<'_>) -> TypeId {
         thir.expression_tys[self]
     }
 }

src/main.rs

@@ -83,7 +83,7 @@ fn run(source: &str) -> u8 {
             |> passes::cst_gen::CstGen
             |> passes::ast_gen::AstGen
             |> passes::hir_gen::HirGen
-            |> passes::thir_gen_2::ThirGen
+            |> passes::thir_gen::ThirGen
             |> passes::mir_gen::MirGen
             |> passes::codegen::Codegen => (&ink)
         }

src/passes/mir_gen.rs

@@ -1,11 +1,11 @@
 use crate::{ir::hir::TraitImplementationKey, prelude::*};
 
 use mir::{UnaryOperation, *};
-use thir::Thir2;
+use thir::Thir;
 
 pub struct MirGen<'ctx, 'hir, 'thir> {
     ctx: &'ctx mut Ctx,
-    thir: &'thir Thir2<'hir>,
+    thir: &'thir Thir<'hir>,
 
     mir: Mir,
 
@@ -16,7 +16,7 @@ pub struct MirGen<'ctx, 'hir, 'thir> {
 }
 
 impl<'ctx, 'hir, 'thir> Pass<'ctx, 'thir> for MirGen<'ctx, 'hir, 'thir> {
-    type Input = Thir2<'hir>;
+    type Input = Thir<'hir>;
     type Output = Mir;
     type Extra = ();
 
@@ -45,7 +45,7 @@ impl<'ctx, 'hir, 'thir> Pass<'ctx, 'thir> for MirGen<'ctx, 'hir, 'thir> {
 
 impl<'ctx, 'hir, 'thir> MirGen<'ctx, 'hir, 'thir> {
     /// Create a new instance.
-    pub fn new(ctx: &'ctx mut Ctx, thir: &'thir Thir2<'hir>) -> Self {
+    pub fn new(ctx: &'ctx mut Ctx, thir: &'thir Thir<'hir>) -> Self {
         Self {
             ctx,
             thir,

src/passes/mod.rs

@@ -4,7 +4,6 @@ pub mod cst_gen;
 pub mod hir_gen;
 pub mod mir_gen;
 pub mod thir_gen;
-pub mod thir_gen_2;
 
 use crate::prelude::*;