refactor(cli): reduce some nesting code

crates/tauri-cli/src/dev.rs

@@ -241,9 +241,7 @@ pub fn setup(
           .canonicalize()
           .fs_context("failed to canonicalize path", path.to_path_buf())?;
 
-        let ip = options
-          .host
-          .unwrap_or_else(|| Ipv4Addr::new(127, 0, 0, 1).into());
+        let ip = options.host.unwrap_or_else(|| Ipv4Addr::LOCALHOST.into());
 
         let server_url = builtin_dev_server::start(path, ip, options.port)
           .context("failed to start builtin dev server")?;

crates/tauri-cli/src/interface/rust.rs

@@ -29,7 +29,7 @@ use tauri_utils::config::{parse::is_configuration_file, DeepLinkProtocol, Runner
 
 use super::{AppSettings, DevProcess, ExitReason};
 use crate::{
-  error::{Context, Error, ErrorExt},
+  error::{bail, Context, Error, ErrorExt},
   helpers::{
     app_paths::Dirs,
     config::{nsis_settings, reload_config, wix_settings, BundleResources, Config, ConfigMetadata},
@@ -144,9 +144,10 @@ impl Rust {
         }
       })
       .unwrap();
+      let manifest_path = tauri_dir.join("Cargo.toml");
       watcher
-        .watch(tauri_dir.join("Cargo.toml"), RecursiveMode::NonRecursive)
-        .with_context(|| format!("failed to watch {}", tauri_dir.join("Cargo.toml").display()))?;
+        .watch(&manifest_path, RecursiveMode::NonRecursive)
+        .with_context(|| format!("failed to watch {}", manifest_path.display()))?;
       let (manifest, modified) = rewrite_manifest(config, tauri_dir)?;
       if modified {
         // Wait for the modified event so we don't trigger a re-build later on
@@ -553,43 +554,46 @@ impl Rust {
       }
     }
 
-    loop {
-      if let Ok(events) = rx.recv() {
-        for event in events {
-          if event.kind.is_access() {
-            continue;
-          }
+    while let Ok(events) = rx.recv() {
+      for event in events {
+        if event.kind.is_access() {
+          continue;
+        }
+
+        let Some(event_path) = event.paths.first() else {
+          continue;
+        };
+
+        if ignore_matcher.is_ignore(event_path, event_path.is_dir()) {
+          continue;
+        }
 
-          if let Some(event_path) = event.paths.first() {
-            if !ignore_matcher.is_ignore(event_path, event_path.is_dir()) {
-              if is_configuration_file(self.app_settings.target_platform, event_path)
-                && reload_config(config, merge_configs, dirs.tauri).is_ok()
-              {
-                let (manifest, modified) = rewrite_manifest(config, dirs.tauri)?;
-                if modified {
-                  *self.app_settings.manifest.lock().unwrap() = manifest;
-                  // no need to run the watcher logic, the manifest was modified
-                  // and it will trigger the watcher again
-                  continue;
-                }
-              }
-
-              log::info!(
-                "File {} changed. Rebuilding application...",
-                display_path(event_path.strip_prefix(dirs.frontend).unwrap_or(event_path))
-              );
-
-              child.kill().context("failed to kill app process")?;
-
-              // wait for the process to exit
-              // note that on mobile, kill() already waits for the process to exit (duct implementation)
-              let _ = child.wait();
-              child = run(self, config)?;
-            }
+        if is_configuration_file(self.app_settings.target_platform, event_path)
+          && reload_config(config, merge_configs, dirs.tauri).is_ok()
+        {
+          let (manifest, modified) = rewrite_manifest(config, dirs.tauri)?;
+          if modified {
+            *self.app_settings.manifest.lock().unwrap() = manifest;
+            // no need to run the watcher logic, the manifest was modified
+            // and it will trigger the watcher again
+            continue;
           }
         }
+
+        log::info!(
+          "File {} changed. Rebuilding application...",
+          display_path(event_path.strip_prefix(dirs.frontend).unwrap_or(event_path))
+        );
+
+        child.kill().context("failed to kill app process")?;
+
+        // wait for the process to exit
+        // note that on mobile, kill() already waits for the process to exit (duct implementation)
+        let _ = child.wait();
+        child = run(self, config)?;
       }
     }
+    bail!("File watcher exited unexpectedly")
   }
 }