From e11f3fdc484fb22a4983467d846c99479606227c Mon Sep 17 00:00:00 2001 From: Evan Almloff Date: Wed, 15 Nov 2023 09:30:15 -0600 Subject: [PATCH] fix clippy --- packages/cli-config/src/lib.rs | 2 +- packages/cli/src/server/web/mod.rs | 5 +---- packages/cli/src/server/web/proxy.rs | 4 ++-- packages/core/src/diff.rs | 2 +- packages/rsx/src/lib.rs | 2 +- 5 files changed, 6 insertions(+), 9 deletions(-) diff --git a/packages/cli-config/src/lib.rs b/packages/cli-config/src/lib.rs index 776d1d10c..da7446918 100644 --- a/packages/cli-config/src/lib.rs +++ b/packages/cli-config/src/lib.rs @@ -47,7 +47,7 @@ pub static CURRENT_CONFIG: once_cell::sync::Lazy< Result, > = once_cell::sync::Lazy::new(|| { CURRENT_CONFIG_JSON - .and_then(|config| serde_json::from_str(&config).ok()) + .and_then(|config| serde_json::from_str(config).ok()) .ok_or_else(|| { tracing::error!("A library is trying to access the crate's configuration, but the dioxus CLI was not used to build the application."); DioxusCLINotUsed diff --git a/packages/cli/src/server/web/mod.rs b/packages/cli/src/server/web/mod.rs index b38c535f4..5ebc66772 100644 --- a/packages/cli/src/server/web/mod.rs +++ b/packages/cli/src/server/web/mod.rs @@ -313,10 +313,7 @@ async fn setup_router( router = if let Some(base_path) = config.dioxus_config.web.app.base_path.clone() { let base_path = format!("/{}", base_path.trim_matches('/')); Router::new() - .nest( - &base_path, - axum::routing::any_service(router), - ) + .nest(&base_path, axum::routing::any_service(router)) .fallback(get(move || { let base_path = base_path.clone(); async move { format!("Outside of the base path: {}", base_path) } diff --git a/packages/cli/src/server/web/proxy.rs b/packages/cli/src/server/web/proxy.rs index d7b4837e8..4242a55eb 100644 --- a/packages/cli/src/server/web/proxy.rs +++ b/packages/cli/src/server/web/proxy.rs @@ -1,6 +1,6 @@ -use crate::{Result,}; +use crate::Result; use dioxus_cli_config::WebProxyConfig; - + use anyhow::Context; use axum::{http::StatusCode, routing::any, Router}; use hyper::{Request, Response, Uri}; diff --git a/packages/core/src/diff.rs b/packages/core/src/diff.rs index 74017db0f..b2145a806 100644 --- a/packages/core/src/diff.rs +++ b/packages/core/src/diff.rs @@ -560,7 +560,7 @@ impl<'b> VirtualDom { // If none of the old keys are reused by the new children, then we remove all the remaining old children and // create the new children afresh. if shared_keys.is_empty() { - if old.get(0).is_some() { + if !old.is_empty() { self.remove_nodes(&old[1..]); self.replace(&old[0], new); } else { diff --git a/packages/rsx/src/lib.rs b/packages/rsx/src/lib.rs index bdf32b272..5db6baee9 100644 --- a/packages/rsx/src/lib.rs +++ b/packages/rsx/src/lib.rs @@ -193,7 +193,7 @@ impl<'a> ToTokens for TemplateRenderer<'a> { fn to_tokens(&self, out_tokens: &mut TokenStream2) { let mut context = DynamicContext::default(); - let key = match self.roots.get(0) { + let key = match self.roots.first() { Some(BodyNode::Element(el)) if self.roots.len() == 1 => el.key.clone(), Some(BodyNode::Component(comp)) if self.roots.len() == 1 => comp.key().cloned(), _ => None,