chore(tests): Rewrite some compile failure tests (noir-lang#2850)

Co-authored-by: Yordan Madzhunkov <ymadzhunkov@gmail.com>
Sakapoi · Oct 19, 2023 · 7ccecbf · 7ccecbf
1 parent f340b49
commit 7ccecbf
Show file tree

Hide file tree

Showing 49 changed files with 1,195 additions and 912 deletions.
diff --git a/compiler/noirc_frontend/src/hir/def_collector/dc_crate.rs b/compiler/noirc_frontend/src/hir/def_collector/dc_crate.rs
@@ -122,6 +122,7 @@ pub struct DefCollector {
     pub(crate) collected_traits_impls: Vec<UnresolvedTraitImpl>,
 }
 
+#[derive(Debug, Clone)]
 pub enum CompilationError {
     ParseError(ParserError),
     DefinitionError(DefCollectorErrorKind),
@@ -506,7 +507,11 @@ fn add_method_to_struct_namespace(
     let type_module = struct_type.id.local_module_id();
     let module = &mut current_def_map.modules[type_module.0];
     module.declare_function(name_ident.clone(), func_id).map_err(|(first_def, second_def)| {
-        DefCollectorErrorKind::Duplicate { typ: DuplicateType::Function, first_def, second_def }
+        DefCollectorErrorKind::Duplicate {
+            typ: DuplicateType::TraitImplementation,
+            first_def,
+            second_def,
+        }
     })
 }
 

diff --git a/compiler/noirc_frontend/src/hir/def_collector/errors.rs b/compiler/noirc_frontend/src/hir/def_collector/errors.rs
@@ -9,7 +9,7 @@ use thiserror::Error;
 
 use std::fmt;
 
-#[derive(Debug, Clone, Eq, PartialEq)]
+#[derive(Clone, Debug, Eq, PartialEq)]
 pub enum DuplicateType {
     Function,
     Module,

diff --git a/compiler/noirc_frontend/src/hir/def_map/mod.rs b/compiler/noirc_frontend/src/hir/def_map/mod.rs
@@ -260,9 +260,7 @@ pub struct Contract {
 /// Given a FileId, fetch the File, from the FileManager and parse it's content
 pub fn parse_file(fm: &FileManager, file_id: FileId) -> (ParsedModule, Vec<ParserError>) {
     let file = fm.fetch_file(file_id);
-    let (program, errors) = parse_program(file.source());
-
-    (program, errors)
+    parse_program(file.source())
 }
 
 impl std::ops::Index<LocalModuleId> for CrateDefMap {