diff --git a/Cargo.lock b/Cargo.lock index 8640454b342f..05388293b076 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -254,7 +254,7 @@ dependencies = [ "rsa", "serde", "serde_json", - "thiserror", + "thiserror 1.0.68", "x509-certificate", ] @@ -338,7 +338,7 @@ dependencies = [ "spki 0.7.3", "subtle", "tempfile", - "thiserror", + "thiserror 1.0.68", "tokio", "tungstenite 0.21.0", "uuid", @@ -366,7 +366,7 @@ dependencies = [ "scroll", "serde", "serde-xml-rs", - "thiserror", + "thiserror 1.0.68", ] [[package]] @@ -392,7 +392,7 @@ dependencies = [ "sha1", "sha2", "signature 2.2.0", - "thiserror", + "thiserror 1.0.68", "url", "x509-certificate", "xml-rs", @@ -467,7 +467,7 @@ dependencies = [ "nom", "num-traits", "rusticata-macros", - "thiserror", + "thiserror 1.0.68", ] [[package]] @@ -1160,7 +1160,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "57792b99d555ebf109c83169228076f7d997e2b37ba1a653850ccd703ac7bab0" dependencies = [ "sysctl", - "thiserror", + "thiserror 1.0.68", "uname", "winapi", ] @@ -1438,7 +1438,7 @@ dependencies = [ "glib", "libc", "once_cell", - "thiserror", + "thiserror 1.0.68", ] [[package]] @@ -1499,7 +1499,7 @@ dependencies = [ "serde", "serde_json", "textwrap", - "thiserror", + "thiserror 1.0.68", "toml 0.8.19", "ureq", "which 6.0.3", @@ -1527,7 +1527,7 @@ dependencies = [ "semver", "serde", "serde_json", - "thiserror", + "thiserror 1.0.68", ] [[package]] @@ -1986,7 +1986,7 @@ dependencies = [ "chrono", "is_executable", "simple-file-manifest", - "thiserror", + "thiserror 1.0.68", ] [[package]] @@ -2384,7 +2384,7 @@ dependencies = [ "console", "shell-words", "tempfile", - "thiserror", + "thiserror 1.0.68", "zeroize", ] @@ -3059,7 +3059,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "db9c27b72f19a99a895f8ca89e2d26e4ef31013376e56fdafef697627306c3e4" dependencies = [ "nom", - "thiserror", + "thiserror 1.0.68", ] [[package]] @@ -3367,7 +3367,7 @@ dependencies = [ "once_cell", "pin-project-lite", "smallvec", - "thiserror", + "thiserror 1.0.68", ] [[package]] @@ -3403,7 +3403,7 @@ dependencies = [ "memchr", "once_cell", "smallvec", - "thiserror", + "thiserror 1.0.68", ] [[package]] @@ -3605,7 +3605,7 @@ dependencies = [ "pest_derive", "serde", "serde_json", - "thiserror", + "thiserror 1.0.68", ] [[package]] @@ -4425,7 +4425,7 @@ dependencies = [ "combine", "jni-sys", "log", - "thiserror", + "thiserror 1.0.68", "walkdir", "windows-sys 0.45.0", ] @@ -4468,7 +4468,7 @@ checksum = "ec9ad60d674508f3ca8f380a928cfe7b096bc729c4e2dbfe3852bc45da3ab30b" dependencies = [ "serde", "serde_json", - "thiserror", + "thiserror 1.0.68", ] [[package]] @@ -4480,7 +4480,7 @@ dependencies = [ "jsonptr 0.4.7", "serde", "serde_json", - "thiserror", + "thiserror 1.0.68", ] [[package]] @@ -4492,7 +4492,7 @@ dependencies = [ "jsonptr 0.6.3", "serde", "serde_json", - "thiserror", + "thiserror 1.0.68", ] [[package]] @@ -4551,7 +4551,7 @@ dependencies = [ "jsonrpsee-core", "pin-project", "soketto", - "thiserror", + "thiserror 1.0.68", "tokio", "tokio-util", "tracing", @@ -4578,7 +4578,7 @@ dependencies = [ "rustc-hash", "serde", "serde_json", - "thiserror", + "thiserror 1.0.68", "tokio", "tokio-stream", "tracing", @@ -4603,7 +4603,7 @@ dependencies = [ "serde", "serde_json", "soketto", - "thiserror", + "thiserror 1.0.68", "tokio", "tokio-stream", "tokio-util", @@ -4620,7 +4620,7 @@ dependencies = [ "http 1.1.0", "serde", "serde_json", - "thiserror", + "thiserror 1.0.68", ] [[package]] @@ -4928,7 +4928,7 @@ checksum = "3669cf5561f8d27e8fc84cc15e58350e70f557d4d65f70e3154e54cd2f8e1782" dependencies = [ "libc", "neli", - "thiserror", + "thiserror 1.0.68", "windows-sys 0.59.0", ] @@ -5100,7 +5100,7 @@ dependencies = [ "miette-derive", "owo-colors", "textwrap", - "thiserror", + "thiserror 1.0.68", "unicode-width", ] @@ -5218,7 +5218,7 @@ dependencies = [ "once_cell", "png", "serde", - "thiserror", + "thiserror 1.0.68", "windows-sys 0.59.0", ] @@ -5308,7 +5308,7 @@ dependencies = [ "ndk-sys", "num_enum", "raw-window-handle", - "thiserror", + "thiserror 1.0.68", ] [[package]] @@ -6308,7 +6308,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fdbef9d1d47087a895abd220ed25eb4ad973a5e26f6a4367b038c25e28dfc2d9" dependencies = [ "memchr", - "thiserror", + "thiserror 1.0.68", "ucd-trie", ] @@ -6404,7 +6404,7 @@ dependencies = [ "sha3", "signature 2.2.0", "smallvec", - "thiserror", + "thiserror 1.0.68", "twofish", "x25519-dalek", "zeroize", @@ -6913,7 +6913,7 @@ dependencies = [ "rustc-hash", "rustls 0.23.13", "socket2", - "thiserror", + "thiserror 1.0.68", "tokio", "tracing", ] @@ -6930,7 +6930,7 @@ dependencies = [ "rustc-hash", "rustls 0.23.13", "slab", - "thiserror", + "thiserror 1.0.68", "tinyvec", "tracing", ] @@ -7121,7 +7121,7 @@ dependencies = [ "rand_chacha 0.3.1", "simd_helpers", "system-deps", - "thiserror", + "thiserror 1.0.68", "v_frame", "wasm-bindgen", ] @@ -7193,7 +7193,7 @@ checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43" dependencies = [ "getrandom 0.2.15", "libredox", - "thiserror", + "thiserror 1.0.68", ] [[package]] @@ -7496,7 +7496,7 @@ dependencies = [ "pgp", "sha1", "sha2", - "thiserror", + "thiserror 1.0.68", "xz2", "zstd", ] @@ -8035,7 +8035,7 @@ checksum = "fb3aa78ecda1ebc9ec9847d5d3aba7d618823446a049ba2491940506da6e2782" dependencies = [ "log", "serde", - "thiserror", + "thiserror 1.0.68", "xml-rs", ] @@ -8387,7 +8387,7 @@ checksum = "adc4e5204eb1910f40f9cfa375f6f05b68c3abac4b6fd879c8ff5e7ae8a0a085" dependencies = [ "num-bigint", "num-traits", - "thiserror", + "thiserror 1.0.68", "time", ] @@ -8570,7 +8570,7 @@ checksum = "4ccbb212565d2dc177bc15ecb7b039d66c4490da892436a4eee5b394d620c9bc" dependencies = [ "paste", "specta-macros", - "thiserror", + "thiserror 1.0.68", ] [[package]] @@ -8871,7 +8871,7 @@ dependencies = [ "bitflags 1.3.2", "byteorder", "libc", - "thiserror", + "thiserror 1.0.68", "walkdir", ] @@ -9029,7 +9029,7 @@ dependencies = [ "tauri-runtime", "tauri-runtime-wry", "tauri-utils 2.0.2", - "thiserror", + "thiserror 2.0.0", "tokio", "tracing", "tray-icon", @@ -9097,7 +9097,7 @@ dependencies = [ "tauri-macos-sign", "tauri-utils 2.0.2", "tempfile", - "thiserror", + "thiserror 2.0.0", "time", "ureq", "url", @@ -9217,7 +9217,7 @@ dependencies = [ "sha2", "syn 2.0.87", "tauri-utils 2.0.2", - "thiserror", + "thiserror 2.0.0", "time", "url", "uuid", @@ -9344,7 +9344,7 @@ dependencies = [ "swift-rs", "tauri", "tauri-plugin 2.0.0-rc.13", - "thiserror", + "thiserror 1.0.68", "time", ] @@ -9356,7 +9356,7 @@ dependencies = [ "serde", "tauri", "tauri-plugin 2.0.2", - "thiserror", + "thiserror 2.0.0", ] [[package]] @@ -9371,7 +9371,7 @@ dependencies = [ "serde", "serde_json", "tauri-utils 2.0.2", - "thiserror", + "thiserror 2.0.0", "url", "windows", ] @@ -9451,7 +9451,7 @@ dependencies = [ "serde_json", "serde_with", "serialize-to-javascript", - "thiserror", + "thiserror 1.0.68", "toml 0.7.8", "url", "windows-version", @@ -9484,7 +9484,7 @@ dependencies = [ "serde_json", "serde_with", "swift-rs", - "thiserror", + "thiserror 1.0.68", "toml 0.8.19", "url", "urlpattern", @@ -9523,7 +9523,7 @@ dependencies = [ "serial_test", "serialize-to-javascript", "swift-rs", - "thiserror", + "thiserror 2.0.0", "toml 0.8.19", "url", "urlpattern", @@ -9619,7 +9619,16 @@ version = "1.0.68" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "02dd99dc800bbb97186339685293e1cc5d9df1f8fae2d0aecd9ff1c77efea892" dependencies = [ - "thiserror-impl", + "thiserror-impl 1.0.68", +] + +[[package]] +name = "thiserror" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "15291287e9bff1bc6f9ff3409ed9af665bec7a5fc8ac079ea96be07bca0e2668" +dependencies = [ + "thiserror-impl 2.0.0", ] [[package]] @@ -9633,6 +9642,17 @@ dependencies = [ "syn 2.0.87", ] +[[package]] +name = "thiserror-impl" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22efd00f33f93fa62848a7cab956c3d38c8d43095efda1decfc2b3a5dc0b8972" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.87", +] + [[package]] name = "tiff" version = "0.9.1" @@ -10002,7 +10022,7 @@ dependencies = [ "once_cell", "png", "serde", - "thiserror", + "thiserror 1.0.68", "windows-sys 0.59.0", ] @@ -10038,7 +10058,7 @@ dependencies = [ "rustls-native-certs 0.7.3", "rustls-pki-types", "sha1", - "thiserror", + "thiserror 1.0.68", "url", "utf-8", ] @@ -10057,7 +10077,7 @@ dependencies = [ "log", "rand 0.8.5", "sha1", - "thiserror", + "thiserror 1.0.68", "utf-8", ] @@ -10705,7 +10725,7 @@ version = "0.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a3a3e2eeb58f82361c93f9777014668eb3d07e7d174ee4c819575a9208011886" dependencies = [ - "thiserror", + "thiserror 1.0.68", "windows", "windows-core 0.58.0", ] @@ -11204,7 +11224,7 @@ dependencies = [ "serde", "serde-wasm-bindgen 0.5.0", "serde_json", - "thiserror", + "thiserror 1.0.68", "wasm-bindgen", "wasm-bindgen-futures", ] @@ -11280,7 +11300,7 @@ dependencies = [ "sha2", "soup3", "tao-macros", - "thiserror", + "thiserror 1.0.68", "tracing", "webkit2gtk", "webkit2gtk-sys", @@ -11358,7 +11378,7 @@ dependencies = [ "ring", "signature 2.2.0", "spki 0.7.3", - "thiserror", + "thiserror 1.0.68", "zeroize", ] @@ -11545,7 +11565,7 @@ dependencies = [ "flate2", "indexmap 2.6.0", "memchr", - "thiserror", + "thiserror 1.0.68", "zopfli", ] @@ -11557,7 +11577,7 @@ checksum = "ce824a6bfffe8942820fa36d24973b7c83a40896749a42e33de0abdd11750ee5" dependencies = [ "byteorder", "bytesize", - "thiserror", + "thiserror 1.0.68", ] [[package]] diff --git a/crates/tauri-bundler/Cargo.toml b/crates/tauri-bundler/Cargo.toml index a485f0a9ccf7..447642a1257d 100644 --- a/crates/tauri-bundler/Cargo.toml +++ b/crates/tauri-bundler/Cargo.toml @@ -21,7 +21,7 @@ tauri-utils = { version = "2.0.2", path = "../tauri-utils", features = [ image = "0.25.0" flate2 = "1.0" anyhow = "1.0" -thiserror = "1.0" +thiserror = "2" serde_json = "1.0" serde = { version = "1.0", features = ["derive"] } strsim = "0.11.0" diff --git a/crates/tauri-cli/templates/plugin/Cargo.crate-manifest b/crates/tauri-cli/templates/plugin/Cargo.crate-manifest index 64170c165365..e8fc7774087e 100644 --- a/crates/tauri-cli/templates/plugin/Cargo.crate-manifest +++ b/crates/tauri-cli/templates/plugin/Cargo.crate-manifest @@ -11,7 +11,7 @@ links = "tauri-plugin-{{ plugin_name }}" [dependencies] tauri = {{ tauri_dep }} serde = "1.0" -thiserror = "1.0" +thiserror = "2" [build-dependencies] tauri-plugin = {{{ tauri_plugin_dep }}} diff --git a/crates/tauri-codegen/Cargo.toml b/crates/tauri-codegen/Cargo.toml index 19884121d878..637e18623cc9 100644 --- a/crates/tauri-codegen/Cargo.toml +++ b/crates/tauri-codegen/Cargo.toml @@ -23,7 +23,7 @@ serde_json = "1" tauri-utils = { version = "2.0.2", path = "../tauri-utils", features = [ "build", ] } -thiserror = "1" +thiserror = "2" walkdir = "2" brotli = { version = "7", optional = true, default-features = false, features = [ "std", diff --git a/crates/tauri-runtime/Cargo.toml b/crates/tauri-runtime/Cargo.toml index f5b6fd0814ef..ece1aa52e6ad 100644 --- a/crates/tauri-runtime/Cargo.toml +++ b/crates/tauri-runtime/Cargo.toml @@ -28,7 +28,7 @@ targets = [ [dependencies] serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" -thiserror = "1.0" +thiserror = "2" tauri-utils = { version = "2.0.2", path = "../tauri-utils" } http = "1.1" raw-window-handle = "0.6" diff --git a/crates/tauri-utils/Cargo.toml b/crates/tauri-utils/Cargo.toml index 074b2ed4d9cb..b920ec9e3f70 100644 --- a/crates/tauri-utils/Cargo.toml +++ b/crates/tauri-utils/Cargo.toml @@ -15,7 +15,7 @@ rust-version.workspace = true [dependencies] serde = { version = "1", features = ["derive"] } serde_json = "1" -thiserror = "1" +thiserror = "2" phf = { version = "0.11", features = ["macros"] } brotli = { version = "7", optional = true, default-features = false, features = [ "std", diff --git a/crates/tauri-utils/src/acl/identifier.rs b/crates/tauri-utils/src/acl/identifier.rs index 64df0ed274cc..1693e4195b7c 100644 --- a/crates/tauri-utils/src/acl/identifier.rs +++ b/crates/tauri-utils/src/acl/identifier.rs @@ -122,7 +122,7 @@ pub enum ParseIdentifierError { Empty, /// Identifier is too long. - #[error("identifiers cannot be longer than {}, found {0}", MAX_LEN_IDENTIFIER)] + #[error("identifiers cannot be longer than {len}, found {0}", len = MAX_LEN_IDENTIFIER)] Humongous(usize), /// Identifier is not in a valid format. diff --git a/crates/tauri/Cargo.toml b/crates/tauri/Cargo.toml index 254660afdb9c..36610576fa0f 100644 --- a/crates/tauri/Cargo.toml +++ b/crates/tauri/Cargo.toml @@ -56,7 +56,7 @@ futures-util = "0.3" uuid = { version = "1", features = ["v4"], optional = true } url = "2" anyhow = "1.0" -thiserror = "1.0" +thiserror = "2" tauri-runtime = { version = "2.1.1", path = "../tauri-runtime" } tauri-macros = { version = "2.0.2", path = "../tauri-macros" } tauri-utils = { version = "2.0.2", features = [ diff --git a/examples/api/src-tauri/tauri-plugin-sample/Cargo.toml b/examples/api/src-tauri/tauri-plugin-sample/Cargo.toml index 095c0bd03802..15b0f050016d 100644 --- a/examples/api/src-tauri/tauri-plugin-sample/Cargo.toml +++ b/examples/api/src-tauri/tauri-plugin-sample/Cargo.toml @@ -8,7 +8,7 @@ links = "tauri-plugin-sample" tauri = { path = "../../../../crates/tauri" } log = "0.4" serde = "1" -thiserror = "1" +thiserror = "2" [build-dependencies] tauri-plugin = { path = "../../../../crates/tauri-plugin", features = [