feat: visibility for traits

compiler/noirc_frontend/src/ast/traits.rs

@@ -22,6 +22,7 @@ pub struct NoirTrait {
     pub span: Span,
     pub items: Vec<Documented<TraitItem>>,
     pub attributes: Vec<SecondaryAttribute>,
+    pub visibility: ItemVisibility,
 }
 
 /// Any declaration inside the body of a trait that a user is required to

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

@@ -392,8 +392,20 @@
             context.def_interner.set_doc_comments(ReferenceId::Trait(trait_id), doc_comments);
 
             // Add the trait to scope so its path can be looked up later
-            let result = self.def_collector.def_map.modules[self.module_id.0]
-                .declare_trait(name.clone(), trait_id);
+            let visibility = trait_definition.visibility;
+            let result = self.def_collector.def_map.modules[self.module_id.0].declare_trait(
+                name.clone(),
+                visibility,
+                trait_id,
+            );
+
+            let parent_module_id = ModuleId { krate, local_id: self.module_id };
+            context.def_interner.usage_tracker.add_unused_item(
+                parent_module_id,
+                name.clone(),
+                UnusedItem::Trait(trait_id),
+                visibility,
+            );
 
             if let Err((first_def, second_def)) = result {
                 let error = DefCollectorErrorKind::Duplicate {
@@ -816,7 +828,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 =

compiler/noirc_frontend/src/hir/def_map/module_data.rs

@@ -117,8 +117,13 @@ impl ModuleData {
         self.declare(name, ItemVisibility::Public, id.into(), None)
     }
 
-    pub fn declare_trait(&mut self, name: Ident, id: TraitId) -> Result<(), (Ident, Ident)> {
-        self.declare(name, ItemVisibility::Public, ModuleDefId::TraitId(id), None)
+    pub fn declare_trait(
+        &mut self,
+        name: Ident,
+        visibility: ItemVisibility,
+        id: TraitId,
+    ) -> Result<(), (Ident, Ident)> {
+        self.declare(name, visibility, ModuleDefId::TraitId(id), None)
     }
 
     pub fn declare_child_module(

compiler/noirc_frontend/src/parser/parser/traits.rs

@@ -4,6 +4,7 @@ use super::attributes::{attributes, validate_secondary_attributes};
 use super::doc_comments::outer_doc_comments;
 use super::function::{function_modifiers, function_return_type};
 use super::path::path_no_turbofish;
+use super::visibility::item_visibility;
 use super::{
     block, expression, fresh_statement, function, function_declaration_parameters, let_statement,
 };
@@ -42,22 +43,26 @@ pub(super) fn trait_definition() -> impl NoirParser<TopLevelStatementKind> {
         });
 
     attributes()
+        .then(item_visibility())
         .then_ignore(keyword(Keyword::Trait))
         .then(ident())
         .then(function::generics())
         .then(where_clause())
         .then(trait_body_or_error)
-        .validate(|((((attributes, name), generics), where_clause), items), span, emit| {
-            let attributes = validate_secondary_attributes(attributes, span, emit);
-            TopLevelStatementKind::Trait(NoirTrait {
-                name,
-                generics,
-                where_clause,
-                span,
-                items,
-                attributes,
-            })
-        })
+        .validate(
+            |(((((attributes, visibility), name), generics), where_clause), items), span, emit| {
+                let attributes = validate_secondary_attributes(attributes, span, emit);
+                TopLevelStatementKind::Trait(NoirTrait {
+                    name,
+                    generics,
+                    where_clause,
+                    span,
+                    items,
+                    attributes,
+                    visibility,
+                })
+            },
+        )
 }
 
 fn trait_body() -> impl NoirParser<Vec<Documented<TraitItem>>> {

compiler/noirc_frontend/src/tests.rs

@@ -2333,7 +2333,7 @@
 }
 
 #[test]
 fn underflowing_u8() {
     let src = r#"
         fn main() {
             let _: u8 = -1;
@@ -2371,7 +2371,7 @@
 }
 
 #[test]
 fn underflowing_i8() {
     let src = r#"
         fn main() {
             let _: i8 = -129;
@@ -3447,6 +3447,34 @@
     assert_eq!(*item_type, "struct");
 }
 
+#[test]
+fn errors_on_unused_trait() {
+    let src = r#"
+    trait Foo {}
+    trait Bar {}
+
+    pub struct Baz {
+    }
+
+    impl Bar for Baz {}
+
+    fn main() {
+    }
+    "#;
+
+    let errors = get_program_errors(src);
+    assert_eq!(errors.len(), 1);
+
+    let CompilationError::ResolverError(ResolverError::UnusedItem { ident, item_type }) =
+        &errors[0].0
+    else {
+        panic!("Expected an unused item error");
+    };
+
+    assert_eq!(ident.to_string(), "Foo");
+    assert_eq!(*item_type, "trait");
+}
+
 #[test]
 fn constrained_reference_to_unconstrained() {
     let src = r#"
@@ -3488,7 +3516,7 @@
 }
 
 #[test]
 fn arithmetic_generics_canonicalization_deduplication_regression() {
     let source = r#"
         struct ArrData<let N: u32> {
             a: [Field; N],

compiler/noirc_frontend/src/usage_tracker.rs

@@ -4,14 +4,15 @@ use crate::{
     ast::{Ident, ItemVisibility},
     hir::def_map::ModuleId,
     macros_api::StructId,
-    node_interner::FuncId,
+    node_interner::{FuncId, TraitId},
 };
 
 #[derive(Debug)]
 pub enum UnusedItem {
     Import,
     Function(FuncId),
     Struct(StructId),
+    Trait(TraitId),
 }
 
 impl UnusedItem {
@@ -20,6 +21,7 @@ impl UnusedItem {
             UnusedItem::Import => "import",
             UnusedItem::Function(_) => "function",
             UnusedItem::Struct(_) => "struct",
+            UnusedItem::Trait(_) => "trait",
         }
     }
 }

docs/docs/noir/concepts/traits.md

@@ -463,3 +463,13 @@ impl Default for Wrapper {
 Since we have an impl for our own type, the behavior of this code will not change even if `some_library` is updated
 to provide its own `impl Default for Foo`. The downside of this pattern is that it requires extra wrapping and
 unwrapping of values when converting to and from the `Wrapper` and `Foo` types.
+
+### Visibility
+
+By default, like functions, traits are private to the module the exist in. You can use `pub`
+to make the trait public or `pub(crate)` to make it public to just its crate:
+
+```rust
+// This trait is now public
+pub trait Trait {}
+```

noir_stdlib/src/append.nr

@@ -7,7 +7,7 @@
 // - `T::empty().append(x) == x`
 // - `x.append(T::empty()) == x`
 // docs:start:append-trait
-trait Append {
+pub trait Append {
     fn empty() -> Self;
     fn append(self, other: Self) -> Self;
 }

noir_stdlib/src/bigint.nr

@@ -43,7 +43,7 @@ impl BigInt {
     }
 }
 
-trait BigField {
+pub trait BigField {
     fn from_le_bytes(bytes: [u8]) -> Self;
     fn from_le_bytes_32(bytes: [u8; 32]) -> Self;
     fn to_le_bytes(self) -> [u8];

noir_stdlib/src/cmp.nr

@@ -2,7 +2,7 @@ use crate::meta::derive_via;
 
 #[derive_via(derive_eq)]
 // docs:start:eq-trait
-trait Eq {
+pub trait Eq {
     fn eq(self, other: Self) -> bool;
 }
 // docs:end:eq-trait
@@ -173,7 +173,7 @@ impl Ordering {
 
 #[derive_via(derive_ord)]
 // docs:start:ord-trait
-trait Ord {
+pub trait Ord {
     fn cmp(self, other: Self) -> Ordering;
 }
 // docs:end:ord-trait

noir_stdlib/src/convert.nr

@@ -1,5 +1,5 @@
 // docs:start:from-trait
-trait From<T> {
+pub trait From<T> {
     fn from(input: T) -> Self;
 }
 // docs:end:from-trait
@@ -11,7 +11,7 @@ impl<T> From<T> for T {
 }
 
 // docs:start:into-trait
-trait Into<T> {
+pub trait Into<T> {
     fn into(self) -> T;
 }
 

noir_stdlib/src/default.nr

@@ -2,7 +2,7 @@ use crate::meta::derive_via;
 
 #[derive_via(derive_default)]
 // docs:start:default-trait
-trait Default {
+pub trait Default {
     fn default() -> Self;
 }
 // docs:end:default-trait

noir_stdlib/src/hash/mod.nr

@@ -140,7 +140,7 @@ pub fn poseidon2_permutation<let N: u32>(_input: [Field; N], _state_length: u32)
 
 // Hash trait shall be implemented per type.
 #[derive_via(derive_hash)]
-trait Hash {
+pub trait Hash {
     fn hash<H>(self, state: &mut H) where H: Hasher;
 }
 
@@ -155,14 +155,14 @@ comptime fn derive_hash(s: StructDefinition) -> Quoted {
 
 // Hasher trait shall be implemented by algorithms to provide hash-agnostic means.
 // TODO: consider making the types generic here ([u8], [Field], etc.)
-trait Hasher{
+pub trait Hasher {
     fn finish(self) -> Field;
 
     fn write(&mut self, input: Field);
 }
 
 // BuildHasher is a factory trait, responsible for production of specific Hasher.
-trait BuildHasher<H> where H: Hasher{
+pub trait BuildHasher<H> where H: Hasher {
     fn build_hasher(self) -> H;
 }
 

noir_stdlib/src/meta/ctstring.nr

@@ -41,7 +41,7 @@ impl Append for CtString {
 }
 
 // docs:start:as-ctstring
-trait AsCtString {
+pub trait AsCtString {
     comptime fn as_ctstring(self) -> CtString;
 }
 // docs:end:as-ctstring

noir_stdlib/src/ops/arith.nr

@@ -1,5 +1,5 @@
 // docs:start:add-trait
-trait Add {
+pub trait Add {
     fn add(self, other: Self) -> Self;
 }
 // docs:end:add-trait
@@ -58,7 +58,7 @@ impl Add for i64 {
 }
 
 // docs:start:sub-trait
-trait Sub {
+pub trait Sub {
     fn sub(self, other: Self) -> Self;
 }
 // docs:end:sub-trait
@@ -117,7 +117,7 @@ impl Sub for i64 {
 }
 
 // docs:start:mul-trait
-trait Mul {
+pub trait Mul {
     fn mul(self, other: Self) -> Self;
 }
 // docs:end:mul-trait
@@ -176,7 +176,7 @@ impl Mul for i64 {
 }
 
 // docs:start:div-trait
-trait Div {
+pub trait Div {
     fn div(self, other: Self) -> Self;
 }
 // docs:end:div-trait
@@ -235,7 +235,7 @@ impl Div for i64 {
 }
 
 // docs:start:rem-trait
-trait Rem{
+pub trait Rem {
     fn rem(self, other: Self) -> Self;
 }
 // docs:end:rem-trait
@@ -288,7 +288,7 @@ impl Rem for i64 {
 }
 
 // docs:start:neg-trait
-trait Neg {
+pub trait Neg {
     fn neg(self) -> Self;
 }
 // docs:end:neg-trait

noir_stdlib/src/ops/bit.nr

@@ -1,5 +1,5 @@
 // docs:start:not-trait
-trait Not {
+pub trait Not {
     fn not(self: Self) -> Self;
 }
 // docs:end:not-trait
@@ -60,7 +60,7 @@ impl Not for i64 {
 // docs:end:not-trait-impls
 
 // docs:start:bitor-trait
-trait BitOr {
+pub trait BitOr {
     fn bitor(self, other: Self) -> Self;
 }
 // docs:end:bitor-trait
@@ -119,7 +119,7 @@ impl BitOr for i64 {
 }
 
 // docs:start:bitand-trait
-trait BitAnd {
+pub trait BitAnd {
     fn bitand(self, other: Self) -> Self;
 }
 // docs:end:bitand-trait
@@ -178,7 +178,7 @@ impl BitAnd for i64 {
 }
 
 // docs:start:bitxor-trait
-trait BitXor {
+pub trait BitXor {
     fn bitxor(self, other: Self) -> Self;
 }
 // docs:end:bitxor-trait
@@ -237,7 +237,7 @@ impl BitXor for i64 {
 }
 
 // docs:start:shl-trait
-trait Shl {
+pub trait Shl {
     fn shl(self, other: u8) -> Self;
 }
 // docs:end:shl-trait
@@ -290,7 +290,7 @@ impl Shl for i64 {
 }
 
 // docs:start:shr-trait
-trait Shr {
+pub trait Shr {
     fn shr(self, other: u8) -> Self;
 }
 // docs:end:shr-trait