diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ba9aca7f1..f3d6b0908 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -168,13 +168,13 @@ jobs: - name: 🧰 Install nextest if: startsWith(matrix.target, 'x86_64-') || contains(matrix.target, '-linux-') - uses: taiki-e/install-action@e659bf85ee986e37e35cc1c53bfeebe044d8133e # v2 + uses: taiki-e/install-action@47d27149ff6b3422864ec504071d5cc7873d642e# v2 with: tool: nextest - name: 🧰 Install cargo-deb if: endsWith(matrix.target, '-linux-gnu') - uses: taiki-e/install-action@e659bf85ee986e37e35cc1c53bfeebe044d8133e # v2 + uses: taiki-e/install-action@47d27149ff6b3422864ec504071d5cc7873d642e # v2 with: tool: cargo-deb diff --git a/Cargo.lock b/Cargo.lock index 9db37ba35..f452f5034 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -188,9 +188,9 @@ dependencies = [ [[package]] name = "bstr" -version = "1.6.2" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c2f7349907b712260e64b0afe2f84692af14a454be26187d9df565c7f69266a" +checksum = "c79ad7fb2dd38f3dabd76b09c6a5a20c038fc0213ef1e9afd30eb777f120f019" dependencies = [ "memchr", "serde", @@ -739,25 +739,14 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.4" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "add4f07d43996f76ef320709726a556a9d4f965d9410d8d0271132d2f8293480" +checksum = "ac3e13f66a2f95e32a39eaa81f6b95d42878ca0e1db0c7543723dfe12557e860" dependencies = [ - "errno-dragonfly", "libc", "windows-sys", ] -[[package]] -name = "errno-dragonfly" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" -dependencies = [ - "cc", - "libc", -] - [[package]] name = "fastrand" version = "2.0.1" @@ -1335,9 +1324,9 @@ checksum = "29fc123b2f6600099ca18248f69e3ee02b09c4188c0d98e9a690d90dec3e408a" [[package]] name = "linux-raw-sys" -version = "0.4.8" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3852614a3bd9ca9804678ba6be5e3b8ce76dfc902cae004e3e0c44051b6e88db" +checksum = "da2479e8c062e40bf0066ffa0bc823de0a9368974af99c9f6df941d2c231e03f" [[package]] name = "lock_api" @@ -1473,9 +1462,9 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.16" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2" +checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" dependencies = [ "autocfg", ] @@ -1531,7 +1520,7 @@ checksum = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575" [[package]] name = "optivorbis" version = "0.1.4" -source = "git+https://github.com/OptiVorbis/OptiVorbis#c20ea0b14618137319db8bf7194690e361459152" +source = "git+https://github.com/OptiVorbis/OptiVorbis#c4ab66f89938dd76e1badf947ee8a6776cde1672" dependencies = [ "bumpalo", "getrandom", @@ -1573,8 +1562,9 @@ dependencies = [ [[package]] name = "oxipng" -version = "8.0.0" -source = "git+https://github.com/shssoichiro/oxipng?rev=1f002df0#1f002df0a2755ad7d1294413ab91ffc7919e9ecf" +version = "9.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28e5c341ef78a228e47a551bfd15ff885d8c501af49f953358763a538c01f14d" dependencies = [ "bitvec", "indexmap", @@ -1888,9 +1878,9 @@ checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068" [[package]] name = "proc-macro2" -version = "1.0.68" +version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b1106fec09662ec6dd98ccac0f81cef56984d0b49f75c92d8cbad76e20c005c" +checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da" dependencies = [ "unicode-ident", ] @@ -2018,25 +2008,25 @@ dependencies = [ [[package]] name = "regex" -version = "1.10.0" +version = "1.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d119d7c7ca818f8a53c300863d4f87566aac09943aef5b355bb83969dae75d87" +checksum = "aaac441002f822bc9705a681810a4dd2963094b9ca0ddc41cb963a4c189189ea" dependencies = [ "aho-corasick", "memchr", "regex-automata", - "regex-syntax 0.8.0", + "regex-syntax 0.8.2", ] [[package]] name = "regex-automata" -version = "0.4.1" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "465c6fc0621e4abc4187a2bda0937bfd4f722c2730b29562e19689ea796c9a4b" +checksum = "5011c7e263a695dc8ca064cddb722af1be54e517a280b12a5356f98366899e5d" dependencies = [ "aho-corasick", "memchr", - "regex-syntax 0.8.0", + "regex-syntax 0.8.2", ] [[package]] @@ -2047,9 +2037,9 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] name = "regex-syntax" -version = "0.8.0" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3cbb081b9784b07cceb8824c8583f86db4814d172ab043f3c23f7dc600bf83d" +checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" [[package]] name = "rgb" @@ -2132,9 +2122,9 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.17" +version = "0.38.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f25469e9ae0f3d0047ca8b93fc56843f38e6774f0914a107ff8b41be8be8e0b7" +checksum = "745ecfa778e66b2b63c88a61cb36e0eea109e803b0b86bf9879fbc77c70e86ed" dependencies = [ "bitflags 2.4.0", "errno", @@ -2172,24 +2162,24 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "semver" -version = "1.0.19" +version = "1.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad977052201c6de01a8ef2aa3378c4bd23217a056337d1d6da40468d267a4fb0" +checksum = "836fa6a3e1e547f9a2c4040802ec865b5d85f4014efe00555d7090a3dcaa1090" [[package]] name = "serde" -version = "1.0.188" +version = "1.0.189" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e" +checksum = "8e422a44e74ad4001bdc8eede9a4570ab52f71190e9c076d14369f38b9200537" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.188" +version = "1.0.189" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2" +checksum = "1e48d1f918009ce3145511378cf68d613e3b3d9137d67272562080d68a2b32d5" dependencies = [ "proc-macro2", "quote", @@ -2726,20 +2716,19 @@ dependencies = [ [[package]] name = "tracing" -version = "0.1.37" +version = "0.1.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" +checksum = "ee2ef2af84856a50c1d430afce2fdded0a4ec7eda868db86409b4543df0797f9" dependencies = [ - "cfg-if", "pin-project-lite", "tracing-core", ] [[package]] name = "tracing-core" -version = "0.1.31" +version = "0.1.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a" +checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" dependencies = [ "once_cell", ] @@ -2811,7 +2800,7 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" [[package]] name = "vorbis_bitpack" version = "0.1.1" -source = "git+https://github.com/OptiVorbis/OptiVorbis#c20ea0b14618137319db8bf7194690e361459152" +source = "git+https://github.com/OptiVorbis/OptiVorbis#c4ab66f89938dd76e1badf947ee8a6776cde1672" [[package]] name = "vorbis_rs" @@ -3038,9 +3027,9 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "winnow" -version = "0.5.16" +version = "0.5.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "037711d82167854aff2018dfd193aa0fef5370f456732f0d5a0c59b0f1b4b907" +checksum = "a3b801d0e0a6726477cc207f60162da452f3a95adb368399bef20a946e06f65c" dependencies = [ "memchr", ] diff --git a/Cargo.toml b/Cargo.toml index 6257bb525..548173101 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -3,10 +3,6 @@ members = ["packages/*"] resolver = "2" [patch.crates-io] -# Use a newer commit of oxipng that has a PR that adds a more performant raw image API merged. -# Related PR: https://github.com/shssoichiro/oxipng/pull/482 -oxipng = { git = "https://github.com/shssoichiro/oxipng", rev = "1f002df0" } - # Use our fork of glsl-lang that allows it to parse #moj_import directives glsl-lang = { git = "https://github.com/ComunidadAylas/glsl-lang" } glsl-lang-lexer = { git = "https://github.com/ComunidadAylas/glsl-lang" } diff --git a/deny.toml b/deny.toml index eb906d751..406d0ed5e 100644 --- a/deny.toml +++ b/deny.toml @@ -91,10 +91,6 @@ ignore = true multiple-versions = "warn" highlight = "all" skip = [ - # Some parts of the ecosystem have already updated aho-corasick to v1 (e.g., the - # regex crate), but others didn't (e.g., globset). Let's ignore that for now, - # globset shouldn't stay that way for long - { name = "aho-corasick", version = "=0.7.20" }, # 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" }, @@ -107,14 +103,16 @@ skip-tree = [ # affect the final user executables at all { name = "perfcnt" }, # Criterion itself also pulls some older dependencies - { name = "criterion" } + { name = "criterion" }, + # The build-time winresource dependency pulls slightly older toml + # crate versions. They don't affect final executables + { name = "winresource" } ] [sources] unknown-registry = "deny" unknown-git = "deny" allow-git = [ - "https://github.com/shssoichiro/oxipng", "https://github.com/RustAudio/ogg" ] diff --git a/packages/packsquash/Cargo.toml b/packages/packsquash/Cargo.toml index 316086938..6178dcca3 100644 --- a/packages/packsquash/Cargo.toml +++ b/packages/packsquash/Cargo.toml @@ -27,7 +27,7 @@ tokio-util = { version = "0.7.9", default-features = false, features = ["codec", tokio-stream = { version = "0.1.14", default-features = false } futures = { version = "0.3.28", default-features = false } -serde = { version = "1.0.188", features = ["derive"] } +serde = { version = "1.0.189", features = ["derive"] } serde_json = "1.0.107" json_comments = "0.2.1" @@ -36,7 +36,7 @@ jsonpath_lib = "0.3.0" spng = { version = "0.2.0-alpha.2", default-features = false } rgb = "0.8.36" imagequant = { version = "4.2.2", default-features = false } -oxipng = { version = "8.0.0", default-features = false, features = ["zopfli"] } +oxipng = { version = "9.0.0", default-features = false, features = ["zopfli"] } symphonia = { version = "0.5.3", default-features = false, features = ["wav", "isomp4", "flac", "pcm", "mp3", "aac"] } vorbis_rs = { version = "0.5.0", default-features = false } @@ -64,7 +64,7 @@ fpe = "0.6.1" uuid = "1.4.1" entropy = "0.4.1" rand_xoshiro = "0.6.0" -regex = "1.10.0" +regex = "1.10.1" aho-corasick = "1.1.2" [target.'cfg(unix)'.dependencies]