diff options
| author | Alex <lx@deuxfleurs.fr> | 2025-02-03 15:54:54 +0000 |
|---|---|---|
| committer | Alex <lx@deuxfleurs.fr> | 2025-02-03 15:54:54 +0000 |
| commit | b9df2d1ad1e80745350e25fd44ddaa0f0c6bcbab (patch) | |
| tree | 02ca809d1305f8f76eedfac145fb843489d65d35 /src | |
| parent | 4dc2bc337f10be616a141ba8b52564038ef3ae41 (diff) | |
| parent | 390a5d97fece744bcad3c5b7b7d31b2722d0b092 (diff) | |
| download | garage-b9df2d1ad1e80745350e25fd44ddaa0f0c6bcbab.tar.gz garage-b9df2d1ad1e80745350e25fd44ddaa0f0c6bcbab.zip | |
Merge pull request 'compile with crane' (#950) from nix-crane into main
Reviewed-on: https://git.deuxfleurs.fr/Deuxfleurs/garage/pulls/950
Diffstat (limited to 'src')
| -rw-r--r-- | src/block/layout.rs | 3 | ||||
| -rw-r--r-- | src/model/helper/locked.rs | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/src/block/layout.rs b/src/block/layout.rs index 00e3debb..e78f3f08 100644 --- a/src/block/layout.rs +++ b/src/block/layout.rs @@ -279,8 +279,7 @@ 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 43f4f363..4f8b6e44 100644 --- a/src/model/helper/locked.rs +++ b/src/model/helper/locked.rs @@ -279,8 +279,7 @@ 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 {}", |