aboutsummaryrefslogtreecommitdiff
path: root/src/model
diff options
context:
space:
mode:
authorAlex <alex@adnab.me>2023-03-13 18:34:33 +0000
committerAlex <alex@adnab.me>2023-03-13 18:34:33 +0000
commit703ac43f1c7c0538ac72a06afc16ad182c3aaba1 (patch)
tree7ae124a8b7165edab933bc9649baf9c126e95c92 /src/model
parentd6ffa57f4054c41c37a06686330e0080f8243430 (diff)
parent000006d689d2d8075599fbe1653605566ae9d36e (diff)
downloadgarage-703ac43f1c7c0538ac72a06afc16ad182c3aaba1.tar.gz
garage-703ac43f1c7c0538ac72a06afc16ad182c3aaba1.zip
Merge pull request 'Prepare for v0.8.2' (#530) from prepare-v082 into main
Reviewed-on: https://git.deuxfleurs.fr/Deuxfleurs/garage/pulls/530
Diffstat (limited to 'src/model')
-rw-r--r--src/model/Cargo.toml12
-rw-r--r--src/model/k2v/item_table.rs1
-rw-r--r--src/model/s3/object_table.rs1
3 files changed, 6 insertions, 8 deletions
diff --git a/src/model/Cargo.toml b/src/model/Cargo.toml
index d1c7cd29..2b525a42 100644
--- a/src/model/Cargo.toml
+++ b/src/model/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "garage_model"
-version = "0.8.1"
+version = "0.8.2"
authors = ["Alex Auvolat <alex@adnab.me>"]
edition = "2018"
license = "AGPL-3.0"
@@ -14,11 +14,11 @@ path = "lib.rs"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies]
-garage_db = { version = "0.8.1", default-features = false, path = "../db" }
-garage_rpc = { version = "0.8.1", path = "../rpc" }
-garage_table = { version = "0.8.1", path = "../table" }
-garage_block = { version = "0.8.1", path = "../block" }
-garage_util = { version = "0.8.1", path = "../util" }
+garage_db = { version = "0.8.2", default-features = false, path = "../db" }
+garage_rpc = { version = "0.8.2", path = "../rpc" }
+garage_table = { version = "0.8.2", path = "../table" }
+garage_block = { version = "0.8.2", path = "../block" }
+garage_util = { version = "0.8.2", path = "../util" }
async-trait = "0.1.7"
arc-swap = "1.0"
diff --git a/src/model/k2v/item_table.rs b/src/model/k2v/item_table.rs
index 84c05db5..9e3ba5a5 100644
--- a/src/model/k2v/item_table.rs
+++ b/src/model/k2v/item_table.rs
@@ -269,7 +269,6 @@ impl CountedItem for K2VItem {
&self.partition.partition_key
}
- #[allow(clippy::bool_to_int_with_if)]
fn counts(&self) -> Vec<(&'static str, i64)> {
let values = self.values();
diff --git a/src/model/s3/object_table.rs b/src/model/s3/object_table.rs
index 29614dc5..518acc95 100644
--- a/src/model/s3/object_table.rs
+++ b/src/model/s3/object_table.rs
@@ -355,7 +355,6 @@ impl CountedItem for Object {
fn counts(&self) -> Vec<(&'static str, i64)> {
let versions = self.versions();
- #[allow(clippy::bool_to_int_with_if)]
let n_objects = if versions.iter().any(|v| v.is_data()) {
1
} else {