Merge branch 'master' into ab/test-error-spans-and-messages

.github/benchmark_projects.yml

@@ -7,7 +7,7 @@ projects:
     num_runs: 5
     compilation-timeout: 2.5
     execution-timeout: 0.08
-    compilation-memory-limit: 300
+    compilation-memory-limit: 350
     execution-memory-limit: 250
   private-kernel-tail:
     repo: AztecProtocol/aztec-packages
@@ -18,7 +18,7 @@ projects:
     compilation-timeout: 1.2
     execution-timeout: 0.02
     compilation-memory-limit: 250
-    execution-memory-limit: 210
+    execution-memory-limit: 230
   private-kernel-reset:
     repo: AztecProtocol/aztec-packages
     ref: *AZ_COMMIT
@@ -65,7 +65,7 @@ projects:
     cannot_execute: true
     num_runs: 1
     timeout: 60
-    compilation-timeout: 100
+    compilation-timeout: 110
     compilation-memory-limit: 8000
   rollup-block-root:
     repo: AztecProtocol/aztec-packages

.github/workflows/docs-pr.yml

@@ -33,7 +33,7 @@ jobs:
           // Check if any file is within the 'docs' folder
           const docsChanged = files.some(file => file.filename.startsWith('docs/'));
           return docsChanged;
-    
+
     - name: Add label if not present
       if: steps.check-labels.outputs.result == 'true'
       uses: actions/github-script@v7.0.1
@@ -57,7 +57,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Setup toolchain
-        uses: dtolnay/rust-toolchain@1.75.0
+        uses: dtolnay/rust-toolchain@1.85.0
 
       - uses: Swatinem/rust-cache@v2
         with:
@@ -102,13 +102,13 @@ jobs:
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
-    
+
       - name: Download built docs
         uses: actions/download-artifact@v4
         with:
           name: docs
           path: ./docs/build
-     
+
       - name: Deploy to Netlify
         uses: nwtgck/actions-netlify@v2.1
         with:

.github/workflows/formatting.yml

@@ -25,7 +25,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Setup toolchain
-        uses: dtolnay/rust-toolchain@1.75.0
+        uses: dtolnay/rust-toolchain@1.85.0
         with:
           targets: x86_64-unknown-linux-gnu
           components: clippy, rustfmt
@@ -51,7 +51,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Setup toolchain
-        uses: dtolnay/rust-toolchain@1.75.0
+        uses: dtolnay/rust-toolchain@1.85.0
         with:
           targets: x86_64-unknown-linux-gnu
           components: clippy, rustfmt
@@ -89,7 +89,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Setup toolchain
-        uses: dtolnay/rust-toolchain@1.75.0
+        uses: dtolnay/rust-toolchain@1.85.0
 
       - uses: Swatinem/rust-cache@v2
         with:
@@ -121,7 +121,7 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v4
-      
+
       - name: Download nargo binary
         uses: ./.github/actions/download-nargo
 

.github/workflows/publish-acvm.yml

@@ -18,7 +18,7 @@ jobs:
           ref: ${{ inputs.noir-ref }}
 
       - name: Setup toolchain
-        uses: dtolnay/rust-toolchain@1.75.0
+        uses: dtolnay/rust-toolchain@1.85.0
 
       # These steps are in a specific order so crate dependencies are updated first
       - name: Publish acir_field

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

@@ -22,9 +22,9 @@ jobs:
         uses: actions/checkout@v4
         with:
           ref: ${{ inputs.noir-ref }}
-      
+
       - name: Setup toolchain
-        uses: dtolnay/rust-toolchain@1.75.0
+        uses: dtolnay/rust-toolchain@1.85.0
 
       - uses: Swatinem/rust-cache@v2
         with:
@@ -44,7 +44,7 @@ jobs:
         uses: actions/upload-artifact@v4
         with:
           name: noirc_abi_wasm
-          path: | 
+          path: |
             ./tooling/noirc_abi_wasm/nodejs
             ./tooling/noirc_abi_wasm/web
           retention-days: 10
@@ -58,7 +58,7 @@ jobs:
           ref: ${{ inputs.noir-ref }}
 
       - name: Setup toolchain
-        uses: dtolnay/rust-toolchain@1.75.0
+        uses: dtolnay/rust-toolchain@1.85.0
 
       - uses: Swatinem/rust-cache@v2
         with:
