diff --git a/Cargo.toml b/Cargo.toml
index c869267b1..24493e787 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -2,7 +2,7 @@
 name = "dioxus-cli"
 version = "0.1.4"
 authors = ["Jonathan Kelley"]
-edition = "2018"
+edition = "2021"
 description = "CLI tool for developing, testing, and publishing Dioxus apps"
 license = "MIT/Apache-2.0"
 
diff --git a/rustfmt.toml b/rustfmt.toml
index 9071fb4b5..39b98f125 100644
--- a/rustfmt.toml
+++ b/rustfmt.toml
@@ -1,8 +1,8 @@
 version = "Two"
-edition = "2018"
+edition = "2021"
 
 imports_granularity = "Crate"
 #use_small_heuristics = "Max"
 #control_brace_style = "ClosingNextLine"
 normalize_comments = true
-format_code_in_doc_comments = true
\ No newline at end of file
+format_code_in_doc_comments = true
diff --git a/src/server/mod.rs b/src/server/mod.rs
index 1df13ca6a..ada3e10c7 100644
--- a/src/server/mod.rs
+++ b/src/server/mod.rs
@@ -79,7 +79,7 @@ pub async fn startup(config: CrateConfig) -> Result<()> {
     let file_service_config = config.clone();
     let file_service = ServiceBuilder::new()
         .and_then(
-            |response: Response<ServeFileSystemResponseBody>| async move {
+            move |response: Response<ServeFileSystemResponseBody>| async move {
                 let response = if file_service_config
                     .dioxus_config
                     .web