Merge branch 'main' into disable-ccache

Author: avikivity

.github/workflows/benchmarks.yml

@@ -18,7 +18,7 @@ concurrency:
 
 jobs:
   benchmarks:
-    name: Run benchmarks (CodSpeed)
+    name: Run performance benchmarks (CodSpeed)
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v6
@@ -37,11 +37,40 @@ jobs:
         shell: bash
         run: cargo codspeed build
 
-      - name: Run benchmarks
+      - name: Run performance benchmarks
         uses: CodSpeedHQ/action@v4
         env:
           CODSPEED_LOG: debug
         with:
           mode: simulation
           run: cargo codspeed run > /dev/null
           token: ${{ secrets.CODSPEED_TOKEN }}
+
+  memory-benchmarks:
+    name: Run memory benchmarks (CodSpeed)
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v6
+        with:
+          persist-credentials: false
+
+      - uses: dtolnay/rust-toolchain@stable
+
+      - uses: Swatinem/rust-cache@v2
+
+      - name: Install cargo-codspeed
+        shell: bash
+        run: cargo install cargo-codspeed --locked
+
+      - name: Build benchmarks for memory analysis
+        shell: bash
+        run: cargo codspeed build -m analysis
+
+      - name: Run memory benchmarks
+        uses: CodSpeedHQ/action@v4
+        env:
+          CODSPEED_LOG: debug
+        with:
+          mode: memory
+          run: cargo codspeed run > /dev/null
+          token: ${{ secrets.CODSPEED_TOKEN }}

Cargo.lock

@@ -49,9 +49,7 @@ flate2 = { version = "1.0", optional = true, default-features = false, features
 ] }
 fs-err = "3"
 futures = "0.3"
-gzp = { version = "0.11.3", default-features = false, features = [
-  "deflate_rust",
-] }
+gzp = { version = "2", default-features = false, features = ["deflate_rust"] }
 http = "1.0"
 http-body-util = { version = "0.1", optional = true }
 hyper = { version = "1.1", optional = true, features = ["server", "http1"] }

Cargo.toml

@@ -180,7 +180,7 @@ mod toolchain_imp {
                 file_set,
                 symlinks,
             } = self;
-            let par: ParCompress<Gzip> = ParCompressBuilder::new()
+            let par: ParCompress<'_, Gzip, W> = ParCompressBuilder::new()
                 .compression_level(Compression::default())
                 .from_writer(writer);
             let mut builder = tar::Builder::new(par);

src/dist/pkg.rs

@@ -1237,7 +1237,7 @@ where
     ) -> SccacheResponse {
         match compiler {
             Err(e) => {
-                debug!("check_compiler: Unsupported compiler: {}", e.to_string());
+                debug!("check_compiler: Unsupported compiler: {e}");
                 self.stats.lock().await.requests_unsupported_compiler += 1;
                 return Message::WithoutBody(Response::Compile(
                     CompileResponse::UnsupportedCompiler(OsString::from(e.to_string())),