remove option

noir-lang · Sep 25, 2023 · 3e59eca · 3e59eca
1 parent a8093b5
commit 3e59eca
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 15 deletions.
diff --git a/compiler/noirc_frontend/src/hir/resolution/resolver.rs b/compiler/noirc_frontend/src/hir/resolution/resolver.rs
@@ -672,7 +672,7 @@ impl<'a> Resolver<'a> {
     ) -> Vec<TraitConstraint> {
         vecmap(where_clause, |constraint| TraitConstraint {
             typ: self.resolve_type(constraint.typ.clone()),
-            trait_id: constraint.trait_bound.trait_id,
+            trait_id: constraint.trait_bound.trait_id.unwrap_or(TraitId::dummy_id()),
         })
     }
 

diff --git a/compiler/noirc_frontend/src/hir/type_check/expr.rs b/compiler/noirc_frontend/src/hir/type_check/expr.rs
@@ -858,19 +858,18 @@ impl<'interner> TypeChecker<'interner> {
                 );
 
                 for constraint in func_meta.trait_constraints {
-                    if let Some(trait_id) = constraint.trait_id {
-                        // TODO(#2568): == on types is sketchy, since Field != TypeVar::Bound(Field)
-                        // unify() is sketchier here though, since it may accidentally commit typebindings.
-                        // this works for now, but likely needs to be revisited when we implement generic traits
-                        if *object_type == constraint.typ {
-                            let the_trait = self.interner.get_trait(trait_id);
-                            let the_trait = the_trait.borrow();
-
-                            for (method_index, method) in the_trait.methods.iter().enumerate() {
-                                if method.name.0.contents == method_name {
-                                    let trait_method = TraitMethodId { trait_id, method_index };
-                                    return Some(HirMethodReference::TraitMethodId(trait_method));
-                                }
+                    // TODO(#2568): == on types is sketchy, since Field != TypeVar::Bound(Field)
+                    // unify() is sketchier here though, since it may accidentally commit typebindings.
+                    // this works for now, but likely needs to be revisited when we implement generic traits
+                    if *object_type == constraint.typ {
+                        let the_trait = self.interner.get_trait(constraint.trait_id);
+                        let the_trait = the_trait.borrow();
+
+                        for (method_index, method) in the_trait.methods.iter().enumerate() {
+                            if method.name.0.contents == method_name {
+                                let trait_method =
+                                    TraitMethodId { trait_id: constraint.trait_id, method_index };
+                                return Some(HirMethodReference::TraitMethodId(trait_method));
                             }
                         }
                     }

diff --git a/compiler/noirc_frontend/src/hir_def/traits.rs b/compiler/noirc_frontend/src/hir_def/traits.rs
@@ -62,7 +62,7 @@ pub struct TraitImpl {
 #[derive(Debug, Clone)]
 pub struct TraitConstraint {
     pub typ: Type,
-    pub trait_id: Option<TraitId>,
+    pub trait_id: TraitId,
     // pub trait_generics: Generics, TODO
 }