Cleanup

Author: Choochmeque

Cargo.toml

@@ -11,19 +11,19 @@ license = "MIT"
 repository = "https://github.com/Choochmeque/tauri-plugin-iap"
 
 [features]
-unstable = []
+unstable = ["dep:swift-bridge", "dep:serde_json"]
 
 [dependencies]
 tauri = { version = "2.7.0" }
 serde = "1.0"
 thiserror = "2"
 
-[target.'cfg(all(target_os = "macos", feature = "unstable"))'.dependencies]
-swift-bridge = { version = "0.1", features = ["async"] }
-serde_json = "1.0"
+[target.'cfg(target_os = "macos")'.dependencies]
+swift-bridge = { version = "0.1", features = ["async"], optional = true}
+serde_json = { version = "1.0", optional = true }
 
 [build-dependencies]
 tauri-plugin = { version = "2.3.0", features = ["build"] }
 
-[target.'cfg(all(target_os = "macos", feature = "unstable"))'.build-dependencies]
+[target.'cfg(target_os = "macos")'.build-dependencies]
 swift-bridge-build = "0.1"

build.rs

@@ -23,7 +23,7 @@ fn main() {
         if std::env::var("CARGO_CFG_TARGET_OS").unwrap_or_default() == "macos" {
             let bridges = vec!["src/macos.rs"];
             for path in &bridges {
-                println!("cargo:rerun-if-changed={}", path);
+                println!("cargo:rerun-if-changed={path}");
             }
 
             swift_bridge_build::parse_bridges(bridges)
@@ -59,15 +59,14 @@ fn main() {
             "cargo:rustc-link-search={}/Toolchains/XcodeDefault.xctoolchain/usr/lib/swift/macosx/",
             &xcode_path
         );
-            println!("cargo:rustc-link-search={}", "/usr/lib/swift");
+            println!("cargo:rustc-link-search=/usr/lib/swift");
 
             let p = "/Library/Developer/CommandLineTools/usr/lib/swift-5.5/macosx";
             println!("cargo:rustc-link-search=native={p}");
             println!("cargo:rustc-link-arg=-Wl,-rpath,{p}");
 
             println!(
-                "cargo:rustc-link-search={}",
-                "/Library/Developer/CommandLineTools/usr/lib/swift-5.5/macosx"
+                "cargo:rustc-link-search=/Library/Developer/CommandLineTools/usr/lib/swift-5.5/macosx"
             );
         }
     }
@@ -79,7 +78,7 @@ fn compile_swift() {
 
     let mut cmd = Command::new("swift");
 
-    cmd.current_dir(swift_package_dir).arg("build").args(&[
+    cmd.current_dir(swift_package_dir).arg("build").args([
         "-Xswiftc",
         "-import-objc-header",
         "-Xswiftc",
@@ -90,7 +89,7 @@ fn compile_swift() {
     ]);
 
     if is_release_build() {
-        cmd.args(&["-c", "release"]);
+        cmd.args(["-c", "release"]);
     }
 
     let exit_status = cmd.spawn().unwrap().wait_with_output().unwrap();
@@ -141,5 +140,5 @@ fn swift_library_static_lib_dir() -> PathBuf {
         "debug"
     };
 
-    manifest_dir().join(format!("macos/.build/{}", debug_or_release))
+    manifest_dir().join(format!("macos/.build/{debug_or_release}"))
 }

src/macos.rs

@@ -39,12 +39,11 @@ impl<R: Runtime> Iap<R> {
     fn to_result<T: serde::de::DeserializeOwned>(bridged: ffi::FFIResult) -> crate::Result<T> {
         match bridged {
             ffi::FFIResult::Ok(response) => {
-                let parsed: T =
-                    serde_json::from_str(&response).map_err(Into::<serde_json::Error>::into)?;
+                let parsed: T = serde_json::from_str(&response)?;
                 Ok(parsed)
             }
             ffi::FFIResult::Err(err) => {
-                Err(std::io::Error::new(std::io::ErrorKind::Other, err).into())
+                Err(std::io::Error::other(err).into())
             }
         }
     }