From 1111fa86642a19cbc9cc16b54680dcd5c25e5fcb Mon Sep 17 00:00:00 2001 From: arcstur Date: Sun, 3 Sep 2023 21:09:37 -0300 Subject: fix: clippy warning on single_match_else It seems this is a `single_match_else` and not a `single_match`. Now clippy shows no warnings. --- src/edit.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/edit.rs b/src/edit.rs index aa8c7b1..178e188 100644 --- a/src/edit.rs +++ b/src/edit.rs @@ -30,7 +30,7 @@ pub fn edit(contents: &str, help: &str) -> Result { let editor = std::path::Path::new(&editor); let mut editor_args = vec![]; - #[allow(clippy::single_match)] // more to come + #[allow(clippy::single_match_else)] // more to come match editor.file_name() { Some(editor) => match editor.to_str() { Some("vim" | "nvim") => { -- cgit v1.2.3-54-g00ecf From ae1ce97bdaf76bbdf3a885dd1b8ccd66965c2b66 Mon Sep 17 00:00:00 2001 From: arcstur Date: Sun, 3 Sep 2023 21:32:43 -0300 Subject: fix: cargo fmt --- src/bin/rbw-agent/actions.rs | 31 ++++++++++--------------------- 1 file changed, 10 insertions(+), 21 deletions(-) diff --git a/src/bin/rbw-agent/actions.rs b/src/bin/rbw-agent/actions.rs index 58432b1..ff39510 100644 --- a/src/bin/rbw-agent/actions.rs +++ b/src/bin/rbw-agent/actions.rs @@ -10,8 +10,7 @@ pub async fn register( let url_str = config_base_url().await?; let url = reqwest::Url::parse(&url_str) .context("failed to parse base url")?; - let Some(host) = url.host_str() - else { + let Some(host) = url.host_str() else { return Err(anyhow::anyhow!( "couldn't find host in rbw base url {}", url_str @@ -88,8 +87,7 @@ pub async fn login( let url_str = config_base_url().await?; let url = reqwest::Url::parse(&url_str) .context("failed to parse base url")?; - let Some(host) = url.host_str() - else { + let Some(host) = url.host_str() else { return Err(anyhow::anyhow!( "couldn't find host in rbw base url {}", url_str @@ -330,8 +328,7 @@ async fn login_success( sync(None, state.clone()).await?; let db = load_db().await?; - let Some(protected_private_key) = db.protected_private_key - else { + let Some(protected_private_key) = db.protected_private_key else { return Err(anyhow::anyhow!( "failed to find protected private key in db" )); @@ -369,15 +366,11 @@ pub async fn unlock( if state.lock().await.needs_unlock() { let db = load_db().await?; - let Some(kdf) = db.kdf - else { - return Err(anyhow::anyhow!( - "failed to find kdf type in db" - )); + let Some(kdf) = db.kdf else { + return Err(anyhow::anyhow!("failed to find kdf type in db")); }; - let Some(iterations) = db.iterations - else { + let Some(iterations) = db.iterations else { return Err(anyhow::anyhow!( "failed to find number of iterations in db" )); @@ -386,14 +379,12 @@ pub async fn unlock( let memory = db.memory; let parallelism = db.parallelism; - let Some(protected_key) = db.protected_key - else { + let Some(protected_key) = db.protected_key else { return Err(anyhow::anyhow!( "failed to find protected key in db" )); }; - let Some(protected_private_key) = db.protected_private_key - else { + let Some(protected_private_key) = db.protected_private_key else { return Err(anyhow::anyhow!( "failed to find protected private key in db" )); @@ -543,8 +534,7 @@ pub async fn decrypt( org_id: Option<&str>, ) -> anyhow::Result<()> { let state = state.lock().await; - let Some(keys) = state.key(org_id) - else { + let Some(keys) = state.key(org_id) else { return Err(anyhow::anyhow!( "failed to find decryption keys in in-memory state" )); @@ -570,8 +560,7 @@ pub async fn encrypt( org_id: Option<&str>, ) -> anyhow::Result<()> { let state = state.lock().await; - let Some(keys) = state.key(org_id) - else { + let Some(keys) = state.key(org_id) else { return Err(anyhow::anyhow!( "failed to find encryption keys in in-memory state" )); -- cgit v1.2.3-54-g00ecf From ece824ed8fcf6eaf8096267fa1eaeb64faa4e89e Mon Sep 17 00:00:00 2001 From: arcstur Date: Sun, 3 Sep 2023 21:44:28 -0300 Subject: fix: update webpki dependency version These updates fix vulnerabilities: * https://rustsec.org/advisories/RUSTSEC-2023-0052 * https://rustsec.org/advisories/RUSTSEC-2023-0053 --- Cargo.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 7d4d24b..850a8de 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1564,9 +1564,9 @@ dependencies = [ [[package]] name = "rustls-webpki" -version = "0.101.1" +version = "0.101.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15f36a6828982f422756984e47912a7a51dcbc2a197aa791158f8ca61cd8204e" +checksum = "7d93931baf2d282fff8d3a532bbfd7653f734643161b87e3e01e59a04439bf0d" dependencies = [ "ring", "untrusted", @@ -2324,9 +2324,9 @@ dependencies = [ [[package]] name = "webpki" -version = "0.22.0" +version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f095d78192e208183081cc07bc5515ef55216397af48b873e5edcd72637fa1bd" +checksum = "f0e74f82d49d545ad128049b7e88f6576df2da6b02e9ce565c6f533be576957e" dependencies = [ "ring", "untrusted", -- cgit v1.2.3-54-g00ecf