chore: test that associated function and constant with the same name collide

compiler/noirc_frontend/src/elaborator/trait_impls.rs

@@ -94,7 +94,7 @@ impl Elaborator<'_> {
 
                 if overrides.len() > 1 {
                     self.push_err(DefCollectorErrorKind::Duplicate {
-                        typ: DuplicateType::TraitAssociatedFunction,
+                        typ: DuplicateType::TraitAssociatedItem,
                         first_def: overrides[0].2.name_ident().clone(),
                         second_def: overrides[1].2.name_ident().clone(),
                     });

compiler/noirc_frontend/src/hir/def_collector/dc_mod.rs

@@ -593,7 +593,7 @@
                             }
                             Err((first_def, second_def)) => {
                                 let error = DefCollectorErrorKind::Duplicate {
-                                    typ: DuplicateType::TraitAssociatedFunction,
+                                    typ: DuplicateType::TraitAssociatedItem,
                                     first_def,
                                     second_def,
                                 };
@@ -618,7 +618,7 @@
                             .declare_global(name.clone(), ItemVisibility::Public, global_id)
                         {
                             let error = DefCollectorErrorKind::Duplicate {
-                                typ: DuplicateType::TraitAssociatedConst,
+                                typ: DuplicateType::TraitAssociatedItem,
                                 first_def,
                                 second_def,
                             };
@@ -646,7 +646,7 @@
                             )
                         {
                             let error = DefCollectorErrorKind::Duplicate {
-                                typ: DuplicateType::TraitAssociatedType,
+                                typ: DuplicateType::TraitAssociatedItem,
                                 first_def,
                                 second_def,
                             };
@@ -936,7 +936,7 @@
     //   if it's an inline module, or the first char of a the file if it's an external module.
     // - `location` will always point to the token "foo" in `mod foo` regardless of whether
     //   it's inline or external.
     // Eventually the location put in `ModuleData` is used for codelenses about `contract`s,
     // so we keep using `location` so that it continues to work as usual.
     let location = Location::new(mod_name.span(), mod_location.file);
     let new_module = ModuleData::new(

compiler/noirc_frontend/src/hir/def_collector/errors.rs

@@ -17,9 +17,7 @@ pub enum DuplicateType {
     Import,
     Trait,
     TraitImplementation,
-    TraitAssociatedType,
-    TraitAssociatedConst,
-    TraitAssociatedFunction,
+    TraitAssociatedItem,
     StructField,
     EnumVariant,
 }
@@ -145,9 +143,7 @@ impl fmt::Display for DuplicateType {
             DuplicateType::Trait => write!(f, "trait definition"),
             DuplicateType::TraitImplementation => write!(f, "trait implementation"),
             DuplicateType::Import => write!(f, "import"),
-            DuplicateType::TraitAssociatedType => write!(f, "trait associated type"),
-            DuplicateType::TraitAssociatedConst => write!(f, "trait associated constant"),
-            DuplicateType::TraitAssociatedFunction => write!(f, "trait associated function"),
+            DuplicateType::TraitAssociatedItem => write!(f, "trait associated item"),
             DuplicateType::StructField => write!(f, "struct field"),
             DuplicateType::EnumVariant => write!(f, "enum variant"),
         }

compiler/noirc_frontend/src/tests.rs

@@ -284,7 +284,7 @@
 
     let chars = line.chars().collect::<Vec<_>>();
     let first_caret = chars.iter().position(|c| *c == char).unwrap();
     let last_caret = chars.iter().rposition(|c| *c == char).unwrap();
     let start = byte - last_line_length;
     let span = Span::from((start + first_caret - 1) as u32..(start + last_caret) as u32);
     let error = line.trim().trim_start_matches(char).trim().to_string();
@@ -453,13 +453,13 @@
     impl Default2 for Foo {
         // Duplicate trait methods should not compile
         fn default(x: Field, y: Field) -> Field {
-           ~~~~~~~ First trait associated function found here
+           ~~~~~~~ First trait associated item found here
             y + 2 * x
         }
         // Duplicate trait methods should not compile
         fn default(x: Field, y: Field) -> Field {
-           ^^^^^^^ Duplicate definitions of trait associated function with name default found
-           ~~~~~~~ Second trait associated function found here
+           ^^^^^^^ Duplicate definitions of trait associated item with name default found
+           ~~~~~~~ Second trait associated item found here
             x + 2 * y
         }
     }
@@ -3190,7 +3190,7 @@
     // wouldn't panic due to infinite recursion, but the errors asserted here
     // come from the compilation checks, which does static analysis to catch the
     // problem before it even has a chance to cause a panic.
     let srcs = vec![
         r#"
         fn main() {
            ^^^^ function `main` cannot return without recursing
@@ -3272,7 +3272,7 @@
         "#,
     ];
 
     for (index, src) in srcs.into_iter().enumerate() {
         check_errors(src, Some(&format!("{}_{index}", function_path!())));
     }
 }
@@ -3280,7 +3280,7 @@
 #[named]
 #[test]
 fn unconditional_recursion_pass() {
     let srcs = vec![
         r#"
         fn main() {
             if false { main(); }
@@ -3322,7 +3322,7 @@
         "#,
     ];
 
     for (index, src) in srcs.into_iter().enumerate() {
         assert_no_errors(src, &format!("{}_{index}", function_path!()));
     }
 }
@@ -4362,12 +4362,12 @@
             let mut array = [1, 2, 3];
             borrow(&array);
                    ^^^^^^ This requires the unstable feature 'ownership' which is not enabled
                    ~~~~~~ Pass -Zownership to nargo to enable this feature at your own risk.
         }
 
         fn borrow(_array: &[Field; 3]) {}
                           ^^^^^^^^^^^ This requires the unstable feature 'ownership' which is not enabled
                           ~~~~~~~~~~~ Pass -Zownership to nargo to enable this feature at your own risk.
     "#;
     check_errors!(src);
 }

test_programs/compile_failure/trait_associated_items_clash/Nargo.toml

@@ -0,0 +1,6 @@
+[package]
+name = "trait_associated_items_clash"
+type = "bin"
+authors = [""]
+
+[dependencies]

test_programs/compile_failure/trait_associated_items_clash/src/main.nr

@@ -0,0 +1,7 @@
+pub trait Foo {
+    let N: u32;
+
+    fn N() {}
+}
+
+fn main() {}