Merge branch 'master' into tf/use-setup-node

.github/workflows/publish-es-packages.yml

@@ -30,11 +30,6 @@ jobs:
           nix-cache-name: "noir"
           cachix-auth-token: ${{ secrets.CACHIXAUTHTOKEN }}
 
-      - name: Enable aztec features
-        if: ${{ inputs.npm-tag == 'aztec' }}
-        run: |
-          echo $'\n'"default = [\"aztec\"]"$'\n' >> compiler/noirc_driver/Cargo.toml
-
       - name: Build wasm package
         run: |
           nix build -L .#noir_wasm

.github/workflows/test-cargo.yml

@@ -1,9 +1,16 @@
 name: Test cargo
 
 on:
+  pull_request:
+  merge_group:
   push:
     branches:
-      - 'master'
+      - master
+
+# This will cancel previous runs when a branch or PR is updated
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.ref || github.run_id }}
+  cancel-in-progress: true
 
 jobs:
   build:

.github/workflows/test-js.yml

@@ -1,9 +1,17 @@
 name: Test JS packages
 
 on:
+  pull_request:
+  merge_group:
   push:
     branches:
-      - 'master'
+      - master
+
+# This will cancel previous runs when a branch or PR is updated
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.ref || github.run_id }}
+  cancel-in-progress: true
+
 
 jobs:
   build:

Cargo.toml

@@ -96,7 +96,7 @@ getrandom = "0.2"
 
 
 cfg-if = "1.0.0"
-clap = { version = "4.3.19", features = ["derive"] }
+clap = { version = "4.3.19", features = ["derive", "env"] }
 codespan = { version = "0.11.1", features = ["serialization"] }
 codespan-lsp = "0.11.1"
 codespan-reporting = "0.11.1"
@@ -120,6 +120,7 @@ const_format = "0.2.30"
 num-bigint = "0.4"
 num-traits = "0.2"
 similar-asserts = "1.5.0"
+log = "0.4.17"
 
 [profile.dev]
 # This is required to be able to run `cargo test` in acvm_js due to the `locals exceeds maximum` error.

acvm-repo/acvm_js/Cargo.toml

@@ -26,9 +26,9 @@ wasm-bindgen-futures.workspace = true
 console_error_panic_hook.workspace = true
 gloo-utils.workspace = true
 js-sys.workspace = true
+log.workspace = true
 
 serde = { version = "1.0.136", features = ["derive"] }
-log = "0.4.17"
 wasm-logger = "0.2.0"
 const-str = "0.5.5"
 

compiler/fm/src/lib.rs

@@ -7,6 +7,10 @@ mod file_map;
 mod file_reader;
 
 pub use file_map::{File, FileId, FileMap, PathString};
+
+// Re-export for the lsp
+pub use codespan_reporting::files as codespan_files;
+
 use file_reader::is_stdlib_asset;
 pub use file_reader::FileReader;
 

compiler/noirc_driver/Cargo.toml

@@ -22,7 +22,4 @@ fm.workspace = true
 serde.workspace = true
 fxhash.workspace = true
 
-aztec_macros ={path = "../../aztec_macros", optional = true}
-
-[features]
-aztec = ["aztec_macros"]
+aztec_macros = { path = "../../aztec_macros" }

compiler/noirc_driver/src/lib.rs

@@ -61,6 +61,10 @@ pub struct CompileOptions {
     /// Suppress warnings
     #[arg(long, conflicts_with = "deny_warnings")]
     pub silence_warnings: bool,
+
+    /// Disables the builtin macros being used in the compiler
+    #[arg(long, hide = true)]
+    pub disable_macros: bool,
 }
 
 /// Helper type used to signify where only warnings are expected in file diagnostics
@@ -121,11 +125,13 @@ pub fn check_crate(
     context: &mut Context,
     crate_id: CrateId,
     deny_warnings: bool,
+    disable_macros: bool,
 ) -> CompilationResult<()> {
-    #[cfg(not(feature = "aztec"))]
-    let macros: Vec<&dyn MacroProcessor> = Vec::new();
-    #[cfg(feature = "aztec")]
-    let macros = vec![&aztec_macros::AztecMacro as &dyn MacroProcessor];
+    let macros: Vec<&dyn MacroProcessor> = if disable_macros {
+        vec![]
+    } else {
+        vec![&aztec_macros::AztecMacro as &dyn MacroProcessor]
+    };
 
     let mut errors = vec![];
     let diagnostics = CrateDefMap::collect_defs(crate_id, context, macros);
@@ -161,7 +167,8 @@ pub fn compile_main(
     cached_program: Option<CompiledProgram>,
     force_compile: bool,
 ) -> CompilationResult<CompiledProgram> {
-    let (_, mut warnings) = check_crate(context, crate_id, options.deny_warnings)?;
+    let (_, mut warnings) =
+        check_crate(context, crate_id, options.deny_warnings, options.disable_macros)?;
 
     let main = context.get_main_function(&crate_id).ok_or_else(|| {
         // TODO(#2155): This error might be a better to exist in Nargo
@@ -194,7 +201,8 @@ pub fn compile_contract(
     crate_id: CrateId,
     options: &CompileOptions,
 ) -> CompilationResult<CompiledContract> {
-    let (_, warnings) = check_crate(context, crate_id, options.deny_warnings)?;
+    let (_, warnings) =
+        check_crate(context, crate_id, options.deny_warnings, options.disable_macros)?;
 
     // TODO: We probably want to error if contracts is empty
     let contracts = context.get_all_contracts(&crate_id);