From 69414a487ff680875cff5924c39efc01e2f501c8 Mon Sep 17 00:00:00 2001
From: Lucas Nogueira <lucas@tauri.studio>
Date: Wed, 9 Nov 2022 11:38:08 -0300
Subject: [PATCH] chore(cli): lint

---
 examples/api/src-tauri/Cargo.lock         | 19 ++-----------------
 examples/api/src-tauri/Cargo.toml         |  3 ---
 tooling/cli/src/interface/rust/desktop.rs |  2 +-
 tooling/cli/src/mobile/ios/build.rs       |  7 +++----
 tooling/cli/src/mobile/ios/project.rs     |  2 +-
 5 files changed, 7 insertions(+), 26 deletions(-)

diff --git a/examples/api/src-tauri/Cargo.lock b/examples/api/src-tauri/Cargo.lock
index e604447b0..bd54e02d6 100644
--- a/examples/api/src-tauri/Cargo.lock
+++ b/examples/api/src-tauri/Cargo.lock
@@ -103,7 +103,6 @@ version = "0.1.0"
 dependencies = [
  "android_logger",
  "env_logger 0.9.3",
- "jni 0.19.0",
  "log",
  "serde",
  "serde_json",
@@ -1501,20 +1500,6 @@ dependencies = [
  "walkdir",
 ]
 
-[[package]]
-name = "jni"
-version = "0.20.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "039022cdf4d7b1cf548d31f60ae783138e5fd42013f6271049d7df7afadef96c"
-dependencies = [
- "cesu8",
- "combine",
- "jni-sys",
- "log",
- "thiserror",
- "walkdir",
-]
-
 [[package]]
 name = "jni-sys"
 version = "0.3.0"
@@ -1626,7 +1611,7 @@ dependencies = [
  "libc",
  "neli",
  "thiserror",
- "windows-sys",
+ "windows-sys 0.36.1",
 ]
 
 [[package]]
@@ -3110,7 +3095,7 @@ dependencies = [
  "gtk",
  "image",
  "instant",
- "jni 0.20.0",
+ "jni",
  "lazy_static",
  "libappindicator",
  "libc",
diff --git a/examples/api/src-tauri/Cargo.toml b/examples/api/src-tauri/Cargo.toml
index 6dad7c673..8bec982b3 100644
--- a/examples/api/src-tauri/Cargo.toml
+++ b/examples/api/src-tauri/Cargo.toml
@@ -6,9 +6,6 @@ edition = "2021"
 rust-version = "1.59"
 license = "Apache-2.0 OR MIT"
 
-[patch.crates-io]
-tao = { git = "https://github.com/tauri-apps/tao", branch = "dev" }
-
 [lib]
 crate-type = ["staticlib", "cdylib", "rlib"]
 
diff --git a/tooling/cli/src/interface/rust/desktop.rs b/tooling/cli/src/interface/rust/desktop.rs
index e477e6eea..b84c6e552 100644
--- a/tooling/cli/src/interface/rust/desktop.rs
+++ b/tooling/cli/src/interface/rust/desktop.rs
@@ -383,7 +383,7 @@ fn rename_app(bin_path: &Path, product_name: Option<&str>) -> crate::Result<Path
     let product_path = bin_path
       .parent()
       .unwrap()
-      .join(&product_name)
+      .join(product_name)
       .with_extension(bin_path.extension().unwrap_or_default());
 
     rename(bin_path, &product_path).with_context(|| {
diff --git a/tooling/cli/src/mobile/ios/build.rs b/tooling/cli/src/mobile/ios/build.rs
index f1d06e1d5..ce0269cac 100644
--- a/tooling/cli/src/mobile/ios/build.rs
+++ b/tooling/cli/src/mobile/ios/build.rs
@@ -134,7 +134,7 @@ fn run_build(
     options.targets.iter(),
     &detect_target_ok,
     env,
-    |target: &Target| {
+    |target: &Target| -> Result<()> {
       let mut app_version = config.bundle_version().clone();
       if let Some(build_number) = options.build_number {
         app_version.push_extra(build_number);
@@ -152,11 +152,10 @@ fn run_build(
         out_files.push(path);
       }
 
-      anyhow::Result::Ok(())
+      Ok(())
     },
   )
-  .map_err(|e: TargetInvalid| anyhow::anyhow!(e.to_string()))?
-  .map_err(|e: anyhow::Error| e)?;
+  .map_err(|e: TargetInvalid| anyhow::anyhow!(e.to_string()))??;
 
   log_finished(out_files, "IPA");
 
diff --git a/tooling/cli/src/mobile/ios/project.rs b/tooling/cli/src/mobile/ios/project.rs
index ea7bf3035..051af0eee 100644
--- a/tooling/cli/src/mobile/ios/project.rs
+++ b/tooling/cli/src/mobile/ios/project.rs
@@ -172,7 +172,7 @@ pub fn gen(
   // often necessary.
   println!("Generating Xcode project...");
   bossy::Command::impure("xcodegen")
-    .with_args(&["generate", "--spec"])
+    .with_args(["generate", "--spec"])
     .with_arg(dest.join("project.yml"))
     .run_and_wait()
     .with_context(|| "failed to run `xcodegen`")?;