From 2a65c4f1724d559f4ad953f468a6c96caed4b486 Mon Sep 17 00:00:00 2001 From: Jonathan Kelley Date: Thu, 30 Jan 2025 22:40:58 -0800 Subject: [PATCH] clippy --- packages/desktop/src/protocol.rs | 2 +- packages/dioxus/src/launch.rs | 13 +++++++++---- packages/native/src/assets.rs | 2 +- packages/native/src/contexts.rs | 2 +- packages/native/src/dioxus_application.rs | 2 +- packages/native/src/dioxus_document.rs | 5 ++--- packages/native/src/mutation_writer.rs | 9 +++++---- 7 files changed, 20 insertions(+), 15 deletions(-) diff --git a/packages/desktop/src/protocol.rs b/packages/desktop/src/protocol.rs index 08a953681f..4fbf2a6b46 100644 --- a/packages/desktop/src/protocol.rs +++ b/packages/desktop/src/protocol.rs @@ -63,7 +63,7 @@ pub(super) fn desktop_handler( } } - match dioxus_asset_resolver::serve_asset_from_raw_path(&request.uri().path()) { + match dioxus_asset_resolver::serve_asset_from_raw_path(request.uri().path()) { Ok(res) => responder.respond(res), Err(_e) => responder.respond( Response::builder() diff --git a/packages/dioxus/src/launch.rs b/packages/dioxus/src/launch.rs index a1a986ed9a..e7ece209e0 100644 --- a/packages/dioxus/src/launch.rs +++ b/packages/dioxus/src/launch.rs @@ -41,10 +41,13 @@ use crate::prelude::*; /// /// # Example /// ```rust, no_run -/// use dioxus::prelude::*; +/// # use dioxus::prelude::*; /// -/// fn main() { -/// dioxus::launch(app); +/// dioxus::launch(app); +/// fn app() -> Element { +/// rsx! { +/// div { "Hello, world!" } +/// } /// } /// ``` pub fn launch(app: fn() -> Element) { @@ -219,6 +222,8 @@ impl LaunchBuilder { } /// Launch your application. + /// + #[allow(clippy::diverging_sub_expression)] pub fn launch(self, app: fn() -> Element) { let Self { platform, @@ -231,7 +236,7 @@ impl LaunchBuilder { dioxus_logger::initialize_default(); // Set any flags if we're running under fullstack - #[cfg(all(feature = "fullstack"))] + #[cfg(feature = "fullstack")] { use dioxus_fullstack::prelude::server_fn::client::{get_server_url, set_server_url}; diff --git a/packages/native/src/assets.rs b/packages/native/src/assets.rs index ca61f3d36f..c59d1bd35c 100644 --- a/packages/native/src/assets.rs +++ b/packages/native/src/assets.rs @@ -41,7 +41,7 @@ impl NetProvider for DioxusNativeNetProvider { handler: blitz_traits::net::BoxedHandler, ) { if request.url.scheme() == "dioxus" { - match dioxus_asset_resolver::serve_asset_from_raw_path(&request.url.path()) { + match dioxus_asset_resolver::serve_asset_from_raw_path(request.url.path()) { Ok(res) => { println!("fetching asset from file system success {request:#?}"); handler.bytes(doc_id, res.into_body().into(), self.callback.clone()) diff --git a/packages/native/src/contexts.rs b/packages/native/src/contexts.rs index 4cafa61425..0cc6c5ab39 100644 --- a/packages/native/src/contexts.rs +++ b/packages/native/src/contexts.rs @@ -31,7 +31,7 @@ impl Document for DioxusNativeDocument { DioxusNativeEvent::CreateHeadElement { name: name.to_string(), attributes: attributes - .into_iter() + .iter() .map(|(name, value)| (name.to_string(), value.clone())) .collect(), contents, diff --git a/packages/native/src/dioxus_application.rs b/packages/native/src/dioxus_application.rs index b843583aef..57129c9a49 100644 --- a/packages/native/src/dioxus_application.rs +++ b/packages/native/src/dioxus_application.rs @@ -60,7 +60,7 @@ impl DioxusNativeApplication { contents, window, } => { - if let Some(window) = self.inner.windows.get_mut(&window) { + if let Some(window) = self.inner.windows.get_mut(window) { window.doc.create_head_element(name, attributes, contents); window.poll(); } diff --git a/packages/native/src/dioxus_document.rs b/packages/native/src/dioxus_document.rs index 4ad531f95a..8c3199aa69 100644 --- a/packages/native/src/dioxus_document.rs +++ b/packages/native/src/dioxus_document.rs @@ -505,8 +505,7 @@ impl DioxusDocument { title = attributes .iter() .find(|(name, _value)| name == "text") - .map(|(_name, _value)| contents.clone()) - .flatten(); + .and_then(|(_name, _value)| contents.clone()); } let attributes = attributes @@ -525,7 +524,7 @@ impl DioxusDocument { ))); if let Some(contents) = contents { - let text_node = self.inner.create_text_node(&contents); + let text_node = self.inner.create_text_node(contents); self.inner .get_node_mut(new_elememt) .unwrap() diff --git a/packages/native/src/mutation_writer.rs b/packages/native/src/mutation_writer.rs index 36ffa4fe60..6150ccfa4f 100644 --- a/packages/native/src/mutation_writer.rs +++ b/packages/native/src/mutation_writer.rs @@ -166,13 +166,13 @@ impl MutationWriter<'_> { // } if let Some(src_attr) = node.attr(local_name!("src")) { - crate::assets::fetch_image(&self.doc, id, src_attr.to_string()); + crate::assets::fetch_image(self.doc, id, src_attr.to_string()); } let rel_attr = node.attr(local_name!("rel")); let href_attr = node.attr(local_name!("href")); if let (Some("stylesheet"), Some(href)) = (rel_attr, href_attr) { - crate::assets::fetch_linked_stylesheet(&self.doc, id, href.to_string()); + crate::assets::fetch_linked_stylesheet(self.doc, id, href.to_string()); } for &child_id in &child_ids { @@ -239,6 +239,7 @@ impl WriteMutations for MutationWriter<'_> { self.state.stack.push(node_id); } + #[allow(clippy::map_entry)] fn load_template(&mut self, template: Template, index: usize, id: ElementId) { if !self.state.templates.contains_key(&template) { let template_root_ids: Vec = template @@ -420,11 +421,11 @@ impl WriteMutations for MutationWriter<'_> { } if let Some(queued_image) = queued_image { - crate::assets::fetch_image(&self.doc, node_id, queued_image); + crate::assets::fetch_image(self.doc, node_id, queued_image); } if let Some(queued_stylesheet) = queued_stylesheet { - crate::assets::fetch_linked_stylesheet(&self.doc, node_id, queued_stylesheet); + crate::assets::fetch_linked_stylesheet(self.doc, node_id, queued_stylesheet); } }