diff --git a/.cargo/config b/.cargo/config.toml similarity index 100% rename from .cargo/config rename to .cargo/config.toml diff --git a/core/tauri/src/async_runtime.rs b/core/tauri/src/async_runtime.rs index 01c7083be47..17a554be2f7 100644 --- a/core/tauri/src/async_runtime.rs +++ b/core/tauri/src/async_runtime.rs @@ -42,7 +42,7 @@ impl GlobalRuntime { } } - fn spawn(&self, task: F) -> JoinHandle + fn spawn(&self, task: F) -> JoinHandle where F: Future + Send + 'static, F::Output: Send + 'static, @@ -96,7 +96,7 @@ impl Runtime { } /// Spawns a future onto the runtime. - pub fn spawn(&self, task: F) -> JoinHandle + pub fn spawn(&self, task: F) -> JoinHandle where F: Future + Send + 'static, F::Output: Send + 'static, @@ -189,7 +189,7 @@ impl RuntimeHandle { } /// Spawns a future onto the runtime. - pub fn spawn(&self, task: F) -> JoinHandle + pub fn spawn(&self, task: F) -> JoinHandle where F: Future + Send + 'static, F::Output: Send + 'static, diff --git a/tooling/cli/Cargo.toml b/tooling/cli/Cargo.toml index 02f31182916..eb4ea1d090a 100644 --- a/tooling/cli/Cargo.toml +++ b/tooling/cli/Cargo.toml @@ -6,7 +6,7 @@ name = "tauri-cli" version = "1.5.12" authors = [ "Tauri Programme within The Commons Conservancy" ] edition = "2021" -rust-version = "1.60" +rust-version = "1.70" categories = [ "gui", "web-programming" ] license = "Apache-2.0 OR MIT" homepage = "https://tauri.app" diff --git a/tooling/cli/src/build.rs b/tooling/cli/src/build.rs index d8fc8d162f5..dc961006014 100644 --- a/tooling/cli/src/build.rs +++ b/tooling/cli/src/build.rs @@ -160,7 +160,7 @@ pub fn command(mut options: Options, verbosity: u8) -> Result<()> { } if options.runner.is_none() { - options.runner = config_.build.runner.clone(); + options.runner.clone_from(&config_.build.runner); } options diff --git a/tooling/cli/src/dev.rs b/tooling/cli/src/dev.rs index 67a048e7407..d63398d0d83 100644 --- a/tooling/cli/src/dev.rs +++ b/tooling/cli/src/dev.rs @@ -192,14 +192,9 @@ fn command_internal(mut options: Options) -> Result<()> { } if options.runner.is_none() { - options.runner = config - .lock() - .unwrap() - .as_ref() - .unwrap() - .build + options .runner - .clone(); + .clone_from(&config.lock().unwrap().as_ref().unwrap().build.runner); } let mut cargo_features = config