@@ -95,7 +95,7 @@ jobs:
           ref: ${{ inputs.noir-ref }}
 
       - name: Setup toolchain
-        uses: dtolnay/rust-toolchain@1.75.0
+        uses: dtolnay/rust-toolchain@1.85.0
 
       - uses: Swatinem/rust-cache@v2
         with:
@@ -119,7 +119,7 @@ jobs:
             ./acvm-repo/acvm_js/nodejs
             ./acvm-repo/acvm_js/web
           retention-days: 3
-          
+
   publish-es-packages:
     runs-on: ubuntu-22.04
     needs: [build-acvm_js, build-noirc_abi_wasm, build-noir_wasm]
@@ -133,12 +133,12 @@ jobs:
         with:
           name: acvm-js
           path: acvm-repo/acvm_js
-      
+
       - uses: actions/download-artifact@v4
         with:
           name: noir_wasm
           path: compiler/wasm
-      
+
       - uses: actions/download-artifact@v4
         with:
           name: noirc_abi_wasm

.github/workflows/publish-nargo.yml

@@ -38,15 +38,8 @@ jobs:
         with:
           ref: ${{ inputs.tag || env.GITHUB_REF }}
 
-      - name: Setup for Apple Silicon
-        if: matrix.target == 'aarch64-apple-darwin'
-        run: |
-          sudo xcode-select -s /Applications/Xcode_15.4.0.app/Contents/Developer/
-          echo "SDKROOT=$(xcrun -sdk macosx$(sw_vers -productVersion) --show-sdk-path)" >> $GITHUB_ENV
-          echo "MACOSX_DEPLOYMENT_TARGET=$(xcrun -sdk macosx$(sw_vers -productVersion) --show-sdk-platform-version)" >> $GITHUB_ENV
-
       - name: Setup toolchain
-        uses: dtolnay/rust-toolchain@1.75.0
+        uses: dtolnay/rust-toolchain@1.85.0
         with:
           targets: ${{ matrix.target }}
 
@@ -61,7 +54,7 @@ jobs:
           cargo build --package nargo_cli --release --target ${{ matrix.target }} --no-default-features --features "${{ inputs.features }}"
           cargo build --package noir_profiler --release --target ${{ matrix.target }} --no-default-features --features "${{ inputs.features }}"
           cargo build --package noir_inspector --release --target ${{ matrix.target }} --no-default-features --features "${{ inputs.features }}"
-      
+
       - name: Package artifacts
         run: |
           mkdir dist
@@ -151,7 +144,7 @@ jobs:
           ref: ${{ inputs.tag || env.GITHUB_REF }}
 
       - name: Setup toolchain
-        uses: dtolnay/rust-toolchain@1.75.0
+        uses: dtolnay/rust-toolchain@1.85.0
         with:
           targets: ${{ matrix.target }}
 
@@ -245,4 +238,4 @@ jobs:
           overwrite: true
           tag: ${{ format('{0}-{1}', 'nightly', steps.date.outputs.date) }}
 
-  
+

.github/workflows/reports.yml

@@ -32,7 +32,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Setup toolchain
-        uses: dtolnay/rust-toolchain@1.75.0
+        uses: dtolnay/rust-toolchain@1.85.0
 
       - uses: Swatinem/rust-cache@v2
         with:
@@ -305,7 +305,7 @@ jobs:
           repository: ${{ matrix.repo }}
           path: test-repo
           ref: ${{ matrix.ref }}
-      
+
       - name: Fetch noir dependencies
         working-directory: ./test-repo/${{ matrix.path }}
         run: |
@@ -341,7 +341,7 @@ jobs:
           path: ${{ steps.compilation_report.outputs.report_path }}
           retention-days: 3
           overwrite: true
-        
+
       - name: Generate execution report
         id: execution_report
         working-directory: ./test-repo/${{ matrix.path }}
@@ -359,7 +359,7 @@ jobs:
 
           echo "report_name=$REPORT_NAME" >> $GITHUB_OUTPUT
           echo "report_path=$REPORT_PATH" >> $GITHUB_OUTPUT
-    
+
       - name: Upload execution report
         if: ${{ !matrix.cannot_execute }}
         uses: actions/upload-artifact@v4
