chore: remove aztec compile time feature flag

.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

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"

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);

tooling/lsp/src/notifications/mod.rs

@@ -113,7 +113,7 @@ pub(super) fn on_did_save_text_document(
         .flat_map(|package| -> Vec<Diagnostic> {
             let (mut context, crate_id) = prepare_package(package, Box::new(get_non_stdlib_asset));
 
-            let file_diagnostics = match check_crate(&mut context, crate_id, false) {
+            let file_diagnostics = match check_crate(&mut context, crate_id, false, false) {
                 Ok(((), warnings)) => warnings,
                 Err(errors_and_warnings) => errors_and_warnings,
             };

tooling/lsp/src/requests/code_lens_request.rs

@@ -86,7 +86,7 @@ fn on_code_lens_request_inner(
         let (mut context, crate_id) = prepare_package(package, Box::new(get_non_stdlib_asset));
         // We ignore the warnings and errors produced by compilation for producing code lenses
         // because we can still get the test functions even if compilation fails
-        let _ = check_crate(&mut context, crate_id, false);
+        let _ = check_crate(&mut context, crate_id, false, false);
 
         let fm = &context.file_manager;
         let files = fm.as_file_map();

tooling/lsp/src/requests/goto_definition.rs

@@ -56,7 +56,7 @@ fn on_goto_definition_inner(
             nargo::prepare_package(package, Box::new(crate::get_non_stdlib_asset));
 
         // We ignore the warnings and errors produced by compilation while resolving the definition
-        let _ = noirc_driver::check_crate(&mut context, crate_id, false);
+        let _ = noirc_driver::check_crate(&mut context, crate_id, false, false);
 
         let files = context.file_manager.as_file_map();
         let file_id = context.file_manager.name_to_id(file_path.clone());

tooling/lsp/src/requests/test_run.rs

@@ -52,7 +52,7 @@ fn on_test_run_request_inner(
     match workspace.into_iter().next() {
         Some(package) => {
             let (mut context, crate_id) = prepare_package(package, Box::new(get_non_stdlib_asset));
-            if check_crate(&mut context, crate_id, false).is_err() {
+            if check_crate(&mut context, crate_id, false, false).is_err() {
                 let result = NargoTestRunResult {
                     id: params.id.clone(),
                     result: "error".to_string(),

tooling/lsp/src/requests/tests.rs

@@ -56,7 +56,7 @@ fn on_tests_request_inner(
             let (mut context, crate_id) = prepare_package(package, Box::new(get_non_stdlib_asset));
             // We ignore the warnings and errors produced by compilation for producing tests
             // because we can still get the test functions even if compilation fails
-            let _ = check_crate(&mut context, crate_id, false);
+            let _ = check_crate(&mut context, crate_id, false, false);
 
             // We don't add test headings for a package if it contains no `#[test]` functions
             get_package_tests_in_crate(&context, &crate_id, &package.name)

tooling/nargo_cli/src/cli/check_cmd.rs

@@ -61,6 +61,7 @@ fn check_package(package: &Package, compile_options: &CompileOptions) -> Result<
         &mut context,
         crate_id,
         compile_options.deny_warnings,
+        compile_options.disable_macros,
         compile_options.silence_warnings,
     )?;
 
@@ -182,9 +183,10 @@ pub(crate) fn check_crate_and_report_errors(
     context: &mut Context,
     crate_id: CrateId,
     deny_warnings: bool,
+    disable_macros: bool,
     silence_warnings: bool,
 ) -> Result<(), CompileError> {
-    let result = check_crate(context, crate_id, deny_warnings);
+    let result = check_crate(context, crate_id, deny_warnings, disable_macros);
     super::compile_cmd::report_errors(
         result,
         &context.file_manager,

tooling/nargo_cli/src/cli/test_cmd.rs

@@ -92,6 +92,7 @@ fn run_tests<S: BlackBoxFunctionSolver>(
         &mut context,
         crate_id,
         compile_options.deny_warnings,
+        compile_options.disable_macros,
         compile_options.silence_warnings,
     )?;