fix: schemars 0.8.18 compatibility (#9680)

* fix: schemars 0.8.18 compatibility backport of #9676 Co-authored-by: Hankung <73242257+Hankung7183@users.noreply.github.com> * fix clippy lol --------- Co-authored-by: Hankung <73242257+Hankung7183@users.noreply.github.com>
tauri-apps · May 6, 2024 · 5ee5ed4 · 5ee5ed4
1 parent b8fd8e1
commit 5ee5ed4
Show file tree

Hide file tree

Showing 13 changed files with 34 additions and 42 deletions.
diff --git a/.cargo/config → .cargo/config.toml b/.cargo/config → .cargo/config.toml
diff --git a/.changes/schemars-comp.md b/.changes/schemars-comp.md
@@ -0,0 +1,5 @@
+---
+tauri-utils: "patch:bug"
+---
+
+Fixes `schemars` compilation issue.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/core/tauri-config-schema/Cargo.toml b/core/tauri-config-schema/Cargo.toml
@@ -8,7 +8,7 @@ publish = false
 tauri-utils = { version = "1.0.0", features = [
   "schema",
 ], path = "../tauri-utils" }
-schemars = { version = "0.8", features = ["url", "preserve_order"] }
+schemars = { version = "0.8.18", features = ["url", "preserve_order"] }
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 url = { version = "2.3", features = ["serde"] }
diff --git a/core/tauri-config-schema/schema.json b/core/tauri-config-schema/schema.json
@@ -226,7 +226,6 @@
         },
         "version": {
           "description": "App version. It is a semver version number or a path to a `package.json` file containing the `version` field. If removed the version number from `Cargo.toml` is used.",
-          "default": null,
           "type": [
             "string",
             "null"

diff --git a/core/tauri-utils/Cargo.toml b/core/tauri-utils/Cargo.toml
@@ -22,7 +22,7 @@ html5ever = "0.26"
 kuchiki = { package = "kuchikiki", version = "0.8" }
 proc-macro2 = { version = "1", optional = true }
 quote = { version = "1", optional = true }
-schemars = { version = "0.8", features = [ "url" ], optional = true }
+schemars = { version = "0.8.18", features = [ "url" ], optional = true }
 serde_with = "3"
 aes-gcm = { version = "0.10", optional = true }
 getrandom = { version = "0.2", optional = true, features = [ "std" ] }

diff --git a/core/tauri-utils/src/config.rs b/core/tauri-utils/src/config.rs
@@ -166,19 +166,13 @@ impl schemars::JsonSchema for BundleTarget {
         ..Default::default()
       }
       .into(),
-      schemars::_private::apply_metadata(
+      schemars::_private::metadata::add_description(
         gen.subschema_for::<Vec<BundleType>>(),
-        schemars::schema::Metadata {
-          description: Some("A list of bundle targets.".to_owned()),
-          ..Default::default()
-        },
+        "A list of bundle targets.",
       ),
-      schemars::_private::apply_metadata(
+      schemars::_private::metadata::add_description(
         gen.subschema_for::<BundleType>(),
-        schemars::schema::Metadata {
-          description: Some("A single bundle target.".to_owned()),
-          ..Default::default()
-        },
+        "A single bundle target.",
       ),
     ];
 

diff --git a/core/tauri/src/async_runtime.rs b/core/tauri/src/async_runtime.rs
@@ -42,7 +42,7 @@ impl GlobalRuntime {
     }
   }
 
-  fn spawn<F: Future>(&self, task: F) -> JoinHandle<F::Output>
+  fn spawn<F>(&self, task: F) -> JoinHandle<F::Output>
   where
     F: Future + Send + 'static,
     F::Output: Send + 'static,
@@ -96,7 +96,7 @@ impl Runtime {
   }
 
   /// Spawns a future onto the runtime.
-  pub fn spawn<F: Future>(&self, task: F) -> JoinHandle<F::Output>
+  pub fn spawn<F>(&self, task: F) -> JoinHandle<F::Output>
   where
     F: Future + Send + 'static,
     F::Output: Send + 'static,
@@ -189,7 +189,7 @@ impl RuntimeHandle {
   }
 
   /// Spawns a future onto the runtime.
-  pub fn spawn<F: Future>(&self, task: F) -> JoinHandle<F::Output>
+  pub fn spawn<F>(&self, task: F) -> JoinHandle<F::Output>
   where
     F: Future + Send + 'static,
     F::Output: Send + 'static,

diff --git a/tooling/cli/Cargo.lock b/tooling/cli/Cargo.lock
diff --git 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/schema.json b/tooling/cli/schema.json
@@ -226,7 +226,6 @@
         },
         "version": {
           "description": "App version. It is a semver version number or a path to a `package.json` file containing the `version` field. If removed the version number from `Cargo.toml` is used.",
-          "default": null,
           "type": [
             "string",
             "null"

diff --git 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
@@ -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
-Original file line number
+Diff line change
@@ Expand Up @@
       }
       if options.runner.is_none() {
-        options.runner = config_.build.runner.clone();
+        options.runner.clone_from(&config_.build.runner);
       }
       options
@@ Expand Down @@