From 1cff9b4264f333e3958978301d19562650c3ceee Mon Sep 17 00:00:00 2001 From: Luke Parker Date: Fri, 5 Jan 2024 00:09:56 -0500 Subject: [PATCH] Patch proc-macro-crate 2 to proc-macro-crate 3 Updates toml_edit to 0.21. --- Cargo.lock | 25 ++++++++++++++++--------- Cargo.toml | 4 ++++ patches/proc-macro-crate/Cargo.toml | 17 +++++++++++++++++ patches/proc-macro-crate/src/lib.rs | 1 + 4 files changed, 38 insertions(+), 9 deletions(-) create mode 100644 patches/proc-macro-crate/Cargo.toml create mode 100644 patches/proc-macro-crate/src/lib.rs diff --git a/Cargo.lock b/Cargo.lock index 14509aa9..144cf041 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -687,7 +687,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bf4918709cc4dd777ad2b6303ed03cb37f3ca0ccede8c1b0d28ac6db8f4710e0" dependencies = [ "once_cell", - "proc-macro-crate 2.0.0", + "proc-macro-crate 2.0.1", "proc-macro2", "quote", "syn 2.0.47", @@ -4708,7 +4708,7 @@ version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6c11e44798ad209ccdd91fc192f0526a369a01234f7373e1b141c96d7cee4f0e" dependencies = [ - "proc-macro-crate 2.0.0", + "proc-macro-crate 2.0.1", "proc-macro2", "quote", "syn 2.0.47", @@ -5002,7 +5002,7 @@ version = "3.6.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "be30eaf4b0a9fba5336683b38de57bb86d179a35862ba6bfcf57625d006bde5b" dependencies = [ - "proc-macro-crate 2.0.0", + "proc-macro-crate 2.0.1", "proc-macro2", "quote", "syn 1.0.109", @@ -5362,11 +5362,18 @@ dependencies = [ [[package]] name = "proc-macro-crate" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e8366a6159044a37876a2b9817124296703c586a5c92e2c53751fa06d8d43e8" +version = "2.0.1" dependencies = [ - "toml_edit 0.20.7", + "proc-macro-crate 3.0.0", +] + +[[package]] +name = "proc-macro-crate" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6b2685dd208a3771337d8d386a89840f0f43cd68be8dae90a5f8c2384effc9cd" +dependencies = [ + "toml_edit 0.21.0", ] [[package]] @@ -9240,9 +9247,9 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.20.7" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70f427fce4d84c72b5b732388bf4a9f4531b53f74e2887e3ecb2481f68f66d81" +checksum = "d34d383cd00a163b4a5b85053df514d45bc330f6de7737edfe0a93311d1eaa03" dependencies = [ "indexmap 2.1.0", "toml_datetime", diff --git a/Cargo.toml b/Cargo.toml index 953e8f92..8bd7bec5 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -73,6 +73,7 @@ members = [ "patches/option-ext", "patches/directories-next", "patches/mach", + "patches/proc-macro-crate", ] # Always compile Monero (and a variety of dependencies) with optimizations due @@ -118,6 +119,9 @@ directories-next = { path = "patches/directories-next" } # mach is unmaintained, so this wraps mach2 as mach mach = { path = "patches/mach" } +# proc-macro-crate 2 binds to an old version of toml for msrv so we patch to 3 +proc-macro-crate = { path = "patches/proc-macro-crate" } + [workspace.lints.clippy] unwrap_or_default = "allow" borrow_as_ptr = "deny" diff --git a/patches/proc-macro-crate/Cargo.toml b/patches/proc-macro-crate/Cargo.toml new file mode 100644 index 00000000..1b37535a --- /dev/null +++ b/patches/proc-macro-crate/Cargo.toml @@ -0,0 +1,17 @@ +[package] +name = "proc-macro-crate" +version = "2.0.1" +description = "Patches proc-macro-crate 2 to 3" +license = "MIT" +repository = "https://github.com/serai-dex/serai/tree/develop/patches/proc-macro-crate" +authors = ["Luke Parker "] +keywords = [] +edition = "2021" +rust-version = "1.66" + +[package.metadata.docs.rs] +all-features = true +rustdoc-args = ["--cfg", "docsrs"] + +[dependencies] +proc-macro-crate = "3" diff --git a/patches/proc-macro-crate/src/lib.rs b/patches/proc-macro-crate/src/lib.rs new file mode 100644 index 00000000..4232bfb0 --- /dev/null +++ b/patches/proc-macro-crate/src/lib.rs @@ -0,0 +1 @@ +pub use proc_macro_crate::*;