diff options
| author | Alex Auvolat <alex@adnab.me> | 2024-02-08 19:02:48 +0100 |
|---|---|---|
| committer | Alex Auvolat <alex@adnab.me> | 2024-02-08 23:29:57 +0100 |
| commit | bcbd15da84181ad94ece7e794933a6ebd388f5bc (patch) | |
| tree | c7b21f8b5d9c800f3a0be5f1ca26a0c956c63288 | |
| parent | ad5ce968d212d951f7459c36bcbdd78ce39be585 (diff) | |
| download | garage-bcbd15da84181ad94ece7e794933a6ebd388f5bc.tar.gz garage-bcbd15da84181ad94ece7e794933a6ebd388f5bc.zip | |
[dep-upgrade-202402] cargo clippy fixes
| -rw-r--r-- | src/garage/cli/convert_db.rs | 4 | ||||
| -rw-r--r-- | src/garage/secrets.rs | 4 | ||||
| -rw-r--r-- | src/garage/tests/common/custom_requester.rs | 4 | ||||
| -rw-r--r-- | src/garage/tests/s3/website.rs | 6 | ||||
| -rw-r--r-- | src/k2v-client/lib.rs | 2 |
5 files changed, 9 insertions, 11 deletions
diff --git a/src/garage/cli/convert_db.rs b/src/garage/cli/convert_db.rs index 044ccbb9..6b854ccb 100644 --- a/src/garage/cli/convert_db.rs +++ b/src/garage/cli/convert_db.rs @@ -67,8 +67,8 @@ fn open_db(path: PathBuf, engine: Engine, open: &OpenDbOpt) -> Result<Db> { #[cfg(feature = "sqlite")] Engine::Sqlite => { let db = sqlite_adapter::rusqlite::Connection::open(&path)?; - db.pragma_update(None, "journal_mode", &"WAL")?; - db.pragma_update(None, "synchronous", &"NORMAL")?; + db.pragma_update(None, "journal_mode", "WAL")?; + db.pragma_update(None, "synchronous", "NORMAL")?; Ok(sqlite_adapter::SqliteDb::init(db)) } #[cfg(feature = "lmdb")] diff --git a/src/garage/secrets.rs b/src/garage/secrets.rs index e96be9e4..8c89a262 100644 --- a/src/garage/secrets.rs +++ b/src/garage/secrets.rs @@ -213,10 +213,10 @@ mod tests { }; use std::os::unix::fs::PermissionsExt; - let metadata = std::fs::metadata(&path_secret_path)?; + let metadata = std::fs::metadata(path_secret_path)?; let mut perm = metadata.permissions(); perm.set_mode(0o660); - std::fs::set_permissions(&path_secret_path, perm)?; + std::fs::set_permissions(path_secret_path, perm)?; // Config file that just specifies the path let config = read_config(path_config.to_path_buf())?; diff --git a/src/garage/tests/common/custom_requester.rs b/src/garage/tests/common/custom_requester.rs index 72fb1a46..e5f4cca1 100644 --- a/src/garage/tests/common/custom_requester.rs +++ b/src/garage/tests/common/custom_requester.rs @@ -205,8 +205,8 @@ impl<'a> RequestBuilder<'a> { all_headers.insert("x-amz-content-sha256".to_owned(), body_sha.clone()); let mut signed_headers = all_headers - .iter() - .map(|(k, _)| k.as_ref()) + .keys() + .map(|k| k.as_ref()) .collect::<Vec<&str>>(); signed_headers.sort(); let signed_headers = signed_headers.join(";"); diff --git a/src/garage/tests/s3/website.rs b/src/garage/tests/s3/website.rs index 19f53fcd..0cadc388 100644 --- a/src/garage/tests/s3/website.rs +++ b/src/garage/tests/s3/website.rs @@ -61,8 +61,7 @@ async fn test_website() { .method("GET") .uri(format!( "http://127.0.0.1:{0}/check?domain={1}", - ctx.garage.admin_port, - BCKT_NAME.to_string() + ctx.garage.admin_port, BCKT_NAME )) .body(Body::new(Bytes::new())) .unwrap() @@ -136,8 +135,7 @@ async fn test_website() { .method("GET") .uri(format!( "http://127.0.0.1:{0}/check?domain={1}", - ctx.garage.admin_port, - BCKT_NAME.to_string() + ctx.garage.admin_port, BCKT_NAME )) .body(Body::new(Bytes::new())) .unwrap() diff --git a/src/k2v-client/lib.rs b/src/k2v-client/lib.rs index 13538909..852274a7 100644 --- a/src/k2v-client/lib.rs +++ b/src/k2v-client/lib.rs @@ -10,7 +10,7 @@ use http::header::{ACCEPT, CONTENT_TYPE}; use http::status::StatusCode; use http::{HeaderName, HeaderValue, Request}; use http_body_util::{BodyExt, Full as FullBody}; -use hyper::{body::Body as BodyTrait, body::Bytes}; +use hyper::body::Bytes; use hyper_rustls::HttpsConnector; use hyper_util::client::legacy::{connect::HttpConnector, Client as HttpClient}; use hyper_util::rt::TokioExecutor; |