Merge pull request 'Update dependencies post-2.3.0 release' (#1415) from update-dependencies into main-v2

Reviewed-on: https://git.deuxfleurs.fr/Deuxfleurs/garage/pulls/1415

flake.lock

@@ -81,17 +81,17 @@
         ]
       },
       "locked": {
-        "lastModified": 1763952169,
-        "narHash": "sha256-+PeDBD8P+NKauH+w7eO/QWCIp8Cx4mCfWnh9sJmy9CM=",
+        "lastModified": 1776914043,
+        "narHash": "sha256-qug5r56yW1qOsjSI99l3Jm15JNT9CvS2otkXNRNtrPI=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "ab726555a9a72e6dc80649809147823a813fa95b",
+        "rev": "2d35c4358d7de3a0e606a6e8b27925d981c01cc3",
         "type": "github"
       },
       "original": {
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "ab726555a9a72e6dc80649809147823a813fa95b",
+        "rev": "2d35c4358d7de3a0e606a6e8b27925d981c01cc3",
         "type": "github"
       }
     },

flake.nix

@@ -6,9 +6,9 @@
   inputs.nixpkgs.url =
     "github:NixOS/nixpkgs/cfe2c7d5b5d3032862254e68c37a6576b633d632";
 
-  # Rust overlay as of 2025-11-24
+  # Rust overlay as of 2026-04-23
   inputs.rust-overlay.url =
-  "github:oxalica/rust-overlay/ab726555a9a72e6dc80649809147823a813fa95b";
+  "github:oxalica/rust-overlay/2d35c4358d7de3a0e606a6e8b27925d981c01cc3";
   inputs.rust-overlay.inputs.nixpkgs.follows = "nixpkgs";
 
   # Crane as of 2025-01-24

nix/compile.nix

@@ -48,7 +48,7 @@ let
 
   inherit (pkgs) lib stdenv;
 
-  toolchainFn = (p: p.rust-bin.stable."1.91.0".default.override {
+  toolchainFn = (p: p.rust-bin.stable."1.95.0".default.override {
     targets = lib.optionals (target != null) [ rustTarget ];
     extensions = [
       "rust-src"

src/api/s3/post_object.rs

@@ -473,12 +473,10 @@ where
 					))));
 				}
 			}
-			Poll::Ready(None) => {
-				if !self.length.contains(&self.read) {
-					return Poll::Ready(Some(Err(Error::bad_request(
-						"File size does not match policy",
-					))));
-				}
+			Poll::Ready(None) if !self.length.contains(&self.read) => {
+				return Poll::Ready(Some(Err(Error::bad_request(
+					"File size does not match policy",
+				))));
 			}
 			_ => {}
 		}

src/block/repair.rs

@@ -648,7 +648,7 @@ impl BlockStoreIterator {
 
 		let mut cum_cap = 0;
 		let mut todo = vec![];
-		for (dir, cap) in data_layout.data_dirs.iter().zip(dir_cap.into_iter()) {
+		for (dir, cap) in data_layout.data_dirs.iter().zip(dir_cap) {
 			let progress_min = (cum_cap * PROGRESS_FP) / sum_cap;
 			let progress_max = ((cum_cap + cap as u64) * PROGRESS_FP) / sum_cap;
 			cum_cap += cap as u64;

src/net/peering.rs

@@ -313,10 +313,8 @@ impl PeeringManager {
 								to_ping.push(*id);
 							}
 						}
-						PeerConnState::Waiting(_, t) => {
-							if Instant::now() >= t {
-								to_retry.push(*id);
-							}
+						PeerConnState::Waiting(_, t) if Instant::now() >= t => {
+							to_retry.push(*id);
 						}
 						_ => (),
 					}

src/rpc/rpc_helper.rs

@@ -241,11 +241,7 @@ impl RpcHelper {
 		)
 		.with_context(Context::current_with_span(span))
 		.await;
-		Ok(to
-			.iter()
-			.cloned()
-			.zip(resps.into_iter())
-			.collect::<Vec<_>>())
+		Ok(to.iter().cloned().zip(resps).collect::<Vec<_>>())
 	}
 
 	pub async fn broadcast<M, N, H, S>(