diff --git a/crates/cuddle-please-frontend/src/gatheres/execution_env.rs b/crates/cuddle-please-frontend/src/gatheres/execution_env.rs index bb97a9e..f3ba9fe 100644 --- a/crates/cuddle-please-frontend/src/gatheres/execution_env.rs +++ b/crates/cuddle-please-frontend/src/gatheres/execution_env.rs @@ -40,7 +40,7 @@ pub fn get_from_environment(vars: std::env::Vars) -> PleaseConfigBuilder { } pub fn detect_environment(vars: &HashMap) -> ExecutionEnvironment { - if let Some(_) = vars.get("DRONE".into()) { + if vars.get("DRONE").is_some() { return ExecutionEnvironment::Drone; } diff --git a/crates/cuddle-please-frontend/src/lib.rs b/crates/cuddle-please-frontend/src/lib.rs index 011efa4..2da616d 100644 --- a/crates/cuddle-please-frontend/src/lib.rs +++ b/crates/cuddle-please-frontend/src/lib.rs @@ -25,19 +25,19 @@ pub struct PleaseConfig { } impl PleaseConfig { - pub fn get_owner<'a>(&'a self) -> &'a str { + pub fn get_owner(&self) -> &str { &self.project.owner } - pub fn get_repository<'a>(&'a self) -> &'a str { + pub fn get_repository(&self) -> &str { &self.project.repository } - pub fn get_source<'a>(&'a self) -> &'a PathBuf { + pub fn get_source(&self) -> &PathBuf { &self.project.source } - pub fn get_branch<'a>(&'a self) -> &'a str { + pub fn get_branch(&self) -> &str { &self.project.branch } - pub fn get_api_url<'a>(&'a self) -> &'a str { + pub fn get_api_url(&self) -> &str { &self.settings.api_url } } @@ -90,6 +90,6 @@ impl PleaseConfigBuilder { a.merge(x).clone() }); - Ok(final_config.try_into()?) + final_config.try_into() } } diff --git a/crates/cuddle-please-frontend/src/stage0_config.rs b/crates/cuddle-please-frontend/src/stage0_config.rs index 9108101..5bb78f8 100644 --- a/crates/cuddle-please-frontend/src/stage0_config.rs +++ b/crates/cuddle-please-frontend/src/stage0_config.rs @@ -1,4 +1,4 @@ -use std::{default, path::PathBuf}; +use std::path::PathBuf; use serde::{Deserialize, Serialize}; @@ -35,7 +35,7 @@ impl PleaseConfigBuilder { Some(settings) => settings, }; - if let Some(mut project) = config.project { + if let Some(project) = config.project { if let Some(owner) = project.owner { fproject.owner = Some(owner); } @@ -51,7 +51,7 @@ impl PleaseConfigBuilder { self.project = Some(fproject); } - if let Some(mut settings) = config.settings { + if let Some(settings) = config.settings { if let Some(api_url) = settings.api_url { fsettings.api_url = Some(api_url); } diff --git a/crates/cuddle-please/src/command.rs b/crates/cuddle-please/src/command.rs index 5584577..6e8176d 100644 --- a/crates/cuddle-please/src/command.rs +++ b/crates/cuddle-please/src/command.rs @@ -8,7 +8,7 @@ use std::{ use ::semver::Version; use anyhow::Context; use clap::{Args, Parser, Subcommand}; -use cuddle_please_frontend::{gatheres::ConfigArgs, PleaseConfig, PleaseConfigBuilder}; +use cuddle_please_frontend::{gatheres::ConfigArgs, PleaseConfigBuilder}; use crate::{ cliff::{self, changelog_parser}, diff --git a/crates/cuddle-please/src/gitea_client.rs b/crates/cuddle-please/src/gitea_client.rs index 1330731..2003b72 100644 --- a/crates/cuddle-please/src/gitea_client.rs +++ b/crates/cuddle-please/src/gitea_client.rs @@ -10,8 +10,7 @@ pub struct GiteaClient { pub allow_insecure: bool, } -const APP_USER_AGENT: &str = - concat!(env!("CARGO_PKG_NAME"), "/", env!("CARGO_PKG_VERSION"),); +const APP_USER_AGENT: &str = concat!(env!("CARGO_PKG_NAME"), "/", env!("CARGO_PKG_VERSION"),); impl GiteaClient { pub fn new(url: impl Into, token: Option>) -> Self { diff --git a/crates/cuddle-please/src/ui.rs b/crates/cuddle-please/src/ui.rs index e6a5da4..5043dc4 100644 --- a/crates/cuddle-please/src/ui.rs +++ b/crates/cuddle-please/src/ui.rs @@ -24,8 +24,6 @@ impl ConsoleUi { } } - - impl From for DynUi { fn from(value: ConsoleUi) -> Self { Box::new(value) diff --git a/crates/cuddle-please/tests/common/mod.rs b/crates/cuddle-please/tests/common/mod.rs index 6af2050..d66e3f6 100644 --- a/crates/cuddle-please/tests/common/mod.rs +++ b/crates/cuddle-please/tests/common/mod.rs @@ -85,8 +85,6 @@ impl Ui for BufferUi { } } - - impl Default for BufferUi { fn default() -> Self { Self {