remove aztec feature flag

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,
+
+    /// Enables the aztec macro preprocessor
+    #[arg(long, hide = true)]
+    pub aztec_macro: bool,
 }
 
 /// Helper type used to signify where only warnings are expected in file diagnostics
@@ -121,11 +125,12 @@ pub fn check_crate(
     context: &mut Context,
     crate_id: CrateId,
     deny_warnings: bool,
+    enable_aztec_macro: 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 mut macros: Vec<&dyn MacroProcessor> = Vec::new();
+    if enable_aztec_macro {
+        macros.push(&aztec_macros::AztecMacro as &dyn MacroProcessor);
+    }
 
     let mut errors = vec![];
     let diagnostics = CrateDefMap::collect_defs(crate_id, context, macros);
@@ -161,7 +166,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.aztec_macro)?;
 
     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 +200,7 @@ 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.aztec_macro)?;
 
     // TODO: We probably want to error if contracts is empty
     let contracts = context.get_all_contracts(&crate_id);

tooling/lsp/src/lib.rs

@@ -46,6 +46,7 @@ pub struct LspState {
     root_path: Option<PathBuf>,
     client: ClientSocket,
     solver: WrapperSolver,
+    enable_aztec_macro: bool,
     input_files: HashMap<String, String>,
 }
 
@@ -55,6 +56,7 @@ impl LspState {
             client: client.clone(),
             root_path: None,
             solver: WrapperSolver(Box::new(solver)),
+            enable_aztec_macro: false,
             input_files: HashMap::new(),
         }
     }

tooling/lsp/src/notifications/mod.rs

@@ -113,10 +113,11 @@ 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) {
-                Ok(((), warnings)) => warnings,
-                Err(errors_and_warnings) => errors_and_warnings,
-            };
+            let file_diagnostics =
+                match check_crate(&mut context, crate_id, false, state.enable_aztec_macro) {
+                    Ok(((), warnings)) => warnings,
+                    Err(errors_and_warnings) => errors_and_warnings,
+                };
 
             // We don't add test headings for a package if it contains no `#[test]` functions
             if let Some(tests) = get_package_tests_in_crate(&context, &crate_id, &package.name) {

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, state.enable_aztec_macro);
 
         let fm = &context.file_manager;
         let files = fm.as_file_map();

tooling/lsp/src/requests/profile_run.rs

@@ -61,13 +61,15 @@ fn on_profile_run_request_inner(
             let is_opcode_supported = |_opcode: &Opcode| true;
             let np_language = Language::PLONKCSat { width: 3 };
 
+            let compile_options =
+                CompileOptions { aztec_macro: state.enable_aztec_macro, ..Default::default() };
             let (compiled_programs, compiled_contracts) = nargo::ops::compile_workspace(
                 &workspace,
                 &binary_packages,
                 &contract_packages,
                 np_language,
                 is_opcode_supported,
-                &CompileOptions::default(),
+                &compile_options,
             )
             .map_err(|err| ResponseError::new(ErrorCode::REQUEST_FAILED, err))?;
 

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, state.enable_aztec_macro).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, state.enable_aztec_macro);
 
             // 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

@@ -62,6 +62,7 @@ fn check_package(package: &Package, compile_options: &CompileOptions) -> Result<
         crate_id,
         compile_options.deny_warnings,
         compile_options.silence_warnings,
+        compile_options.aztec_macro,
     )?;
 
     if package.is_library() || package.is_contract() {
@@ -183,8 +184,9 @@ pub(crate) fn check_crate_and_report_errors(
     crate_id: CrateId,
     deny_warnings: bool,
     silence_warnings: bool,
+    enable_aztec_macro: bool,
 ) -> Result<(), CompileError> {
-    let result = check_crate(context, crate_id, deny_warnings);
+    let result = check_crate(context, crate_id, deny_warnings, enable_aztec_macro);
     super::compile_cmd::report_errors(
         result,
         &context.file_manager,

tooling/nargo_cli/src/cli/test_cmd.rs

@@ -93,6 +93,7 @@ fn run_tests<S: BlackBoxFunctionSolver>(
         crate_id,
         compile_options.deny_warnings,
         compile_options.silence_warnings,
+        compile_options.aztec_macro,
     )?;
 
     let test_functions = context.get_all_test_functions_in_crate_matching(&crate_id, test_name);