chore(errors): Refactor error representation in compiler

noir-lang · Sep 25, 2023 · a7ef0e7 · a7ef0e7
1 parent 0490549
commit a7ef0e7
Show file tree

Hide file tree

Showing 10 changed files with 443 additions and 320 deletions.
diff --git a/compiler/noirc_driver/src/lib.rs b/compiler/noirc_driver/src/lib.rs
@@ -112,7 +112,11 @@ pub fn check_crate(
     deny_warnings: bool,
 ) -> CompilationResult<()> {
     let mut errors = vec![];
-    CrateDefMap::collect_defs(crate_id, context, &mut errors);
+    let diagnostics = CrateDefMap::collect_defs(crate_id, context);
+    errors.extend(diagnostics.into_iter().map(|(error, file_id)| {
+        let diagnostic: CustomDiagnostic = error.into();
+        diagnostic.in_file(file_id)
+    }));
 
     if has_errors(&errors, deny_warnings) {
         Err(errors)

diff --git a/compiler/noirc_errors/src/reporter.rs b/compiler/noirc_errors/src/reporter.rs
@@ -99,7 +99,7 @@ impl std::fmt::Display for CustomDiagnostic {
 
 #[derive(Debug, Clone, PartialEq, Eq)]
 pub struct CustomLabel {
-    message: String,
+    pub message: String,
     pub span: Span,
 }