From e1776946ad034d7a6e005834a754773671d9f7ef Mon Sep 17 00:00:00 2001 From: Brendan Allan Date: Wed, 24 Jul 2024 18:47:51 +0800 Subject: [PATCH] fix(core): use specta's derive feature (#10362) * use specta's derive feature * use specta rc.15 * .changes file * try patched specta * specta rc.16 * Update .changes/specta-derive-feature.md Co-authored-by: Fabian-Lars * Update specta-derive-feature.md [skip ci] --------- Co-authored-by: Fabian-Lars --- .changes/specta-derive-feature.md | 5 +++++ Cargo.lock | 22 +++++++++------------- core/tauri/Cargo.toml | 2 +- 3 files changed, 15 insertions(+), 14 deletions(-) create mode 100644 .changes/specta-derive-feature.md diff --git a/.changes/specta-derive-feature.md b/.changes/specta-derive-feature.md new file mode 100644 index 000000000000..c12d2d2137dd --- /dev/null +++ b/.changes/specta-derive-feature.md @@ -0,0 +1,5 @@ +--- +"tauri": patch:bug +--- + +Use `specta rc.15's `derive` feature which fixes build issues in docs.rs. diff --git a/Cargo.lock b/Cargo.lock index 8b074a69e3ab..071f337c1fb5 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3201,9 +3201,9 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.203" +version = "1.0.204" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094" +checksum = "bc76f558e0cbb2a839d37354c575f1dc3fdc6546b5be373ba43d95f231bf7c12" dependencies = [ "serde_derive", ] @@ -3221,9 +3221,9 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.203" +version = "1.0.204" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" +checksum = "e0cd7e117be63d3c3678776753929474f3b04a43a080c744d6b0ae2a8c28e222" dependencies = [ "proc-macro2", "quote", @@ -3470,27 +3470,23 @@ dependencies = [ [[package]] name = "specta" -version = "2.0.0-rc.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3624a07cbde326fdf1ec37cbd39d06a224660fa0199b7db7316f2349583df981" +version = "2.0.0-rc.15" +source = "git+https://github.com/oscartbeaumont/specta?branch=optional-feature#e4cce4040a6cb8048273b531fe79b367fbac96c5" dependencies = [ - "once_cell", "paste", - "serde", "specta-macros", "thiserror", ] [[package]] name = "specta-macros" -version = "2.0.0-rc.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef33e9678ae36993fcbfc46aa29568ef10d32fd54428808759c6a450998c43ec" +version = "2.0.0-rc.15" +source = "git+https://github.com/oscartbeaumont/specta?branch=optional-feature#e4cce4040a6cb8048273b531fe79b367fbac96c5" dependencies = [ "Inflector", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.71", ] [[package]] diff --git a/core/tauri/Cargo.toml b/core/tauri/Cargo.toml index 3cc5d8320f23..04b400411d21 100644 --- a/core/tauri/Cargo.toml +++ b/core/tauri/Cargo.toml @@ -75,7 +75,7 @@ tracing = { version = "0.1", optional = true } heck = "0.5" log = "0.4" dunce = "1" -specta = { version = "^2.0.0-rc.9", optional = true, default-features = false, features = [ "function" ] } +specta = { version = "^2.0.0-rc.16", optional = true, default-features = false, features = [ "function", "derive" ] } [target."cfg(any(target_os = \"linux\", target_os = \"dragonfly\", target_os = \"freebsd\", target_os = \"openbsd\", target_os = \"netbsd\", target_os = \"windows\", target_os = \"macos\"))".dependencies] muda = { version = "0.13.4", default-features = false, features = [ "serde" ] }