From 61d77584e8cd8d0c3b3fd742a4e6c5b684d12c30 Mon Sep 17 00:00:00 2001 From: link2xt Date: Thu, 12 Sep 2024 00:27:29 +0000 Subject: [PATCH] chore(cargo): update typescript-type-def to 0.5.12 This removes unmaintained proc-macro-error dependency. --- Cargo.lock | 105 +++++++++++------------------------ deltachat-jsonrpc/Cargo.toml | 2 +- deny.toml | 7 --- 3 files changed, 32 insertions(+), 82 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 5c872d785..5d58ebd44 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1177,70 +1177,35 @@ dependencies = [ [[package]] name = "darling" -version = "0.13.4" +version = "0.20.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a01d95850c592940db9b8194bc39f4bc0e89dee5c4265e4b1807c34a9aba453c" +checksum = "6f63b86c8a8826a49b8c21f08a2d07338eec8d900540f8630dc76284be802989" dependencies = [ - "darling_core 0.13.4", - "darling_macro 0.13.4", -] - -[[package]] -name = "darling" -version = "0.20.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83b2eb4d90d12bdda5ed17de686c2acb4c57914f8f921b8da7e112b5a36f3fe1" -dependencies = [ - "darling_core 0.20.9", - "darling_macro 0.20.9", + "darling_core", + "darling_macro", ] [[package]] name = "darling_core" -version = "0.13.4" +version = "0.20.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "859d65a907b6852c9361e3185c862aae7fafd2887876799fa55f5f99dc40d610" +checksum = "95133861a8032aaea082871032f5815eb9e98cef03fa916ab4500513994df9e5" dependencies = [ "fnv", "ident_case", "proc-macro2", "quote", - "strsim 0.10.0", - "syn 1.0.109", -] - -[[package]] -name = "darling_core" -version = "0.20.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "622687fe0bac72a04e5599029151f5796111b90f1baaa9b544d807a5e31cd120" -dependencies = [ - "fnv", - "ident_case", - "proc-macro2", - "quote", - "strsim 0.11.1", + "strsim", "syn 2.0.77", ] [[package]] name = "darling_macro" -version = "0.13.4" +version = "0.20.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c972679f83bdf9c42bd905396b6c3588a843a17f0f16dfcfa3e2c5d57441835" +checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" dependencies = [ - "darling_core 0.13.4", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "darling_macro" -version = "0.20.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "733cabb43482b1a1b53eee8583c2b9e8684d592215ea83efd305dd31bc2f0178" -dependencies = [ - "darling_core 0.20.9", + "darling_core", "quote", "syn 2.0.77", ] @@ -1518,7 +1483,7 @@ version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d48cda787f839151732d396ac69e3473923d54312c070ee21e9effcaa8ca0b1d" dependencies = [ - "darling 0.20.9", + "darling", "proc-macro2", "quote", "syn 2.0.77", @@ -4378,34 +4343,32 @@ dependencies = [ ] [[package]] -name = "proc-macro-error" -version = "1.0.4" +name = "proc-macro-error-attr2" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" +checksum = "96de42df36bb9bba5542fe9f1a054b8cc87e172759a1868aa05c1f3acc89dfc5" dependencies = [ - "proc-macro-error-attr", "proc-macro2", "quote", - "syn 1.0.109", - "version_check", ] [[package]] -name = "proc-macro-error-attr" -version = "1.0.4" +name = "proc-macro-error2" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" +checksum = "11ec05c52be0a07b08061f7dd003e7d7092e0472bc731b4af7bb1ef876109802" dependencies = [ + "proc-macro-error-attr2", "proc-macro2", "quote", - "version_check", + "syn 2.0.77", ] [[package]] name = "proc-macro2" -version = "1.0.85" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22244ce15aa966053a896d1accb3a6e68469b97c7f33f284b99f0d576879fc23" +checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" dependencies = [ "unicode-ident", ] @@ -5290,9 +5253,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.127" +version = "1.0.128" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8043c06d9f82bd7271361ed64f415fe5e12a77fdb52e573e7f06a516dea329ad" +checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8" dependencies = [ "itoa", "memchr", @@ -5626,12 +5589,6 @@ dependencies = [ "pin-project-lite", ] -[[package]] -name = "strsim" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" - [[package]] name = "strsim" version = "0.11.1" @@ -6284,9 +6241,9 @@ checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" [[package]] name = "typescript-type-def" -version = "0.5.11" +version = "0.5.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19d9560109be8840693dcb09ed745851f3713bee7b23534b8cab65b7ff9383f1" +checksum = "3c9a1ec7a0e59e03c7ab74e924abef19d2669aa9255b9821e55854b08453eb71" dependencies = [ "serde_json", "typescript-type-def-derive", @@ -6294,16 +6251,16 @@ dependencies = [ [[package]] name = "typescript-type-def-derive" -version = "0.5.11" +version = "0.5.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2835fe6badda3e20a012d19d6593ded0fc11f659d5d5152394061ffbb03b4b04" +checksum = "34c1213de2386875250474a109f0985ce83333038c885d2fec4de79d9dfcee8c" dependencies = [ - "darling 0.13.4", + "darling", "ident_case", - "proc-macro-error", + "proc-macro-error2", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.77", ] [[package]] @@ -7023,7 +6980,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "35ba6b4417cfeb26cd806f3aabc22e7c4097632e07b5b61a4c818bccb2df4f21" dependencies = [ "convert_case", - "darling 0.20.9", + "darling", "proc-macro2", "quote", "syn 2.0.77", diff --git a/deltachat-jsonrpc/Cargo.toml b/deltachat-jsonrpc/Cargo.toml index c248c28f9..53bf7ebed 100644 --- a/deltachat-jsonrpc/Cargo.toml +++ b/deltachat-jsonrpc/Cargo.toml @@ -25,7 +25,7 @@ async-channel = { workspace = true } futures = { workspace = true } serde_json = { workspace = true } yerpc = { workspace = true, features = ["anyhow_expose", "openrpc"] } -typescript-type-def = { version = "0.5.8", features = ["json_value"] } +typescript-type-def = { version = "0.5.12", features = ["json_value"] } tokio = { workspace = true } sanitize-filename = { workspace = true } walkdir = "2.5.0" diff --git a/deny.toml b/deny.toml index e58a8141e..d9ebe2a5c 100644 --- a/deny.toml +++ b/deny.toml @@ -11,9 +11,6 @@ ignore = [ # Unmaintained encoding "RUSTSEC-2021-0153", - - # Unmaintained proc-macro-error - "RUSTSEC-2024-0370", ] [bans] @@ -29,9 +26,6 @@ skip = [ { name = "base64", version = "<0.21" }, { name = "base64", version = "0.21.7" }, { name = "bitflags", version = "1.3.2" }, - { name = "darling_core", version = "<0.14" }, - { name = "darling_macro", version = "<0.14" }, - { name = "darling", version = "<0.14" }, { name = "der-parser", version = "8.2.0" }, { name = "event-listener", version = "2.5.3" }, { name = "event-listener", version = "4.0.3" }, @@ -56,7 +50,6 @@ skip = [ { name = "rustls", version = "0.21.11" }, { name = "rustls-webpki", version = "0.101.7" }, { name = "spin", version = "<0.9.6" }, - { name = "strsim", version = "0.10.0" }, { name = "sync_wrapper", version = "0.1.2" }, { name = "synstructure", version = "0.12.6" }, { name = "syn", version = "1.0.109" },