diff --git a/tooling/cli/src/interface/mod.rs b/tooling/cli/src/interface/mod.rs index c5805cbac0a..3ab53af0286 100644 --- a/tooling/cli/src/interface/mod.rs +++ b/tooling/cli/src/interface/mod.rs @@ -95,7 +95,7 @@ pub trait Interface: Sized { options: Options, on_exit: F, ) -> crate::Result<()>; - fn mobile_dev crate::Result>>( + fn mobile_dev crate::Result>>( &mut self, options: MobileOptions, runner: R, diff --git a/tooling/cli/src/interface/rust.rs b/tooling/cli/src/interface/rust.rs index 239a2a48ed1..ed1e92fb1d6 100644 --- a/tooling/cli/src/interface/rust.rs +++ b/tooling/cli/src/interface/rust.rs @@ -197,7 +197,7 @@ impl Interface for Rust { } } - fn mobile_dev crate::Result>>( + fn mobile_dev crate::Result>>( &mut self, mut options: MobileOptions, runner: R, @@ -431,7 +431,7 @@ impl Rust { options: Options, run_args: Vec, on_exit: F, - ) -> crate::Result> { + ) -> crate::Result> { desktop::run_dev( options, run_args, @@ -441,10 +441,10 @@ impl Rust { self.product_name.clone(), on_exit, ) - .map(|c| Box::new(c) as Box) + .map(|c| Box::new(c) as Box) } - fn run_dev_watcher crate::Result>>( + fn run_dev_watcher crate::Result>>( &mut self, config: Option, run: Arc, diff --git a/tooling/cli/src/migrate/manifest.rs b/tooling/cli/src/migrate/manifest.rs index 22024f9898d..54673d91766 100644 --- a/tooling/cli/src/migrate/manifest.rs +++ b/tooling/cli/src/migrate/manifest.rs @@ -225,6 +225,7 @@ mod tests { .as_array() .expect("features must be an array") .clone(); + if toml.contains("reqwest-native-tls-vendored") { assert!( features @@ -233,10 +234,22 @@ mod tests { "reqwest-native-tls-vendored was not replaced with native-tls-vendored" ); } + + if toml.contains("system-tray") { + assert!( + features + .iter() + .any(|f| f.as_str().expect("feature must be a string") == "tray-icon"), + "system-tray was not replaced with tray-icon" + ); + } + for feature in features.iter() { let feature = feature.as_str().expect("feature must be a string"); assert!( - keep_features.contains(&feature) || feature == "native-tls-vendored", + keep_features.contains(&feature) + || feature == "native-tls-vendored" + || feature == "tray-icon", "feature {feature} should have been removed" ); } diff --git a/tooling/cli/src/mobile/android/dev.rs b/tooling/cli/src/mobile/android/dev.rs index 058d8da7e80..5f739f06765 100644 --- a/tooling/cli/src/mobile/android/dev.rs +++ b/tooling/cli/src/mobile/android/dev.rs @@ -235,7 +235,7 @@ fn run_dev( crate::dev::wait_dev_process(c.clone(), move |status, reason| { crate::dev::on_app_exit(status, reason, exit_on_panic, no_watch) }); - Ok(Box::new(c) as Box) + Ok(Box::new(c) as Box) } Err(e) => { crate::dev::kill_before_dev_process(); diff --git a/tooling/cli/src/mobile/ios/dev.rs b/tooling/cli/src/mobile/ios/dev.rs index ec866cdc5d0..1e2b9ede52c 100644 --- a/tooling/cli/src/mobile/ios/dev.rs +++ b/tooling/cli/src/mobile/ios/dev.rs @@ -221,7 +221,7 @@ fn run_dev( crate::dev::wait_dev_process(c.clone(), move |status, reason| { crate::dev::on_app_exit(status, reason, exit_on_panic, no_watch) }); - Ok(Box::new(c) as Box) + Ok(Box::new(c) as Box) } Err(e) => { crate::dev::kill_before_dev_process();