@@ -716,7 +716,7 @@ jobs:
       - upload_compilation_memory_report
       - upload_execution_report
       - upload_execution_memory_report
-     
+
     steps:
         - name: Report overall success
           run: |

.github/workflows/test-js-packages.yml

@@ -54,7 +54,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Setup toolchain
-        uses: dtolnay/rust-toolchain@1.75.0
+        uses: dtolnay/rust-toolchain@1.85.0
 
       - uses: Swatinem/rust-cache@v2
         with:
@@ -87,7 +87,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Setup toolchain
-        uses: dtolnay/rust-toolchain@1.75.0
+        uses: dtolnay/rust-toolchain@1.85.0
 
       - uses: Swatinem/rust-cache@v2
         with:
@@ -119,7 +119,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Setup toolchain
-        uses: dtolnay/rust-toolchain@1.75.0
+        uses: dtolnay/rust-toolchain@1.85.0
 
       - uses: Swatinem/rust-cache@v2
         with:
@@ -154,7 +154,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Setup toolchain
-        uses: dtolnay/rust-toolchain@1.75.0
+        uses: dtolnay/rust-toolchain@1.85.0
 
       - uses: Swatinem/rust-cache@v2
         with:
@@ -493,7 +493,7 @@ jobs:
       fail-fast: false
       matrix:
         include: ${{ fromJson( needs.critical-library-list.outputs.libraries )}}
-         
+
     name: Check external repo - ${{ matrix.repo }}/${{ matrix.path }}
     steps:
       - name: Checkout

.github/workflows/test-rust-workspace-msrv.yml

@@ -3,7 +3,7 @@ name: Test (MSRV check)
 # TL;DR https://github.com/noir-lang/noir/issues/4384
 #
 # This workflow acts to ensure that we can publish to crates.io, we need this extra check as libraries don't respect the Cargo.lock file committed in this repository.
-# We must then always be able to build the workspace using the latest versions of all of our dependencies, so we explicitly update them and build in this workflow. 
+# We must then always be able to build the workspace using the latest versions of all of our dependencies, so we explicitly update them and build in this workflow.
 
 on:
   schedule:
@@ -29,12 +29,12 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Setup toolchain
-        uses: dtolnay/rust-toolchain@1.75.0
+        uses: dtolnay/rust-toolchain@1.85.0
         with:
           targets: x86_64-unknown-linux-gnu
 
       # We force the ACVM crate and all of its dependencies to update their dependencies
-      # This ensures that we'll be able to build the crates when they're being published. 
+      # This ensures that we'll be able to build the crates when they're being published.
       - name: Update Cargo.lock
         run: |
           cargo update --package acvm --aggressive
@@ -53,7 +53,7 @@ jobs:
 
       - name: Build and archive tests
         run: cargo nextest archive --workspace --archive-file nextest-archive.tar.zst
-      
+
       - name: Upload archive to workflow
         uses: actions/upload-artifact@v4
         with:
@@ -70,17 +70,17 @@ jobs:
         partition: [1, 2, 3, 4]
     steps:
       - uses: actions/checkout@v4
-      
+
       - name: Setup toolchain
-        uses: dtolnay/rust-toolchain@1.75.0
+        uses: dtolnay/rust-toolchain@1.85.0
         with:
           targets: x86_64-unknown-linux-gnu
 
       - name: Install nextest
         uses: taiki-e/install-action@v2
         with:
           tool: nextest@0.9.67
-      
+
       - name: Download archive
         uses: actions/download-artifact@v4
         with:
@@ -99,9 +99,9 @@ jobs:
     runs-on: ubuntu-22.04
     # We want this job to always run (even if the dependant jobs fail) as we want this job to fail rather than skipping.
     if: ${{ always() }}
-    needs: 
+    needs:
       - run-tests
-    
+
     steps:
       - name: Report overall success
         run: |
@@ -113,7 +113,7 @@ jobs:
         env:
           # We treat any cancelled, skipped or failing jobs as a failure for the workflow as a whole.
           FAIL: ${{ contains(needs.*.result, 'failure') || contains(needs.*.result, 'skipped') }}
-    
+
       - name: Checkout
         if: ${{ failure() }}
         uses: actions/checkout@v4