swaits/dioxus
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix merge conflict causing CLI lifetime to be wrong

Browse Source
This commit is contained in:
Jonathan Kelley committed 2024-12-10 17:08:45 -08:00
1 parent d89ab3cfad
commit e598cfe31c
1 file changed
+2 -2
Download Patch File Download Diff File Expand all files Collapse all files
packages/cli/src/serve/handle.rs
+2 -2
View File
@@ -195,7 +195,7 @@ impl AppHandle {
// The asset might've been renamed thanks to the manifest, let's attempt to reload that too // The asset might've been renamed thanks to the manifest, let's attempt to reload that too
if let Some(resource) = self.app.app.assets.assets.get(&changed_file).as_ref() { if let Some(resource) = self.app.app.assets.assets.get(&changed_file).as_ref() {
let res = std::fs::copy(changed_file, asset_dir.join(resource.bundled_path())); let res = std::fs::copy(&changed_file, asset_dir.join(resource.bundled_path()));
bundled_name = Some(PathBuf::from(resource.bundled_path())); bundled_name = Some(PathBuf::from(resource.bundled_path()));
if let Err(e) = res { if let Err(e) = res {
tracing::debug!("Failed to hotreload asset {e}"); tracing::debug!("Failed to hotreload asset {e}");
@@ -209,7 +209,7 @@ impl AppHandle {
tracing::debug!("Pushing asset to device: {target}"); tracing::debug!("Pushing asset to device: {target}");
let res = tokio::process::Command::new("adb") let res = tokio::process::Command::new("adb")
.arg("push") .arg("push")
.arg(changed_file) .arg(&changed_file)
.arg(target) .arg(target)
.output() .output()
.await .await