From f2e4d57d69f4ecba7ee20b8e03b0ba86c7410fe4 Mon Sep 17 00:00:00 2001 From: yggverse Date: Sat, 18 Jan 2025 14:27:19 +0200 Subject: [PATCH] apply clippy corrections --- .../browser/window/tab/item/page/client/request.rs | 2 +- .../window/tab/item/page/client/request/feature.rs | 8 ++------ .../window/tab/item/page/client/request/gemini.rs | 12 ++++-------- 3 files changed, 7 insertions(+), 15 deletions(-) diff --git a/src/app/browser/window/tab/item/page/client/request.rs b/src/app/browser/window/tab/item/page/client/request.rs index 876ede32..465c2256 100644 --- a/src/app/browser/window/tab/item/page/client/request.rs +++ b/src/app/browser/window/tab/item/page/client/request.rs @@ -79,7 +79,7 @@ impl Request { referrer: _, uri, } - | Self::Titan(uri) => &uri, + | Self::Titan(uri) => uri, } } } diff --git a/src/app/browser/window/tab/item/page/client/request/feature.rs b/src/app/browser/window/tab/item/page/client/request/feature.rs index 4026bd7c..8a01c454 100644 --- a/src/app/browser/window/tab/item/page/client/request/feature.rs +++ b/src/app/browser/window/tab/item/page/client/request/feature.rs @@ -3,7 +3,9 @@ const DOWNLOAD: &str = "download:"; const SOURCE: &str = "source:"; /// Feature wrapper for client `Request` +#[derive(Default)] pub enum Feature { + #[default] Default, Download, Source, @@ -37,9 +39,3 @@ impl Feature { } } } - -impl Default for Feature { - fn default() -> Self { - Feature::Default - } -} diff --git a/src/app/browser/window/tab/item/page/client/request/gemini.rs b/src/app/browser/window/tab/item/page/client/request/gemini.rs index 5c4ea8e2..9003acd2 100644 --- a/src/app/browser/window/tab/item/page/client/request/gemini.rs +++ b/src/app/browser/window/tab/item/page/client/request/gemini.rs @@ -89,10 +89,7 @@ fn handle( Ok(text) => callback(Response::TextGemini { base, source: text.data, - is_source_request: match feature { - Feature::Source => true, - _ => false, - }, + is_source_request: matches!(feature, Feature::Source), }), Err(e) => callback(Response::Failure(Failure::Mime { base, @@ -177,7 +174,7 @@ fn redirect( // [Gemini protocol specifications](https://geminiprotocol.net/docs/protocol-specification.gmi#redirection) if referrer.len() > 5 { return Response::Failure(Failure::Error { - message: format!("Max redirection count reached"), + message: "Max redirection count reached".to_string(), }); } match data { @@ -190,9 +187,8 @@ fn redirect( || base.host() != target.host() { return Response::Failure(Failure::Error { - message: format!( - "External redirects not allowed by protocol specification" - ), + message: "External redirects not allowed by protocol specification" + .to_string(), }); // @TODO placeholder page with optional link open button }