From 03bfdfb4ef3d144a364e8465ed1c285f1f14f49f Mon Sep 17 00:00:00 2001
From: Alex Auvolat <alex@adnab.me>
Date: Wed, 13 Apr 2022 17:41:55 +0200
Subject: [PATCH] Fix clippy

---
 src/api/generic_server.rs   | 2 +-
 src/api/s3/api_server.rs    | 6 +++---
 src/model/garage.rs         | 3 +--
 src/model/k2v/item_table.rs | 1 +
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/api/generic_server.rs b/src/api/generic_server.rs
index d4b3f8f1..1d00e681 100644
--- a/src/api/generic_server.rs
+++ b/src/api/generic_server.rs
@@ -23,7 +23,7 @@ use crate::error::*;
 
 pub(crate) trait ApiEndpoint: Send + Sync + 'static {
 	fn name(&self) -> &'static str;
-	fn add_span_attributes<'a>(&self, span: SpanRef<'a>);
+	fn add_span_attributes(&self, span: SpanRef<'_>);
 }
 
 #[async_trait]
diff --git a/src/api/s3/api_server.rs b/src/api/s3/api_server.rs
index a83f1048..e3b28e37 100644
--- a/src/api/s3/api_server.rs
+++ b/src/api/s3/api_server.rs
@@ -9,8 +9,8 @@ use hyper::{Body, Method, Request, Response};
 
 use opentelemetry::{trace::SpanRef, KeyValue};
 
-use garage_util::error::Error as GarageError;
 use garage_table::util::*;
+use garage_util::error::Error as GarageError;
 
 use garage_model::garage::Garage;
 use garage_model::key_table::Key;
@@ -96,7 +96,7 @@ impl ApiHandler for S3ApiServer {
 			.and_then(|root_domain| host_to_bucket(&host, root_domain));
 
 		let (endpoint, bucket_name) =
-			Endpoint::from_request(&req, bucket_name.map(ToOwned::to_owned))?;
+			Endpoint::from_request(req, bucket_name.map(ToOwned::to_owned))?;
 
 		Ok(S3ApiEndpoint {
 			bucket_name,
@@ -432,7 +432,7 @@ impl ApiEndpoint for S3ApiEndpoint {
 		self.endpoint.name()
 	}
 
-	fn add_span_attributes<'a>(&self, span: SpanRef<'a>) {
+	fn add_span_attributes(&self, span: SpanRef<'_>) {
 		span.set_attribute(KeyValue::new(
 			"bucket",
 			self.bucket_name.clone().unwrap_or_default(),
diff --git a/src/model/garage.rs b/src/model/garage.rs
index c0723bcb..7132ca37 100644
--- a/src/model/garage.rs
+++ b/src/model/garage.rs
@@ -151,8 +151,7 @@ impl Garage {
 		);
 
 		// ---- K2V tables ----
-		let k2v_item_table =
-			Table::new(K2VItemTable {}, meta_rep_param.clone(), system.clone(), &db);
+		let k2v_item_table = Table::new(K2VItemTable {}, meta_rep_param, system.clone(), &db);
 
 		info!("Initialize Garage...");
 
diff --git a/src/model/k2v/item_table.rs b/src/model/k2v/item_table.rs
index 0fa9e0ac..3b79ebc9 100644
--- a/src/model/k2v/item_table.rs
+++ b/src/model/k2v/item_table.rs
@@ -203,6 +203,7 @@ impl TableSchema for K2VItemTable {
 		// nothing for now
 	}
 
+	#[allow(clippy::nonminimal_bool)]
 	fn matches_filter(entry: &Self::E, filter: &Self::Filter) -> bool {
 		let v = entry.values();
 		!(filter.conflicts_only && v.len() < 2)