From b5fe17e0f3ca4b24f2b718978a5a7fa0c165603d Mon Sep 17 00:00:00 2001 From: Oliver Hamlet Date: Sun, 28 Sep 2025 19:12:14 +0100 Subject: [PATCH] Update keyvalues-parser to v0.2.1 It removes several dependencies. --- Cargo.lock | 137 ++------------------------------------ supply-chain/config.toml | 47 +------------ supply-chain/imports.lock | 34 +--------- 3 files changed, 11 insertions(+), 207 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 0e99eba2..8bd76de7 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -56,15 +56,6 @@ version = "2.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5c8214115b7bf84099f1309324e63141d4c5d7cc26862f97a0a857dbefe165bd" -[[package]] -name = "block-buffer" -version = "0.10.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" -dependencies = [ - "generic-array", -] - [[package]] name = "cc" version = "1.2.18" @@ -146,15 +137,6 @@ dependencies = [ "unicode-segmentation", ] -[[package]] -name = "cpufeatures" -version = "0.2.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59ed5838eebb26a2bb2e58f6d5b5316989ae9d08bab10e0e6d103e656d1b0280" -dependencies = [ - "libc", -] - [[package]] name = "crc32fast" version = "1.5.0" @@ -195,16 +177,6 @@ version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "43da5946c66ffcc7745f48db692ffbb10a83bfe0afd96235c5c2a4fb23994929" -[[package]] -name = "crypto-common" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" -dependencies = [ - "generic-array", - "typenum", -] - [[package]] name = "ctor" version = "0.4.2" @@ -309,16 +281,6 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c2ea6706d74fca54e15f1d40b5cf7fe7f764aaec61352a9fcec58fe27e042fc8" -[[package]] -name = "digest" -version = "0.10.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" -dependencies = [ - "block-buffer", - "crypto-common", -] - [[package]] name = "dirs" version = "6.0.0" @@ -425,16 +387,6 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2" -[[package]] -name = "generic-array" -version = "0.14.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" -dependencies = [ - "typenum", - "version_check", -] - [[package]] name = "getrandom" version = "0.2.15" @@ -508,13 +460,11 @@ checksum = "f4c7245a08504955605670dbf141fceab975f15ca21570696aebe9d2e71576bd" [[package]] name = "keyvalues-parser" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e4c8354918309196302015ac9cae43362f1a13d0d5c5539a33b4c2fd2cd6d25" +checksum = "8a08dbe66b5c751fa0ccb33b447931646bf7dc055e8d48562dfed7fa6ee216bf" dependencies = [ "pest", - "pest_derive", - "thiserror 1.0.69", ] [[package]] @@ -809,44 +759,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "198db74531d58c70a361c42201efde7e2591e976d518caf7662a47dc5720e7b6" dependencies = [ "memchr", - "thiserror 2.0.12", + "thiserror", "ucd-trie", ] -[[package]] -name = "pest_derive" -version = "2.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d725d9cfd79e87dccc9341a2ef39d1b6f6353d68c4b33c177febbe1a402c97c5" -dependencies = [ - "pest", - "pest_generator", -] - -[[package]] -name = "pest_generator" -version = "2.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db7d01726be8ab66ab32f9df467ae8b1148906685bbe75c82d1e65d7f5b3f841" -dependencies = [ - "pest", - "pest_meta", - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "pest_meta" -version = "2.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f9f832470494906d1fca5329f8ab5791cc60beb230c74815dff541cbd2b5ca0" -dependencies = [ - "once_cell", - "pest", - "sha2", -] - [[package]] name = "petgraph" version = "0.8.2" @@ -990,7 +906,7 @@ checksum = "dd6f9d3d47bdd2ad6945c5015a226ec6155d0bcdfd8f7cd29f86b71f8de99d2b" dependencies = [ "getrandom 0.2.15", "libredox", - "thiserror 2.0.12", + "thiserror", ] [[package]] @@ -1124,17 +1040,6 @@ dependencies = [ "syn", ] -[[package]] -name = "sha2" -version = "0.10.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" -dependencies = [ - "cfg-if", - "cpufeatures", - "digest", -] - [[package]] name = "shlex" version = "1.3.0" @@ -1186,33 +1091,13 @@ dependencies = [ "winapi-util", ] -[[package]] -name = "thiserror" -version = "1.0.69" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52" -dependencies = [ - "thiserror-impl 1.0.69", -] - [[package]] name = "thiserror" version = "2.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "567b8a2dae586314f7be2a752ec7474332959c6460e02bde30d702a66d488708" dependencies = [ - "thiserror-impl 2.0.12", -] - -[[package]] -name = "thiserror-impl" -version = "1.0.69" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" -dependencies = [ - "proc-macro2", - "quote", - "syn", + "thiserror-impl", ] [[package]] @@ -1241,12 +1126,6 @@ version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "343e926fc669bc8cde4fa3129ab681c63671bae288b1f1081ceee6d9d37904fc" -[[package]] -name = "typenum" -version = "1.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1dccffe3ce07af9386bfd29e80c0ab1a8205a2fc34e4bcd40364df902cfa8f3f" - [[package]] name = "ucd-trie" version = "0.1.7" @@ -1283,12 +1162,6 @@ version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7264e107f553ccae879d21fbea1d6724ac785e8c3bfc762137959b5802826ef3" -[[package]] -name = "version_check" -version = "0.9.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" - [[package]] name = "wasi" version = "0.11.0+wasi-snapshot-preview1" diff --git a/supply-chain/config.toml b/supply-chain/config.toml index e0cdd39e..319a9c22 100644 --- a/supply-chain/config.toml +++ b/supply-chain/config.toml @@ -13,6 +13,9 @@ url = "https://raw.githubusercontent.com/google/supply-chain/main/audits.toml" [imports.isrg] url = "https://raw.githubusercontent.com/divviup/libprio-rs/main/supply-chain/audits.toml" +[imports.libloadorder] +url = "https://raw.githubusercontent.com/Ortham/libloadorder/refs/heads/master/supply-chain/audits.toml" + [imports.mozilla] url = "https://raw.githubusercontent.com/mozilla/supply-chain/main/audits.toml" @@ -34,10 +37,6 @@ criteria = "safe-to-deploy" version = "1.0.0" criteria = "safe-to-deploy" -[[exemptions.block-buffer]] -version = "0.10.4" -criteria = "safe-to-deploy" - [[exemptions.cc]] version = "1.2.18" criteria = "safe-to-deploy" @@ -54,10 +53,6 @@ criteria = "safe-to-deploy" version = "0.8.0" criteria = "safe-to-deploy" -[[exemptions.cpufeatures]] -version = "0.2.17" -criteria = "safe-to-deploy" - [[exemptions.crc32fast]] version = "1.5.0" criteria = "safe-to-deploy" @@ -110,10 +105,6 @@ criteria = "safe-to-deploy" version = "0.1.2" criteria = "safe-to-deploy" -[[exemptions.digest]] -version = "0.10.7" -criteria = "safe-to-deploy" - [[exemptions.dirs]] version = "6.0.0" criteria = "safe-to-deploy" @@ -146,10 +137,6 @@ criteria = "safe-to-deploy" version = "0.5.7" criteria = "safe-to-deploy" -[[exemptions.generic-array]] -version = "0.14.7" -criteria = "safe-to-deploy" - [[exemptions.getrandom]] version = "0.2.15" criteria = "safe-to-deploy" @@ -270,18 +257,6 @@ criteria = "safe-to-deploy" version = "2.8.0" criteria = "safe-to-deploy" -[[exemptions.pest_derive]] -version = "2.8.0" -criteria = "safe-to-deploy" - -[[exemptions.pest_generator]] -version = "2.8.0" -criteria = "safe-to-deploy" - -[[exemptions.pest_meta]] -version = "2.8.0" -criteria = "safe-to-deploy" - [[exemptions.petgraph]] version = "0.8.2" criteria = "safe-to-deploy" @@ -374,18 +349,10 @@ criteria = "safe-to-deploy" version = "1.4.1" criteria = "safe-to-deploy" -[[exemptions.thiserror]] -version = "1.0.69" -criteria = "safe-to-deploy" - [[exemptions.thiserror]] version = "2.0.12" criteria = "safe-to-deploy" -[[exemptions.thiserror-impl]] -version = "1.0.69" -criteria = "safe-to-deploy" - [[exemptions.thiserror-impl]] version = "2.0.12" criteria = "safe-to-deploy" @@ -398,10 +365,6 @@ criteria = "safe-to-deploy" version = "0.1.7" criteria = "safe-to-deploy" -[[exemptions.typenum]] -version = "1.18.0" -criteria = "safe-to-deploy" - [[exemptions.ucd-trie]] version = "0.1.7" criteria = "safe-to-deploy" @@ -410,10 +373,6 @@ criteria = "safe-to-deploy" version = "0.2.4" criteria = "safe-to-deploy" -[[exemptions.version_check]] -version = "0.9.5" -criteria = "safe-to-deploy" - [[exemptions.wasi]] version = "0.11.0+wasi-snapshot-preview1" criteria = "safe-to-deploy" diff --git a/supply-chain/imports.lock b/supply-chain/imports.lock index 60a95448..5049e944 100644 --- a/supply-chain/imports.lock +++ b/supply-chain/imports.lock @@ -265,11 +265,6 @@ criteria = "safe-to-deploy" version = "0.11.1" notes = "This library uses `forbid(unsafe_code)` and has no filesystem or network I/O." -[[audits.bytecode-alliance.audits.crypto-common]] -who = "Benjamin Bouvier " -criteria = "safe-to-deploy" -version = "0.1.3" - [[audits.bytecode-alliance.audits.fastrand]] who = "Alex Crichton " criteria = "safe-to-deploy" @@ -992,10 +987,10 @@ who = "David Cook " criteria = "safe-to-deploy" delta = "1.12.1 -> 1.13.0" -[[audits.isrg.audits.sha2]] -who = "David Cook " +[[audits.libloadorder.audits.keyvalues-parser]] +who = "Oliver Hamlet " criteria = "safe-to-deploy" -version = "0.10.2" +delta = "0.2.0 -> 0.2.1" [[audits.mozilla.wildcard-audits.encoding_rs]] who = "Henri Sivonen " @@ -1054,12 +1049,6 @@ criteria = "safe-to-deploy" version = "0.2.3" aggregated-from = "https://hg.mozilla.org/mozilla-central/raw-file/tip/supply-chain/audits.toml" -[[audits.mozilla.audits.crypto-common]] -who = "Mike Hommey " -criteria = "safe-to-deploy" -delta = "0.1.3 -> 0.1.6" -aggregated-from = "https://hg.mozilla.org/mozilla-central/raw-file/tip/supply-chain/audits.toml" - [[audits.mozilla.audits.fastrand]] who = "Mike Hommey " criteria = "safe-to-deploy" @@ -1130,23 +1119,6 @@ delta = "1.1.0 -> 2.1.1" notes = "Simple hashing crate, no unsafe code." aggregated-from = "https://hg.mozilla.org/mozilla-central/raw-file/tip/supply-chain/audits.toml" -[[audits.mozilla.audits.sha2]] -who = "Mike Hommey " -criteria = "safe-to-deploy" -delta = "0.10.2 -> 0.10.6" -aggregated-from = "https://hg.mozilla.org/mozilla-central/raw-file/tip/supply-chain/audits.toml" - -[[audits.mozilla.audits.sha2]] -who = "Jeff Muizelaar " -criteria = "safe-to-deploy" -delta = "0.10.6 -> 0.10.8" -notes = """ -The bulk of this is https://github.com/RustCrypto/hashes/pull/490 which adds aarch64 support along with another PR adding longson. -I didn't check the implementation thoroughly but there wasn't anything obviously nefarious. 0.10.8 has been out for more than a year -which suggests no one else has found anything either. -""" -aggregated-from = "https://hg.mozilla.org/mozilla-central/raw-file/tip/supply-chain/audits.toml" - [[audits.mozilla.audits.shlex]] who = "Max Inden " criteria = "safe-to-deploy"