diff options
| author | Alex <lx@deuxfleurs.fr> | 2025-01-13 10:19:53 +0000 |
|---|---|---|
| committer | Alex <lx@deuxfleurs.fr> | 2025-01-13 10:19:53 +0000 |
| commit | 39ac034de55c7040b61a08ecb95c58afa983501c (patch) | |
| tree | 9776372019bdc60906e65e0021a09bf4b5d856c5 /src | |
| parent | 4b1a7fb5e3c2f6a58780165955e49d8e24a1d018 (diff) | |
| parent | 8ddb0dd485cf8290b7e3462f5614ca6d858ea8c3 (diff) | |
| download | garage-39ac034de55c7040b61a08ecb95c58afa983501c.tar.gz garage-39ac034de55c7040b61a08ecb95c58afa983501c.zip | |
Merge pull request 'update toolchain' (#924) from nix-update into main
Reviewed-on: https://git.deuxfleurs.fr/Deuxfleurs/garage/pulls/924
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 f8e06add..b541d548 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 {}", |