From 714c6dd46ff383abfa749e6c3d9d82bbbfd6bdb5 Mon Sep 17 00:00:00 2001
From: YuKun Liu <41265098+mrxiaozhuox@users.noreply.github.com>
Date: Sun, 17 Apr 2022 11:24:17 +0800
Subject: [PATCH] Upgrade `axum` version

---
 Cargo.toml           |  2 +-
 src/builder.rs       |  8 ++++----
 src/cli/serve/mod.rs | 15 ++++-----------
 3 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 5f5ded9be..21e2dad7e 100644
--- a/Cargo.toml
+++ b/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
diff --git a/src/builder.rs b/src/builder.rs
index aaaa0278a..09a410458 100644
--- a/src/builder.rs
+++ b/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)
             }
         };
 
diff --git a/src/cli/serve/mod.rs b/src/cli/serve/mod.rs
index 21d29cd93..85bd92c74 100644
--- a/src/cli/serve/mod.rs
+++ b/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(());