From fec1be27b2aa0d5211a641cf6ec3f56b28135a1a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alejandro=20Gonz=C3=A1lez?= Date: Thu, 19 Sep 2024 22:46:28 +0200 Subject: [PATCH] chore: update `glsl-lang` fork This drops a build-time dependency on `syn` v1, which is expected to help out with build times a little. --- Cargo.lock | 159 ++++++++++++--------------------- deny.toml | 7 -- packages/packsquash/Cargo.toml | 8 +- 3 files changed, 59 insertions(+), 115 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index f371aa603..c892c446d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -155,7 +155,7 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn", ] [[package]] @@ -358,7 +358,7 @@ dependencies = [ "anstream", "anstyle", "clap_lex", - "strsim 0.11.1", + "strsim", ] [[package]] @@ -403,12 +403,6 @@ dependencies = [ "tiny-keccak", ] -[[package]] -name = "convert_case" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" - [[package]] name = "core-foundation" version = "0.10.0" @@ -557,38 +551,14 @@ dependencies = [ "memchr", ] -[[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]] @@ -601,18 +571,8 @@ dependencies = [ "ident_case", "proc-macro2", "quote", - "syn 2.0.77", -] - -[[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", + "strsim", + "syn", ] [[package]] @@ -621,9 +581,9 @@ 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.77", + "syn", ] [[package]] @@ -683,15 +643,23 @@ dependencies = [ [[package]] name = "derive_more" -version = "0.99.18" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4a9b99b9cbbe49445b21764dc0625032a89b145a2642e67603e1c936f5458d05" +dependencies = [ + "derive_more-impl", +] + +[[package]] +name = "derive_more-impl" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f33878137e4dafd7fa914ad4e259e18a4e8e532b9617a2d0150262bf53abfce" +checksum = "cb7330aeadfbe296029522e6c40f315320aba36fc43a5b3632f3795348f3bd22" dependencies = [ - "convert_case", "proc-macro2", "quote", - "rustc_version", - "syn 2.0.77", + "syn", + "unicode-xid", ] [[package]] @@ -767,10 +735,10 @@ version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "59c3b24c345d8c314966bdc1832f6c2635bfcce8e7cf363bd115987bba2ee242" dependencies = [ - "darling 0.20.10", + "darling", "proc-macro2", "quote", - "syn 2.0.77", + "syn", ] [[package]] @@ -922,7 +890,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn", ] [[package]] @@ -1005,8 +973,8 @@ dependencies = [ [[package]] name = "glsl-lang" -version = "0.5.3" -source = "git+https://github.com/ComunidadAylas/glsl-lang#1a85a63bd7d99fcbe109671a62909e2ad7f3ca7b" +version = "0.6.0" +source = "git+https://github.com/ComunidadAylas/glsl-lang#b2429d010eeee20cfa8a356288cbc6ed4540f75d" dependencies = [ "glsl-lang-lexer", "glsl-lang-types", @@ -1019,8 +987,8 @@ dependencies = [ [[package]] name = "glsl-lang-lexer" -version = "0.5.3" -source = "git+https://github.com/ComunidadAylas/glsl-lang#1a85a63bd7d99fcbe109671a62909e2ad7f3ca7b" +version = "0.6.0" +source = "git+https://github.com/ComunidadAylas/glsl-lang#b2429d010eeee20cfa8a356288cbc6ed4540f75d" dependencies = [ "glsl-lang-pp", "glsl-lang-types", @@ -1031,14 +999,14 @@ dependencies = [ [[package]] name = "glsl-lang-pp" -version = "0.5.3" -source = "git+https://github.com/ComunidadAylas/glsl-lang#1a85a63bd7d99fcbe109671a62909e2ad7f3ca7b" +version = "0.6.0" +source = "git+https://github.com/ComunidadAylas/glsl-lang#b2429d010eeee20cfa8a356288cbc6ed4540f75d" dependencies = [ "arrayvec", "bimap", "cbitset", "derive_more", - "itertools 0.10.5", + "itertools 0.13.0", "lang-util", "once_cell", "rowan", @@ -1050,8 +1018,8 @@ dependencies = [ [[package]] name = "glsl-lang-types" -version = "0.5.3" -source = "git+https://github.com/ComunidadAylas/glsl-lang#1a85a63bd7d99fcbe109671a62909e2ad7f3ca7b" +version = "0.6.0" +source = "git+https://github.com/ComunidadAylas/glsl-lang#b2429d010eeee20cfa8a356288cbc6ed4540f75d" dependencies = [ "lang-util", "thiserror", @@ -1251,9 +1219,9 @@ dependencies = [ [[package]] name = "lang-util" -version = "0.5.3" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce46299d6a421319bee3407a6dd0634f3b02beb4999c4c849754306677e368e9" +checksum = "02d6cde280d262a2a5bcf4b18c8a5db2f86a034e750eaca96ff93d971f9d3f4d" dependencies = [ "derive_more", "lalrpop-util", @@ -1265,14 +1233,14 @@ dependencies = [ [[package]] name = "lang-util-derive" -version = "0.5.3" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42c23fd574ffb619785ee3aaead83bbb3688217d48aa6a1886e380b662390f0c" +checksum = "c67163960de3113c0d188c129eb53953fe341976fe4d00bc03b21ad548bd8474" dependencies = [ - "darling 0.14.4", + "darling", "proc-macro2", "quote", - "syn 1.0.109", + "syn", ] [[package]] @@ -1572,7 +1540,7 @@ dependencies = [ "proc-macro2", "proc-macro2-diagnostics", "quote", - "syn 2.0.77", + "syn", ] [[package]] @@ -1890,7 +1858,7 @@ checksum = "af066a9c399a26e020ada66a034357a868728e72cd426f3adcd35f80d88d88c8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn", "version_check 0.9.5", "yansi", ] @@ -2183,7 +2151,7 @@ checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn", ] [[package]] @@ -2259,9 +2227,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "smol_str" -version = "0.1.24" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fad6c857cbab2627dcf01ec85a623ca4e7dcb5691cbaa3d7fb7653671f0d09c9" +checksum = "dd538fb6910ac1099850255cf94a94df6551fbdd602454387d0adb2d1ca6dead" dependencies = [ "serde", ] @@ -2326,12 +2294,6 @@ dependencies = [ "quote", ] -[[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" @@ -2460,17 +2422,6 @@ dependencies = [ "symphonia-metadata", ] -[[package]] -name = "syn" -version = "1.0.109" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - [[package]] name = "syn" version = "2.0.77" @@ -2558,7 +2509,7 @@ checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn", ] [[package]] @@ -2616,7 +2567,7 @@ checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn", ] [[package]] @@ -2836,7 +2787,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.77", + "syn", "wasm-bindgen-shared", ] @@ -2858,7 +2809,7 @@ checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -2963,7 +2914,7 @@ checksum = "9107ddc059d5b6fbfbffdfa7a7fe3e22a226def0b2608f72e9d552763d3e1ad7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn", ] [[package]] @@ -2974,7 +2925,7 @@ checksum = "2bbd5b46c938e506ecbce286b6628a02171d56153ba733b6c741fc627ec9579b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn", ] [[package]] @@ -2985,7 +2936,7 @@ checksum = "29bee4b38ea3cde66011baa44dba677c432a78593e202392d1e9070cf2a7fca7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn", ] [[package]] @@ -2996,7 +2947,7 @@ checksum = "053c4c462dc91d3b1504c6fe5a726dd15e216ba718e84a0e46a88fbe5ded3515" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn", ] [[package]] @@ -3215,9 +3166,9 @@ dependencies = [ [[package]] name = "wmi" -version = "0.13.4" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff00ac1309d4c462be86f03a55e409509e8bf4323ec296aeb4b381dd9aabe6ec" +checksum = "fbdda506bdee26ba617bd814538b690e14f59e8185345344cff113a8be21c005" dependencies = [ "futures", "log", @@ -3284,7 +3235,7 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn", ] [[package]] diff --git a/deny.toml b/deny.toml index 852d3cc76..d533f2bde 100644 --- a/deny.toml +++ b/deny.toml @@ -87,13 +87,6 @@ ignore = true [bans] multiple-versions = "warn" highlight = "all" -skip = [ - # This older version is pulled by the GLSL macro machinery on build-time. - # It should not affect final executables - { name = "darling", version = "=0.14.4" }, - { name = "darling_macro", version = "=0.14.4" }, - { name = "darling_core", version = "=0.14.4" } -] skip-tree = [ # An ancient nom is pulled by the development dependency for # benchmarking perfcnt. Let's ignore that for now. It doesn't diff --git a/packages/packsquash/Cargo.toml b/packages/packsquash/Cargo.toml index 321224a7a..dad69d32f 100644 --- a/packages/packsquash/Cargo.toml +++ b/packages/packsquash/Cargo.toml @@ -48,9 +48,9 @@ dasp_sample = "0.11.0" rubato = "0.15.0" optivorbis = "0.2.0" -glsl-lang = { version = "0.5.3", features = ["lexer-v2-full", "lexer-v2-min"] } -glsl-lang-lexer = "0.5.3" -glsl-lang-pp = "0.5.3" +glsl-lang = { version = "0.6.0", features = ["lexer-v2-full", "lexer-v2-min"] } +glsl-lang-lexer = "0.6.0" +glsl-lang-pp = "0.6.0" java-properties = { version = "2.0.0", optional = true } @@ -72,7 +72,7 @@ rlimit = "0.10.2" [target.'cfg(windows)'.dependencies] winreg = "0.52.0" -wmi = { version = "0.13.4", default-features = false } +wmi = { version = "0.14.0", default-features = false } [target.'cfg(target_os = "macos")'.dependencies] core-foundation = "0.10.0"