Use ErasedReportedError pervasively

Author: fmease

Cargo.lock

@@ -8,10 +8,8 @@ publish = false
 [dependencies]
 colored = "2.0.0"
 diagnostics = { path = "../diagnostics" }
-error = { path = "../error" }
 index_map = { path = "../../project/library/index_map" }
-item = { path = "../item" }
-joinery = "2.1.0"
+joinery = "3.1.0"
 smallvec = { version = "1.8.0", features = ["const_generics"] }
 span = { path = "../span" }
 token = { path = "../token" }

compiler/ast/Cargo.toml

@@ -366,7 +366,7 @@ impl Format for super::BareExpression {
             Self::CaseAnalysis(analysis) => analysis.format(f, indentation),
             Self::DoBlock(do_) => do_.format(f, indentation),
             Self::SequenceLiteral(sequence) => sequence.format(f, indentation),
-            Self::Error => write!(f, "{}", "invalid".color(color_palette::INVALID)),
+            Self::Error(_) => write!(f, "{}", "invalid".color(color_palette::INVALID)),
         }
     }
 }

compiler/ast/src/format.rs

@@ -1,10 +1,9 @@
 //! The abstract syntax tree (AST).
 //!
 //! The most important definitions are [`Declaration`], [`Expression`] and [`Pattern`].
-#![feature(default_free_fn)]
+#![feature(default_free_fn, let_chains)]
 
-use diagnostics::{Diagnostic, ErrorCode};
-use error::PossiblyErroneous;
+use diagnostics::{error::PossiblyErroneous, reporter::ErasedReportedError};
 pub use format::{Debug, Format};
 use smallvec::smallvec;
 use span::{PossiblySpanning, SourceFileIndex, Span, Spanned, Spanning};
@@ -14,7 +13,7 @@ use utilities::{obtain, Atom, SmallVec};
 
 mod format;
 
-pub type Item<Bare> = item::Item<Bare, Attributes>;
+pub type Item<Bare> = span::item::Item<Bare, Attributes>;
 
 pub type Declaration = Item<BareDeclaration>;
 
@@ -194,12 +193,12 @@ pub enum BareExpression {
     CaseAnalysis(Box<CaseAnalysis>),
     DoBlock(Box<DoBlock>),
     SequenceLiteral(Box<SequenceLiteral<Expression>>),
-    Error,
+    Error(ErasedReportedError),
 }
 
 impl PossiblyErroneous for BareExpression {
-    fn error() -> Self {
-        Self::Error
+    fn error(error: ErasedReportedError) -> Self {
+        Self::Error(error)
     }
 }
 
@@ -481,16 +480,9 @@ impl Path {
         }
     }
 
-    // @Task make this Option<Self> and move diagnostic construction into lowerer
-    pub fn join(mut self, other: Self) -> Result<Self, Diagnostic> {
-        if let Some(hanger) = other.hanger {
-            if !matches!(hanger.bare, BareHanger::Self_) {
-                return Err(Diagnostic::error()
-                    .code(ErrorCode::E026)
-                    .message(format!("path ‘{hanger}’ not allowed in this position"))
-                    .primary_span(hanger)
-                    .help("consider moving this path to a separate use-declaration"));
-            }
+    pub fn join(mut self, other: Self) -> Result<Self, Hanger> {
+        if let Some(hanger) = other.hanger && !matches!(hanger.bare, BareHanger::Self_) {
+            return Err(hanger);
         }
         self.segments.extend(other.segments);
         Ok(self)

compiler/ast/src/lib.rs

@@ -11,6 +11,5 @@ cranelift-module = "0.85.1"
 cranelift-native = "0.85.1"
 cranelift-object = "0.85.1"
 diagnostics = { path = "../diagnostics" }
-error = { path = "../error" }
 hir = { path = "../hir" }
 session = { path = "../session" }

compiler/codegen_cranelift/Cargo.toml

@@ -9,8 +9,7 @@ use cranelift::{
 };
 use cranelift_module::{Linkage, Module};
 use cranelift_object::{ObjectBuilder, ObjectModule};
-use diagnostics::Diagnostic;
-use error::Result;
+use diagnostics::{error::Result, Diagnostic};
 use session::{BuildSession, Component};
 use std::{
     path::{Path, PathBuf},

compiler/codegen_cranelift/src/lib.rs

@@ -7,7 +7,6 @@ publish = false
 
 [dependencies]
 diagnostics = { path = "../diagnostics" }
-error = { path = "../error" }
 hir = { path = "../hir" }
 hir_format = { path = "../hir_format" }
 resolver = { path = "../resolver" }

compiler/codegen_llvm/Cargo.toml

@@ -2,8 +2,7 @@
 #![feature(default_free_fn, let_chains, io_error_other)]
 #![allow(clippy::match_same_arms)] // @Temporary
 
-use diagnostics::Diagnostic;
-use error::Result;
+use diagnostics::{error::Result, Diagnostic};
 use hir::DeclarationIndex;
 use hir_format::ComponentExt;
 use inkwell::{
@@ -326,7 +325,7 @@ impl<'a, 'ctx> Generator<'a, 'ctx> {
             }
             Use(_) => {}
             // @Question how should we handle that?
-            Error => todo!(),
+            Error(_) => todo!(),
         };
     }
 
@@ -383,7 +382,7 @@ impl<'a, 'ctx> Generator<'a, 'ctx> {
             }
             Use(_) => {}
             // @Question how should we handle that?
-            Error => todo!(),
+            Error(_) => todo!(),
         };
     }
 
@@ -413,7 +412,7 @@ impl<'a, 'ctx> Generator<'a, 'ctx> {
             }
             Substituted(_) => todo!(),
             IO(_) => todo!(),
-            Error => todo!(),
+            Error(_) => todo!(),
         }
     }
 
@@ -490,7 +489,7 @@ impl<'a, 'ctx> Generator<'a, 'ctx> {
             IntrinsicApplication(_) => todo!("compiling intrinsic applications"),
             Projection(_) => todo!("compiling record projections"),
             IO(_) => todo!("compiling IO actions"),
-            Substituted(_) | Error => unreachable!(),
+            Substituted(_) | Error(_) => unreachable!(),
         }
     }
 
@@ -551,7 +550,7 @@ impl<'a, 'ctx> Generator<'a, 'ctx> {
             Substituted(_) => todo!(),
             IntrinsicApplication(_) => todo!(),
             Projection(_) => todo!(),
-            Error => todo!(),
+            Error(_) => todo!(),
             Number(_) | Text(_) | IO(_) => unreachable!(),
         }
     }
@@ -576,7 +575,7 @@ impl<'a, 'ctx> Generator<'a, 'ctx> {
             IntrinsicApplication(_) => todo!(),
             Projection(_) => todo!(),
             IO(_) => todo!(),
-            Error => todo!(),
+            Error(_) => todo!(),
         }
     }
 
@@ -620,7 +619,7 @@ impl ExpressionExt for hir::Expression {
             Substituted(_) => todo!(),
             Projection(_) => todo!(),
             IO(_) => todo!(),
-            Error => todo!(),
+            Error(_) => todo!(),
         }
     }
 }