reintroduce proper error message

assembly/src/ast/module.rs

@@ -208,9 +208,11 @@ impl Module {
                 span: export.span(),
             });
         }
-        if let Some(_prev) = self.resolve(export.name()) {
-            Err(SemanticAnalysisError::ProcedureNameConflict {
-                name: export.name().clone(),
+        if let Some(prev) = self.resolve(export.name()) {
+            let prev_span = prev.span();
+            Err(SemanticAnalysisError::SymbolConflict {
+                span: export.span(),
+                prev_span,
             })
         } else {
             self.procedures.push(export);

assembly/src/sema/errors.rs

@@ -5,8 +5,6 @@ use crate::{
 use alloc::{sync::Arc, vec::Vec};
 use core::fmt;
 
-use super::ProcedureName;
-
 /// The high-level error type for all semantic analysis errors.
 ///
 /// This rolls up multiple errors into a single one, and as such, can emit many
@@ -78,9 +76,6 @@ pub enum SemanticAnalysisError {
         #[label("previously defined here")]
         prev_span: SourceSpan,
     },
-    #[error("procedure name conflict: found duplicate definitions of '{name}'")]
-    #[diagnostic()]
-    ProcedureNameConflict { name: ProcedureName },
     #[error("symbol undefined: no such name found in scope")]
     #[diagnostic(help("are you missing an import?"))]
     SymbolUndefined {

assembly/src/tests.rs

@@ -2198,7 +2198,13 @@ fn invalid_proc_duplicate_procedure_name() {
         source,
         "syntax error",
         "help: see emitted diagnostics for details",
-        "procedure name conflict: found duplicate definitions of 'foo'"
+        "symbol conflict: found duplicate definitions of the same name",
+        regex!(r#",-\[test[\d]+:1:6\]"#),
+        "1 | proc.foo add mul end proc.foo push.3 end begin push.1 end",
+        "  :      ^|^             ^^^^^^^^^|^^^^^^^^^",
+        "  :       |                       `-- conflict occurs here",
+        "  :       `-- previously defined here",
+        "  `----"
     );
 }