[1 changes] chore: add regression test for issue 4449 (noir-lang/noir…

…#4503) chore: pass macro processors by reference (noir-lang/noir#4501) chore: bump bb to 0.26.3 (noir-lang/noir#4488) fix: handling of gh deps in noir_wasm (noir-lang/noir#4499) fix: iterative flattening pass (noir-lang/noir#4492) chore: Move templated code for assert_message into the stdlib (noir-lang/noir#4475) chore: pull out separate function for compiling and running a test chore: update cargo deny config (noir-lang/noir#4486) feat: run tests in parallel in `nargo test` (noir-lang/noir#4484)
AztecProtocol · Mar 7, 2024 · 4d77db2 · 4d77db2
1 parent 7ff9b71
commit 4d77db2
Show file tree

Hide file tree

Showing 27 changed files with 499 additions and 450 deletions.
diff --git a/noir/noir-repo/.gitrepo b/noir/noir-repo/.gitrepo
@@ -6,7 +6,7 @@
 [subrepo]
 	remote = https://github.com/noir-lang/noir
 	branch = master
-	commit = 5f57ebb7ff4b810802f90699a10f4325ef904f2e
-	parent = 8307dadd853d5091841e169c841ab6b09c223efb
+	commit = 2a555a041dbd3e40cbf768ca131f508570f4ba50
+	parent = 481e46b2091080e5c9498f248a29caafc122508e
 	method = merge
 	cmdver = 0.4.6
diff --git a/noir/noir-repo/Cargo.lock b/noir/noir-repo/Cargo.lock
diff --git a/noir/noir-repo/Cargo.toml b/noir/noir-repo/Cargo.toml
@@ -1,9 +1,8 @@
 [workspace]
 
 members = [
-    # Macros crates for metaprogramming
+    # Aztec Macro crate for metaprogramming
     "aztec_macros",
-    "noirc_macros",
     # Compiler crates
     "compiler/noirc_evaluator",
     "compiler/noirc_frontend",

diff --git a/noir/noir-repo/bootstrap.sh b/noir/noir-repo/bootstrap.sh
diff --git a/noir/noir-repo/bootstrap_cache.sh b/noir/noir-repo/bootstrap_cache.sh
diff --git a/noir/noir-repo/compiler/noirc_driver/Cargo.toml b/noir/noir-repo/compiler/noirc_driver/Cargo.toml
@@ -26,4 +26,3 @@ tracing.workspace = true
 thiserror.workspace = true
 
 aztec_macros = { path = "../../aztec_macros" }
-noirc_macros = { path = "../../noirc_macros" }
diff --git a/noir/noir-repo/compiler/noirc_driver/src/lib.rs b/noir/noir-repo/compiler/noirc_driver/src/lib.rs
@@ -237,14 +237,8 @@ pub fn check_crate(
     deny_warnings: bool,
     disable_macros: bool,
 ) -> CompilationResult<()> {
-    let macros: Vec<&dyn MacroProcessor> = if disable_macros {
-        vec![&noirc_macros::AssertMessageMacro as &dyn MacroProcessor]
-    } else {
-        vec![
-            &aztec_macros::AztecMacro as &dyn MacroProcessor,
-            &noirc_macros::AssertMessageMacro as &dyn MacroProcessor,
-        ]
-    };
+    let macros: &[&dyn MacroProcessor] =
+        if disable_macros { &[] } else { &[&aztec_macros::AztecMacro as &dyn MacroProcessor] };
 
     let mut errors = vec![];
     let diagnostics = CrateDefMap::collect_defs(crate_id, context, macros);