Merge branch 'master' into intigrate-collect-assets

packages/cli/src/cli/bundle.rs

@@ -145,10 +145,10 @@ impl Bundle {
             .project_out_directory(crate_config.out_dir)
             .package_settings(PackageSettings {
                 product_name: crate_config.dioxus_config.application.name.clone(),
-                version: package.version,
-                description: package.description.unwrap_or_default(),
-                homepage: package.homepage,
-                authors: Some(package.authors),
+                version: package.version().to_string(),
+                description: package.description().unwrap_or_default().to_string(),
+                homepage: Some(package.homepage().unwrap_or_default().to_string()),
+                authors: Some(Vec::from(package.authors())),
                 default_run: Some(crate_config.dioxus_config.application.name.clone()),
             })
             .binaries(binaries)

packages/cli/src/server/desktop/mod.rs

@@ -81,7 +81,6 @@ async fn serve<P: Platform + Send + 'static>(
     let _watcher = setup_file_watcher(
         {
             let config = config.clone();
-
             move || platform.write().unwrap().rebuild(&config)
         },
         &config,
@@ -90,7 +89,7 @@ async fn serve<P: Platform + Send + 'static>(
     )
     .await?;
 
-    match &hot_reload_state {
+    match hot_reload_state {
         Some(hot_reload_state) => {
             // The open interprocess sockets
             start_desktop_hot_reload(hot_reload_state).await?;
@@ -103,7 +102,7 @@ async fn serve<P: Platform + Send + 'static>(
     Ok(())
 }
 
-async fn start_desktop_hot_reload(hot_reload_state: &HotReloadState) -> Result<()> {
+async fn start_desktop_hot_reload(hot_reload_state: HotReloadState) -> Result<()> {
     match LocalSocketListener::bind("@dioxusin") {
         Ok(local_socket_stream) => {
             let aborted = Arc::new(Mutex::new(false));