diff --git a/Cargo.lock b/Cargo.lock index 7b23a26..4f0ac27 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1,5 +1,7 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. +version = 3 + [[package]] name = "addr2line" version = "0.14.0" @@ -60,9 +62,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bf292193c4eb7fc03befa301900c5e59ea7df253053db751f89fd16524494528" dependencies = [ "edit-distance", - "proc-macro2 1.0.24", + "proc-macro2 1.0.83", "quickcheck", - "quote 1.0.7", + "quote 1.0.36", "syn 1.0.48", ] @@ -233,11 +235,11 @@ version = "0.15.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e93c5b508a37aa7f8ce0b0035fb6e2b344d482597fccd89ff6d87e350c9ffcae" dependencies = [ - "heck", + "heck 0.3.1", "proc-macro-crate", - "proc-macro2 1.0.24", + "proc-macro2 1.0.83", "proc_macro_roids", - "quote 1.0.7", + "quote 1.0.36", "syn 1.0.48", ] @@ -561,8 +563,8 @@ dependencies = [ "lazy_static", "lazycell", "peeking_take_while", - "proc-macro2 1.0.24", - "quote 1.0.7", + "proc-macro2 1.0.83", + "quote 1.0.36", "regex", "rustc-hash", "shlex", @@ -1104,7 +1106,7 @@ version = "0.1.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7fbaabec2c953050352311293be5c6aba8e141ba19d6811862b232d6fd020484" dependencies = [ - "quote 1.0.7", + "quote 1.0.36", "syn 1.0.48", ] @@ -1145,8 +1147,8 @@ version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cb582b60359da160a9477ee80f15c8d784c477e69c217ef2cdd4169c24ea380f" dependencies = [ - "proc-macro2 1.0.24", - "quote 1.0.7", + "proc-macro2 1.0.83", + "quote 1.0.36", "syn 1.0.48", ] @@ -1156,8 +1158,8 @@ version = "0.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "71f31892cd5c62e414316f2963c5689242c43d8e7bbcaaeca97e5e28c95d91d9" dependencies = [ - "proc-macro2 1.0.24", - "quote 1.0.7", + "proc-macro2 1.0.83", + "quote 1.0.36", "syn 1.0.48", ] @@ -1273,8 +1275,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "22deed3a8124cff5fa835713fa105621e43bbdc46690c3a6b68328a012d350d4" dependencies = [ "proc-macro-error", - "proc-macro2 1.0.24", - "quote 1.0.7", + "proc-macro2 1.0.83", + "quote 1.0.36", "rustversion", "syn 1.0.48", "synstructure", @@ -1315,8 +1317,8 @@ version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "aa4da3c766cd7a0db8242e326e9e4e081edd567072893ed320008189715366a4" dependencies = [ - "proc-macro2 1.0.24", - "quote 1.0.7", + "proc-macro2 1.0.83", + "quote 1.0.36", "syn 1.0.48", "synstructure", ] @@ -1489,8 +1491,8 @@ version = "0.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5bb3f5b7d8d70c9bd23cf29b2b38094661418fb0ea79f1b0cc2019a11d6f5429" dependencies = [ - "proc-macro2 1.0.24", - "quote 1.0.7", + "proc-macro2 1.0.83", + "quote 1.0.36", "syn 1.0.48", ] @@ -1570,8 +1572,8 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1a5bcf1bbeab73aa4cf2fde60a846858dc036163c7c33bec309f8d17de785479" dependencies = [ - "proc-macro2 1.0.24", - "quote 1.0.7", + "proc-macro2 1.0.83", + "quote 1.0.36", "syn 1.0.48", ] @@ -1612,8 +1614,8 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "def9469f08de9930cae4c4e7d88b059cce0765a0ffdf6108ecc96568e801516d" dependencies = [ - "proc-macro2 1.0.24", - "quote 1.0.7", + "proc-macro2 1.0.83", + "quote 1.0.36", "syn 1.0.48", ] @@ -1637,8 +1639,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f6636de7bf52227363554f1ca2d9cd180fc666129ddd0933097e1f227dfa7293" dependencies = [ "inflections", - "proc-macro2 1.0.24", - "quote 1.0.7", + "proc-macro2 1.0.83", + "quote 1.0.36", "syn 1.0.48", ] @@ -1716,6 +1718,12 @@ dependencies = [ "unicode-segmentation", ] +[[package]] +name = "heck" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" + [[package]] name = "hermit-abi" version = "0.1.17" @@ -1844,8 +1852,8 @@ version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ddead8880bc50f57fcd3b5869a7f6ff92570bb4e8f6870c22e2483272f2256da" dependencies = [ - "proc-macro2 1.0.24", - "quote 1.0.7", + "proc-macro2 1.0.83", + "quote 1.0.36", "syn 1.0.48", ] @@ -2636,8 +2644,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" dependencies = [ "proc-macro-error-attr", - "proc-macro2 1.0.24", - "quote 1.0.7", + "proc-macro2 1.0.83", + "quote 1.0.36", "syn 1.0.48", "version_check", ] @@ -2648,8 +2656,8 @@ version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" dependencies = [ - "proc-macro2 1.0.24", - "quote 1.0.7", + "proc-macro2 1.0.83", + "quote 1.0.36", "version_check", ] @@ -2670,11 +2678,11 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.24" +version = "1.0.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e0704ee1a7e00d7bb417d0770ea303c1bccbabf0ef1667dae92b5967f5f8a71" +checksum = "0b33eb56c327dec362a9e55b3ad14f9d2f0904fb5a5b03b513ab5465399e9f43" dependencies = [ - "unicode-xid 0.2.1", + "unicode-ident", ] [[package]] @@ -2683,8 +2691,8 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "06675fa2c577f52bcf77fbb511123927547d154faa08097cc012c66ec3c9611a" dependencies = [ - "proc-macro2 1.0.24", - "quote 1.0.7", + "proc-macro2 1.0.83", + "quote 1.0.36", "syn 1.0.48", ] @@ -2711,11 +2719,11 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.7" +version = "1.0.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa563d17ecb180e500da1cfd2b028310ac758de548efdd203e18f283af693f37" +checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" dependencies = [ - "proc-macro2 1.0.24", + "proc-macro2 1.0.83", ] [[package]] @@ -3285,8 +3293,8 @@ version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "475e68978dc5b743f2f40d8e0a8fdc83f1c5e78cbf4b8fa5e74e73beebc340de" dependencies = [ - "proc-macro2 1.0.24", - "quote 1.0.7", + "proc-macro2 1.0.83", + "quote 1.0.36", "syn 1.0.48", ] @@ -3428,7 +3436,7 @@ dependencies = [ "sanity-lib", "serde", "strum", - "strum_macros 0.20.1", + "strum_macros", "wfc", ] @@ -3440,7 +3448,7 @@ dependencies = [ "bracket-pathfinding", "serde", "strum", - "strum_macros 0.19.4", + "strum_macros", ] [[package]] @@ -3494,8 +3502,8 @@ version = "1.0.117" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cbd1ae72adb44aab48f325a02444a5fc079349a8d804c1fc922aed3f7454c74e" dependencies = [ - "proc-macro2 1.0.24", - "quote 1.0.7", + "proc-macro2 1.0.83", + "quote 1.0.36", "syn 1.0.48", ] @@ -3578,8 +3586,8 @@ version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a1f37080f2751fbf091dbdebaa95bd6cf9dbf74ad1d50396b1908518a1747fdf" dependencies = [ - "proc-macro2 1.0.24", - "quote 1.0.7", + "proc-macro2 1.0.83", + "quote 1.0.36", "syn 1.0.48", ] @@ -3671,8 +3679,8 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3e23e09360f3d2190fec4222cd9e19d3158d5da948c0d1ea362df617dd103511" dependencies = [ - "proc-macro2 1.0.24", - "quote 1.0.7", + "proc-macro2 1.0.83", + "quote 1.0.36", "syn 1.0.48", ] @@ -3742,32 +3750,21 @@ dependencies = [ [[package]] name = "strum" -version = "0.19.5" +version = "0.26.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b89a286a7e3b5720b9a477b23253bc50debac207c8d21505f8e70b36792f11b5" +checksum = "5d8cec3501a5194c432b2b7976db6b7d10ec95c253208b45f83f7136aa985e29" [[package]] name = "strum_macros" -version = "0.19.4" +version = "0.26.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e61bb0be289045cb80bfce000512e32d09f8337e54c186725da381377ad1f8d5" +checksum = "c6cf59daf282c0a494ba14fd21610a0325f9f90ec9d1231dea26bcb1d696c946" dependencies = [ - "heck", - "proc-macro2 1.0.24", - "quote 1.0.7", - "syn 1.0.48", -] - -[[package]] -name = "strum_macros" -version = "0.20.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee8bc6b87a5112aeeab1f4a9f7ab634fe6cbefc4850006df31267f4cfb9e3149" -dependencies = [ - "heck", - "proc-macro2 1.0.24", - "quote 1.0.7", - "syn 1.0.48", + "heck 0.4.1", + "proc-macro2 1.0.83", + "quote 1.0.36", + "rustversion", + "syn 2.0.65", ] [[package]] @@ -3798,19 +3795,30 @@ version = "1.0.48" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cc371affeffc477f42a221a1e4297aedcea33d47d19b61455588bd9d8f6b19ac" dependencies = [ - "proc-macro2 1.0.24", - "quote 1.0.7", + "proc-macro2 1.0.83", + "quote 1.0.36", "unicode-xid 0.2.1", ] +[[package]] +name = "syn" +version = "2.0.65" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2863d96a84c6439701d7a38f9de935ec562c8832cc55d1dde0f513b52fad106" +dependencies = [ + "proc-macro2 1.0.83", + "quote 1.0.36", + "unicode-ident", +] + [[package]] name = "synstructure" version = "0.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b834f2d66f734cb897113e34aaff2f1ab4719ca946f9a7358dba8f8064148701" dependencies = [ - "proc-macro2 1.0.24", - "quote 1.0.7", + "proc-macro2 1.0.83", + "quote 1.0.36", "syn 1.0.48", "unicode-xid 0.2.1", ] @@ -3830,8 +3838,8 @@ version = "1.0.22" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9ba20f23e85b10754cd195504aebf6a27e2e6cbe28c17778a0c930724628dd56" dependencies = [ - "proc-macro2 1.0.24", - "quote 1.0.7", + "proc-macro2 1.0.83", + "quote 1.0.36", "syn 1.0.48", ] @@ -4014,11 +4022,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e0098f77bd754f8fb7850cdf4ab143aa821898c4ac6dc16bcb2aa3e62ce858d1" dependencies = [ "proc-macro-hack", - "quote 1.0.7", + "quote 1.0.36", "syn 1.0.48", "unic-langid-impl", ] +[[package]] +name = "unicode-ident" +version = "1.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" + [[package]] name = "unicode-normalization" version = "0.1.14" @@ -4110,8 +4124,8 @@ dependencies = [ "bumpalo", "lazy_static", "log", - "proc-macro2 1.0.24", - "quote 1.0.7", + "proc-macro2 1.0.83", + "quote 1.0.36", "syn 1.0.48", "wasm-bindgen-shared", ] @@ -4122,7 +4136,7 @@ version = "0.2.68" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6b13312a745c08c469f0b292dd2fcd6411dba5f7160f593da6ef69b64e407038" dependencies = [ - "quote 1.0.7", + "quote 1.0.36", "wasm-bindgen-macro-support", ] @@ -4132,8 +4146,8 @@ version = "0.2.68" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f249f06ef7ee334cc3b8ff031bfc11ec99d00f34d86da7498396dc1e3b1498fe" dependencies = [ - "proc-macro2 1.0.24", - "quote 1.0.7", + "proc-macro2 1.0.83", + "quote 1.0.36", "syn 1.0.48", "wasm-bindgen-backend", "wasm-bindgen-shared", diff --git a/sanity-bin/Cargo.toml b/sanity-bin/Cargo.toml index baa2163..4a66277 100644 --- a/sanity-bin/Cargo.toml +++ b/sanity-bin/Cargo.toml @@ -16,8 +16,8 @@ ron = "0.6.2" serde = "1.0.117" wfc = "0.9.2" bracket-pathfinding = "0.8.1" -strum = "0.19.5" -strum_macros = "0.20.1" +strum = "0.26.0" +strum_macros = "0.26.0" [features] default = ["vulkan"] diff --git a/sanity-lib/Cargo.toml b/sanity-lib/Cargo.toml index 5b3bce9..bfb21af 100644 --- a/sanity-lib/Cargo.toml +++ b/sanity-lib/Cargo.toml @@ -10,8 +10,8 @@ edition = "2018" amethyst = "0.15.3" bracket-pathfinding = "0.8.1" serde = "1.0.117" -strum = "0.19.5" -strum_macros = "0.19.4" +strum = "0.26.0" +strum_macros = "0.26.0" [features] default = ["vulkan"]