feat: Traits methods - default and override

crates/nargo_cli/tests/compile_failure/dup_trait_declaration/src/main.nr

@@ -21,6 +21,4 @@ trait Default {
 }
 
 fn main(x: Field, y: Field) {
-    let first = Foo::default(x,y);
-    assert(first.bar == x);
 }

crates/nargo_cli/tests/compile_failure/dup_trait_implementation/src/main.nr

@@ -25,6 +25,4 @@ impl Default for Foo {
 
 
 fn main(x: Field, y: Field) {
-    let first = Foo::default(x,y);
-    assert(first.bar == x);
 }

crates/nargo_cli/tests/compile_failure/dup_trait_implementation_2/Nargo.toml

@@ -0,0 +1,7 @@
+[package]
+name = "dup_trait_implementation_2"
+type = "bin"
+authors = [""]
+compiler_version = "0.9.0"
+
+[dependencies]

crates/nargo_cli/tests/compile_failure/dup_trait_implementation_2/Prover.toml

@@ -0,0 +1,2 @@
+x = 1
+y = 2

crates/nargo_cli/tests/compile_failure/dup_trait_implementation_2/src/main.nr

@@ -0,0 +1,18 @@
+trait Default {
+}
+
+struct Foo {
+    bar: Field,
+}
+
+// Duplicate trait implementations should not compile
+impl Default for Foo {
+}
+
+// Duplicate trait implementations should not compile
+impl Default for Foo {
+}
+
+
+fn main(x: Field, y: Field) {
+}

crates/nargo_cli/tests/compile_failure/dup_trait_implementation_3/Nargo.toml

@@ -0,0 +1,7 @@
+[package]
+name = "dup_trait_implementation_3"
+type = "bin"
+authors = [""]
+compiler_version = "0.9.0"
+
+[dependencies]

crates/nargo_cli/tests/compile_failure/dup_trait_implementation_3/Prover.toml

@@ -0,0 +1,2 @@
+x = 1
+y = 2

crates/nargo_cli/tests/compile_failure/dup_trait_implementation_3/src/main.nr

@@ -0,0 +1,19 @@
+trait Default {
+}
+
+struct MyStruct {
+}
+
+type MyType = MyStruct;
+
+// Duplicate trait implementations should not compile
+impl Default for MyStruct {
+}
+
+// Duplicate trait implementations should not compile
+impl Default for MyType {
+}
+
+
+fn main(x: Field, y: Field) {
+}

crates/nargo_cli/tests/compile_failure/impl_struct_not_trait/src/main.nr

@@ -18,6 +18,4 @@ impl Default for Foo {
 }
 
 fn main(x: Field, y: Field) {
-    let first = Foo::default(x,y);
-    assert(first.bar == x);
 }

crates/nargo_cli/tests/compile_failure/impl_trait_for_non_type/Nargo.toml

@@ -0,0 +1,7 @@
+[package]
+name = "impl_trait_for_non_type"
+type = "bin"
+authors = [""]
+compiler_version = "0.9.0"
+
+[dependencies]

crates/nargo_cli/tests/compile_failure/impl_trait_for_non_type/Prover.toml

@@ -0,0 +1,2 @@
+x = 1
+y = 2

crates/nargo_cli/tests/compile_failure/impl_trait_for_non_type/src/main.nr

@@ -0,0 +1,15 @@
+use dep::std;
+
+trait Default {
+    fn default(x: Field, y: Field) -> Field;
+}
+
+
+impl Default for main {
+    fn default(x: Field, y: Field) -> Field {
+        x + y
+    }
+}
+
+fn main(x: Field, y: Field) {
+}

crates/nargo_cli/tests/compile_failure/trait_missing_implementation/src/main.nr

@@ -19,6 +19,4 @@ impl Default for Foo {
 }
 
 fn main(x: Field) {
-    let first = Foo::method2(x);
-    assert(first == x);
 }

crates/nargo_cli/tests/compile_failure/trait_not_in_scope/src/main.nr

@@ -13,6 +13,4 @@ impl Default for Foo {
 }
 
 fn main(x: Field, y: Field) {
-    let first = Foo::default(x,y);
-    assert(first.bar == x);
 }

crates/nargo_cli/tests/compile_failure/trait_wrong_method_name/src/main.nr

@@ -1,7 +1,6 @@
 use dep::std;
 
 trait Default {
-    fn default(x: Field, y: Field) -> Self;
 }
 
 struct Foo {
@@ -11,12 +10,10 @@ struct Foo {
 
 // wrong trait name method should not compile
 impl Default for Foo {
-    fn default_wrong_name(x: Field, y: Field) -> Self {
+    fn doesnt_exist(x: Field, y: Field) -> Self {
         Self { bar: x, array: [x,y] }
     }
 }
 
 fn main(x: Field, y: Field) {
-    let first = Foo::default_wrong_name(x,y);
-    assert(first.bar == x);
 }

crates/nargo_cli/tests/compile_failure/trait_wrong_method_return_type/src/main.nr

@@ -16,6 +16,4 @@ impl Default for Foo {
 }
 
 fn main(x: Field, y: Field) {
-    let first = Foo::default(x,y);
-    assert(first.bar == x);
 }

crates/nargo_cli/tests/compile_failure/trait_wrong_method_return_type2/Nargo.toml

@@ -0,0 +1,7 @@
+[package]
+name = "trait_wrong_method_return_type"
+type = "bin"
+authors = [""]
+compiler_version = "0.9.0"
+
+[dependencies]

crates/nargo_cli/tests/compile_failure/trait_wrong_method_return_type2/Prover.toml

@@ -0,0 +1,2 @@
+x = 1
+y = 2

crates/nargo_cli/tests/compile_failure/trait_wrong_method_return_type2/src/main.nr

@@ -0,0 +1,21 @@
+use dep::std;
+
+trait Default {
+    fn default(x: Field, y: Field) -> Self;
+}
+
+struct Foo {
+    bar: Field,
+    array: [Field; 2],
+}
+
+impl Default for Foo {
+    fn default(x: Field, y: Field) -> Field {
+        x
+    }
+}
+
+fn main(x: Field, y: Field) {
+    let first = Foo::default(x,y);
+    assert(first == x);
+}

crates/nargo_cli/tests/compile_failure/trait_wrong_parameter/src/main.nr

@@ -16,6 +16,4 @@ impl Default for Foo {
 }
 
 fn main(x: Field, y: Field) {
-    let first = Foo::default(x,y);
-    assert(first.bar == x);
 }

crates/nargo_cli/tests/compile_failure/trait_wrong_parameter2/Nargo.toml

@@ -0,0 +1,7 @@
+[package]
+name = "trait_wrong_parameter"
+type = "bin"
+authors = [""]
+compiler_version = "0.9.0"
+
+[dependencies]

crates/nargo_cli/tests/compile_failure/trait_wrong_parameter2/Prover.toml

@@ -0,0 +1,2 @@
+x = 1
+y = 2

crates/nargo_cli/tests/compile_failure/trait_wrong_parameter2/src/main.nr

@@ -0,0 +1,22 @@
+use dep::std;
+
+trait Default {
+    fn default(x: Field, y: Field) -> Self;
+}
+
+struct Foo {
+    bar: Field,
+    array: [Field; 2],
+}
+
+impl Default for Foo {
+    fn default(x: Field, y: Foo) -> Self {
+        Self { bar: x, array: [x, y.bar] }
+    }
+}
+
+fn main(x: Field, y: Field) {
+    let foo = Foo { bar: x, array: [x, y] };
+    let first = Foo::default(x,foo);
+    assert(first.bar == x);
+}

crates/nargo_cli/tests/compile_failure/trait_wrong_parameters_count/src/main.nr

@@ -16,6 +16,4 @@ impl Default for Foo {
 }
 
 fn main(x: Field, y: Field) {
-    let first = Foo::default(x,y);
-    assert(first.bar == x);
 }

crates/nargo_cli/tests/execution_success/trait_self/Nargo.toml

@@ -0,0 +1,7 @@
+[package]
+name = "trait_self"
+type = "bin"
+authors = [""]
+compiler_version = "0.10.5"
+
+[dependencies]

crates/nargo_cli/tests/execution_success/trait_self/src/main.nr

@@ -0,0 +1,18 @@
+struct Foo {
+    x: Field
+}
+
+trait Asd {
+    fn asd() -> Self;
+}
+
+impl Asd for Foo {
+    // the Self should typecheck properly
+    fn asd() -> Self {
+        Foo{x: 100}
+    }
+}
+
+fn main() {
+    assert(Foo::asd().x == 100);
+}

crates/noirc_frontend/src/ast/expression.rs

@@ -689,10 +689,12 @@ impl Display for FunctionDefinition {
 }
 
 impl FunctionReturnType {
-    pub fn get_type(&self) -> &UnresolvedTypeData {
+    pub fn get_type(&self) -> UnresolvedType {
         match self {
-            FunctionReturnType::Default(_span) => &UnresolvedTypeData::Unit,
-            FunctionReturnType::Ty(typ) => &typ.typ,
+            FunctionReturnType::Default(span) => {
+                UnresolvedType { typ: UnresolvedTypeData::Unit, span: Some(*span) }
+            }
+            FunctionReturnType::Ty(typ) => typ.clone(),
         }
     }
 }