Bladeren bron

Upgrade `axum` version

YuKun Liu 3 jaren geleden
bovenliggende
commit
714c6dd46f
3 gewijzigde bestanden met toevoegingen van 9 en 16 verwijderingen
  1. 1 1
      Cargo.toml
  2. 4 4
      src/builder.rs
  3. 4 11
      src/cli/serve/mod.rs

+ 1 - 1
Cargo.toml

@@ -36,7 +36,7 @@ chrono = "0.4.19"
 anyhow = "1.0.53"
 hyper = "0.14.17"
 
-axum = { version = "0.4.5", features = ["ws", "headers"] }
+axum = { version = "0.5.1", features = ["ws", "headers"] }
 tower-http = { version = "0.2.2", features = ["fs", "trace"] }
 headers = "0.3.7"
 # tools download

+ 4 - 4
src/builder.rs

@@ -206,16 +206,16 @@ pub fn build_desktop(config: &CrateConfig, is_serve: bool) -> Result<()> {
                 file_name = name.clone();
                 config
                     .target_dir
-                    .join(release_type.to_string())
-                    .join(name.to_string())
+                    .join(release_type)
+                    .join(name)
             }
             crate::ExecutableType::Example(name) => {
                 file_name = name.clone();
                 config
                     .target_dir
-                    .join(release_type.to_string())
+                    .join(release_type)
                     .join("examples")
-                    .join(name.to_string())
+                    .join(name)
             }
         };
 

+ 4 - 11
src/cli/serve/mod.rs

@@ -1,9 +1,9 @@
+use super::*;
 use std::{
     io::Write,
     path::PathBuf,
     process::{Command, Stdio},
 };
-use super::*;
 
 /// Run the WASM project on dev-server
 #[derive(Clone, Debug, Parser)]
@@ -47,16 +47,9 @@ impl Serve {
                         if cfg!(windows) {
                             file.set_extension("exe");
                         }
-                        Command::new(
-                            crate_config
-                                .out_dir
-                                .join(file)
-                                .to_str()
-                                .unwrap()
-                                .to_string(),
-                        )
-                        .stdout(Stdio::inherit())
-                        .output()?;
+                        Command::new(crate_config.out_dir.join(file).to_str().unwrap())
+                            .stdout(Stdio::inherit())
+                            .output()?;
                     }
                 }
                 return Ok(());