From f3b3c0698b2a33a309e35e2fea2d5a3777264a0d Mon Sep 17 00:00:00 2001 From: Evan Almloff Date: Tue, 18 Jul 2023 12:43:02 -0700 Subject: [PATCH] fix clippy --- packages/cli/src/cli/build.rs | 11 ++++------- packages/cli/src/cli/serve.rs | 11 ++++------- packages/cli/src/server/web/mod.rs | 4 ++-- packages/core/src/scopes.rs | 4 ++-- 4 files changed, 12 insertions(+), 18 deletions(-) diff --git a/packages/cli/src/cli/build.rs b/packages/cli/src/cli/build.rs index 29edf301b..3053a6e5a 100644 --- a/packages/cli/src/cli/build.rs +++ b/packages/cli/src/cli/build.rs @@ -32,13 +32,10 @@ impl Build { crate_config.set_features(self.build.features.unwrap()); } - let platform = self.build.platform.unwrap_or_else(|| { - crate_config - .dioxus_config - .application - .default_platform - .clone() - }); + let platform = self + .build + .platform + .unwrap_or(crate_config.dioxus_config.application.default_platform); #[cfg(feature = "plugin")] let _ = PluginManager::on_build_start(&crate_config, &platform); diff --git a/packages/cli/src/cli/serve.rs b/packages/cli/src/cli/serve.rs index a5d69c7cc..433d611b7 100644 --- a/packages/cli/src/cli/serve.rs +++ b/packages/cli/src/cli/serve.rs @@ -34,13 +34,10 @@ impl Serve { // Subdirectories don't work with the server crate_config.dioxus_config.web.app.base_path = None; - let platform = self.serve.platform.unwrap_or_else(|| { - crate_config - .dioxus_config - .application - .default_platform - .clone() - }); + let platform = self + .serve + .platform + .unwrap_or(crate_config.dioxus_config.application.default_platform); match platform { cfg::Platform::Web => { diff --git a/packages/cli/src/server/web/mod.rs b/packages/cli/src/server/web/mod.rs index 28ffa28c0..e08d2297a 100644 --- a/packages/cli/src/server/web/mod.rs +++ b/packages/cli/src/server/web/mod.rs @@ -473,7 +473,7 @@ async fn ws_handler( } fn build(config: &CrateConfig, reload_tx: &Sender<()>) -> Result { - let result = builder::build(&config, true)?; + let result = builder::build(config, true)?; // change the websocket reload state to true; // the page will auto-reload. if config @@ -483,7 +483,7 @@ fn build(config: &CrateConfig, reload_tx: &Sender<()>) -> Result { .reload_html .unwrap_or(false) { - let _ = Serve::regen_dev_page(&config); + let _ = Serve::regen_dev_page(config); } let _ = reload_tx.send(()); Ok(result) diff --git a/packages/core/src/scopes.rs b/packages/core/src/scopes.rs index ff94c456d..87e894ef3 100644 --- a/packages/core/src/scopes.rs +++ b/packages/core/src/scopes.rs @@ -688,13 +688,13 @@ impl<'src> ScopeState { raw_ref.downcast_mut::() }) .expect( - r###" + r#" Unable to retrieve the hook that was initialized at this index. Consult the `rules of hooks` to understand how to use hooks properly. You likely used the hook in a conditional. Hooks rely on consistent ordering between renders. Functions prefixed with "use" should never be called conditionally. - "###, + "#, ) } }