fix: report missing trait instance function instead of causing ice!() (…

…#33) This was a lazy todo from the unification of methods. This now properly reports the correct diagnostic code.
junlarsen · Feb 4, 2025 · d4d667c · d4d667c
1 parent 5726473
commit d4d667c
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 13 deletions.
diff --git a/compiler/eight-middle/src/hir_type_check_pass/typing_context.rs b/compiler/eight-middle/src/hir_type_check_pass/typing_context.rs
@@ -15,8 +15,9 @@ use eight_diagnostics::errors::hir::{
     BindingReDeclaresName, ConstructingNonStructTypeError, ConstructingPointerTypeError,
     DereferenceOfNonPointerError, FunctionTypeMismatchError, HirError,
     InvalidFieldReferenceOfNonStructError, InvalidStructFieldReferenceError, MissingFieldError,
-    SelfReferentialTypeError, TraitDoesNotExistError, TraitMissingInstanceError, TypeMismatchError,
-    TypeParameterShadowsExisting, UnknownFieldError, WrongFunctionTypeArgumentCount,
+    SelfReferentialTypeError, TraitDoesNotExistError, TraitInstanceMissingFnError,
+    TraitMissingInstanceError, TypeMismatchError, TypeParameterShadowsExisting, UnknownFieldError,
+    WrongFunctionTypeArgumentCount,
 };
 use eight_diagnostics::ice;
 use eight_span::Span;
@@ -976,16 +977,13 @@ impl<'hir> TypingContext<'hir> {
                 trait_substitutions.as_slice(),
             )
             .unwrap_or_else(|| ice!("trait instance not found"));
-        let method = instance
-            .methods
-            .get(&constraint.method_name)
-            .unwrap_or_else(|| {
-                ice!(
-                    "trait instance does not have method {}",
-                    constraint.method_name
-                )
-            });
-
+        let method = instance.methods.get(&constraint.method_name).ok_or(
+            HirError::TraitInstanceMissingFn(TraitInstanceMissingFnError {
+                name: constraint.trait_name.to_owned(),
+                method: constraint.method_name.to_owned(),
+                span: constraint.method_name_span,
+            }),
+        )?;
         // Ensure that the method type parameters are substituted for the provided type arguments.
         for (param, arg) in method
             .type_parameters

diff --git a/compiler/eight-tests/tests/stdlib.rs b/compiler/eight-tests/tests/stdlib.rs
@@ -14,7 +14,7 @@ fn test_evaluate_stdlib() {
                 .is_file()
         })
         .collect::<Vec<_>>();
-    files.sort_by(|a, b| a.path().cmp(&b.path()));
+    files.sort_by_key(|a| a.path());
     let mut buf = String::new();
     for file in files {
         let path = file.path();