fix typecheck err formatting in instantiate

noir-lang · May 23, 2024 · 8c1e8d8 · 8c1e8d8
1 parent c9192f5
commit 8c1e8d8
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 11 deletions.
diff --git a/compiler/noirc_frontend/src/elaborator/expressions.rs b/compiler/noirc_frontend/src/elaborator/expressions.rs
@@ -345,7 +345,8 @@ impl<'context> Elaborator<'context> {
                     self.interner,
                 );
 
-                let func_type = self.type_check_variable(function_name, function_id, turbofish_generics);
+                let func_type =
+                    self.type_check_variable(function_name, function_id, turbofish_generics);
 
                 // Type check the new call now that it has been changed from a method call
                 // to a function call. This way we avoid duplicating code.

diff --git a/compiler/noirc_frontend/src/elaborator/patterns.rs b/compiler/noirc_frontend/src/elaborator/patterns.rs
@@ -486,16 +486,12 @@ impl<'context> Elaborator<'context> {
         match turbofish_generics {
             Some(turbofish_generics) => {
                 if turbofish_generics.len() != function_generic_count {
-                    self.errors.push((
-                        CompilationError::TypeError(
-                            TypeCheckError::IncorrectTurbofishGenericCount {
-                                expected_count: function_generic_count,
-                                actual_count: turbofish_generics.len(),
-                                span,
-                            },
-                        ),
-                        location.file,
-                    ));
+                    let type_check_err = TypeCheckError::IncorrectTurbofishGenericCount {
+                        expected_count: function_generic_count,
+                        actual_count: turbofish_generics.len(),
+                        span,
+                    };
+                    self.errors.push((CompilationError::TypeError(type_check_err), location.file));
                     typ.instantiate_with_bindings(bindings, self.interner)
                 } else {
                     // Fetch the count of any implicit generics on the function, such as