Merge branch 'master' into ab/type-check-trait-default-methods

noir-lang · Dec 23, 2024 · a046c32 · a046c32
2 parents eb304cd + c8a25b5
commit a046c32
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 13 deletions.
diff --git a/.github/workflows/reports.yml b/.github/workflows/reports.yml
@@ -290,6 +290,9 @@ jobs:
           - project: { repo: AztecProtocol/aztec-packages, path: noir-projects/noir-protocol-circuits/crates/private-kernel-inner, take_average: true }
           - project: { repo: AztecProtocol/aztec-packages, path: noir-projects/noir-protocol-circuits/crates/private-kernel-tail, take_average: true  }
           - project: { repo: AztecProtocol/aztec-packages, path: noir-projects/noir-protocol-circuits/crates/private-kernel-reset, take_average: true }
+          - project: { repo: AztecProtocol/aztec-packages, path: noir-projects/noir-protocol-circuits/crates/rollup-root }
+          #- project: { repo: AztecProtocol/aztec-packages, path: noir-projects/noir-protocol-circuits/crates/rollup-block-root }
+          - project: { repo: AztecProtocol/aztec-packages, path: noir-projects/noir-protocol-circuits/crates/rollup-block-merge }
           - project: { repo: AztecProtocol/aztec-packages, path: noir-projects/noir-protocol-circuits/crates/rollup-base-private }
           - project: { repo: AztecProtocol/aztec-packages, path: noir-projects/noir-protocol-circuits/crates/rollup-base-public }
 

diff --git a/compiler/noirc_frontend/src/hir/comptime/interpreter/builtin.rs b/compiler/noirc_frontend/src/hir/comptime/interpreter/builtin.rs
@@ -1,6 +1,6 @@
 use std::rc::Rc;
 
-use acvm::{acir::BlackBoxFunc, AcirField, FieldElement};
+use acvm::{AcirField, FieldElement};
 use builtin_helpers::{
     block_expression_to_value, byte_array_type, check_argument_count,
     check_function_not_yet_resolved, check_one_argument, check_three_arguments,
@@ -236,9 +236,6 @@ impl<'local, 'context> Interpreter<'local, 'context> {
             "unresolved_type_is_field" => unresolved_type_is_field(interner, arguments, location),
             "unresolved_type_is_unit" => unresolved_type_is_unit(interner, arguments, location),
             "zeroed" => zeroed(return_type, location.span),
-            blackbox if BlackBoxFunc::is_valid_black_box_func_name(blackbox) => {
-                self.call_foreign(blackbox, arguments, return_type, location)
-            }
             _ => {
                 let item = format!("Comptime evaluation for builtin function '{name}'");
                 Err(InterpreterError::Unimplemented { item, location })

diff --git a/...ioned_docs/version-v1.0.0-beta.1/noir/standard_library/containers/boundedvec.md b/...ioned_docs/version-v1.0.0-beta.1/noir/standard_library/containers/boundedvec.md
@@ -400,7 +400,7 @@ let vec: BoundedVec<u32, 4> = BoundedVec::from_parts([1, 2, 3, 0], 3);
             assert_eq(vec.len(), 3);
 
             // Any elements past the given length are zeroed out, so these
-            // two BoundedVecs will be completely equal
+            // two vectors will be completely equal
             let vec1: BoundedVec<u32, 4> = BoundedVec::from_parts([1, 2, 3, 1], 3);
             let vec2: BoundedVec<u32, 4> = BoundedVec::from_parts([1, 2, 3, 2], 3);
             assert_eq(vec1, vec2);
@@ -433,7 +433,7 @@ let vec: BoundedVec<u32, 4> = BoundedVec::from_parts_unchecked([1, 2, 3, 0], 3);
             let vec1: BoundedVec<u32, 4> = BoundedVec::from_parts_unchecked([1, 2, 3, 1], 3);
             let vec2: BoundedVec<u32, 4> = BoundedVec::from_parts_unchecked([1, 2, 3, 2], 3);
 
-            // both vecs have length 3 so we'd expect them to be equal, but this
+            // both vectors have length 3 so we'd expect them to be equal, but this
             // fails because elements past the length are still checked in eq
             assert(vec1 != vec2);
 ```

diff --git a/noir_stdlib/src/bigint.nr b/noir_stdlib/src/bigint.nr
@@ -33,17 +33,17 @@ pub struct BigInt {
 // docs:end:big_int_definition
 
 impl BigInt {
-    #[builtin(bigint_add)]
+    #[foreign(bigint_add)]
     fn bigint_add(self, other: BigInt) -> BigInt {}
-    #[builtin(bigint_sub)]
+    #[foreign(bigint_sub)]
     fn bigint_sub(self, other: BigInt) -> BigInt {}
-    #[builtin(bigint_mul)]
+    #[foreign(bigint_mul)]
     fn bigint_mul(self, other: BigInt) -> BigInt {}
-    #[builtin(bigint_div)]
+    #[foreign(bigint_div)]
     fn bigint_div(self, other: BigInt) -> BigInt {}
-    #[builtin(bigint_from_le_bytes)]
+    #[foreign(bigint_from_le_bytes)]
     fn from_le_bytes(bytes: [u8], modulus: [u8]) -> BigInt {}
-    #[builtin(bigint_to_le_bytes)]
+    #[foreign(bigint_to_le_bytes)]
     fn to_le_bytes(self) -> [u8; 32] {}
 
     fn check_32_bytes(self: Self, other: BigInt) -> bool {

diff --git a/tooling/nargo/src/lib.rs b/tooling/nargo/src/lib.rs
@@ -97,7 +97,7 @@ fn insert_all_files_for_package_into_file_manager(
         .parent()
         .unwrap_or_else(|| panic!("The entry path is expected to be a single file within a directory and so should have a parent {:?}", package.entry_path));
 
-    for entry in WalkDir::new(entry_path_parent) {
+    for entry in WalkDir::new(entry_path_parent).sort_by_file_name() {
         let Ok(entry) = entry else {
             continue;
         };