Merge branch 'master' into jf/source-order-attrs

.aztec-sync-commit

@@ -1 +1 @@
-d9de430e4a01d6908a9b1fe5e6ede9309aa8a10d
+0577c1a70e9746bd06f07d2813af1be39e01ca02

.github/ACVM_NOT_PUBLISHABLE.md

@@ -5,7 +5,7 @@ assignees: TomAFrench, Savio-Sou
 
 The ACVM crates are currently unpublishable, making a release will NOT push our crates to crates.io.
 
-This is likely due to a crate we depend on bumping its MSRV above our own. Our lockfile is not taken into account when publishing to crates.io (as people downloading our crate don't use it) so we need to be able to use the most up to date versions of our dependencies (including transient dependencies) specified. 
+This is likely due to a crate we depend on bumping its MSRV above our own. Our lockfile is not taken into account when publishing to crates.io (as people downloading our crate don't use it) so we need to be able to use the most up-to-date versions of our dependencies (including transient dependencies) specified. 
 
 Check the [MSRV check]({{env.WORKFLOW_URL}}) workflow for details.
 

.github/workflows/formatting.yml

@@ -15,37 +15,53 @@ concurrency:
 jobs:
   clippy:
     name: cargo clippy
-    runs-on: ${{ matrix.runner }}
+    runs-on: ubuntu-latest
     timeout-minutes: 30
     env:
       RUSTFLAGS: -Dwarnings
 
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - runner: ubuntu-latest
-            target: x86_64-unknown-linux-gnu
-
     steps:
       - name: Checkout
         uses: actions/checkout@v4
 
       - name: Setup toolchain
         uses: dtolnay/[email protected]
         with:
-          targets: ${{ matrix.target }}
+          targets: x86_64-unknown-linux-gnu
           components: clippy, rustfmt
 
       - uses: Swatinem/rust-cache@v2
         with:
-          key: ${{ matrix.target }}
+          key: x86_64-unknown-linux-gnu
           cache-on-failure: true
           save-if: ${{ github.event_name != 'merge_group' }}
 
       - name: Run `cargo clippy`
         run: cargo clippy --all-targets --workspace --locked --release
 
+  rustfmt:
+    name: cargo fmt
+    runs-on: ubuntu-latest
+    timeout-minutes: 30
+    env:
+      RUSTFLAGS: -Dwarnings
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Setup toolchain
+        uses: dtolnay/[email protected]
+        with:
+          targets: x86_64-unknown-linux-gnu
+          components: clippy, rustfmt
+
+      - uses: Swatinem/rust-cache@v2
+        with:
+          key: x86_64-unknown-linux-gnu
+          cache-on-failure: true
+          save-if: ${{ github.event_name != 'merge_group' }}
+
       - name: Run `cargo fmt`
         run: cargo fmt --all --check
 
@@ -88,7 +104,6 @@ jobs:
         run: |
           mkdir dist
           cp ./target/release/nargo ./dist/nargo
-          7z a -ttar -so -an ./dist/* | 7z a -si ./nargo-x86_64-unknown-linux-gnu.tar.gz
 
       - name: Upload artifact
         uses: actions/upload-artifact@v4