From 482c62c9f6332b8fc402ba9a9223016c6cfa8a4b Mon Sep 17 00:00:00 2001 From: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com> Date: Sat, 9 Nov 2024 20:09:14 +0000 Subject: [PATCH] v3.4.0-P --- .github/workflows/rust.yml | 22 +- README.MD | 4 +- apply_patches.sh | 4 +- .../0001-Paradise-Version-Changes.patch | 2113 ++++++++++++++++- .../0003-Paradise-API-Headers.patch | 63 +- .../0004-Paradise-DLL-Location-Fix.patch | 22 - ...=> 0004-Paradise-HTTP-Module-Tweaks.patch} | 51 +- ...patch => 0005-Paradise-Remove-Debug.patch} | 8 +- .../0006-Paradise-Toast-System.patch | 451 ++++ .../0007-Paradise-DMSRC-Changes.patch | 75 + .../0007-Paradise-Toast-System.patch | 476 ---- .../0008-Paradise-Redis-Changes.patch | 154 ++ rebuild_patches.sh | 3 +- 13 files changed, 2877 insertions(+), 569 deletions(-) delete mode 100644 paradise-rust-g-patches/0004-Paradise-DLL-Location-Fix.patch rename paradise-rust-g-patches/{0005-Paradise-HTTP-Module-Tweaks.patch => 0004-Paradise-HTTP-Module-Tweaks.patch} (78%) rename paradise-rust-g-patches/{0006-Paradise-Remove-Debug.patch => 0005-Paradise-Remove-Debug.patch} (68%) create mode 100644 paradise-rust-g-patches/0006-Paradise-Toast-System.patch create mode 100644 paradise-rust-g-patches/0007-Paradise-DMSRC-Changes.patch delete mode 100644 paradise-rust-g-patches/0007-Paradise-Toast-System.patch create mode 100644 paradise-rust-g-patches/0008-Paradise-Redis-Changes.patch diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 69e7e76..3ef5fb7 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -30,22 +30,22 @@ jobs: with: toolchain: stable command: check - args: --manifest-path paradise-rust-g/Cargo.toml --target i686-pc-windows-msvc --all-features + args: --manifest-path paradise-rust-g/Cargo.toml --target i686-pc-windows-msvc --features all - name: Build (release) (default features) uses: actions-rs/cargo@v1 with: toolchain: stable command: build - args: --manifest-path paradise-rust-g/Cargo.toml --target i686-pc-windows-msvc --release - - uses: actions/upload-artifact@v1 + args: --manifest-path paradise-rust-g/Cargo.toml --target i686-pc-windows-msvc --release --features all + - uses: actions/upload-artifact@v4 with: name: rust_g.dll path: paradise-rust-g/target/i686-pc-windows-msvc/release/rust_g.dll build-linux: runs-on: ubuntu-latest env: - BYOND_MAJOR: 513 - BYOND_MINOR: 1536 + BYOND_MAJOR: 515 + BYOND_MINOR: 1642 PKG_CONFIG_ALLOW_CROSS: 1 steps: - uses: actions/checkout@v2 @@ -59,7 +59,7 @@ jobs: - run: | sudo dpkg --add-architecture i386 sudo apt-get update - sudo apt-get install g++-multilib zlib1g-dev:i386 libssl-dev:i386 + sudo apt-get install g++-multilib zlib1g-dev:i386 libssl-dev:i386 libdbus-1-dev ./paradise-rust-g/scripts/install_byond.sh - uses: actions-rs/toolchain@v1 with: @@ -70,19 +70,19 @@ jobs: with: toolchain: stable command: check - args: --manifest-path paradise-rust-g/Cargo.toml --target i686-unknown-linux-gnu --all-features + args: --manifest-path paradise-rust-g/Cargo.toml --target i686-unknown-linux-gnu --features all - name: Build (Debug) (all features) uses: actions-rs/cargo@v1 with: toolchain: stable command: build - args: --manifest-path paradise-rust-g/Cargo.toml --target i686-unknown-linux-gnu --all-features + args: --manifest-path paradise-rust-g/Cargo.toml --target i686-unknown-linux-gnu --features all - name: Run tests (all features) uses: actions-rs/cargo@v1 with: toolchain: stable command: test - args: --manifest-path paradise-rust-g/Cargo.toml --target i686-unknown-linux-gnu --all-features + args: --manifest-path paradise-rust-g/Cargo.toml --target i686-unknown-linux-gnu --features all env: BYOND_BIN: /home/runner/BYOND/byond/bin - name: Build (release) (default features) @@ -90,8 +90,8 @@ jobs: with: toolchain: stable command: build - args: --manifest-path paradise-rust-g/Cargo.toml --target i686-unknown-linux-gnu --release - - uses: actions/upload-artifact@v1 + args: --manifest-path paradise-rust-g/Cargo.toml --target i686-unknown-linux-gnu --release --features all + - uses: actions/upload-artifact@v4 with: name: rust_g path: paradise-rust-g/target/i686-unknown-linux-gnu/release/librust_g.so diff --git a/README.MD b/README.MD index 3e986ea..6546d98 100644 --- a/README.MD +++ b/README.MD @@ -13,8 +13,8 @@ The license for RUST-G itself can be found on tg's repo. Code for the Paradise m 1. You **must** have a copy of `Git Bash` or some other bash emulator on windows, and a git identity setup. This will not work otherwise. 2. Run the `apply_patches.sh` file to autocreate a clone of `tg-rust-g`, and apply the patches to it. 3. Paradise RUST-G requires all features to be enabled. - - To build on windows, run `cargo build --release --all-features --target=i686-pc-windows-msvc`. This will generate a 32-bit `.dll` file that is compatible with BYOND. - - To build on linux, run `cargo build --release --all-features --target=i686-unknown-linux-gnu`. This will generate a 32-bit `.so` file that is compatible with BYOND. + - To build on windows, run `cargo build --release --features all --target=i686-pc-windows-msvc`. This will generate a 32-bit `.dll` file that is compatible with BYOND. + - To build on linux, run `cargo build --release --features all --target=i686-unknown-linux-gnu`. This will generate a 32-bit `.so` file that is compatible with BYOND. If you are still stuck, check tg's README. for more detailed instructions. diff --git a/apply_patches.sh b/apply_patches.sh index fe314f6..f386f95 100755 --- a/apply_patches.sh +++ b/apply_patches.sh @@ -1,7 +1,7 @@ #!/bin/sh basedir=`pwd` -tg_tag="3.0.0" +tg_tag="3.4.0" echo "Checking for TG rust-g repo.." if [ ! -d "./tg-rust-g" ] @@ -46,4 +46,4 @@ apply_patch() { fi } -apply_patch tg-rust-g paradise-rust-g origin/master +apply_patch tg-rust-g paradise-rust-g $tg_tag diff --git a/paradise-rust-g-patches/0001-Paradise-Version-Changes.patch b/paradise-rust-g-patches/0001-Paradise-Version-Changes.patch index 67ee515..c52ba10 100644 --- a/paradise-rust-g-patches/0001-Paradise-Version-Changes.patch +++ b/paradise-rust-g-patches/0001-Paradise-Version-Changes.patch @@ -1,32 +1,2125 @@ -From 85c987757fe9a259a370c79333b3e57ef820dcf5 Mon Sep 17 00:00:00 2001 +From e9048c924158834931b418abe2652129f7aeac40 Mon Sep 17 00:00:00 2001 From: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com> Date: Tue, 24 Oct 2023 21:44:45 +0100 Subject: [PATCH] Paradise Version Changes diff --git a/Cargo.lock b/Cargo.lock -index afdaa60..b276d34 100644 +index 0efdeff..6b456cc 100644 --- a/Cargo.lock +++ b/Cargo.lock -@@ -2166,7 +2166,7 @@ dependencies = [ +@@ -3,10 +3,10 @@ + version = 3 + + [[package]] +-name = "adler" +-version = "1.0.2" ++name = "adler2" ++version = "2.0.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" ++checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627" + + [[package]] + name = "adler32" +@@ -108,15 +108,15 @@ checksum = "69f7f8c3906b62b754cd5326047894316021dcfe5a194c8ea52bdd94934a3457" + + [[package]] + name = "arrayvec" +-version = "0.7.4" ++version = "0.7.6" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" ++checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50" + + [[package]] + name = "autocfg" +-version = "1.3.0" ++version = "1.4.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" ++checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" + + [[package]] + name = "base64" +@@ -132,9 +132,9 @@ checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" + + [[package]] + name = "bigdecimal" +-version = "0.4.5" ++version = "0.4.6" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "51d712318a27c7150326677b321a5fa91b55f6d9034ffd67f20319e147d40cee" ++checksum = "8f850665a0385e070b64c38d2354e6c104c8479c59868d1e48a0c13ee2c7a1c1" + dependencies = [ + "autocfg", + "libm", +@@ -145,22 +145,20 @@ dependencies = [ + + [[package]] + name = "bindgen" +-version = "0.69.4" ++version = "0.70.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "a00dc851838a2120612785d195287475a3ac45514741da670b735818822129a0" ++checksum = "f49d8fed880d473ea71efb9bf597651e77201bdd4893efe54c9e5d65ae04ce6f" + dependencies = [ + "bitflags 2.6.0", + "cexpr", + "clang-sys", + "itertools", +- "lazy_static", +- "lazycell", + "proc-macro2", + "quote", + "regex", + "rustc-hash 1.1.0", + "shlex", +- "syn 2.0.71", ++ "syn 2.0.87", + ] + + [[package]] +@@ -216,15 +214,15 @@ dependencies = [ + "proc-macro-crate", + "proc-macro2", + "quote", +- "syn 2.0.71", ++ "syn 2.0.87", + "syn_derive", + ] + + [[package]] + name = "bstr" +-version = "1.9.1" ++version = "1.10.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "05efc5cfd9110c8416e471df0e96702d58690178e206e61b7173706673c93706" ++checksum = "40723b8fb387abc38f4f4a37c09073622e41dd12327033091ef8950659e6dc0c" + dependencies = [ + "memchr", + "regex-automata", +@@ -276,9 +274,9 @@ dependencies = [ + + [[package]] + name = "bytemuck" +-version = "1.16.1" ++version = "1.19.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "b236fc92302c97ed75b38da1f4917b5cdda4984745740f153a5d3059e48d725e" ++checksum = "8334215b81e418a0a7bdb8ef0849474f40bb10c8b71f1c4ed315cff49f32494d" + + [[package]] + name = "byteorder" +@@ -286,11 +284,17 @@ version = "1.5.0" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" + ++[[package]] ++name = "byteorder-lite" ++version = "0.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8f1fe948ff07f4bd06c30984e69f5b4899c516a3ef74f34df92a2df2ab535495" ++ + [[package]] + name = "bytes" +-version = "1.6.1" ++version = "1.8.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "a12916984aab3fa6e39d655a33e09c0071eb36d6ab3aea5c2d78551f1df6d952" ++checksum = "9ac0150caa2ae65ca5bd83f25c7de183dea78d4d366469f148435e2acfbad0da" + + [[package]] + name = "bzip2" +@@ -315,12 +319,13 @@ dependencies = [ + + [[package]] + name = "cc" +-version = "1.1.6" ++version = "1.1.34" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "2aba8f4e9906c7ce3c73463f62a7f0c65183ada1a2d47e397cc8810827f9694f" ++checksum = "67b9470d453346108f93a59222a9a1a5724db32d0a4727b7ab7ace4b4d822dc9" + dependencies = [ + "jobserver", + "libc", ++ "shlex", + ] + + [[package]] +@@ -387,9 +392,9 @@ checksum = "cbd0f76e066e64fdc5631e3bb46381254deab9ef1158292f27c8c57e3bf3fe59" + + [[package]] + name = "cmake" +-version = "0.1.50" ++version = "0.1.51" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "a31c789563b815f77f4250caee12365734369f942439b7defd71e18a48197130" ++checksum = "fb1e43aa7fd152b1f968787f7dbcdeb306d1867ff373c69955211876c053f91a" + dependencies = [ + "cc", + ] +@@ -426,9 +431,9 @@ dependencies = [ + + [[package]] + name = "constant_time_eq" +-version = "0.3.0" ++version = "0.3.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "f7144d30dcf0fafbce74250a3963025d8d52177934239851c917d29f1df280c2" ++checksum = "7c74b8349d32d297c9134b8c88677813a227df8f779daa29bfc29c183fe3dca6" + + [[package]] + name = "core-foundation" +@@ -442,15 +447,15 @@ dependencies = [ + + [[package]] + name = "core-foundation-sys" +-version = "0.8.6" ++version = "0.8.7" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" ++checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" + + [[package]] + name = "cpufeatures" +-version = "0.2.12" ++version = "0.2.14" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" ++checksum = "608697df725056feaccfa42cffdaeeec3fccc4ffc38358ecd19b243e716a78e0" + dependencies = [ + "libc", + ] +@@ -572,7 +577,7 @@ dependencies = [ + "proc-macro2", + "quote", + "strsim", +- "syn 2.0.71", ++ "syn 2.0.87", + ] + + [[package]] +@@ -583,7 +588,7 @@ checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" + dependencies = [ + "darling_core", + "quote", +- "syn 2.0.71", ++ "syn 2.0.87", + ] + + [[package]] +@@ -638,7 +643,7 @@ dependencies = [ + "proc-macro2", + "quote", + "semver", +- "syn 2.0.71", ++ "syn 2.0.87", + ] + + [[package]] +@@ -658,18 +663,18 @@ checksum = "67e77553c4162a157adbf834ebae5b415acbecbeafc7a74b0e886657506a7611" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.71", ++ "syn 2.0.87", + ] + + [[package]] + name = "derive_utils" +-version = "0.14.1" ++version = "0.14.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "61bb5a1014ce6dfc2a378578509abe775a5aa06bff584a547555d9efdb81b926" ++checksum = "65f152f4b8559c4da5d574bafc7af85454d706b4c5fe8b530d508cacbb6807ea" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.71", ++ "syn 2.0.87", + ] + + [[package]] +@@ -691,14 +696,14 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.71", ++ "syn 2.0.87", + ] + + [[package]] + name = "dmi" +-version = "0.3.5" ++version = "0.3.7" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "75e7db200016e5059f8de3bfb7fb256195893ca1383682d401f07df0892306da" ++checksum = "91bec4fbd086174ce996af5c8d10074f63c82b4a1aa517fd40e2d812cd75f734" + dependencies = [ + "bitflags 2.6.0", + "deflate", +@@ -709,9 +714,9 @@ dependencies = [ + + [[package]] + name = "dunce" +-version = "1.0.4" ++version = "1.0.5" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "56ce8c6da7551ec6c462cbaf3bfbc75131ebbfa1c944aeaa9dab51ca1c5f0c3b" ++checksum = "92773504d58c093f6de2459af4af33faa518c13451eb8f2b5698ed3d36e7c813" + + [[package]] + name = "either" +@@ -732,7 +737,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" + dependencies = [ + "libc", +- "windows-sys", ++ "windows-sys 0.52.0", + ] + + [[package]] +@@ -754,36 +759,36 @@ checksum = "a2a2b11eda1d40935b26cf18f6833c526845ae8c41e58d09af6adeb6f0269183" + + [[package]] + name = "fastrand" +-version = "2.1.0" ++version = "2.1.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a" ++checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6" + + [[package]] + name = "fdeflate" +-version = "0.3.4" ++version = "0.3.6" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "4f9bfee30e4dedf0ab8b422f03af778d9612b63f502710fc500a334ebe2de645" ++checksum = "07c6f4c64c1d33a3111c4466f7365ebdcc37c5bd1ea0d62aae2e3d722aacbedb" + dependencies = [ + "simd-adler32", + ] + + [[package]] + name = "filetime" +-version = "0.2.23" ++version = "0.2.25" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "1ee447700ac8aa0b2f2bd7bc4462ad686ba06baa6727ac149a2d6277f0d240fd" ++checksum = "35c0522e981e68cbfa8c3f978441a5f34b30b96e146b33cd3359176b50fe8586" + dependencies = [ + "cfg-if", + "libc", +- "redox_syscall 0.4.1", +- "windows-sys", ++ "libredox", ++ "windows-sys 0.59.0", + ] + + [[package]] + name = "flate2" +-version = "1.0.30" ++version = "1.0.34" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae" ++checksum = "a1b589b4dc103969ad3cf85c950899926ec64300a1a46d76c03a6072957036f0" + dependencies = [ + "crc32fast", + "libz-sys", +@@ -792,9 +797,9 @@ dependencies = [ + + [[package]] + name = "flume" +-version = "0.11.0" ++version = "0.11.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "55ac459de2512911e4b674ce33cf20befaba382d05b62b008afc1c8b57cbf181" ++checksum = "da0e4dd2a88388a1f4ccc7c9ce104604dab68d9f408dc34cd45823d5a9069095" + dependencies = [ + "futures-core", + "futures-sink", +@@ -808,6 +813,12 @@ version = "1.0.7" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" + ++[[package]] ++name = "foldhash" ++version = "0.1.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f81ec6369c545a7d40e4589b5597581fa1c441fe1cce96dd1de43159910a36a2" ++ + [[package]] + name = "foreign-types" + version = "0.3.2" +@@ -834,54 +845,58 @@ dependencies = [ + + [[package]] + name = "frunk" +-version = "0.4.2" ++version = "0.4.3" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "11a351b59e12f97b4176ee78497dff72e4276fb1ceb13e19056aca7fa0206287" ++checksum = "874b6a17738fc273ec753618bac60ddaeac48cb1d7684c3e7bd472e57a28b817" + dependencies = [ + "frunk_core", + "frunk_derives", + "frunk_proc_macros", ++ "serde", + ] + + [[package]] + name = "frunk_core" +-version = "0.4.2" ++version = "0.4.3" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "af2469fab0bd07e64ccf0ad57a1438f63160c69b2e57f04a439653d68eb558d6" ++checksum = "3529a07095650187788833d585c219761114005d5976185760cf794d265b6a5c" ++dependencies = [ ++ "serde", ++] + + [[package]] + name = "frunk_derives" +-version = "0.4.2" ++version = "0.4.3" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "b0fa992f1656e1707946bbba340ad244f0814009ef8c0118eb7b658395f19a2e" ++checksum = "e99b8b3c28ae0e84b604c75f721c21dc77afb3706076af5e8216d15fd1deaae3" + dependencies = [ + "frunk_proc_macro_helpers", + "quote", +- "syn 2.0.71", ++ "syn 2.0.87", + ] + + [[package]] + name = "frunk_proc_macro_helpers" +-version = "0.1.2" ++version = "0.1.3" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "35b54add839292b743aeda6ebedbd8b11e93404f902c56223e51b9ec18a13d2c" ++checksum = "05a956ef36c377977e512e227dcad20f68c2786ac7a54dacece3746046fea5ce" + dependencies = [ + "frunk_core", + "proc-macro2", + "quote", +- "syn 2.0.71", ++ "syn 2.0.87", + ] + + [[package]] + name = "frunk_proc_macros" +-version = "0.1.2" ++version = "0.1.3" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "71b85a1d4a9a6b300b41c05e8e13ef2feca03e0334127f29eca9506a7fe13a93" ++checksum = "67e86c2c9183662713fea27ea527aad20fb15fee635a71081ff91bf93df4dc51" + dependencies = [ + "frunk_core", + "frunk_proc_macro_helpers", + "quote", +- "syn 2.0.71", ++ "syn 2.0.87", + ] + + [[package]] +@@ -902,15 +917,15 @@ dependencies = [ + + [[package]] + name = "futures-core" +-version = "0.3.30" ++version = "0.3.31" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" ++checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e" + + [[package]] + name = "futures-sink" +-version = "0.3.30" ++version = "0.3.31" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" ++checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7" + + [[package]] + name = "generic-array" +@@ -978,41 +993,41 @@ dependencies = [ + + [[package]] + name = "gix-actor" +-version = "0.31.4" ++version = "0.31.5" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "d9b8ee65074b2bbb91d9d97c15d172ea75043aefebf9869b5b329149dc76501c" ++checksum = "a0e454357e34b833cc3a00b6efbbd3dd4d18b24b9fb0c023876ec2645e8aa3f2" + dependencies = [ + "bstr", + "gix-date", + "gix-utils", + "itoa", + "thiserror", +- "winnow 0.6.14", ++ "winnow", + ] + + [[package]] + name = "gix-bitmap" +-version = "0.2.11" ++version = "0.2.12" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "a371db66cbd4e13f0ed9dc4c0fea712d7276805fccc877f77e96374d317e87ae" ++checksum = "10f78312288bd02052be5dbc2ecbc342c9f4eb791986d86c0a5c06b92dc72efa" + dependencies = [ + "thiserror", + ] + + [[package]] + name = "gix-chunk" +-version = "0.4.8" ++version = "0.4.9" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "45c8751169961ba7640b513c3b24af61aa962c967aaf04116734975cd5af0c52" ++checksum = "6c28b58ba04f0c004722344390af9dbc85888fbb84be1981afb934da4114d4cf" + dependencies = [ + "thiserror", + ] + + [[package]] + name = "gix-commitgraph" +-version = "0.24.2" ++version = "0.24.3" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "f7b102311085da4af18823413b5176d7c500fb2272eaf391cfa8635d8bcb12c4" ++checksum = "133b06f67f565836ec0c473e2116a60fb74f80b6435e21d88013ac0e3c60fc78" + dependencies = [ + "bstr", + "gix-chunk", +@@ -1040,14 +1055,14 @@ dependencies = [ + "smallvec", + "thiserror", + "unicode-bom", +- "winnow 0.6.14", ++ "winnow", + ] + + [[package]] + name = "gix-config-value" +-version = "0.14.6" ++version = "0.14.9" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "fbd06203b1a9b33a78c88252a625031b094d9e1b647260070c25b09910c0a804" ++checksum = "f3de3fdca9c75fa4b83a76583d265fa49b1de6b088ebcd210749c24ceeb74660" + dependencies = [ + "bitflags 2.6.0", + "bstr", +@@ -1070,9 +1085,9 @@ dependencies = [ + + [[package]] + name = "gix-diff" +-version = "0.44.0" ++version = "0.44.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "40b9bd8b2d07b6675a840b56a6c177d322d45fa082672b0dad8f063b25baf0a4" ++checksum = "1996d5c8a305b59709467d80617c9fde48d9d75fd1f4179ea970912630886c9d" + dependencies = [ + "bstr", + "gix-hash", +@@ -1120,9 +1135,9 @@ dependencies = [ + + [[package]] + name = "gix-fs" +-version = "0.11.1" ++version = "0.11.3" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "c3338ff92a2164f5209f185ec0cd316f571a72676bb01d27e22f2867ba69f77a" ++checksum = "f2bfe6249cfea6d0c0e0990d5226a4cb36f030444ba9e35e0639275db8f98575" + dependencies = [ + "fastrand", + "gix-features", +@@ -1131,9 +1146,9 @@ dependencies = [ + + [[package]] + name = "gix-glob" +-version = "0.16.3" ++version = "0.16.5" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "c2a29ad0990cf02c48a7aac76ed0dbddeb5a0d070034b83675cc3bbf937eace4" ++checksum = "74908b4bbc0a0a40852737e5d7889f676f081e340d5451a16e5b4c50d592f111" + dependencies = [ + "bitflags 2.6.0", + "bstr", +@@ -1164,9 +1179,9 @@ dependencies = [ + + [[package]] + name = "gix-index" +-version = "0.33.0" ++version = "0.33.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "2d8c5a5f1c58edcbc5692b174cda2703aba82ed17d7176ff4c1752eb48b1b167" ++checksum = "9a9a44eb55bd84bb48f8a44980e951968ced21e171b22d115d1cdcef82a7d73f" + dependencies = [ + "bitflags 2.6.0", + "bstr", +@@ -1209,7 +1224,7 @@ checksum = "999ce923619f88194171a67fb3e6d613653b8d4d6078b529b15a765da0edcc17" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.71", ++ "syn 2.0.87", + ] + + [[package]] +@@ -1228,14 +1243,14 @@ dependencies = [ + "itoa", + "smallvec", + "thiserror", +- "winnow 0.6.14", ++ "winnow", + ] + + [[package]] + name = "gix-odb" +-version = "0.61.0" ++version = "0.61.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "e92b9790e2c919166865d0825b26cc440a387c175bed1b43a2fa99c0e9d45e98" ++checksum = "20d384fe541d93d8a3bb7d5d5ef210780d6df4f50c4e684ccba32665a5e3bc9b" + dependencies = [ + "arc-swap", + "gix-date", +@@ -1253,9 +1268,9 @@ dependencies = [ + + [[package]] + name = "gix-pack" +-version = "0.51.0" ++version = "0.51.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "7a8da51212dbff944713edb2141ed7e002eea326b8992070374ce13a6cb610b3" ++checksum = "3e0594491fffe55df94ba1c111a6566b7f56b3f8d2e1efc750e77d572f5f5229" + dependencies = [ + "clru", + "gix-chunk", +@@ -1264,9 +1279,7 @@ dependencies = [ + "gix-hashtable", + "gix-object", + "gix-path", +- "gix-tempfile", + "memmap2", +- "parking_lot", + "smallvec", + "thiserror", + "uluru", +@@ -1274,9 +1287,9 @@ dependencies = [ + + [[package]] + name = "gix-path" +-version = "0.10.9" ++version = "0.10.12" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "8d23d5bbda31344d8abc8de7c075b3cf26e5873feba7c4a15d916bce67382bd9" ++checksum = "c04e5a94fdb56b1e91eb7df2658ad16832428b8eeda24ff1a0f0288de2bce554" + dependencies = [ + "bstr", + "gix-trace", +@@ -1287,9 +1300,9 @@ dependencies = [ + + [[package]] + name = "gix-quote" +-version = "0.4.12" ++version = "0.4.13" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "cbff4f9b9ea3fa7a25a70ee62f545143abef624ac6aa5884344e70c8b0a1d9ff" ++checksum = "f89f9a1525dcfd9639e282ea939f5ab0d09d93cf2b90c1fc6104f1b9582a8e49" + dependencies = [ + "bstr", + "gix-utils", +@@ -1315,14 +1328,14 @@ dependencies = [ + "gix-validate", + "memmap2", + "thiserror", +- "winnow 0.6.14", ++ "winnow", + ] + + [[package]] + name = "gix-refspec" +-version = "0.23.0" ++version = "0.23.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "dde848865834a54fe4d9b4573f15d0e9a68eaf3d061b42d3ed52b4b8acf880b2" ++checksum = "6868f8cd2e62555d1f7c78b784bece43ace40dd2a462daf3b588d5416e603f37" + dependencies = [ + "bstr", + "gix-hash", +@@ -1334,9 +1347,9 @@ dependencies = [ + + [[package]] + name = "gix-revision" +-version = "0.27.1" ++version = "0.27.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "63e08f8107ed1f93a83bcfbb4c38084c7cb3f6cd849793f1d5eec235f9b13b2b" ++checksum = "01b13e43c2118c4b0537ddac7d0821ae0dfa90b7b8dbf20c711e153fb749adce" + dependencies = [ + "bstr", + "gix-date", +@@ -1350,9 +1363,9 @@ dependencies = [ + + [[package]] + name = "gix-revwalk" +-version = "0.13.1" ++version = "0.13.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "4181db9cfcd6d1d0fd258e91569dbb61f94cb788b441b5294dd7f1167a3e788f" ++checksum = "1b030ccaab71af141f537e0225f19b9e74f25fefdba0372246b844491cab43e0" + dependencies = [ + "gix-commitgraph", + "gix-date", +@@ -1365,21 +1378,21 @@ dependencies = [ + + [[package]] + name = "gix-sec" +-version = "0.10.6" ++version = "0.10.9" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "fddc27984a643b20dd03e97790555804f98cf07404e0e552c0ad8133266a79a1" ++checksum = "a2007538eda296445c07949cf04f4a767307d887184d6b3e83e2d636533ddc6e" + dependencies = [ + "bitflags 2.6.0", + "gix-path", + "libc", +- "windows-sys", ++ "windows-sys 0.52.0", + ] + + [[package]] + name = "gix-tempfile" +-version = "14.0.0" ++version = "14.0.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "d3b0e276cd08eb2a22e9f286a4f13a222a01be2defafa8621367515375644b99" ++checksum = "046b4927969fa816a150a0cda2e62c80016fe11fb3c3184e4dddf4e542f108aa" + dependencies = [ + "gix-fs", + "libc", +@@ -1390,15 +1403,15 @@ dependencies = [ + + [[package]] + name = "gix-trace" +-version = "0.1.9" ++version = "0.1.11" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "f924267408915fddcd558e3f37295cc7d6a3e50f8bd8b606cee0808c3915157e" ++checksum = "04bdde120c29f1fc23a24d3e115aeeea3d60d8e65bab92cc5f9d90d9302eb952" + + [[package]] + name = "gix-traverse" +-version = "0.39.1" ++version = "0.39.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "f20cb69b63eb3e4827939f42c05b7756e3488ef49c25c412a876691d568ee2a0" ++checksum = "e499a18c511e71cf4a20413b743b9f5bcf64b3d9e81e9c3c6cd399eae55a8840" + dependencies = [ + "bitflags 2.6.0", + "gix-commitgraph", +@@ -1413,9 +1426,9 @@ dependencies = [ + + [[package]] + name = "gix-url" +-version = "0.27.3" ++version = "0.27.5" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "0db829ebdca6180fbe32be7aed393591df6db4a72dbbc0b8369162390954d1cf" ++checksum = "fd280c5e84fb22e128ed2a053a0daeacb6379469be6a85e3d518a0636e160c89" + dependencies = [ + "bstr", + "gix-features", +@@ -1427,9 +1440,9 @@ dependencies = [ + + [[package]] + name = "gix-utils" +-version = "0.1.12" ++version = "0.1.13" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "35192df7fd0fa112263bad8021e2df7167df4cc2a6e6d15892e1e55621d3d4dc" ++checksum = "ba427e3e9599508ed98a6ddf8ed05493db114564e338e41f6a996d2e4790335f" + dependencies = [ + "fastrand", + "unicode-normalization", +@@ -1470,6 +1483,17 @@ dependencies = [ + "allocator-api2", + ] + ++[[package]] ++name = "hashbrown" ++version = "0.15.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1e087f84d4f86bf4b218b927129862374b72199ae7d8657835f1e89000eea4fb" ++dependencies = [ ++ "allocator-api2", ++ "equivalent", ++ "foldhash", ++] ++ + [[package]] + name = "heck" + version = "0.4.1" +@@ -1497,7 +1521,7 @@ version = "0.5.9" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5" + dependencies = [ +- "windows-sys", ++ "windows-sys 0.52.0", + ] + + [[package]] +@@ -1511,14 +1535,14 @@ dependencies = [ + "markup5ever", + "proc-macro2", + "quote", +- "syn 2.0.71", ++ "syn 2.0.87", + ] + + [[package]] + name = "iana-time-zone" +-version = "0.1.60" ++version = "0.1.61" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141" ++checksum = "235e081f3925a06703c2d0117ea8b91f042756fd6e7a6e5d901e8ca1a996b220" + dependencies = [ + "android_system_properties", + "core-foundation-sys", +@@ -1537,6 +1561,124 @@ dependencies = [ + "cc", + ] + ++[[package]] ++name = "icu_collections" ++version = "1.5.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "db2fa452206ebee18c4b5c2274dbf1de17008e874b4dc4f0aea9d01ca79e4526" ++dependencies = [ ++ "displaydoc", ++ "yoke", ++ "zerofrom", ++ "zerovec", ++] ++ ++[[package]] ++name = "icu_locid" ++version = "1.5.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "13acbb8371917fc971be86fc8057c41a64b521c184808a698c02acc242dbf637" ++dependencies = [ ++ "displaydoc", ++ "litemap", ++ "tinystr", ++ "writeable", ++ "zerovec", ++] ++ ++[[package]] ++name = "icu_locid_transform" ++version = "1.5.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "01d11ac35de8e40fdeda00d9e1e9d92525f3f9d887cdd7aa81d727596788b54e" ++dependencies = [ ++ "displaydoc", ++ "icu_locid", ++ "icu_locid_transform_data", ++ "icu_provider", ++ "tinystr", ++ "zerovec", ++] ++ ++[[package]] ++name = "icu_locid_transform_data" ++version = "1.5.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "fdc8ff3388f852bede6b579ad4e978ab004f139284d7b28715f773507b946f6e" ++ ++[[package]] ++name = "icu_normalizer" ++version = "1.5.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "19ce3e0da2ec68599d193c93d088142efd7f9c5d6fc9b803774855747dc6a84f" ++dependencies = [ ++ "displaydoc", ++ "icu_collections", ++ "icu_normalizer_data", ++ "icu_properties", ++ "icu_provider", ++ "smallvec", ++ "utf16_iter", ++ "utf8_iter", ++ "write16", ++ "zerovec", ++] ++ ++[[package]] ++name = "icu_normalizer_data" ++version = "1.5.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f8cafbf7aa791e9b22bec55a167906f9e1215fd475cd22adfcf660e03e989516" ++ ++[[package]] ++name = "icu_properties" ++version = "1.5.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "93d6020766cfc6302c15dbbc9c8778c37e62c14427cb7f6e601d849e092aeef5" ++dependencies = [ ++ "displaydoc", ++ "icu_collections", ++ "icu_locid_transform", ++ "icu_properties_data", ++ "icu_provider", ++ "tinystr", ++ "zerovec", ++] ++ ++[[package]] ++name = "icu_properties_data" ++version = "1.5.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "67a8effbc3dd3e4ba1afa8ad918d5684b8868b3b26500753effea8d2eed19569" ++ ++[[package]] ++name = "icu_provider" ++version = "1.5.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "6ed421c8a8ef78d3e2dbc98a973be2f3770cb42b606e3ab18d6237c4dfde68d9" ++dependencies = [ ++ "displaydoc", ++ "icu_locid", ++ "icu_provider_macros", ++ "stable_deref_trait", ++ "tinystr", ++ "writeable", ++ "yoke", ++ "zerofrom", ++ "zerovec", ++] ++ ++[[package]] ++name = "icu_provider_macros" ++version = "1.5.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "syn 2.0.87", ++] ++ + [[package]] + name = "ident_case" + version = "1.0.1" +@@ -1545,34 +1687,45 @@ checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" + + [[package]] + name = "idna" +-version = "0.5.0" ++version = "1.0.3" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" ++checksum = "686f825264d630750a544639377bae737628043f20d38bbc029e8f29ea968a7e" + dependencies = [ +- "unicode-bidi", +- "unicode-normalization", ++ "idna_adapter", ++ "smallvec", ++ "utf8_iter", ++] ++ ++[[package]] ++name = "idna_adapter" ++version = "1.2.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "daca1df1c957320b2cf139ac61e7bd64fed304c5040df000a745aa1de3b4ef71" ++dependencies = [ ++ "icu_normalizer", ++ "icu_properties", + ] + + [[package]] + name = "image" +-version = "0.25.1" ++version = "0.25.4" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "fd54d660e773627692c524beaad361aca785a4f9f5730ce91f42aabe5bce3d11" ++checksum = "bc144d44a31d753b02ce64093d532f55ff8dc4ebf2ffb8a63c0dda691385acae" + dependencies = [ + "bytemuck", +- "byteorder", ++ "byteorder-lite", + "num-traits", + "png", + ] + + [[package]] + name = "indexmap" +-version = "2.2.6" ++version = "2.6.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" ++checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da" + dependencies = [ + "equivalent", +- "hashbrown 0.14.5", ++ "hashbrown 0.15.0", + ] + + [[package]] +@@ -1613,9 +1766,9 @@ dependencies = [ + + [[package]] + name = "itertools" +-version = "0.12.1" ++version = "0.13.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" ++checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186" + dependencies = [ + "either", + ] +@@ -1628,18 +1781,18 @@ checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" + + [[package]] + name = "jobserver" +-version = "0.1.31" ++version = "0.1.32" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "d2b099aaa34a9751c5bf0878add70444e1ed2dd73f347be99003d4577277de6e" ++checksum = "48d1dbcbbeb6a7fec7e059840aa538bd62aaccf972c7346c4d9d2059312853d0" + dependencies = [ + "libc", + ] + + [[package]] + name = "js-sys" +-version = "0.3.69" ++version = "0.3.72" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" ++checksum = "6a88f1bda2bd75b0452a14784937d796722fdebfe50df998aeb3f0b7603019a9" + dependencies = [ + "wasm-bindgen", + ] +@@ -1660,12 +1813,6 @@ version = "1.5.0" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" + +-[[package]] +-name = "lazycell" +-version = "1.3.0" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" +- + [[package]] + name = "lerp" + version = "0.4.0" +@@ -1677,9 +1824,9 @@ dependencies = [ + + [[package]] + name = "libc" +-version = "0.2.155" ++version = "0.2.161" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" ++checksum = "8e9489c2807c139ffd9c1794f4af0ebe86a828db53ecdc7fea2111d0fed085d1" + + [[package]] + name = "libloading" +@@ -1693,15 +1840,26 @@ dependencies = [ + + [[package]] + name = "libm" +-version = "0.2.8" ++version = "0.2.11" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" ++checksum = "8355be11b20d696c8f18f6cc018c4e372165b1fa8126cef092399c9951984ffa" ++ ++[[package]] ++name = "libredox" ++version = "0.1.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" ++dependencies = [ ++ "bitflags 2.6.0", ++ "libc", ++ "redox_syscall", ++] + + [[package]] + name = "libz-sys" +-version = "1.1.18" ++version = "1.1.20" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "c15da26e5af7e25c90b37a2d75cdbf940cf4a55316de9d84c679c9b8bfabf82e" ++checksum = "d2d16453e800a8cf6dd2fc3eb4bc99b786a9b90c663b8559a5b1a041bf89e472" + dependencies = [ + "cc", + "pkg-config", +@@ -1714,6 +1872,12 @@ version = "0.4.14" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" + ++[[package]] ++name = "litemap" ++version = "0.7.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "643cb0b8d4fcc284004d5fd0d67ccf61dfffadb7f75e1e71bc420f4688a3a704" ++ + [[package]] + name = "lock_api" + version = "0.4.12" +@@ -1738,11 +1902,11 @@ checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" + + [[package]] + name = "lru" +-version = "0.12.3" ++version = "0.12.5" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "d3262e75e648fce39813cb56ac41f3c3e3f65217ebf3844d818d1f9398cfb0dc" ++checksum = "234cf4f4a04dc1f57e24b96cc0cd600cf2af460d4161ac5ecdd0af8e1f3b2a38" + dependencies = [ +- "hashbrown 0.14.5", ++ "hashbrown 0.15.0", + ] + + [[package]] +@@ -1799,9 +1963,9 @@ checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" + + [[package]] + name = "memmap2" +-version = "0.9.4" ++version = "0.9.5" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "fe751422e4a8caa417e13c3ea66452215d7d63e19e604f4980461212f3ae1322" ++checksum = "fd3f7eed9d3848f8b98834af67102b720745c4ec028fcd0aa0239277e7de374f" + dependencies = [ + "libc", + ] +@@ -1814,11 +1978,11 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" + + [[package]] + name = "miniz_oxide" +-version = "0.7.4" ++version = "0.8.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08" ++checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1" + dependencies = [ +- "adler", ++ "adler2", + "simd-adler32", + ] + +@@ -1863,7 +2027,7 @@ dependencies = [ + "proc-macro-error", + "proc-macro2", + "quote", +- "syn 2.0.71", ++ "syn 2.0.87", + "termcolor", + "thiserror", + ] +@@ -2015,15 +2179,15 @@ dependencies = [ + + [[package]] + name = "once_cell" +-version = "1.19.0" ++version = "1.20.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" ++checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775" + + [[package]] + name = "openssl" +-version = "0.10.65" ++version = "0.10.68" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "c2823eb4c6453ed64055057ea8bd416eda38c71018723869dd043a3b1186115e" ++checksum = "6174bc48f102d208783c2c84bf931bb75927a617866870de8a4ea85597f871f5" + dependencies = [ + "bitflags 2.6.0", + "cfg-if", +@@ -2042,7 +2206,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.71", ++ "syn 2.0.87", + ] + + [[package]] +@@ -2053,9 +2217,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" + + [[package]] + name = "openssl-sys" +-version = "0.9.103" ++version = "0.9.104" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "7f9e8deee91df40a943c71b917e5874b951d32a802526c85721ce3b776c929d6" ++checksum = "45abf306cbf99debc8195b66b7346498d7b10c210de50418b5ccd7ceba08c741" + dependencies = [ + "cc", + "libc", +@@ -2081,16 +2245,16 @@ checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" + dependencies = [ + "cfg-if", + "libc", +- "redox_syscall 0.5.3", ++ "redox_syscall", + "smallvec", + "windows-targets", + ] + + [[package]] + name = "pathfinding" +-version = "4.10.0" ++version = "4.11.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "39103a901800b5711b9076f2474da1e7412f804c11a0f3b4e8dd3b1e59c58b12" ++checksum = "1cff69f3ba9d0346c1dbe1248fc2ed4523567b683d1b6ff4144a6b3583369082" + dependencies = [ + "deprecate-until", + "indexmap", +@@ -2185,15 +2349,15 @@ dependencies = [ + + [[package]] + name = "pkg-config" +-version = "0.3.30" ++version = "0.3.31" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" ++checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2" + + [[package]] + name = "png" +-version = "0.17.13" ++version = "0.17.14" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "06e4b0d3d1312775e782c86c91a111aa1f910cbb65e1337f9975b5f9a554b5e1" ++checksum = "52f9d46a34a05a6a57566bc2bfae066ef07585a6e3fa30fbbdff5936380623f0" + dependencies = [ + "bitflags 1.3.2", + "crc32fast", +@@ -2210,9 +2374,12 @@ checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" + + [[package]] + name = "ppv-lite86" +-version = "0.2.17" ++version = "0.2.20" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" ++checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04" ++dependencies = [ ++ "zerocopy", ++] + + [[package]] + name = "precomputed-hash" +@@ -2222,11 +2389,11 @@ checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c" + + [[package]] + name = "proc-macro-crate" +-version = "3.1.0" ++version = "3.2.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284" ++checksum = "8ecf48c7ca261d60b74ab1a7b20da18bede46776b2e55535cb958eb595c5fa7b" + dependencies = [ +- "toml_edit 0.21.1", ++ "toml_edit", + ] + + [[package]] +@@ -2255,9 +2422,9 @@ dependencies = [ + + [[package]] + name = "proc-macro2" +-version = "1.0.86" ++version = "1.0.89" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" ++checksum = "f139b0662de085916d1fb67d2b4169d1addddda1919e696f3252b740b629986e" + dependencies = [ + "unicode-ident", + ] +@@ -2290,9 +2457,9 @@ dependencies = [ + + [[package]] + name = "quote" +-version = "1.0.36" ++version = "1.0.37" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" ++checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" + dependencies = [ + "proc-macro2", + ] +@@ -2416,27 +2583,18 @@ dependencies = [ + + [[package]] + name = "redox_syscall" +-version = "0.4.1" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" +-dependencies = [ +- "bitflags 1.3.2", +-] +- +-[[package]] +-name = "redox_syscall" +-version = "0.5.3" ++version = "0.5.7" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "2a908a6e00f1fdd0dfd9c0eb08ce85126f6d8bbda50017e74bc4a4b7d4a926a4" ++checksum = "9b6dfecf2c74bce2466cabf93f6664d6998a69eb21e39f4207930065b27b771f" + dependencies = [ + "bitflags 2.6.0", + ] + + [[package]] + name = "regex" +-version = "1.10.5" ++version = "1.11.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "b91213439dad192326a0d7c6ee3955910425f441d7038e0d6933b0aec5c4517f" ++checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191" + dependencies = [ + "aho-corasick", + "memchr", +@@ -2446,9 +2604,9 @@ dependencies = [ + + [[package]] + name = "regex-automata" +-version = "0.4.7" ++version = "0.4.8" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df" ++checksum = "368758f23274712b504848e9d5a6f010445cc8b87a7cdb4d7cbee666c1288da3" + dependencies = [ + "aho-corasick", + "memchr", +@@ -2457,9 +2615,9 @@ dependencies = [ + + [[package]] + name = "regex-syntax" +-version = "0.8.4" ++version = "0.8.5" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" ++checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" + + [[package]] + name = "rend" +@@ -2482,14 +2640,14 @@ dependencies = [ + "libc", + "spin", + "untrusted", +- "windows-sys", ++ "windows-sys 0.52.0", + ] + + [[package]] + name = "rkyv" +-version = "0.7.44" ++version = "0.7.45" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "5cba464629b3394fc4dbc6f940ff8f5b4ff5c7aef40f29166fd4ad12acbc99c0" ++checksum = "9008cd6385b9e161d8229e1f6549dd23c3d022f132a2ea37ac3a10ac4935779b" + dependencies = [ + "bitvec", + "bytecheck", +@@ -2505,9 +2663,9 @@ dependencies = [ + + [[package]] + name = "rkyv_derive" +-version = "0.7.44" ++version = "0.7.45" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "a7dddfff8de25e6f62b9d64e6e432bf1c6736c57d20323e15ee10435fbda7c65" ++checksum = "503d1d27590a2b0a3a4ca4c94755aa2875657196ecbf401a42eff41d7de532c0" + dependencies = [ + "proc-macro2", + "quote", +@@ -2516,7 +2674,7 @@ dependencies = [ [[package]] name = "rust-g" --version = "3.0.0" -+version = "3.0.0-P" +-version = "3.4.0" ++version = "3.4.0-P" dependencies = [ "aho-corasick", - "base64", + "ammonia", +@@ -2559,9 +2717,9 @@ dependencies = [ + + [[package]] + name = "rust_decimal" +-version = "1.35.0" ++version = "1.36.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "1790d1c4c0ca81211399e0e0af16333276f375209e71a37b67698a373db5b47a" ++checksum = "b082d80e3e3cc52b2ed634388d436fe1f4de6af5786cc2de9ba9737527bdf555" + dependencies = [ + "arrayvec", + "borsh", +@@ -2587,31 +2745,31 @@ checksum = "583034fd73374156e66797ed8e5b0d5690409c9226b22d87cb7f19821c05d152" + + [[package]] + name = "rustc_version" +-version = "0.4.0" ++version = "0.4.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" ++checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92" + dependencies = [ + "semver", + ] + + [[package]] + name = "rustix" +-version = "0.38.34" ++version = "0.38.38" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" ++checksum = "aa260229e6538e52293eeb577aabd09945a09d6d9cc0fc550ed7529056c2e32a" + dependencies = [ + "bitflags 2.6.0", + "errno", + "libc", + "linux-raw-sys", +- "windows-sys", ++ "windows-sys 0.52.0", + ] + + [[package]] + name = "rustls" +-version = "0.23.11" ++version = "0.23.16" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "4828ea528154ae444e5a642dbb7d5623354030dc9822b83fd9bb79683c7399d0" ++checksum = "eee87ff5d9b36712a58574e12e9f0ea80f915a5b0ac518d322b24a465617925e" + dependencies = [ + "log", + "once_cell", +@@ -2624,25 +2782,24 @@ dependencies = [ + + [[package]] + name = "rustls-pemfile" +-version = "2.1.2" ++version = "2.2.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "29993a25686778eb88d4189742cd713c9bce943bc54251a33509dc63cbacf73d" ++checksum = "dce314e5fee3f39953d46bb63bb8a46d40c2f8fb7cc5a3b6cab2bde9721d6e50" + dependencies = [ +- "base64 0.22.1", + "rustls-pki-types", + ] + + [[package]] + name = "rustls-pki-types" +-version = "1.7.0" ++version = "1.10.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "976295e77ce332211c0d24d92c0e83e50f5c5f046d11082cea19f3df13a3562d" ++checksum = "16f1201b3c9a7ee8039bcadc17b7e605e2945b27eee7631788c1bd2b0643674b" + + [[package]] + name = "rustls-webpki" +-version = "0.102.5" ++version = "0.102.8" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "f9a6fccd794a42c2c105b513a2f62bc3fd8f3ba57a4593677ceb0bd035164d78" ++checksum = "64ca1bc8749bd4cf37b5ce386cc146580777b4e8572c7b97baf22c83f444bee9" + dependencies = [ + "ring", + "rustls-pki-types", +@@ -2672,11 +2829,11 @@ checksum = "ece8e78b2f38ec51c51f5d475df0a7187ba5111b2a28bdc761ee05b075d40a71" + + [[package]] + name = "schannel" +-version = "0.1.23" ++version = "0.1.26" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534" ++checksum = "01227be5826fa0690321a2ba6c5cd57a19cf3f6a09e76973b58e61de6ab9d1c1" + dependencies = [ +- "windows-sys", ++ "windows-sys 0.59.0", + ] + + [[package]] +@@ -2706,9 +2863,9 @@ dependencies = [ + + [[package]] + name = "security-framework-sys" +-version = "2.11.1" ++version = "2.12.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "75da29fe9b9b08fe9d6b22b5b4bcbc75d8db3aa31e639aa56bb62e9d46bfceaf" ++checksum = "ea4a292869320c0272d7bc55a5a6aafaff59b4f63404a003887b679a2e05b4b6" + dependencies = [ + "core-foundation-sys", + "libc", +@@ -2722,40 +2879,41 @@ checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" + + [[package]] + name = "serde" +-version = "1.0.204" ++version = "1.0.214" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "bc76f558e0cbb2a839d37354c575f1dc3fdc6546b5be373ba43d95f231bf7c12" ++checksum = "f55c3193aca71c12ad7890f1785d2b73e1b9f63a0bbc353c08ef26fe03fc56b5" + dependencies = [ + "serde_derive", + ] + + [[package]] + name = "serde_derive" +-version = "1.0.204" ++version = "1.0.214" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "e0cd7e117be63d3c3678776753929474f3b04a43a080c744d6b0ae2a8c28e222" ++checksum = "de523f781f095e28fa605cdce0f8307e451cc0fd14e2eb4cd2e98a355b147766" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.71", ++ "syn 2.0.87", + ] + + [[package]] + name = "serde_json" +-version = "1.0.120" ++version = "1.0.132" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "4e0d21c9a8cae1235ad58a00c11cb40d4b1e5c784f1ef2c537876ed6ffd8b7c5" ++checksum = "d726bfaff4b320266d395898905d0eba0345aae23b54aee3a737e260fd46db03" + dependencies = [ + "itoa", ++ "memchr", + "ryu", + "serde", + ] + + [[package]] + name = "serde_spanned" +-version = "0.6.6" ++version = "0.6.8" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "79e674e01f999af37c49f70a6ede167a8a60b2503e56c5599532a65baa5969a0" ++checksum = "87607cb1398ed59d48732e575a4c28a7a8ebf2454b964fe3f224f2afc07909e1" + dependencies = [ + "serde", + ] +@@ -2784,9 +2942,9 @@ dependencies = [ + + [[package]] + name = "sha1_smol" +-version = "1.0.0" ++version = "1.0.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "ae1a47186c03a32177042e55dbc5fd5aee900b8e0069a8d70fba96a9375cd012" ++checksum = "bbfa15b3dddfee50a0fff136974b3e1bde555604ba463834a7eb7deb6417705d" + + [[package]] + name = "sha2" +@@ -2813,9 +2971,9 @@ checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" + + [[package]] + name = "simdutf8" +-version = "0.1.4" ++version = "0.1.5" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "f27f6278552951f1f2b8cf9da965d10969b2efdea95a6ec47987ab46edfe263a" ++checksum = "e3a9fe34e3e7a50316060351f37187a3f546bce95496156754b601a5fa71b76e" + + [[package]] + name = "siphasher" +@@ -2836,7 +2994,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c" + dependencies = [ + "libc", +- "windows-sys", ++ "windows-sys 0.52.0", + ] + + [[package]] +@@ -2848,6 +3006,12 @@ dependencies = [ + "lock_api", + ] + ++[[package]] ++name = "stable_deref_trait" ++version = "1.2.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" ++ + [[package]] + name = "static_assertions" + version = "1.1.0" +@@ -2915,9 +3079,9 @@ dependencies = [ + + [[package]] + name = "syn" +-version = "2.0.71" ++version = "2.0.87" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "b146dcf730474b4bcd16c311627b31ede9ab149045db4d6088b3becaea046462" ++checksum = "25aa4ce346d03a6dcd68dd8b4010bcb74e54e62c90c573f394c46eae99aba32d" + dependencies = [ + "proc-macro2", + "quote", +@@ -2933,7 +3097,18 @@ dependencies = [ + "proc-macro-error", + "proc-macro2", + "quote", +- "syn 2.0.71", ++ "syn 2.0.87", ++] ++ ++[[package]] ++name = "synstructure" ++version = "0.13.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "syn 2.0.87", + ] + + [[package]] +@@ -2944,14 +3119,15 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" + + [[package]] + name = "tempfile" +-version = "3.10.1" ++version = "3.13.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" ++checksum = "f0f2c9fc62d0beef6951ccffd757e241266a2c833136efbe35af6cd2567dca5b" + dependencies = [ + "cfg-if", + "fastrand", ++ "once_cell", + "rustix", +- "windows-sys", ++ "windows-sys 0.59.0", + ] + + [[package]] +@@ -2976,22 +3152,22 @@ dependencies = [ + + [[package]] + name = "thiserror" +-version = "1.0.63" ++version = "1.0.68" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724" ++checksum = "02dd99dc800bbb97186339685293e1cc5d9df1f8fae2d0aecd9ff1c77efea892" + dependencies = [ + "thiserror-impl", + ] + + [[package]] + name = "thiserror-impl" +-version = "1.0.63" ++version = "1.0.68" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" ++checksum = "a7c61ec9a6f64d2793d8a45faba21efbe3ced62a886d44c36a009b2b519b4c7e" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.71", ++ "syn 2.0.87", + ] + + [[package]] +@@ -3036,6 +3212,16 @@ dependencies = [ + "crunchy", + ] + ++[[package]] ++name = "tinystr" ++version = "0.7.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f" ++dependencies = [ ++ "displaydoc", ++ "zerovec", ++] ++ + [[package]] + name = "tinyvec" + version = "1.8.0" +@@ -3053,63 +3239,52 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" + + [[package]] + name = "toml" +-version = "0.8.15" ++version = "0.8.19" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "ac2caab0bf757388c6c0ae23b3293fdb463fee59434529014f85e3263b995c28" ++checksum = "a1ed1f98e3fdc28d6d910e6737ae6ab1a93bf1985935a1193e68f93eeb68d24e" + dependencies = [ + "serde", + "serde_spanned", + "toml_datetime", +- "toml_edit 0.22.16", ++ "toml_edit", + ] + + [[package]] + name = "toml_datetime" +-version = "0.6.6" ++version = "0.6.8" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "4badfd56924ae69bcc9039335b2e017639ce3f9b001c393c1b2d1ef846ce2cbf" ++checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41" + dependencies = [ + "serde", + ] + + [[package]] + name = "toml_edit" +-version = "0.21.1" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" +-dependencies = [ +- "indexmap", +- "toml_datetime", +- "winnow 0.5.40", +-] +- +-[[package]] +-name = "toml_edit" +-version = "0.22.16" ++version = "0.22.22" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "278f3d518e152219c994ce877758516bca5e118eaed6996192a774fb9fbf0788" ++checksum = "4ae48d6208a266e853d946088ed816055e556cc6028c5e8e2b84d9fa5dd7c7f5" + dependencies = [ + "indexmap", + "serde", + "serde_spanned", + "toml_datetime", +- "winnow 0.6.14", ++ "winnow", + ] + + [[package]] + name = "tracy-client-sys" +-version = "0.22.2" ++version = "0.24.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "9d104d610dfa9dd154535102cc9c6164ae1fa37842bc2d9e83f9ac82b0ae0882" ++checksum = "68613466112302fdbeabc5fa55f7d57462a0b247d5a6b7d7e09401fb471a144d" + dependencies = [ + "cc", + ] + + [[package]] + name = "tracy_full" +-version = "1.8.0" ++version = "1.10.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "35e7992a48ab79a02b2b39220af68e831c8323036289fcb705b855799bc4539a" ++checksum = "fc88adf397f147eed3ce2a6c85df8e6132d2f83f49c94d89cab6abb46b4cfa9a" + dependencies = [ + "once_cell", + "rustc_version", +@@ -3142,12 +3317,6 @@ dependencies = [ + "arrayvec", + ] + +-[[package]] +-name = "unicode-bidi" +-version = "0.3.15" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" +- + [[package]] + name = "unicode-bom" + version = "2.0.3" +@@ -3156,15 +3325,15 @@ checksum = "7eec5d1121208364f6793f7d2e222bf75a915c19557537745b195b253dd64217" + + [[package]] + name = "unicode-ident" +-version = "1.0.12" ++version = "1.0.13" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" ++checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" + + [[package]] + name = "unicode-normalization" +-version = "0.1.23" ++version = "0.1.24" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" ++checksum = "5033c97c4262335cded6d6fc3e5c18ab755e1a3dc96376350f3d8e9f009ad956" + dependencies = [ + "tinyvec", + ] +@@ -3177,9 +3346,9 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" + + [[package]] + name = "ureq" +-version = "2.10.0" ++version = "2.10.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "72139d247e5f97a3eff96229a7ae85ead5328a39efe76f8bf5a06313d505b6ea" ++checksum = "b74fc6b57825be3373f7054754755f03ac3a8f5d70015ccad699ba2029956f4a" + dependencies = [ + "base64 0.22.1", + "flate2", +@@ -3193,9 +3362,9 @@ dependencies = [ + + [[package]] + name = "url" +-version = "2.5.2" ++version = "2.5.3" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c" ++checksum = "8d157f1b96d14500ffdc1f10ba712e780825526c03d9a49b4d0324b0d9113ada" + dependencies = [ + "form_urlencoded", + "idna", +@@ -3208,11 +3377,23 @@ version = "0.7.6" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" + ++[[package]] ++name = "utf16_iter" ++version = "1.0.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c8232dd3cdaed5356e0f716d285e4b40b932ac434100fe9b7e0e8e935b9e6246" ++ ++[[package]] ++name = "utf8_iter" ++version = "1.0.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be" ++ + [[package]] + name = "uuid" +-version = "1.10.0" ++version = "1.11.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314" ++checksum = "f8c5f0a0af699448548ad1a2fbf920fb4bee257eae39953ba95cb84891a0446a" + + [[package]] + name = "vcpkg" +@@ -3222,9 +3403,9 @@ checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" + + [[package]] + name = "version_check" +-version = "0.9.4" ++version = "0.9.5" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" ++checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" + + [[package]] + name = "walkdir" +@@ -3244,34 +3425,35 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" + + [[package]] + name = "wasm-bindgen" +-version = "0.2.92" ++version = "0.2.95" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" ++checksum = "128d1e363af62632b8eb57219c8fd7877144af57558fb2ef0368d0087bddeb2e" + dependencies = [ + "cfg-if", ++ "once_cell", + "wasm-bindgen-macro", + ] + + [[package]] + name = "wasm-bindgen-backend" +-version = "0.2.92" ++version = "0.2.95" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" ++checksum = "cb6dd4d3ca0ddffd1dd1c9c04f94b868c37ff5fac97c30b97cff2d74fce3a358" + dependencies = [ + "bumpalo", + "log", + "once_cell", + "proc-macro2", + "quote", +- "syn 2.0.71", ++ "syn 2.0.87", + "wasm-bindgen-shared", + ] + + [[package]] + name = "wasm-bindgen-macro" +-version = "0.2.92" ++version = "0.2.95" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" ++checksum = "e79384be7f8f5a9dd5d7167216f022090cf1f9ec128e6e6a482a2cb5c5422c56" + dependencies = [ + "quote", + "wasm-bindgen-macro-support", +@@ -3279,22 +3461,22 @@ dependencies = [ + + [[package]] + name = "wasm-bindgen-macro-support" +-version = "0.2.92" ++version = "0.2.95" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" ++checksum = "26c6ab57572f7a24a4985830b120de1594465e5d500f24afe89e16b4e833ef68" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.71", ++ "syn 2.0.87", + "wasm-bindgen-backend", + "wasm-bindgen-shared", + ] + + [[package]] + name = "wasm-bindgen-shared" +-version = "0.2.92" ++version = "0.2.95" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" ++checksum = "65fc09f10666a9f147042251e0dda9c18f166ff7de300607007e96bdebc1068d" + + [[package]] + name = "webpki" +@@ -3308,9 +3490,9 @@ dependencies = [ + + [[package]] + name = "webpki-roots" +-version = "0.26.3" ++version = "0.26.6" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "bd7c23921eeb1713a4e851530e9b9756e4fb0e89978582942612524cf09f01cd" ++checksum = "841c67bff177718f1d4dfefde8d8f0e78f9b6589319ba88312f567fc5841a958" + dependencies = [ + "rustls-pki-types", + ] +@@ -3333,11 +3515,11 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + + [[package]] + name = "winapi-util" +-version = "0.1.8" ++version = "0.1.9" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b" ++checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" + dependencies = [ +- "windows-sys", ++ "windows-sys 0.59.0", + ] + + [[package]] +@@ -3364,6 +3546,15 @@ dependencies = [ + "windows-targets", + ] + ++[[package]] ++name = "windows-sys" ++version = "0.59.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" ++dependencies = [ ++ "windows-targets", ++] ++ + [[package]] + name = "windows-targets" + version = "0.52.6" +@@ -3430,21 +3621,24 @@ checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" + + [[package]] + name = "winnow" +-version = "0.5.40" ++version = "0.6.20" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876" ++checksum = "36c1fec1a2bb5866f07c25f68c26e565c4c200aebb96d7e55710c19d3e8ac49b" + dependencies = [ + "memchr", + ] + + [[package]] +-name = "winnow" +-version = "0.6.14" ++name = "write16" ++version = "1.0.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "374ec40a2d767a3c1b4972d9475ecd557356637be906f2cb3f7fe17a6eb5e22f" +-dependencies = [ +- "memchr", +-] ++checksum = "d1890f4022759daae28ed4fe62859b1236caebfc61ede2f63ed4e695f3f6d936" ++ ++[[package]] ++name = "writeable" ++version = "0.5.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51" + + [[package]] + name = "wyz" +@@ -3455,12 +3649,37 @@ dependencies = [ + "tap", + ] + ++[[package]] ++name = "yoke" ++version = "0.7.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "6c5b1314b079b0930c31e3af543d8ee1757b1951ae1e1565ec704403a7240ca5" ++dependencies = [ ++ "serde", ++ "stable_deref_trait", ++ "yoke-derive", ++ "zerofrom", ++] ++ ++[[package]] ++name = "yoke-derive" ++version = "0.7.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "28cc31741b18cb6f1d5ff12f5b7523e3d6eb0852bbbad19d73905511d9849b95" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "syn 2.0.87", ++ "synstructure", ++] ++ + [[package]] + name = "zerocopy" + version = "0.7.35" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" + dependencies = [ ++ "byteorder", + "zerocopy-derive", + ] + +@@ -3472,7 +3691,28 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.71", ++ "syn 2.0.87", ++] ++ ++[[package]] ++name = "zerofrom" ++version = "0.1.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "91ec111ce797d0e0784a1116d0ddcdbea84322cd79e5d5ad173daeba4f93ab55" ++dependencies = [ ++ "zerofrom-derive", ++] ++ ++[[package]] ++name = "zerofrom-derive" ++version = "0.1.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0ea7b4a3637ea8669cedf0f1fd5c286a17f3de97b8dd5a70a6c167a1730e63a5" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "syn 2.0.87", ++ "synstructure", + ] + + [[package]] +@@ -3492,14 +3732,36 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.71", ++ "syn 2.0.87", ++] ++ ++[[package]] ++name = "zerovec" ++version = "0.10.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "aa2b893d79df23bfb12d5461018d408ea19dfafe76c2c7ef6d4eba614f8ff079" ++dependencies = [ ++ "yoke", ++ "zerofrom", ++ "zerovec-derive", ++] ++ ++[[package]] ++name = "zerovec-derive" ++version = "0.10.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "syn 2.0.87", + ] + + [[package]] + name = "zip" +-version = "2.1.4" ++version = "2.2.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "e29ab4097989787b2029a5981c41b7bfb427b5a601e23f455daacb4d0360a9e9" ++checksum = "dc5e4288ea4057ae23afc69a4472434a87a2495cafce6632fd1c4ec9f5cf3494" + dependencies = [ + "aes", + "arbitrary", +@@ -3549,18 +3811,18 @@ dependencies = [ + + [[package]] + name = "zstd-safe" +-version = "7.2.0" ++version = "7.2.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "fa556e971e7b568dc775c136fc9de8c779b1c2fc3a63defaafadffdbd3181afa" ++checksum = "54a3ab4db68cea366acc5c897c7b4d4d1b8994a9cd6e6f841f8964566a419059" + dependencies = [ + "zstd-sys", + ] + + [[package]] + name = "zstd-sys" +-version = "2.0.12+zstd.1.5.6" ++version = "2.0.13+zstd.1.5.6" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "0a4e40c320c3cb459d9a9ff6de98cff88f4751ee9275d140e2be94a2b74e4c13" ++checksum = "38ff0f21cfee8f97d94cef41359e0c89aa6113028ab0291aa8ca0038995a95aa" + dependencies = [ + "cc", + "pkg-config", diff --git a/Cargo.toml b/Cargo.toml -index 958fbd4..e3965dd 100644 +index 7466b43..84947b9 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,15 +1,15 @@ [package] name = "rust-g" edition = "2021" --version = "3.0.0" -+version = "3.0.0-P" +-version = "3.4.0" ++version = "3.4.0-P" authors = [ "Bjorn Neergaard ", "Tad Hardesty ", @@ -37,9 +2130,9 @@ index 958fbd4..e3965dd 100644 license = "MIT" -description = "Offloaded task library for the /tg/ Space Station 13 codebase" +description = "Offloaded task library for the ParadiseSS13 Space Station 13 codebase - Adapted from tgstation/rust-g" + rust-version = "1.70" [lib] - crate-type = ["cdylib"] -- 2.41.0.windows.3 diff --git a/paradise-rust-g-patches/0003-Paradise-API-Headers.patch b/paradise-rust-g-patches/0003-Paradise-API-Headers.patch index 4a22d81..6043e6f 100644 --- a/paradise-rust-g-patches/0003-Paradise-API-Headers.patch +++ b/paradise-rust-g-patches/0003-Paradise-API-Headers.patch @@ -1,4 +1,4 @@ -From 1bac400d13a18fa69dacf7571513de3c7d70ad54 Mon Sep 17 00:00:00 2001 +From 49e47bfef4ecc7997a73e61c223ef3be03aaa441 Mon Sep 17 00:00:00 2001 From: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com> Date: Wed, 13 Oct 2021 22:11:10 +0100 Subject: [PATCH] Paradise API Headers @@ -34,7 +34,7 @@ index 2b3914d..702c5cf 100644 * This proc generates a grid of perlin-like noise * diff --git a/dmsrc/dmi.dm b/dmsrc/dmi.dm -index f5d5fe5..d04b0d1 100644 +index 9ebb8ed..6e85891 100644 --- a/dmsrc/dmi.dm +++ b/dmsrc/dmi.dm @@ -1,3 +1,5 @@ @@ -44,28 +44,27 @@ index f5d5fe5..d04b0d1 100644 #define rustg_dmi_create_png(path, width, height, data) RUSTG_CALL(RUST_G, "dmi_create_png")(path, width, height, data) #define rustg_dmi_resize_png(path, width, height, resizetype) RUSTG_CALL(RUST_G, "dmi_resize_png")(path, width, height, resizetype) diff --git a/dmsrc/file.dm b/dmsrc/file.dm -index c18d3f8..b285941 100644 +index 8d64b72..cd03b81 100644 --- a/dmsrc/file.dm +++ b/dmsrc/file.dm @@ -1,3 +1,5 @@ +// File Operations // + #define rustg_file_read(fname) RUSTG_CALL(RUST_G, "file_read")(fname) - #define rustg_file_exists(fname) RUSTG_CALL(RUST_G, "file_exists")(fname) + #define rustg_file_exists(fname) (RUSTG_CALL(RUST_G, "file_exists")(fname) == "true") #define rustg_file_write(text, fname) RUSTG_CALL(RUST_G, "file_write")(text, fname) diff --git a/dmsrc/git.dm b/dmsrc/git.dm -index b3185db..e718815 100644 +index 0643c1d..c4b3e0a 100644 --- a/dmsrc/git.dm +++ b/dmsrc/git.dm -@@ -1,2 +1,4 @@ --#define rustg_git_revparse(rev) RUSTG_CALL(RUST_G, "rg_git_revparse")(rev) --#define rustg_git_commit_date(rev) RUSTG_CALL(RUST_G, "rg_git_commit_date")(rev) +@@ -1,3 +1,5 @@ +// Git Operations // + -+#define rustg_git_revparse(rev) RUSTG_CALL(RUST_G, "rg_git_revparse")(rev) -+#define rustg_git_commit_date(rev) RUSTG_CALL(RUST_G, "rg_git_commit_date")(rev) + /// Returns the git hash of the given revision, ex. "HEAD". + #define rustg_git_revparse(rev) RUSTG_CALL(RUST_G, "rg_git_revparse")(rev) + diff --git a/dmsrc/hash.dm b/dmsrc/hash.dm -index c666d2e..6354515 100644 +index 3df78b1..edf602e 100644 --- a/dmsrc/hash.dm +++ b/dmsrc/hash.dm @@ -1,3 +1,5 @@ @@ -84,6 +83,16 @@ index d63748d..eba7d68 100644 #define RUSTG_HTTP_METHOD_GET "get" #define RUSTG_HTTP_METHOD_PUT "put" #define RUSTG_HTTP_METHOD_DELETE "delete" +diff --git a/dmsrc/iconforge.dm b/dmsrc/iconforge.dm +index 5f6d9bf..27bcaa8 100644 +--- a/dmsrc/iconforge.dm ++++ b/dmsrc/iconforge.dm +@@ -1,3 +1,5 @@ ++// Iconforge Operations // ++ + /// Generates a spritesheet at: [file_path][spritesheet_name]_[size_id].png + /// The resulting spritesheet arranges icons in a random order, with the position being denoted in the "sprites" return value. + /// All icons have the same y coordinate, and their x coordinate is equal to `icon_width * position`. diff --git a/dmsrc/jobs.dm b/dmsrc/jobs.dm index 499314b..46b95ca 100644 --- a/dmsrc/jobs.dm @@ -112,15 +121,17 @@ index bbc8fe6..75d6268 100644 #define rustg_log_write(fname, text) RUSTG_CALL(RUST_G, "log_write")(fname, text) /proc/rustg_log_close_all() return RUSTG_CALL(RUST_G, "log_close_all")() diff --git a/dmsrc/noise.dm b/dmsrc/noise.dm -index 5630600..f05e0d3 100644 +index 43ae5a6..d1eeaa5 100644 --- a/dmsrc/noise.dm +++ b/dmsrc/noise.dm -@@ -1 +1,3 @@ +@@ -1,3 +1,5 @@ +// Noise Operations // + #define rustg_noise_get_at_coordinates(seed, x, y) RUSTG_CALL(RUST_G, "noise_get_at_coordinates")(seed, x, y) + + /** diff --git a/dmsrc/pathfinder.dm b/dmsrc/pathfinder.dm -index 3259aa8..d229569 100644 +index f6e5424..a8e90bd 100644 --- a/dmsrc/pathfinder.dm +++ b/dmsrc/pathfinder.dm @@ -1,3 +1,5 @@ @@ -139,6 +150,26 @@ index 842f1bf..a3c3558 100644 #define RUSTG_REDIS_ERROR_CHANNEL "RUSTG_REDIS_ERROR_CHANNEL" #define rustg_redis_connect(addr) RUSTG_CALL(RUST_G, "redis_connect")(addr) +diff --git a/dmsrc/redis-reliablequeue.dm b/dmsrc/redis-reliablequeue.dm +index 710eb03..814a8b6 100644 +--- a/dmsrc/redis-reliablequeue.dm ++++ b/dmsrc/redis-reliablequeue.dm +@@ -1,3 +1,5 @@ ++// Redis Core Operations // ++ + /** + * Connects to a given redis server. + * +diff --git a/dmsrc/sanitize.dm b/dmsrc/sanitize.dm +index ca42fb7..f17570f 100644 +--- a/dmsrc/sanitize.dm ++++ b/dmsrc/sanitize.dm +@@ -1,3 +1,5 @@ ++// Sanitisation Operations // ++ + /* + * Takes in a string and json_encode()"d lists to produce a sanitized string. + * This function operates on whitelists, there is currently no way to blacklist. diff --git a/dmsrc/sql.dm b/dmsrc/sql.dm index cad44b5..d4d3e68 100644 --- a/dmsrc/sql.dm @@ -150,7 +181,7 @@ index cad44b5..d4d3e68 100644 #define rustg_sql_query_async(handle, query, params) RUSTG_CALL(RUST_G, "sql_query_async")(handle, query, params) #define rustg_sql_query_blocking(handle, query, params) RUSTG_CALL(RUST_G, "sql_query_blocking")(handle, query, params) diff --git a/dmsrc/time.dm b/dmsrc/time.dm -index f4ac5e5..ca5b686 100644 +index 1a81a21..8a5a3f4 100644 --- a/dmsrc/time.dm +++ b/dmsrc/time.dm @@ -1,3 +1,5 @@ @@ -199,5 +230,5 @@ index 379adfc..ccaa166 100644 * This proc generates a noise grid using worley noise algorithm * -- -2.35.2.windows.1 +2.41.0.windows.3 diff --git a/paradise-rust-g-patches/0004-Paradise-DLL-Location-Fix.patch b/paradise-rust-g-patches/0004-Paradise-DLL-Location-Fix.patch deleted file mode 100644 index 41e0364..0000000 --- a/paradise-rust-g-patches/0004-Paradise-DLL-Location-Fix.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 6b7699bf39674cd6f84eb90662bad77247343b21 Mon Sep 17 00:00:00 2001 -From: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com> -Date: Wed, 13 Oct 2021 22:16:17 +0100 -Subject: [PATCH] Paradise DLL Location Fix - - -diff --git a/dmsrc/main.dm b/dmsrc/main.dm -index bd4497a..35c1c72 100644 ---- a/dmsrc/main.dm -+++ b/dmsrc/main.dm -@@ -33,7 +33,7 @@ - // It's not in the current directory, so try others - return __rust_g = "librust_g.so" - else -- return __rust_g = "rust_g" -+ return __rust_g = "rust_g.dll" - - #define RUST_G (__rust_g || __detect_rust_g()) - #endif --- -2.17.1 - diff --git a/paradise-rust-g-patches/0005-Paradise-HTTP-Module-Tweaks.patch b/paradise-rust-g-patches/0004-Paradise-HTTP-Module-Tweaks.patch similarity index 78% rename from paradise-rust-g-patches/0005-Paradise-HTTP-Module-Tweaks.patch rename to paradise-rust-g-patches/0004-Paradise-HTTP-Module-Tweaks.patch index c9e222b..2dfd3f6 100644 --- a/paradise-rust-g-patches/0005-Paradise-HTTP-Module-Tweaks.patch +++ b/paradise-rust-g-patches/0004-Paradise-HTTP-Module-Tweaks.patch @@ -1,4 +1,4 @@ -From edf520da0a3f4c4b9141cde63918b23dcc3f6dac Mon Sep 17 00:00:00 2001 +From 06758a8bc4e57d42c354740437a125169a79d759 Mon Sep 17 00:00:00 2001 From: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com> Date: Thu, 14 Oct 2021 15:50:14 +0100 Subject: [PATCH] Paradise HTTP Module Tweaks @@ -15,7 +15,7 @@ index eba7d68..c880334 100644 +/proc/rustg_create_async_http_client() return RUSTG_CALL(RUST_G, "start_http_client")() +/proc/rustg_close_async_http_client() return RUSTG_CALL(RUST_G, "shutdown_http_client")() diff --git a/src/http.rs b/src/http.rs -index 43f891e..135b2c2 100644 +index c077f06..ef98d45 100644 --- a/src/http.rs +++ b/src/http.rs @@ -1,8 +1,8 @@ @@ -28,18 +28,18 @@ index 43f891e..135b2c2 100644 // ---------------------------------------------------------------------------- // Interface -@@ -75,7 +75,9 @@ fn setup_http_client() -> reqwest::blocking::Client { - Client::builder().default_headers(headers).build().unwrap() - } +@@ -63,7 +63,9 @@ byond_fn!(fn http_check_request(id) { + const VERSION: &str = env!("CARGO_PKG_VERSION"); + const PKG_NAME: &str = env!("CARGO_PKG_NAME"); --pub static HTTP_CLIENT: Lazy = Lazy::new(setup_http_client); +-pub static HTTP_CLIENT: Lazy = Lazy::new(ureq::agent); +thread_local! { -+ pub static HTTP_CLIENT: RefCell> = RefCell::new(Some(setup_http_client())); ++ pub static HTTP_CLIENT: RefCell> = RefCell::new(Some(ureq::agent())); +} // ---------------------------------------------------------------------------- // Request construction and execution -@@ -92,38 +94,56 @@ fn construct_request( +@@ -81,38 +83,57 @@ fn construct_request( headers: &str, options: &str, ) -> Result { @@ -50,16 +50,15 @@ index 43f891e..135b2c2 100644 - "delete" => HTTP_CLIENT.delete(url), - "head" => HTTP_CLIENT.head(url), - _ => HTTP_CLIENT.get(url), -- }; -- -- if !body.is_empty() { -- req = req.body(body.to_owned()); - } +- .set("User-Agent", &format!("{PKG_NAME}/{VERSION}")); +- +- let mut final_body = body.as_bytes().to_vec(); - - if !headers.is_empty() { - let headers: BTreeMap<&str, &str> = serde_json::from_str(headers)?; - for (key, value) in headers { -- req = req.header(key, value); +- req = req.set(key, value); - } - } - @@ -68,7 +67,7 @@ index 43f891e..135b2c2 100644 - let options: RequestOptions = serde_json::from_str(options)?; - output_filename = options.output_filename; - if let Some(fname) = options.body_filename { -- req = req.body(std::fs::File::open(fname)?); +- final_body = std::fs::read(fname)?; + HTTP_CLIENT.with(|cell| { + let borrow = cell.borrow_mut(); + match &*borrow { @@ -80,16 +79,15 @@ index 43f891e..135b2c2 100644 + "delete" => client.delete(url), + "head" => client.head(url), + _ => client.get(url), -+ }; -+ -+ if !body.is_empty() { -+ req = req.body(body.to_owned()); + } ++ .set("User-Agent", &format!("{PKG_NAME}/{VERSION}")); ++ ++ let mut final_body = body.as_bytes().to_vec(); + + if !headers.is_empty() { + let headers: BTreeMap<&str, &str> = serde_json::from_str(headers)?; + for (key, value) in headers { -+ req = req.header(key, value); ++ req = req.set(key, value); + } + } + @@ -98,24 +96,26 @@ index 43f891e..135b2c2 100644 + let options: RequestOptions = serde_json::from_str(options)?; + output_filename = options.output_filename; + if let Some(fname) = options.body_filename { -+ req = req.body(std::fs::File::open(fname)?); ++ final_body = std::fs::read(fname)?; + } + } + + Ok(RequestPrep { + req, + output_filename, ++ body: final_body, + }) + } + + // If we got here we royally fucked up + None => { -+ let client = setup_http_client(); ++ let client = ureq::agent(); + let req = client.get(""); + let output_filename = None; + Ok(RequestPrep { + req, + output_filename, ++ body: Vec::new(), + }) + } } @@ -124,17 +124,18 @@ index 43f891e..135b2c2 100644 - Ok(RequestPrep { - req, - output_filename, +- body: final_body, }) } -@@ -155,3 +175,17 @@ fn submit_request(prep: RequestPrep) -> Result { +@@ -145,3 +166,17 @@ fn submit_request(prep: RequestPrep) -> Result { Ok(serde_json::to_string(&resp)?) } + +byond_fn!(fn start_http_client() { + HTTP_CLIENT.with(|cell| { -+ cell.replace(Some(setup_http_client())) ++ cell.replace(Some(ureq::agent())) + }); + Some("") +}); @@ -146,10 +147,10 @@ index 43f891e..135b2c2 100644 + Some("") +}); diff --git a/src/unzip.rs b/src/unzip.rs -index 16b5009..9b5d5c5 100644 +index b0a471a..c43dbbd 100644 --- a/src/unzip.rs +++ b/src/unzip.rs -@@ -11,9 +11,13 @@ struct UnzipPrep { +@@ -10,9 +10,13 @@ struct UnzipPrep { } fn construct_unzip(url: &str, unzip_directory: &str) -> UnzipPrep { diff --git a/paradise-rust-g-patches/0006-Paradise-Remove-Debug.patch b/paradise-rust-g-patches/0005-Paradise-Remove-Debug.patch similarity index 68% rename from paradise-rust-g-patches/0006-Paradise-Remove-Debug.patch rename to paradise-rust-g-patches/0005-Paradise-Remove-Debug.patch index 5953706..c284444 100644 --- a/paradise-rust-g-patches/0006-Paradise-Remove-Debug.patch +++ b/paradise-rust-g-patches/0005-Paradise-Remove-Debug.patch @@ -1,14 +1,14 @@ -From 3726163f09d0aa5a480185ceb10b56e30087ce1d Mon Sep 17 00:00:00 2001 +From c3c0893a3b4a1e0b243a8e6e0c69ee8dbe38eb08 Mon Sep 17 00:00:00 2001 From: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com> Date: Sun, 30 Oct 2022 15:29:37 +0000 Subject: [PATCH] Paradise Remove Debug diff --git a/Cargo.toml b/Cargo.toml -index b2166a7..1ad5412 100644 +index 84947b9..4e71bc2 100644 --- a/Cargo.toml +++ b/Cargo.toml -@@ -18,7 +18,6 @@ crate-type = ["cdylib"] +@@ -19,7 +19,6 @@ crate-type = ["cdylib"] opt-level = 3 codegen-units = 1 lto = true @@ -17,5 +17,5 @@ index b2166a7..1ad5412 100644 [dependencies] thiserror = "1.0" -- -2.35.2.windows.1 +2.41.0.windows.3 diff --git a/paradise-rust-g-patches/0006-Paradise-Toast-System.patch b/paradise-rust-g-patches/0006-Paradise-Toast-System.patch new file mode 100644 index 0000000..4e401ee --- /dev/null +++ b/paradise-rust-g-patches/0006-Paradise-Toast-System.patch @@ -0,0 +1,451 @@ +From ffe5a143912f8e5a277d6d601a6b428cbad16817 Mon Sep 17 00:00:00 2001 +From: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com> +Date: Mon, 4 Nov 2024 19:54:30 +0000 +Subject: [PATCH] Paradise Toast System + + +diff --git a/Cargo.lock b/Cargo.lock +index 6b456cc..095db20 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -93,9 +93,9 @@ dependencies = [ + + [[package]] + name = "arbitrary" +-version = "1.3.2" ++version = "1.4.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "7d5a26814d8dcb93b0e5a0ff3c6d80a8843bafb21b39e8e18a6f05471870e110" ++checksum = "775a8770d29db3dadcb858482cc240af7b2ffde4ac4de67d1d4955728103f0e2" + dependencies = [ + "derive_arbitrary", + ] +@@ -185,6 +185,12 @@ dependencies = [ + "wyz", + ] + ++[[package]] ++name = "block" ++version = "0.1.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a" ++ + [[package]] + name = "block-buffer" + version = "0.10.4" +@@ -619,6 +625,17 @@ dependencies = [ + "rayon", + ] + ++[[package]] ++name = "dbus" ++version = "0.9.7" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1bb21987b9fb1613058ba3843121dd18b163b254d8a6e797e144cbac14d96d1b" ++dependencies = [ ++ "libc", ++ "libdbus-sys", ++ "winapi", ++] ++ + [[package]] + name = "deflate" + version = "1.0.0" +@@ -657,9 +674,9 @@ dependencies = [ + + [[package]] + name = "derive_arbitrary" +-version = "1.3.2" ++version = "1.4.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "67e77553c4162a157adbf834ebae5b415acbecbeafc7a74b0e886657506a7611" ++checksum = "d475dfebcb4854d596b17b09f477616f80f17a550517f2b3615d8c205d5c802b" + dependencies = [ + "proc-macro2", + "quote", +@@ -688,6 +705,27 @@ dependencies = [ + "subtle", + ] + ++[[package]] ++name = "dirs-next" ++version = "2.0.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1" ++dependencies = [ ++ "cfg-if", ++ "dirs-sys-next", ++] ++ ++[[package]] ++name = "dirs-sys-next" ++version = "0.1.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d" ++dependencies = [ ++ "libc", ++ "redox_users", ++ "winapi", ++] ++ + [[package]] + name = "displaydoc" + version = "0.2.5" +@@ -1485,9 +1523,9 @@ dependencies = [ + + [[package]] + name = "hashbrown" +-version = "0.15.0" ++version = "0.15.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "1e087f84d4f86bf4b218b927129862374b72199ae7d8657835f1e89000eea4fb" ++checksum = "3a9bfc1af68b1726ea47d3d5109de126281def866b33970e10fbab11b5dafab3" + dependencies = [ + "allocator-api2", + "equivalent", +@@ -1549,7 +1587,7 @@ dependencies = [ + "iana-time-zone-haiku", + "js-sys", + "wasm-bindgen", +- "windows-core", ++ "windows-core 0.52.0", + ] + + [[package]] +@@ -1725,7 +1763,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da" + dependencies = [ + "equivalent", +- "hashbrown 0.15.0", ++ "hashbrown 0.15.1", + ] + + [[package]] +@@ -1828,6 +1866,15 @@ version = "0.2.161" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "8e9489c2807c139ffd9c1794f4af0ebe86a828db53ecdc7fea2111d0fed085d1" + ++[[package]] ++name = "libdbus-sys" ++version = "0.2.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "06085512b750d640299b79be4bad3d2fa90a9c00b1fd9e1b46364f66f0485c72" ++dependencies = [ ++ "pkg-config", ++] ++ + [[package]] + name = "libloading" + version = "0.8.5" +@@ -1906,7 +1953,7 @@ version = "0.12.5" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "234cf4f4a04dc1f57e24b96cc0cd600cf2af460d4161ac5ecdd0af8e1f3b2a38" + dependencies = [ +- "hashbrown 0.15.0", ++ "hashbrown 0.15.1", + ] + + [[package]] +@@ -1925,6 +1972,28 @@ version = "0.1.1" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "c41e0c4fef86961ac6d6f8a82609f55f31b05e4fce149ac5710e439df7619ba4" + ++[[package]] ++name = "mac-notification-sys" ++version = "0.6.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "dce8f34f3717aa37177e723df6c1fc5fb02b2a1087374ea3fe0ea42316dc8f91" ++dependencies = [ ++ "cc", ++ "dirs-next", ++ "objc-foundation", ++ "objc_id", ++ "time", ++] ++ ++[[package]] ++name = "malloc_buf" ++version = "0.0.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb" ++dependencies = [ ++ "libc", ++] ++ + [[package]] + name = "maplit" + version = "1.0.2" +@@ -2133,6 +2202,18 @@ dependencies = [ + "minimal-lexical", + ] + ++[[package]] ++name = "notify-rust" ++version = "4.11.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5134a72dc570b178bff81b01e81ab14a6fcc015391ed4b3b14853090658cd3a3" ++dependencies = [ ++ "dbus", ++ "log", ++ "mac-notification-sys", ++ "tauri-winrt-notification", ++] ++ + [[package]] + name = "num-bigint" + version = "0.4.6" +@@ -2177,6 +2258,35 @@ dependencies = [ + "libc", + ] + ++[[package]] ++name = "objc" ++version = "0.2.7" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1" ++dependencies = [ ++ "malloc_buf", ++] ++ ++[[package]] ++name = "objc-foundation" ++version = "0.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1add1b659e36c9607c7aab864a76c7a4c2760cd0cd2e120f3fb8b952c7e22bf9" ++dependencies = [ ++ "block", ++ "objc", ++ "objc_id", ++] ++ ++[[package]] ++name = "objc_id" ++version = "0.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c92d4ddb4bd7b50d730c215ff871754d0da6b2178849f8a2a2ab69712d0c073b" ++dependencies = [ ++ "objc", ++] ++ + [[package]] + name = "once_cell" + version = "1.20.2" +@@ -2455,6 +2565,15 @@ dependencies = [ + "syn 1.0.109", + ] + ++[[package]] ++name = "quick-xml" ++version = "0.31.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1004a344b30a54e2ee58d66a71b32d2db2feb0a31f9a2d302bf0536f15de2a33" ++dependencies = [ ++ "memchr", ++] ++ + [[package]] + name = "quote" + version = "1.0.37" +@@ -2590,6 +2709,17 @@ dependencies = [ + "bitflags 2.6.0", + ] + ++[[package]] ++name = "redox_users" ++version = "0.4.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43" ++dependencies = [ ++ "getrandom", ++ "libredox", ++ "thiserror", ++] ++ + [[package]] + name = "regex" + version = "1.11.1" +@@ -2693,6 +2823,7 @@ dependencies = [ + "md-5", + "mysql", + "noise", ++ "notify-rust", + "num-integer", + "once_cell", + "pathfinding", +@@ -3117,6 +3248,17 @@ version = "1.0.1" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" + ++[[package]] ++name = "tauri-winrt-notification" ++version = "0.2.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f89f5fb70d6f62381f5d9b2ba9008196150b40b75f3068eb24faeddf1c686871" ++dependencies = [ ++ "quick-xml", ++ "windows", ++ "windows-version", ++] ++ + [[package]] + name = "tempfile" + version = "3.13.0" +@@ -3528,6 +3670,16 @@ version = "0.4.0" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + ++[[package]] ++name = "windows" ++version = "0.56.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1de69df01bdf1ead2f4ac895dc77c9351aefff65b2f3db429a343f9cbf05e132" ++dependencies = [ ++ "windows-core 0.56.0", ++ "windows-targets", ++] ++ + [[package]] + name = "windows-core" + version = "0.52.0" +@@ -3537,6 +3689,49 @@ dependencies = [ + "windows-targets", + ] + ++[[package]] ++name = "windows-core" ++version = "0.56.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4698e52ed2d08f8658ab0c39512a7c00ee5fe2688c65f8c0a4f06750d729f2a6" ++dependencies = [ ++ "windows-implement", ++ "windows-interface", ++ "windows-result", ++ "windows-targets", ++] ++ ++[[package]] ++name = "windows-implement" ++version = "0.56.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f6fc35f58ecd95a9b71c4f2329b911016e6bec66b3f2e6a4aad86bd2e99e2f9b" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "syn 2.0.87", ++] ++ ++[[package]] ++name = "windows-interface" ++version = "0.56.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "08990546bf4edef8f431fa6326e032865f27138718c587dc21bc0265bbcb57cc" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "syn 2.0.87", ++] ++ ++[[package]] ++name = "windows-result" ++version = "0.1.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5e383302e8ec8515204254685643de10811af0ed97ea37210dc26fb0032647f8" ++dependencies = [ ++ "windows-targets", ++] ++ + [[package]] + name = "windows-sys" + version = "0.52.0" +@@ -3571,6 +3766,15 @@ dependencies = [ + "windows_x86_64_msvc", + ] + ++[[package]] ++name = "windows-version" ++version = "0.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "6998aa457c9ba8ff2fb9f13e9d2a930dabcea28f1d0ab94d687d8b3654844515" ++dependencies = [ ++ "windows-targets", ++] ++ + [[package]] + name = "windows_aarch64_gnullvm" + version = "0.52.6" +diff --git a/Cargo.toml b/Cargo.toml +index 4e71bc2..7ebe14a 100644 +--- a/Cargo.toml ++++ b/Cargo.toml +@@ -64,6 +64,7 @@ ammonia = { version = "4.0.0", optional = true } + fast_poisson = { version = "0.5.2", optional = true, features = [ + "single_precision", + ] } # Higher versions have problems with x86 due to 'kiddo'. ++notify-rust = { version = "4.6.0", optional = true, features=["d"], default-features = false } + + [features] + default = [ +@@ -81,6 +82,7 @@ default = [ + "sanitize", + "sql", + "time", ++ "toast", + "toml", + "url", + ] +@@ -100,6 +102,7 @@ all = [ + "sanitize", + "sql", + "time", ++ "toast", + "toml", + "url", + "hash", +@@ -125,6 +128,7 @@ log = ["chrono"] + sanitize = ["ammonia", "serde_json"] + sql = ["mysql", "serde", "serde_json", "once_cell", "dashmap", "jobs"] + time = [] ++toast = ["notify-rust"] + toml = ["serde", "serde_json", "toml-dep"] + url = ["url-dep", "percent-encoding"] + +diff --git a/dmsrc/toast.dm b/dmsrc/toast.dm +new file mode 100644 +index 0000000..9222f88 +--- /dev/null ++++ b/dmsrc/toast.dm +@@ -0,0 +1,3 @@ ++// Toast Operations // ++ ++#define rustg_create_toast(title, body) RUSTG_CALL(RUST_G, "create_toast")(title, body) +diff --git a/src/lib.rs b/src/lib.rs +index 6a3f7c3..b467ad5 100644 +--- a/src/lib.rs ++++ b/src/lib.rs +@@ -46,6 +46,8 @@ pub mod sanitize; + pub mod sql; + #[cfg(feature = "time")] + pub mod time; ++#[cfg(feature = "toast")] ++pub mod toast; + #[cfg(feature = "toml")] + pub mod toml; + #[cfg(feature = "unzip")] +diff --git a/src/toast.rs b/src/toast.rs +new file mode 100644 +index 0000000..a1d6cd8 +--- /dev/null ++++ b/src/toast.rs +@@ -0,0 +1,9 @@ ++#[cfg(target_os = "windows")] ++use notify_rust::Notification; ++ ++byond_fn!(fn create_toast(_toast_title, _toast_text) { ++ #[cfg(target_os = "windows")] ++ Notification::new().summary(_toast_title).body(_toast_text).show().ok(); ++ ++ Some("") ++}); +-- +2.41.0.windows.3 + diff --git a/paradise-rust-g-patches/0007-Paradise-DMSRC-Changes.patch b/paradise-rust-g-patches/0007-Paradise-DMSRC-Changes.patch new file mode 100644 index 0000000..7a7871e --- /dev/null +++ b/paradise-rust-g-patches/0007-Paradise-DMSRC-Changes.patch @@ -0,0 +1,75 @@ +From 0145f5747cba34224aab606b71bba4ee98a50d72 Mon Sep 17 00:00:00 2001 +From: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com> +Date: Mon, 4 Nov 2024 19:58:58 +0000 +Subject: [PATCH] Paradise DMSRC Changes + + +diff --git a/dmsrc/iconforge.dm b/dmsrc/iconforge.dm +index 27bcaa8..bcc72d9 100644 +--- a/dmsrc/iconforge.dm ++++ b/dmsrc/iconforge.dm +@@ -10,7 +10,7 @@ + /// Spritesheet will contain all sprites listed within "sprites". + /// "sprites" format: + /// list( +-/// "sprite_name" = list( // <--- this list is a [SPRITE_OBJECT] ++/// "sprite_name" = list(// <--- this list is a [SPRITE_OBJECT] + /// icon_file = 'icons/path_to/an_icon.dmi', + /// icon_state = "some_icon_state", + /// dir = SOUTH, +diff --git a/dmsrc/main.dm b/dmsrc/main.dm +index 5f6b72e..5bc9616 100644 +--- a/dmsrc/main.dm ++++ b/dmsrc/main.dm +@@ -19,21 +19,21 @@ + /* This comment bypasses grep checks */ /var/__rust_g + + /proc/__detect_rust_g() +- if (world.system_type == UNIX) +- if (fexists("./librust_g.so")) ++ if(world.system_type == UNIX) ++ if(fexists("./librust_g.so")) + // No need for LD_LIBRARY_PATH badness. + return __rust_g = "./librust_g.so" +- else if (fexists("./rust_g")) ++ else if(fexists("./rust_g")) + // Old dumb filename. + return __rust_g = "./rust_g" +- else if (fexists("[world.GetConfig("env", "HOME")]/.byond/bin/rust_g")) ++ else if(fexists("[world.GetConfig("env", "HOME")]/.byond/bin/rust_g")) + // Old dumb filename in `~/.byond/bin`. + return __rust_g = "rust_g" + else + // It's not in the current directory, so try others + return __rust_g = "librust_g.so" + else +- return __rust_g = "rust_g" ++ return __rust_g = "rust_g.dll" + + #define RUST_G (__rust_g || __detect_rust_g()) + #endif +diff --git a/dmsrc/toml.dm b/dmsrc/toml.dm +index dddce55..67c25bb 100644 +--- a/dmsrc/toml.dm ++++ b/dmsrc/toml.dm +@@ -4,7 +4,7 @@ + + /proc/rustg_read_toml_file(path) + var/list/output = rustg_raw_read_toml_file(path) +- if (output["success"]) ++ if(output["success"]) + return json_decode(output["content"]) + else + CRASH(output["content"]) +@@ -13,7 +13,7 @@ + + /proc/rustg_toml_encode(value) + var/list/output = rustg_raw_toml_encode(value) +- if (output["success"]) ++ if(output["success"]) + return output["content"] + else + CRASH(output["content"]) +-- +2.41.0.windows.3 + diff --git a/paradise-rust-g-patches/0007-Paradise-Toast-System.patch b/paradise-rust-g-patches/0007-Paradise-Toast-System.patch deleted file mode 100644 index e7cc6d7..0000000 --- a/paradise-rust-g-patches/0007-Paradise-Toast-System.patch +++ /dev/null @@ -1,476 +0,0 @@ -From f62531b52f69dd337bc6b29abc045f71ab14bede Mon Sep 17 00:00:00 2001 -From: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com> -Date: Tue, 24 Oct 2023 21:56:43 +0100 -Subject: [PATCH] Paradise Toast System - - -diff --git a/Cargo.lock b/Cargo.lock -index b276d34..9129a6e 100644 ---- a/Cargo.lock -+++ b/Cargo.lock -@@ -150,6 +150,12 @@ dependencies = [ - "wyz", - ] - -+[[package]] -+name = "block" -+version = "0.1.6" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a" -+ - [[package]] - name = "block-buffer" - version = "0.10.4" -@@ -568,6 +574,17 @@ dependencies = [ - "rayon", - ] - -+[[package]] -+name = "dbus" -+version = "0.9.7" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "1bb21987b9fb1613058ba3843121dd18b163b254d8a6e797e144cbac14d96d1b" -+dependencies = [ -+ "libc", -+ "libdbus-sys", -+ "winapi", -+] -+ - [[package]] - name = "deflate" - version = "1.0.0" -@@ -599,6 +616,27 @@ dependencies = [ - "subtle", - ] - -+[[package]] -+name = "dirs-next" -+version = "2.0.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1" -+dependencies = [ -+ "cfg-if", -+ "dirs-sys-next", -+] -+ -+[[package]] -+name = "dirs-sys-next" -+version = "0.1.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d" -+dependencies = [ -+ "libc", -+ "redox_users", -+ "winapi", -+] -+ - [[package]] - name = "dmi" - version = "0.3.0" -@@ -1051,7 +1089,7 @@ dependencies = [ - "iana-time-zone-haiku", - "js-sys", - "wasm-bindgen", -- "windows", -+ "windows 0.48.0", - ] - - [[package]] -@@ -1290,6 +1328,15 @@ version = "0.2.146" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "f92be4933c13fd498862a9e02a3055f8a8d9c039ce33db97306fd5a6caa7f29b" - -+[[package]] -+name = "libdbus-sys" -+version = "0.2.5" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "06085512b750d640299b79be4bad3d2fa90a9c00b1fd9e1b46364f66f0485c72" -+dependencies = [ -+ "pkg-config", -+] -+ - [[package]] - name = "libgit2-sys" - version = "0.15.2+1.6.4" -@@ -1355,6 +1402,28 @@ dependencies = [ - "hashbrown 0.13.2", - ] - -+[[package]] -+name = "mac-notification-sys" -+version = "0.6.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "51fca4d74ff9dbaac16a01b924bc3693fa2bba0862c2c633abc73f9a8ea21f64" -+dependencies = [ -+ "cc", -+ "dirs-next", -+ "objc-foundation", -+ "objc_id", -+ "time 0.3.22", -+] -+ -+[[package]] -+name = "malloc_buf" -+version = "0.0.6" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb" -+dependencies = [ -+ "libc", -+] -+ - [[package]] - name = "md-5" - version = "0.10.5" -@@ -1555,6 +1624,18 @@ dependencies = [ - "minimal-lexical", - ] - -+[[package]] -+name = "notify-rust" -+version = "4.9.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "6d7b75c8958cb2eab3451538b32db8a7b74006abc33eb2e6a9a56d21e4775c2b" -+dependencies = [ -+ "dbus", -+ "log", -+ "mac-notification-sys", -+ "tauri-winrt-notification", -+] -+ - [[package]] - name = "num" - version = "0.4.0" -@@ -1641,6 +1722,35 @@ dependencies = [ - "libc", - ] - -+[[package]] -+name = "objc" -+version = "0.2.7" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1" -+dependencies = [ -+ "malloc_buf", -+] -+ -+[[package]] -+name = "objc-foundation" -+version = "0.1.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "1add1b659e36c9607c7aab864a76c7a4c2760cd0cd2e120f3fb8b952c7e22bf9" -+dependencies = [ -+ "block", -+ "objc", -+ "objc_id", -+] -+ -+[[package]] -+name = "objc_id" -+version = "0.1.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c92d4ddb4bd7b50d730c215ff871754d0da6b2178849f8a2a2ab69712d0c073b" -+dependencies = [ -+ "objc", -+] -+ - [[package]] - name = "once_cell" - version = "1.18.0" -@@ -1699,7 +1809,7 @@ checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447" - dependencies = [ - "cfg-if", - "libc", -- "redox_syscall", -+ "redox_syscall 0.3.5", - "smallvec", - "windows-targets", - ] -@@ -1898,6 +2008,15 @@ dependencies = [ - "syn 1.0.109", - ] - -+[[package]] -+name = "quick-xml" -+version = "0.30.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "eff6510e86862b57b210fd8cbe8ed3f0d7d600b9c2863cd4549a2e033c66e956" -+dependencies = [ -+ "memchr", -+] -+ - [[package]] - name = "quote" - version = "1.0.28" -@@ -2047,6 +2166,15 @@ dependencies = [ - "url", - ] - -+[[package]] -+name = "redox_syscall" -+version = "0.2.16" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" -+dependencies = [ -+ "bitflags 1.3.2", -+] -+ - [[package]] - name = "redox_syscall" - version = "0.3.5" -@@ -2056,6 +2184,17 @@ dependencies = [ - "bitflags 1.3.2", - ] - -+[[package]] -+name = "redox_users" -+version = "0.4.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" -+dependencies = [ -+ "getrandom 0.2.10", -+ "redox_syscall 0.2.16", -+ "thiserror", -+] -+ - [[package]] - name = "regex" - version = "1.8.4" -@@ -2183,6 +2322,7 @@ dependencies = [ - "md-5", - "mysql", - "noise", -+ "notify-rust", - "num", - "once_cell", - "pathfinding", -@@ -2554,6 +2694,16 @@ version = "1.0.1" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" - -+[[package]] -+name = "tauri-winrt-notification" -+version = "0.1.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "006851c9ccefa3c38a7646b8cec804bb429def3da10497bfa977179869c3e8e2" -+dependencies = [ -+ "quick-xml", -+ "windows 0.51.1", -+] -+ - [[package]] - name = "tempfile" - version = "3.6.0" -@@ -2563,7 +2713,7 @@ dependencies = [ - "autocfg", - "cfg-if", - "fastrand", -- "redox_syscall", -+ "redox_syscall 0.3.5", - "rustix", - "windows-sys 0.48.0", - ] -@@ -3017,6 +3167,25 @@ dependencies = [ - "windows-targets", - ] - -+[[package]] -+name = "windows" -+version = "0.51.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ca229916c5ee38c2f2bc1e9d8f04df975b4bd93f9955dc69fabb5d91270045c9" -+dependencies = [ -+ "windows-core", -+ "windows-targets", -+] -+ -+[[package]] -+name = "windows-core" -+version = "0.51.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64" -+dependencies = [ -+ "windows-targets", -+] -+ - [[package]] - name = "windows-sys" - version = "0.42.0" -@@ -3043,17 +3212,17 @@ dependencies = [ - - [[package]] - name = "windows-targets" --version = "0.48.0" -+version = "0.48.5" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5" -+checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" - dependencies = [ -- "windows_aarch64_gnullvm 0.48.0", -- "windows_aarch64_msvc 0.48.0", -- "windows_i686_gnu 0.48.0", -- "windows_i686_msvc 0.48.0", -- "windows_x86_64_gnu 0.48.0", -- "windows_x86_64_gnullvm 0.48.0", -- "windows_x86_64_msvc 0.48.0", -+ "windows_aarch64_gnullvm 0.48.5", -+ "windows_aarch64_msvc 0.48.5", -+ "windows_i686_gnu 0.48.5", -+ "windows_i686_msvc 0.48.5", -+ "windows_x86_64_gnu 0.48.5", -+ "windows_x86_64_gnullvm 0.48.5", -+ "windows_x86_64_msvc 0.48.5", - ] - - [[package]] -@@ -3064,9 +3233,9 @@ checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" - - [[package]] - name = "windows_aarch64_gnullvm" --version = "0.48.0" -+version = "0.48.5" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" -+checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" - - [[package]] - name = "windows_aarch64_msvc" -@@ -3076,9 +3245,9 @@ checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" - - [[package]] - name = "windows_aarch64_msvc" --version = "0.48.0" -+version = "0.48.5" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" -+checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" - - [[package]] - name = "windows_i686_gnu" -@@ -3088,9 +3257,9 @@ checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" - - [[package]] - name = "windows_i686_gnu" --version = "0.48.0" -+version = "0.48.5" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" -+checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" - - [[package]] - name = "windows_i686_msvc" -@@ -3100,9 +3269,9 @@ checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" - - [[package]] - name = "windows_i686_msvc" --version = "0.48.0" -+version = "0.48.5" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" -+checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" - - [[package]] - name = "windows_x86_64_gnu" -@@ -3112,9 +3281,9 @@ checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" - - [[package]] - name = "windows_x86_64_gnu" --version = "0.48.0" -+version = "0.48.5" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" -+checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" - - [[package]] - name = "windows_x86_64_gnullvm" -@@ -3124,9 +3293,9 @@ checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" - - [[package]] - name = "windows_x86_64_gnullvm" --version = "0.48.0" -+version = "0.48.5" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" -+checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" - - [[package]] - name = "windows_x86_64_msvc" -@@ -3136,9 +3305,9 @@ checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" - - [[package]] - name = "windows_x86_64_msvc" --version = "0.48.0" -+version = "0.48.5" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" -+checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" - - [[package]] - name = "winnow" -diff --git a/Cargo.toml b/Cargo.toml -index 3647e3e..92fb50b 100644 ---- a/Cargo.toml -+++ b/Cargo.toml -@@ -56,6 +56,7 @@ dbpnoise = { version = "0.1.2", optional = true } - pathfinding = { version = "4.2.1", optional = true } - num = { version = "0.4.0", optional = true } - dmi = { version = "0.3.0", optional = true } -+notify-rust = { version = "4.6.0", optional = true, features=["d"], default-features = false } - - [features] - default = [ -@@ -71,6 +72,7 @@ default = [ - "rustls_tls", - "sql", - "time", -+ "toast", - "toml", - "url", - ] -@@ -110,6 +112,7 @@ json = ["serde", "serde_json"] - log = ["chrono"] - sql = ["mysql", "serde", "serde_json", "once_cell", "dashmap", "jobs"] - time = [] -+toast = ["notify-rust"] - toml = ["serde", "serde_json", "toml-dep"] - url = ["url-dep", "percent-encoding"] - -diff --git a/dmsrc/toast.dm b/dmsrc/toast.dm -new file mode 100644 -index 0000000..9222f88 ---- /dev/null -+++ b/dmsrc/toast.dm -@@ -0,0 +1,3 @@ -+// Toast Operations // -+ -+#define rustg_create_toast(title, body) RUSTG_CALL(RUST_G, "create_toast")(title, body) -diff --git a/src/lib.rs b/src/lib.rs -index 8b9fa90..5a79710 100644 ---- a/src/lib.rs -+++ b/src/lib.rs -@@ -40,6 +40,8 @@ pub mod redis_reliablequeue; - pub mod sql; - #[cfg(feature = "time")] - pub mod time; -+#[cfg(feature = "toast")] -+pub mod toast; - #[cfg(feature = "toml")] - pub mod toml; - #[cfg(feature = "unzip")] -diff --git a/src/toast.rs b/src/toast.rs -new file mode 100644 -index 0000000..a1d6cd8 ---- /dev/null -+++ b/src/toast.rs -@@ -0,0 +1,9 @@ -+#[cfg(target_os = "windows")] -+use notify_rust::Notification; -+ -+byond_fn!(fn create_toast(_toast_title, _toast_text) { -+ #[cfg(target_os = "windows")] -+ Notification::new().summary(_toast_title).body(_toast_text).show().ok(); -+ -+ Some("") -+}); --- -2.41.0.windows.3 - diff --git a/paradise-rust-g-patches/0008-Paradise-Redis-Changes.patch b/paradise-rust-g-patches/0008-Paradise-Redis-Changes.patch new file mode 100644 index 0000000..16b13d9 --- /dev/null +++ b/paradise-rust-g-patches/0008-Paradise-Redis-Changes.patch @@ -0,0 +1,154 @@ +From c173d2805c88bb5c1429907f505275750fde43dc Mon Sep 17 00:00:00 2001 +From: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com> +Date: Sat, 9 Nov 2024 20:07:41 +0000 +Subject: [PATCH] Paradise Redis Changes + + +diff --git a/Cargo.lock b/Cargo.lock +index 095db20..90c4df5 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -93,9 +93,9 @@ dependencies = [ + + [[package]] + name = "arbitrary" +-version = "1.4.0" ++version = "1.4.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "775a8770d29db3dadcb858482cc240af7b2ffde4ac4de67d1d4955728103f0e2" ++checksum = "dde20b3d026af13f561bdd0f15edf01fc734f0dafcedbaf42bba506a9517f223" + dependencies = [ + "derive_arbitrary", + ] +@@ -325,9 +325,9 @@ dependencies = [ + + [[package]] + name = "cc" +-version = "1.1.34" ++version = "1.1.36" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "67b9470d453346108f93a59222a9a1a5724db32d0a4727b7ab7ace4b4d822dc9" ++checksum = "baee610e9452a8f6f0a1b6194ec09ff9e2d85dea54432acdae41aa0761c95d70" + dependencies = [ + "jobserver", + "libc", +@@ -674,9 +674,9 @@ dependencies = [ + + [[package]] + name = "derive_arbitrary" +-version = "1.4.0" ++version = "1.4.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "d475dfebcb4854d596b17b09f477616f80f17a550517f2b3615d8c205d5c802b" ++checksum = "30542c1ad912e0e3d22a1935c290e12e8a29d704a420177a31faad4a601a0800" + dependencies = [ + "proc-macro2", + "quote", +@@ -1746,9 +1746,9 @@ dependencies = [ + + [[package]] + name = "image" +-version = "0.25.4" ++version = "0.25.5" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "bc144d44a31d753b02ce64093d532f55ff8dc4ebf2ffb8a63c0dda691385acae" ++checksum = "cd6f44aed642f18953a158afeb30206f4d50da59fbc66ecb53c66488de73563b" + dependencies = [ + "bytemuck", + "byteorder-lite", +@@ -1862,9 +1862,9 @@ dependencies = [ + + [[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 = "libdbus-sys" +@@ -2687,16 +2687,15 @@ dependencies = [ + + [[package]] + name = "redis" +-version = "0.25.4" ++version = "0.23.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "e0d7a6955c7511f60f3ba9e86c6d02b3c3f144f8c24b288d1f4e18074ab8bbec" ++checksum = "3ea8c51b5dc1d8e5fd3350ec8167f464ec0995e79f2e90a075b63371500d557f" + dependencies = [ + "combine", + "itoa", + "percent-encoding", + "ryu", + "sha1_smol", +- "socket2", + "url", + ] + +@@ -2885,9 +2884,9 @@ dependencies = [ + + [[package]] + name = "rustix" +-version = "0.38.38" ++version = "0.38.39" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "aa260229e6538e52293eeb577aabd09945a09d6d9cc0fc550ed7529056c2e32a" ++checksum = "375116bee2be9ed569afe2154ea6a99dfdffd257f533f187498c2a8f5feaf4ee" + dependencies = [ + "bitflags 2.6.0", + "errno", +@@ -3415,11 +3414,12 @@ dependencies = [ + + [[package]] + name = "tracy-client-sys" +-version = "0.24.1" ++version = "0.24.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "68613466112302fdbeabc5fa55f7d57462a0b247d5a6b7d7e09401fb471a144d" ++checksum = "3637e734239e12ab152cd269302500bd063f37624ee210cd04b4936ed671f3b1" + dependencies = [ + "cc", ++ "windows-targets", + ] + + [[package]] +diff --git a/Cargo.toml b/Cargo.toml +index 7ebe14a..0ef077f 100644 +--- a/Cargo.toml ++++ b/Cargo.toml +@@ -42,7 +42,7 @@ gix = { version = "0.63", optional = true, default-features = false, features = + "max-performance-safe", + ] } + noise = { version = "0.9", optional = true } +-redis = { version = "0.25", optional = true } ++redis = { version = "0.23.0", optional = true } # See paradise_redis_build.txt for info + ureq = { version = "2.10.0", optional = true } + serde = { version = "1.0", optional = true, features = ["derive"] } + serde_json = { version = "1.0", optional = true } +diff --git a/paradise_redis_build.txt b/paradise_redis_build.txt +new file mode 100644 +index 0000000..2778bc3 +--- /dev/null ++++ b/paradise_redis_build.txt +@@ -0,0 +1,16 @@ ++This file contains the EXACT version of redis we need for stable operation of redis within rustg. ++Keep this safe. ++ ++[[package]] ++name = "redis" ++version = "0.23.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3ea8c51b5dc1d8e5fd3350ec8167f464ec0995e79f2e90a075b63371500d557f" ++dependencies = [ ++ "combine", ++ "itoa", ++ "percent-encoding", ++ "ryu", ++ "sha1_smol", ++ "url", ++] +-- +2.41.0.windows.3 + diff --git a/rebuild_patches.sh b/rebuild_patches.sh index ac8bdf7..b97d772 100755 --- a/rebuild_patches.sh +++ b/rebuild_patches.sh @@ -2,6 +2,7 @@ PS1="$" basedir=`pwd` +tg_tag="3.4.0" clean=$1 echo "Rebuilding patch files from current fork state..." @@ -40,4 +41,4 @@ save_patches() { if [ "$clean" == "clean" ]; then rm -rf *-patches fi -save_patches tg-rust-g paradise-rust-g origin/master \ No newline at end of file +save_patches tg-rust-g paradise-rust-g $tg_tag \ No newline at end of file