diff --git a/Cargo.lock b/Cargo.lock index 11b1dcc5..2a4c7e17 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -516,7 +516,7 @@ dependencies = [ "anstream", "anstyle", "clap_lex", - "strsim 0.11.1", + "strsim", ] [[package]] @@ -543,7 +543,7 @@ version = "0.10.0" dependencies = [ "arcstr", "convert_case 0.6.0", - "darling 0.20.10", + "darling", "examples", "macrotools", "proc-macro-crate 1.3.1", @@ -667,38 +667,14 @@ dependencies = [ "typenum", ] -[[package]] -name = "darling" -version = "0.14.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b750cb3417fd1b327431a470f388520309479ab0bf5e323505daf0290cd3850" -dependencies = [ - "darling_core 0.14.4", - "darling_macro 0.14.4", -] - [[package]] name = "darling" version = "0.20.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6f63b86c8a8826a49b8c21f08a2d07338eec8d900540f8630dc76284be802989" dependencies = [ - "darling_core 0.20.10", - "darling_macro 0.20.10", -] - -[[package]] -name = "darling_core" -version = "0.14.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "109c1ca6e6b7f82cc233a97004ea8ed7ca123a9af07a8230878fcfda9b158bf0" -dependencies = [ - "fnv", - "ident_case", - "proc-macro2", - "quote", - "strsim 0.10.0", - "syn 1.0.109", + "darling_core", + "darling_macro", ] [[package]] @@ -711,28 +687,17 @@ dependencies = [ "ident_case", "proc-macro2", "quote", - "strsim 0.11.1", + "strsim", "syn 2.0.96", ] -[[package]] -name = "darling_macro" -version = "0.14.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4aab4dbc9f7611d8b55048a3a16d2d010c2c8334e46304b40ac1cc14bf3b48e" -dependencies = [ - "darling_core 0.14.4", - "quote", - "syn 1.0.109", -] - [[package]] name = "darling_macro" version = "0.20.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" dependencies = [ - "darling_core 0.20.10", + "darling_core", "quote", "syn 2.0.96", ] @@ -748,34 +713,13 @@ dependencies = [ "syn 2.0.96", ] -[[package]] -name = "derive_builder" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d67778784b508018359cbc8696edb3db78160bab2c2a28ba7f56ef6932997f8" -dependencies = [ - "derive_builder_macro 0.12.0", -] - [[package]] name = "derive_builder" version = "0.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "507dfb09ea8b7fa618fcf76e953f4f5e192547945816d5358edffe39f6f94947" dependencies = [ - "derive_builder_macro 0.20.2", -] - -[[package]] -name = "derive_builder_core" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c11bdc11a0c47bc7d37d582b5285da6849c96681023680b906673c5707af7b0f" -dependencies = [ - "darling 0.14.4", - "proc-macro2", - "quote", - "syn 1.0.109", + "derive_builder_macro", ] [[package]] @@ -784,29 +728,19 @@ version = "0.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2d5bcf7b024d6835cfb3d473887cd966994907effbe9227e8c8219824d06c4e8" dependencies = [ - "darling 0.20.10", + "darling", "proc-macro2", "quote", "syn 2.0.96", ] -[[package]] -name = "derive_builder_macro" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebcda35c7a396850a55ffeac740804b40ffec779b98fffbb1738f4033f0ee79e" -dependencies = [ - "derive_builder_core 0.12.0", - "syn 1.0.109", -] - [[package]] name = "derive_builder_macro" version = "0.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ab63b0e2bf4d5928aff72e83a7dace85d7bba5fe12dcc3c5a572d78caffd3f3c" dependencies = [ - "derive_builder_core 0.20.2", + "derive_builder_core", "syn 2.0.96", ] @@ -890,7 +824,7 @@ name = "enumify_macros" version = "0.3.0" dependencies = [ "convert_case 0.6.0", - "darling 0.20.10", + "darling", "macrotools", "proc-macro-crate 1.3.1", "proc-macro-error", @@ -1066,7 +1000,7 @@ dependencies = [ "arcstr", "byteorder", "chrono", - "derive_builder 0.12.0", + "derive_builder", "derive_more", "num-derive", "num-traits", @@ -1119,7 +1053,7 @@ dependencies = [ name = "geometry_macros" version = "0.0.3" dependencies = [ - "darling 0.20.10", + "darling", "macrotools", "proc-macro-crate 1.3.1", "proc-macro-error", @@ -1531,7 +1465,7 @@ checksum = "04cbf5b083de1c7e0222a7a51dbfdba1cbe1c6ab0b15e29fff3f6c077fd9cd9f" name = "macrotools" version = "0.2.0" dependencies = [ - "darling 0.20.10", + "darling", "proc-macro2", "quote", "syn 2.0.96", @@ -2529,7 +2463,7 @@ dependencies = [ "approx", "arcstr", "derive-where", - "derive_builder 0.20.2", + "derive_builder", "gds", "gdsconv", "geometry", @@ -2692,12 +2626,6 @@ dependencies = [ "serde", ] -[[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" @@ -2715,7 +2643,7 @@ dependencies = [ "codegen", "config", "derive-where", - "derive_builder 0.12.0", + "derive_builder", "downcast-rs", "duplicate", "ena", @@ -3196,7 +3124,7 @@ checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" name = "type_dispatch" version = "0.5.0" dependencies = [ - "darling 0.20.10", + "darling", "duplicate", "proc-macro2", "quote", @@ -3208,7 +3136,7 @@ dependencies = [ name = "type_dispatch_macros" version = "0.4.0" dependencies = [ - "darling 0.20.10", + "darling", "itertools 0.11.0", "proc-macro-crate 1.3.1", "proc-macro-error", diff --git a/libs/gds/Cargo.toml b/libs/gds/Cargo.toml index 0d3c7524..3ede8a63 100644 --- a/libs/gds/Cargo.toml +++ b/libs/gds/Cargo.toml @@ -6,7 +6,7 @@ edition = "2021" [dependencies] byteorder = "1.4" chrono = { version = "0.4", features = ["serde"] } -derive_builder = "0.12" +derive_builder = "0.20" derive_more = "0.99" num-derive = "0.4" num-traits = "0.2" diff --git a/substrate/Cargo.toml b/substrate/Cargo.toml index 029d2f64..1aa7c2a8 100644 --- a/substrate/Cargo.toml +++ b/substrate/Cargo.toml @@ -16,7 +16,7 @@ rust_decimal = "1" rust_decimal_macros = "1" ena = "0.14" duplicate = "1" -derive_builder = "0.12" +derive_builder = "0.20" slotmap = "1" downcast-rs = "1" indexmap = { version = "2", features = ["serde"] }