From e162e3e4cf0ef723d39f49f090ac8932d003eed5 Mon Sep 17 00:00:00 2001 From: Evan Almloff Date: Mon, 21 Aug 2023 16:07:49 -0500 Subject: [PATCH] fix formatting --- packages/cli/src/builder.rs | 12 ++++++++---- packages/cli/src/cli/serve.rs | 9 +++++++-- packages/cli/src/server/desktop/mod.rs | 2 +- packages/cli/src/server/web/mod.rs | 11 ++++++++--- 4 files changed, 24 insertions(+), 10 deletions(-) diff --git a/packages/cli/src/builder.rs b/packages/cli/src/builder.rs index c7acd9aaa..1a537c049 100644 --- a/packages/cli/src/builder.rs +++ b/packages/cli/src/builder.rs @@ -241,7 +241,7 @@ pub fn build(config: &CrateConfig, quiet: bool, skip_assets: bool) -> Result Result Result { +pub fn build_desktop( + config: &CrateConfig, + _is_serve: bool, + skip_assets: bool, +) -> Result { log::info!("🚅 Running build [Desktop] command..."); let t_start = std::time::Instant::now(); @@ -353,7 +357,7 @@ pub fn build_desktop(config: &CrateConfig, _is_serve: bool, skip_assets: bool) - } } - if !skip_assets{ + if !skip_assets { // Collect assets process_assets(config)?; // Create the __assets_head.html file for bundling @@ -494,7 +498,7 @@ pub fn gen_page(config: &CrateConfig, serve: bool, skip_assets: bool) -> String { style_str.push_str("\n"); } - if !skip_assets{ + if !skip_assets { let manifest = config.asset_manifest(); style_str.push_str(&manifest.head()); } diff --git a/packages/cli/src/cli/serve.rs b/packages/cli/src/cli/serve.rs index aa7380060..62ff8a955 100644 --- a/packages/cli/src/cli/serve.rs +++ b/packages/cli/src/cli/serve.rs @@ -46,8 +46,13 @@ impl Serve { Serve::regen_dev_page(&crate_config, self.serve.skip_assets)?; // start the develop server - server::web::startup(self.serve.port, crate_config.clone(), self.serve.open, self.serve.skip_assets) - .await?; + server::web::startup( + self.serve.port, + crate_config.clone(), + self.serve.open, + self.serve.skip_assets, + ) + .await?; } cfg::Platform::Desktop => { server::desktop::startup(crate_config.clone(), &serve_cfg).await?; diff --git a/packages/cli/src/server/desktop/mod.rs b/packages/cli/src/server/desktop/mod.rs index 94ae7c8c7..7c38fd674 100644 --- a/packages/cli/src/server/desktop/mod.rs +++ b/packages/cli/src/server/desktop/mod.rs @@ -237,7 +237,7 @@ pub(crate) struct DesktopPlatform { } impl Platform for DesktopPlatform { - fn start(config: &CrateConfig,serve: &ConfigOptsServe) -> Result { + fn start(config: &CrateConfig, serve: &ConfigOptsServe) -> Result { let (child, first_build_result) = start_desktop(config, serve.skip_assets)?; log::info!("🚀 Starting development server..."); diff --git a/packages/cli/src/server/web/mod.rs b/packages/cli/src/server/web/mod.rs index 16d57d6fd..297e252fa 100644 --- a/packages/cli/src/server/web/mod.rs +++ b/packages/cli/src/server/web/mod.rs @@ -47,7 +47,12 @@ struct WsReloadState { update: broadcast::Sender<()>, } -pub async fn startup(port: u16, config: CrateConfig, start_browser: bool, skip_assets: bool) -> Result<()> { +pub async fn startup( + port: u16, + config: CrateConfig, + start_browser: bool, + skip_assets: bool, +) -> Result<()> { // ctrl-c shutdown checker let _crate_config = config.clone(); let _ = ctrlc::set_handler(move || { @@ -72,7 +77,7 @@ async fn serve_default( port: u16, config: CrateConfig, start_browser: bool, - skip_assets: bool + skip_assets: bool, ) -> Result<()> { let first_build_result = crate::builder::build(&config, false, skip_assets)?; @@ -134,7 +139,7 @@ async fn serve_hot_reload( port: u16, config: CrateConfig, start_browser: bool, - skip_assets: bool + skip_assets: bool, ) -> Result<()> { let first_build_result = crate::builder::build(&config, false, skip_assets)?;