From 46a30e4dbf20e7d9117ac2ce31b691772adccfc9 Mon Sep 17 00:00:00 2001 From: Sebastian Thiel Date: Sat, 23 Dec 2023 10:51:22 +0100 Subject: [PATCH 1/2] reproduce yanked crates in lock file (#1240) We could easily write the output to a file and run a grep on it to fail the build, but that would make CI flaky. Instead, make it easy to detect this issue locally with `just find-yanked`. --- .github/workflows/ci.yml | 2 +- justfile | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 635347a8173..fc0a0403f4b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -42,7 +42,7 @@ jobs: - name: install Rust via Rustup run: curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --profile minimal; - uses: Swatinem/rust-cache@v2 - - run: /github/home/.cargo/bin/cargo build --no-default-features --features max-pure + - run: /github/home/.cargo/bin/cargo install --debug --locked --no-default-features --features max-pure --path . test: runs-on: ubuntu-latest diff --git a/justfile b/justfile index a89dcb4e545..313ec3a2d15 100755 --- a/justfile +++ b/justfile @@ -242,3 +242,7 @@ fmt: cargo +nightly fmt --all -- --config-path rustfmt-nightly.toml cargo +stable fmt --all -- --check just --fmt --unstable + +# Cancel this after the first few seconds, as yanked crates will appear in warnings. +find-yanked: + cargo install --debug --locked --no-default-features --features max-pure --path . From 65ddb59bd8f19333c6319b7803489c5159794757 Mon Sep 17 00:00:00 2001 From: Sebastian Thiel Date: Sat, 23 Dec 2023 11:04:11 +0100 Subject: [PATCH 2/2] Update yanked crates (#1240) --- Cargo.lock | 29 +++++++++++++++++++++++++---- 1 file changed, 25 insertions(+), 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 1653f02c80b..5baf890dad4 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -19,14 +19,15 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] name = "ahash" -version = "0.8.3" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f" +checksum = "91429305e9f0a25f6205c5b8e0d2db09e0708a7a6df0f42212bb56c32c8ac97a" dependencies = [ "cfg-if", "getrandom", "once_cell", "version_check", + "zerocopy", ] [[package]] @@ -4711,9 +4712,9 @@ checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" [[package]] name = "tracing" -version = "0.1.39" +version = "0.1.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee2ef2af84856a50c1d430afce2fdded0a4ec7eda868db86409b4543df0797f9" +checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" dependencies = [ "pin-project-lite", "tracing-attributes", @@ -5375,6 +5376,26 @@ version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec" +[[package]] +name = "zerocopy" +version = "0.7.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be" +dependencies = [ + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.7.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.38", +] + [[package]] name = "zip" version = "0.6.6"