fix(cli): clippy warnings on macOS

tauri-apps · Apr 13, 2024 · b60d74b · b60d74b
1 parent 32b2133
commit b60d74b
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 15 deletions.
diff --git a/tooling/bundler/src/bundle/macos/ios.rs b/tooling/bundler/src/bundle/macos/ios.rs
@@ -16,7 +16,7 @@
 use crate::{bundle::common, Settings};
 
 use anyhow::Context;
-use image::{self, codecs::png::PngDecoder, GenericImageView, ImageDecoder};
+use image::{codecs::png::PngDecoder, GenericImageView, ImageDecoder};
 
 use std::{
   collections::BTreeSet,

diff --git a/tooling/bundler/src/bundle/updater_bundle.rs b/tooling/bundler/src/bundle/updater_bundle.rs
@@ -19,7 +19,7 @@ use tauri_utils::display_path;
 
 use std::{
   fs::{self, File},
-  io::{prelude::*, Write},
+  io::prelude::*,
   path::{Path, PathBuf},
 };
 

diff --git a/tooling/cli/src/build.rs b/tooling/cli/src/build.rs
@@ -203,7 +203,7 @@ pub fn setup(
   }
 
   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
@@ -288,14 +288,9 @@ pub fn setup(
   }
 
   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

diff --git a/tooling/cli/src/helpers/cargo.rs b/tooling/cli/src/helpers/cargo.rs
@@ -63,13 +63,13 @@ pub fn install_one(options: CargoInstallOptions) -> crate::Result<()> {
 
     match (options.tag, options.rev, options.branch) {
       (Some(tag), None, None) => {
-        cargo.args(["--tag", &tag]);
+        cargo.args(["--tag", tag]);
       }
       (None, Some(rev), None) => {
-        cargo.args(["--rev", &rev]);
+        cargo.args(["--rev", rev]);
       }
       (None, None, Some(branch)) => {
-        cargo.args(["--branch", &branch]);
+        cargo.args(["--branch", branch]);
       }
       (None, None, None) => {}
       _ => anyhow::bail!("Only one of --tag, --rev and --branch can be specified"),

diff --git a/tooling/cli/src/interface/rust/manifest.rs b/tooling/cli/src/interface/rust/manifest.rs
@@ -15,7 +15,6 @@ use std::{
   collections::{HashMap, HashSet},
   fs::File,
   io::{Read, Write},
-  iter::FromIterator,
   path::Path,
 };
 

diff --git a/tooling/cli/src/mobile/mod.rs b/tooling/cli/src/mobile/mod.rs
@@ -293,7 +293,7 @@ pub fn get_app(config: &TauriConfig, interface: &AppInterface) -> App {
     domain.push('.');
   }
   if domain.is_empty() {
-    domain = config.identifier.clone();
+    domain.clone_from(&config.identifier);
     if domain.is_empty() {
       log::error!("Bundle identifier set in `tauri.conf.json > identifier` cannot be empty");
       exit(1);