From face608fae8bdbbee455c87dc3c729af59e6d298 Mon Sep 17 00:00:00 2001 From: Oliver Hamlet Date: Mon, 29 Sep 2025 20:28:40 +0100 Subject: [PATCH] Update libloadorder to v18.5.1 --- Cargo.lock | 106 ++--------------------- cpp/src/tests/common_game_test_fixture.h | 6 +- supply-chain/audits.toml | 6 ++ supply-chain/config.toml | 4 - supply-chain/imports.lock | 63 -------------- 5 files changed, 16 insertions(+), 169 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 9abf560e..351abc74 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -299,7 +299,7 @@ dependencies = [ "libc", "option-ext", "redox_users", - "windows-sys 0.59.0", + "windows-sys 0.61.1", ] [[package]] @@ -485,19 +485,19 @@ dependencies = [ [[package]] name = "libloadorder" -version = "18.4.0" +version = "18.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc4de694d488b4ce2a775d59825ec30d206546ec87fe0866717e6db25c46a164" +checksum = "69b44af67e4a19561303219523bfad95f4e7d85223aa7c2f4ba91c30b96c01ab" dependencies = [ "dirs", "encoding_rs", "esplugin", "keyvalues-parser", "rayon", - "regex", "rust-ini", "unicase", - "windows", + "windows-result", + "windows-sys 0.61.1", ] [[package]] @@ -1208,74 +1208,6 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" -[[package]] -name = "windows" -version = "0.61.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9babd3a767a4c1aef6900409f85f5d53ce2544ccdfaa86dad48c91782c6d6893" -dependencies = [ - "windows-collections", - "windows-core", - "windows-future", - "windows-link 0.1.3", - "windows-numerics", -] - -[[package]] -name = "windows-collections" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3beeceb5e5cfd9eb1d76b381630e82c4241ccd0d27f1a39ed41b2760b255c5e8" -dependencies = [ - "windows-core", -] - -[[package]] -name = "windows-core" -version = "0.61.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0fdd3ddb90610c7638aa2b3a3ab2904fb9e5cdbecc643ddb3647212781c4ae3" -dependencies = [ - "windows-implement", - "windows-interface", - "windows-link 0.1.3", - "windows-result", - "windows-strings", -] - -[[package]] -name = "windows-future" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc6a41e98427b19fe4b73c550f060b59fa592d7d686537eebf9385621bfbad8e" -dependencies = [ - "windows-core", - "windows-link 0.1.3", - "windows-threading", -] - -[[package]] -name = "windows-implement" -version = "0.60.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a47fddd13af08290e67f4acabf4b459f647552718f683a7b415d290ac744a836" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "windows-interface" -version = "0.59.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd9211b69f8dcdfa817bfd14bf1c97c9188afa36f4750130fcdf3f400eca9fa8" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - [[package]] name = "windows-link" version = "0.1.3" @@ -1288,16 +1220,6 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "45e46c0661abb7180e7b9c281db115305d49ca1709ab8242adf09666d2173c65" -[[package]] -name = "windows-numerics" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9150af68066c4c5c07ddc0ce30421554771e528bde427614c61038bc2c92c2b1" -dependencies = [ - "windows-core", - "windows-link 0.1.3", -] - [[package]] name = "windows-result" version = "0.3.4" @@ -1307,15 +1229,6 @@ dependencies = [ "windows-link 0.1.3", ] -[[package]] -name = "windows-strings" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56e6c93f3a0c3b36176cb1327a4958a0353d5d166c2a35cb268ace15e91d3b57" -dependencies = [ - "windows-link 0.1.3", -] - [[package]] name = "windows-sys" version = "0.59.0" @@ -1350,15 +1263,6 @@ dependencies = [ "windows_x86_64_msvc", ] -[[package]] -name = "windows-threading" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b66463ad2e0ea3bbf808b7f1d371311c80e115c0b71d60efc142cafbcfb057a6" -dependencies = [ - "windows-link 0.1.3", -] - [[package]] name = "windows_aarch64_gnullvm" version = "0.52.6" diff --git a/cpp/src/tests/common_game_test_fixture.h b/cpp/src/tests/common_game_test_fixture.h index 5b084fac..14419d4a 100644 --- a/cpp/src/tests/common_game_test_fixture.h +++ b/cpp/src/tests/common_game_test_fixture.h @@ -493,9 +493,13 @@ private: const std::vector>& loadOrder) const { if (gameType_ == GameType::tes3) { std::ofstream out(gamePath / "Morrowind.ini"); + out << "[Game Files]" << std::endl; + + size_t activeIndex = 0; for (const auto& plugin : loadOrder) { if (plugin.second) { - out << "GameFile0=" << plugin.first << std::endl; + out << "GameFile" << activeIndex << "=" << plugin.first << std::endl; + activeIndex += 1; } } } else if (gameType_ == GameType::openmw) { diff --git a/supply-chain/audits.toml b/supply-chain/audits.toml index 1718bfcf..69ef1775 100644 --- a/supply-chain/audits.toml +++ b/supply-chain/audits.toml @@ -1,6 +1,12 @@ # cargo-vet audits file +[[audits.libloadorder]] +who = "Oliver Hamlet " +criteria = "safe-to-deploy" +version = "18.5.1" +notes = "This is my own crate published using Trusted Publishing, but I can't mark it as trusted by cargo-vet because it doesn't support Trusted Publishing and just sees that the publisher is unknown." + [[audits.loot-condition-interpreter]] who = "Oliver Hamlet " criteria = "safe-to-deploy" diff --git a/supply-chain/config.toml b/supply-chain/config.toml index d4d111fd..99b12774 100644 --- a/supply-chain/config.toml +++ b/supply-chain/config.toml @@ -155,10 +155,6 @@ criteria = "safe-to-deploy" version = "0.8.6" criteria = "safe-to-deploy" -[[exemptions.libloadorder]] -version = "18.4.0" -criteria = "safe-to-deploy" - [[exemptions.libredox]] version = "0.1.3" criteria = "safe-to-deploy" diff --git a/supply-chain/imports.lock b/supply-chain/imports.lock index 9f79db79..3e0ef405 100644 --- a/supply-chain/imports.lock +++ b/supply-chain/imports.lock @@ -28,48 +28,6 @@ user-id = 1139 user-login = "Manishearth" user-name = "Manish Goregaokar" -[[publisher.windows]] -version = "0.61.3" -when = "2025-06-12" -user-id = 64539 -user-login = "kennykerr" -user-name = "Kenny Kerr" - -[[publisher.windows-collections]] -version = "0.2.0" -when = "2025-03-18" -user-id = 64539 -user-login = "kennykerr" -user-name = "Kenny Kerr" - -[[publisher.windows-core]] -version = "0.61.2" -when = "2025-05-19" -user-id = 64539 -user-login = "kennykerr" -user-name = "Kenny Kerr" - -[[publisher.windows-future]] -version = "0.2.1" -when = "2025-05-15" -user-id = 64539 -user-login = "kennykerr" -user-name = "Kenny Kerr" - -[[publisher.windows-implement]] -version = "0.60.0" -when = "2025-03-18" -user-id = 64539 -user-login = "kennykerr" -user-name = "Kenny Kerr" - -[[publisher.windows-interface]] -version = "0.59.1" -when = "2025-03-18" -user-id = 64539 -user-login = "kennykerr" -user-name = "Kenny Kerr" - [[publisher.windows-link]] version = "0.1.3" when = "2025-06-12" @@ -84,13 +42,6 @@ user-id = 64539 user-login = "kennykerr" user-name = "Kenny Kerr" -[[publisher.windows-numerics]] -version = "0.2.0" -when = "2025-03-18" -user-id = 64539 -user-login = "kennykerr" -user-name = "Kenny Kerr" - [[publisher.windows-result]] version = "0.3.4" when = "2025-05-19" @@ -98,13 +49,6 @@ user-id = 64539 user-login = "kennykerr" user-name = "Kenny Kerr" -[[publisher.windows-strings]] -version = "0.4.2" -when = "2025-05-19" -user-id = 64539 -user-login = "kennykerr" -user-name = "Kenny Kerr" - [[publisher.windows-sys]] version = "0.59.0" when = "2024-07-30" @@ -126,13 +70,6 @@ user-id = 64539 user-login = "kennykerr" user-name = "Kenny Kerr" -[[publisher.windows-threading]] -version = "0.1.0" -when = "2025-05-15" -user-id = 64539 -user-login = "kennykerr" -user-name = "Kenny Kerr" - [[publisher.windows_aarch64_gnullvm]] version = "0.52.6" when = "2024-07-03"