From 067296ffaba746ccb56477647799069ff78b7380 Mon Sep 17 00:00:00 2001 From: Paul Campbell Date: Tue, 6 Aug 2024 16:15:56 +0100 Subject: [PATCH] refactor: cleanup pedantic clippy in forge-forgejo crate --- crates/forge-forgejo/Cargo.toml | 18 +++++++++--------- crates/forge-forgejo/src/lib.rs | 14 +++++++------- crates/forge-forgejo/src/tests.rs | 16 +++++++++------- crates/forge-forgejo/src/webhook/mod.rs | 4 ++-- .../src/webhook/{parse.rs => parser.rs} | 0 crates/forge-forgejo/src/webhook/register.rs | 9 ++++----- crates/forge-forgejo/src/webhook/unregister.rs | 2 +- 7 files changed, 32 insertions(+), 31 deletions(-) rename crates/forge-forgejo/src/webhook/{parse.rs => parser.rs} (100%) diff --git a/crates/forge-forgejo/Cargo.toml b/crates/forge-forgejo/Cargo.toml index 7c26dde..ca5a478 100644 --- a/crates/forge-forgejo/Cargo.toml +++ b/crates/forge-forgejo/Cargo.toml @@ -6,6 +6,15 @@ license = { workspace = true } repository = { workspace = true } description = "Forgejo support for git-next, the trunk-based development manager" +[lints.clippy] +nursery = { level = "warn", priority = -1 } +pedantic = { level = "warn", priority = -1 } +unwrap_used = "warn" +expect_used = "warn" + +[lints.rust] +unexpected_cfgs = { level = "warn", check-cfg = ['cfg(tarpaulin_include)'] } + [dependencies] git-next-core = { workspace = true } @@ -32,12 +41,3 @@ tokio = { workspace = true } # Testing assert2 = { workspace = true } rand = { workspace = true } - -[lints.clippy] -nursery = { level = "warn", priority = -1 } -# pedantic = "warn" -unwrap_used = "warn" -expect_used = "warn" - -[lints.rust] -unexpected_cfgs = { level = "warn", check-cfg = ['cfg(tarpaulin_include)'] } diff --git a/crates/forge-forgejo/src/lib.rs b/crates/forge-forgejo/src/lib.rs index e5f07fd..b6a5b08 100644 --- a/crates/forge-forgejo/src/lib.rs +++ b/crates/forge-forgejo/src/lib.rs @@ -4,6 +4,8 @@ mod tests; mod webhook; +use std::borrow::ToOwned; + use git_next_core::{ self as core, git::{self, forge::commit::Status}, @@ -20,6 +22,7 @@ pub struct ForgeJo { net: Network, } impl ForgeJo { + #[must_use] pub const fn new(repo_details: git::RepoDetails, net: Network) -> Self { Self { repo_details, net } } @@ -37,10 +40,9 @@ impl git::ForgeLike for ForgeJo { let authorization = msg.header("authorization"); tracing::info!(?authorization, %expected, "is message authorised?"); authorization - .and_then(|header| header.strip_prefix("Basic ").map(|v| v.to_owned())) + .and_then(|header| header.strip_prefix("Basic ").map(ToOwned::to_owned)) .and_then(|value| WebhookAuth::try_new(value.as_str()).ok()) - .map(|auth| &auth == expected) - .unwrap_or(false) + .is_some_and(|auth| &auth == expected) } fn parse_webhook_body( @@ -75,10 +77,8 @@ impl git::ForgeLike for ForgeJo { Ok(response) => match response.response_body() { Some(status) => match status.state { ForgejoState::Success => Status::Pass, - ForgejoState::Pending => Status::Pending, - ForgejoState::Failure => Status::Fail, - ForgejoState::Error => Status::Fail, - ForgejoState::Blank => Status::Pending, + ForgejoState::Pending | ForgejoState::Blank => Status::Pending, + ForgejoState::Failure | ForgejoState::Error => Status::Fail, }, None => { #[cfg(not(tarpaulin_include))] diff --git a/crates/forge-forgejo/src/tests.rs b/crates/forge-forgejo/src/tests.rs index fbb0d61..30045ae 100644 --- a/crates/forge-forgejo/src/tests.rs +++ b/crates/forge-forgejo/src/tests.rs @@ -284,7 +284,7 @@ mod forgejo { let forge = given::a_forgejo_forge(&repo_details, net); - let_assert!(Ok(_) = forge.unregister_webhook(&webhook_id).await); + let_assert!(Ok(()) = forge.unregister_webhook(&webhook_id).await); } #[tokio::test] @@ -397,13 +397,15 @@ mod forgejo { repo_path, token, }; - let hook1 = with::ReturnedWebhook::new(given::a_forgejo_webhook_id(), &repo_listen_url); - let hook2 = with::ReturnedWebhook::new(given::a_forgejo_webhook_id(), &repo_listen_url); - let hook3 = with::ReturnedWebhook::new( + let hook_1 = + with::ReturnedWebhook::new(given::a_forgejo_webhook_id(), &repo_listen_url); + let hook_2 = + with::ReturnedWebhook::new(given::a_forgejo_webhook_id(), &repo_listen_url); + let hook_3 = with::ReturnedWebhook::new( given::a_forgejo_webhook_id(), &given::a_repo_listen_url(&repo_details), ); - let hooks = [hook1, hook2, hook3]; + let hooks = [hook_1, hook_2, hook_3]; // there are three existing webhooks, two are matching webhooks with::get_webhooks_by_page(1, &hooks, &mut args); @@ -585,7 +587,7 @@ mod forgejo { a_commit_status_url(repo_details, commit).as_str(), StatusCode::OK, response.to_string().as_str(), - ) + ); } pub fn a_commit_status_url( @@ -709,7 +711,7 @@ mod forgejo { a_name(), a_name(), a_name(), - Default::default(), // no repos + BTreeMap::default(), // no repos ) } diff --git a/crates/forge-forgejo/src/webhook/mod.rs b/crates/forge-forgejo/src/webhook/mod.rs index 74b2755..e004e2f 100644 --- a/crates/forge-forgejo/src/webhook/mod.rs +++ b/crates/forge-forgejo/src/webhook/mod.rs @@ -4,12 +4,12 @@ use git_next_core::{git, webhook, BranchName, WebhookId}; use std::collections::HashMap; mod list; -mod parse; +mod parser; mod register; mod unregister; pub use list::list; -pub use parse::parse_body; +pub use parser::parse_body; pub use register::register; pub use unregister::unregister; diff --git a/crates/forge-forgejo/src/webhook/parse.rs b/crates/forge-forgejo/src/webhook/parser.rs similarity index 100% rename from crates/forge-forgejo/src/webhook/parse.rs rename to crates/forge-forgejo/src/webhook/parser.rs diff --git a/crates/forge-forgejo/src/webhook/register.rs b/crates/forge-forgejo/src/webhook/register.rs index 0d7a017..c2160dd 100644 --- a/crates/forge-forgejo/src/webhook/register.rs +++ b/crates/forge-forgejo/src/webhook/register.rs @@ -1,14 +1,14 @@ -use git_next_core::server::RepoListenUrl; // -use git_next_core::{git, RegisteredWebhook, WebhookAuth, WebhookId}; +use git_next_core::{git, server::RepoListenUrl, RegisteredWebhook, WebhookAuth, WebhookId}; use kxio::network; -use tracing::{info, warn}; +use secrecy::ExposeSecret as _; +use tracing::{info, instrument, warn}; use crate::webhook; use crate::webhook::Hook; -#[tracing::instrument(skip_all)] +#[instrument(skip_all)] pub async fn register( repo_details: &git::RepoDetails, repo_listen_url: &RepoListenUrl, @@ -26,7 +26,6 @@ pub async fn register( let hostname = &repo_details.forge.hostname(); let repo_path = &repo_details.repo_path; - use secrecy::ExposeSecret; let token = repo_details.forge.token().expose_secret(); let url = network::NetUrl::new(format!( "https://{hostname}/api/v1/repos/{repo_path}/hooks?token={token}" diff --git a/crates/forge-forgejo/src/webhook/unregister.rs b/crates/forge-forgejo/src/webhook/unregister.rs index f32cd2e..135b260 100644 --- a/crates/forge-forgejo/src/webhook/unregister.rs +++ b/crates/forge-forgejo/src/webhook/unregister.rs @@ -2,6 +2,7 @@ use git_next_core::{git, WebhookId}; use kxio::network; +use secrecy::ExposeSecret as _; pub async fn unregister( webhook_id: &WebhookId, @@ -10,7 +11,6 @@ pub async fn unregister( ) -> git::forge::webhook::Result<()> { let hostname = &repo_details.forge.hostname(); let repo_path = &repo_details.repo_path; - use secrecy::ExposeSecret; let token = repo_details.forge.token().expose_secret(); let url = network::NetUrl::new(format!( "https://{hostname}/api/v1/repos/{repo_path}/hooks/{webhook_id}?token={token}"