diff options
| author | Alex <lx@deuxfleurs.fr> | 2025-02-03 17:49:00 +0000 |
|---|---|---|
| committer | Alex <lx@deuxfleurs.fr> | 2025-02-03 17:49:00 +0000 |
| commit | 47e87c8739d7f0d420ea6a01fea99e638414baeb (patch) | |
| tree | 263b48701f7ef8a1333a2f92e9650547071c92b1 /src | |
| parent | b9df2d1ad1e80745350e25fd44ddaa0f0c6bcbab (diff) | |
| parent | 34599bff512e523373c9ca9c3355c57f8da006c6 (diff) | |
| download | garage-47e87c8739d7f0d420ea6a01fea99e638414baeb.tar.gz garage-47e87c8739d7f0d420ea6a01fea99e638414baeb.zip | |
Merge pull request 'upgrade Rust compiler and Cargo dependencies' (#951) from nix-crane into main
Reviewed-on: https://git.deuxfleurs.fr/Deuxfleurs/garage/pulls/951
Diffstat (limited to 'src')
| -rw-r--r-- | src/block/layout.rs | 3 | ||||
| -rw-r--r-- | src/model/helper/locked.rs | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/block/layout.rs b/src/block/layout.rs index e78f3f08..00e3debb 100644 --- a/src/block/layout.rs +++ b/src/block/layout.rs @@ -279,7 +279,8 @@ impl DataLayout { u16::from_be_bytes([ hash.as_slice()[HASH_DRIVE_BYTES.0], hash.as_slice()[HASH_DRIVE_BYTES.1], - ]) as usize % DRIVE_NPART + ]) as usize + % DRIVE_NPART } fn block_dir_from(&self, hash: &Hash, dir: &PathBuf) -> PathBuf { diff --git a/src/model/helper/locked.rs b/src/model/helper/locked.rs index 4f8b6e44..43f4f363 100644 --- a/src/model/helper/locked.rs +++ b/src/model/helper/locked.rs @@ -279,7 +279,8 @@ impl<'a> LockedHelper<'a> { .local_aliases .get(alias_name) .cloned() - .flatten() != Some(bucket_id) + .flatten() + != Some(bucket_id) { return Err(GarageError::Message(format!( "Bucket {:?} does not have alias {} in namespace of key {}", |