From 594a6503430350c2b37e4b0de738933d1ebc00c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alejandro=20Gonz=C3=A1lez?= Date: Thu, 14 Nov 2024 09:58:49 +0100 Subject: [PATCH] chore(deps): update `glsl-lang` fork to v0.7.0 --- Cargo.lock | 104 ++++++++++++++--------------- packages/packsquash/Cargo.toml | 14 ++-- packages/packsquash_cli/Cargo.toml | 2 +- 3 files changed, 60 insertions(+), 60 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 11408140b..82973d2a4 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -232,9 +232,9 @@ dependencies = [ [[package]] name = "bstr" -version = "1.10.0" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40723b8fb387abc38f4f4a37c09073622e41dd12327033091ef8950659e6dc0c" +checksum = "1a68f1f47cdf0ec8ee4b941b2eee2a80cb796db73118c0dd09ac63fbe405be22" dependencies = [ "memchr", "serde", @@ -290,9 +290,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.1.36" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baee610e9452a8f6f0a1b6194ec09ff9e2d85dea54432acdae41aa0761c95d70" +checksum = "1aeb932158bd710538c73702db6945cb68a8fb08c519e6e12706b94263b36db8" dependencies = [ "shlex", ] @@ -342,18 +342,18 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.20" +version = "4.5.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b97f376d85a664d5837dbae44bf546e6477a679ff6610010f17276f686d867e8" +checksum = "fb3b4b9e5a7c7514dfa52869339ee98b3156b0bfb4e8a77c4ff4babb64b1604f" dependencies = [ "clap_builder", ] [[package]] name = "clap_builder" -version = "4.5.20" +version = "4.5.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19bc80abd44e4bed93ca373a0704ccbd1b710dc5749406201bb018272808dc54" +checksum = "b17a95aa67cc7b5ebd32aa5370189aa0d79069ef1c64ce893bd30fb24bff20ec" dependencies = [ "anstream", "anstyle", @@ -363,9 +363,9 @@ dependencies = [ [[package]] name = "clap_lex" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1462739cb27611015575c0c11df5df7601141071f07518d56fcc1be504cbec97" +checksum = "afb84c814227b90d6895e01398aee0d8033c00e7466aca416fb6a8e0eb19d8a7" [[package]] name = "clap_mangen" @@ -427,9 +427,9 @@ checksum = "7704b5fdd17b18ae31c4c1da5a2e0305a2bf17b5249300a9ee9ed7b72114c636" [[package]] name = "cpufeatures" -version = "0.2.14" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "608697df725056feaccfa42cffdaeeec3fccc4ffc38358ecd19b243e716a78e0" +checksum = "0ca741a962e1b0bff6d724a1a0958b686406e853bb14061f218562e1896f95e6" dependencies = [ "libc", ] @@ -532,9 +532,9 @@ dependencies = [ [[package]] name = "csv" -version = "1.3.0" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac574ff4d437a7b5ad237ef331c17ccca63c46479e5b5453eb8e10bb99a759fe" +checksum = "acdc4883a9c96732e4733212c01447ebd805833b7275a73ca3ee080fd77afdaf" dependencies = [ "csv-core", "itoa", @@ -786,9 +786,9 @@ checksum = "af9673d8203fcb076b19dfd17e38b3d4ae9f44959416ea532ce72415a6020365" [[package]] name = "fastrand" -version = "2.1.1" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6" +checksum = "486f806e73c5707928240ddc295403b1b93c96a02038563881c4a2fd84b81ac4" [[package]] name = "filetime" @@ -973,8 +973,8 @@ dependencies = [ [[package]] name = "glsl-lang" -version = "0.6.1" -source = "git+https://github.com/ComunidadAylas/glsl-lang#335fcbd94284839e22863a5fef10251614347a8e" +version = "0.7.1" +source = "git+https://github.com/ComunidadAylas/glsl-lang#6da345bf488b5636c9767a50b614c16dbc29fb47" dependencies = [ "glsl-lang-lexer", "glsl-lang-types", @@ -982,25 +982,25 @@ dependencies = [ "lalrpop-util", "lang-util", "once_cell", - "thiserror 1.0.68", + "thiserror 1.0.69", ] [[package]] name = "glsl-lang-lexer" -version = "0.6.1" -source = "git+https://github.com/ComunidadAylas/glsl-lang#335fcbd94284839e22863a5fef10251614347a8e" +version = "0.7.1" +source = "git+https://github.com/ComunidadAylas/glsl-lang#6da345bf488b5636c9767a50b614c16dbc29fb47" dependencies = [ "glsl-lang-pp", "glsl-lang-types", "lalrpop-util", "lang-util", - "thiserror 1.0.68", + "thiserror 1.0.69", ] [[package]] name = "glsl-lang-pp" -version = "0.6.1" -source = "git+https://github.com/ComunidadAylas/glsl-lang#335fcbd94284839e22863a5fef10251614347a8e" +version = "0.7.1" +source = "git+https://github.com/ComunidadAylas/glsl-lang#6da345bf488b5636c9767a50b614c16dbc29fb47" dependencies = [ "arrayvec", "bimap", @@ -1013,16 +1013,16 @@ dependencies = [ "static_assertions", "string_cache", "string_cache_codegen", - "thiserror 1.0.68", + "thiserror 1.0.69", ] [[package]] name = "glsl-lang-types" -version = "0.6.1" -source = "git+https://github.com/ComunidadAylas/glsl-lang#335fcbd94284839e22863a5fef10251614347a8e" +version = "0.7.1" +source = "git+https://github.com/ComunidadAylas/glsl-lang#6da345bf488b5636c9767a50b614c16dbc29fb47" dependencies = [ "lang-util", - "thiserror 1.0.68", + "thiserror 1.0.69", ] [[package]] @@ -1225,9 +1225,9 @@ dependencies = [ [[package]] name = "lang-util" -version = "0.6.1" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d1ff113d52dd7efb231f1309d6fef82fbf0cc0f3c4597e02e5a6dc9c3197774" +checksum = "e079c573bd484aa5e5feff396642f10b11184bf56e2e39f9b9da9c5154188770" dependencies = [ "derive_more", "lalrpop-util", @@ -1239,9 +1239,9 @@ dependencies = [ [[package]] name = "lang-util-derive" -version = "0.6.1" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f440b77c4d69537fbf388080e3d25f8d82b816d6bfbff4bb5b2ec1a69755f596" +checksum = "d9626b200d46c2088152252fafd5e08ee1b2e609fa0cf89a747f8c6d3c7d6b21" dependencies = [ "darling", "proc-macro2", @@ -1257,9 +1257,9 @@ checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" [[package]] name = "libc" -version = "0.2.161" +version = "0.2.162" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e9489c2807c139ffd9c1794f4af0ebe86a828db53ecdc7fea2111d0fed085d1" +checksum = "18d287de67fe55fd7e1581fe933d965a5a9477b38e949cfa9f8574ef01506398" [[package]] name = "libdeflate-sys" @@ -1519,7 +1519,7 @@ dependencies = [ "ouroboros", "rand_xoshiro", "slice-group-by", - "thiserror 1.0.68", + "thiserror 1.0.69", "tinyvec", "vorbis_bitpack", ] @@ -1978,7 +1978,7 @@ checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43" dependencies = [ "getrandom", "libredox", - "thiserror 1.0.68", + "thiserror 1.0.69", ] [[package]] @@ -1995,9 +1995,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.8" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "368758f23274712b504848e9d5a6f010445cc8b87a7cdb4d7cbee666c1288da3" +checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908" dependencies = [ "aho-corasick", "memchr", @@ -2096,9 +2096,9 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.39" +version = "0.38.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "375116bee2be9ed569afe2154ea6a99dfdffd257f533f187498c2a8f5feaf4ee" +checksum = "99e4ea3e1cdc4b559b8e5650f9c8e5998e3e5c1343b4eaf034565f32318d63c0" dependencies = [ "bitflags 2.6.0", "errno", @@ -2142,18 +2142,18 @@ checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" [[package]] name = "serde" -version = "1.0.214" +version = "1.0.215" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f55c3193aca71c12ad7890f1785d2b73e1b9f63a0bbc353c08ef26fe03fc56b5" +checksum = "6513c1ad0b11a9376da888e3e0baa0077f1aed55c17f50e7b2397136129fb88f" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.214" +version = "1.0.215" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de523f781f095e28fa605cdce0f8307e451cc0fd14e2eb4cd2e98a355b147766" +checksum = "ad1e866f866923f252f05c889987993144fb74e722403468a4ebd70c3cd756c0" dependencies = [ "proc-macro2", "quote", @@ -2500,11 +2500,11 @@ checksum = "f18aa187839b2bdb1ad2fa35ead8c4c2976b64e4363c386d45ac0f7ee85c9233" [[package]] name = "thiserror" -version = "1.0.68" +version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02dd99dc800bbb97186339685293e1cc5d9df1f8fae2d0aecd9ff1c77efea892" +checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52" dependencies = [ - "thiserror-impl 1.0.68", + "thiserror-impl 1.0.69", ] [[package]] @@ -2518,9 +2518,9 @@ dependencies = [ [[package]] name = "thiserror-impl" -version = "1.0.68" +version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7c61ec9a6f64d2793d8a45faba21efbe3ced62a886d44c36a009b2b519b4c7e" +checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" dependencies = [ "proc-macro2", "quote", @@ -2771,7 +2771,7 @@ dependencies = [ "aotuv_lancer_vorbis_sys", "errno", "ogg_next_sys", - "thiserror 1.0.68", + "thiserror 1.0.69", "tinyvec", ] @@ -2878,7 +2878,7 @@ version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" dependencies = [ - "windows-sys 0.48.0", + "windows-sys 0.59.0", ] [[package]] @@ -3199,7 +3199,7 @@ dependencies = [ "futures", "log", "serde", - "thiserror 1.0.68", + "thiserror 1.0.69", "windows 0.58.0", "windows-core 0.58.0", ] diff --git a/packages/packsquash/Cargo.toml b/packages/packsquash/Cargo.toml index 807e32e9c..c49c8b0d3 100644 --- a/packages/packsquash/Cargo.toml +++ b/packages/packsquash/Cargo.toml @@ -15,19 +15,19 @@ globset = { version = "0.4.15", default-features = false } enumset = { version = "1.1.5", features = ["serde"] } indexmap = { version = "2.6.0", features = ["serde"] } itertools = "0.13.0" -thiserror = "2.0.0" +thiserror = "2.0.3" ahash = "0.8.11" patricia_tree = "0.8.0" sysinfo = { version = "0.32.0", default-features = false, features = ["system"] } walkdir = "2.5.0" -tokio = { version = "1.41.0", default-features = false, features = ["rt-multi-thread", "macros", "io-util", "fs", "sync", "parking_lot"] } +tokio = { version = "1.41.1", default-features = false, features = ["rt-multi-thread", "macros", "io-util", "fs", "sync", "parking_lot"] } tokio-util = { version = "0.7.12", default-features = false, features = ["codec", "io"] } tokio-stream = { version = "0.1.16", default-features = false } futures = { version = "0.3.31", default-features = false } -serde = { version = "1.0.214", features = ["derive"] } +serde = { version = "1.0.215", features = ["derive"] } serde_json = "1.0.132" json_comments = "0.2.2" @@ -48,13 +48,13 @@ dasp_sample = "0.11.0" rubato = "0.16.1" optivorbis = "0.2.0" -glsl-lang = { version = "0.6.1", features = ["lexer-v2-full", "lexer-v2-min"] } -glsl-lang-lexer = "0.6.1" -glsl-lang-pp = "0.6.1" +glsl-lang = { version = "0.7.1", features = ["lexer-v2-full", "lexer-v2-min"] } +glsl-lang-lexer = "0.7.1" +glsl-lang-pp = "0.7.1" java-properties = { version = "2.0.0", optional = true } -tempfile = "3.13.0" +tempfile = "3.14.0" crc32fast = { version = "1.4.2", features = ["nightly"] } zopfli = { version = "0.8.1", default-features = false, features = ["std", "nightly"] } diff --git a/packages/packsquash_cli/Cargo.toml b/packages/packsquash_cli/Cargo.toml index 11975ccf6..0960ac2ad 100644 --- a/packages/packsquash_cli/Cargo.toml +++ b/packages/packsquash_cli/Cargo.toml @@ -15,7 +15,7 @@ packsquash = { path = "../packsquash", version = "0.4.0" } getopts = "0.2.21" toml = { version = "0.8.19", default-features = false, features = ["parse"] } -tokio = { version = "1.41.0", default-features = false, features = ["time"] } +tokio = { version = "1.41.1", default-features = false, features = ["time"] } serde_path_to_error = "0.1.16"