From d39dea85ad3cefbbd5b797d86cb2530c9c641c39 Mon Sep 17 00:00:00 2001 From: David Tolnay Date: Mon, 14 Aug 2023 04:02:23 -0700 Subject: [PATCH] Adopt 'cargo rm' after Cargo bugfix --- .github/workflows/ci.yml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4fb72c48..98ebb27b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -122,13 +122,11 @@ jobs: - run: precompiled/build.sh - name: replace serde_derive dependency with precompiled run: | - # FIXME: consider using `cargo rm serde_derive` but it's currently broken - # https://github.com/rust-lang/cargo/issues/12419 - sed -i '/serde_derive =/d' serde/Cargo.toml - sed -i '/derive = \["serde_derive"\]/d' serde/Cargo.toml + cargo rm serde_derive --package serde + cargo rm serde_derive --package serde --dev sed -i '/"serde_derive"/d' Cargo.toml sed -i '/\[workspace\]/d' precompiled/serde_derive/Cargo.toml - cargo add --dev serde_derive --path precompiled/serde_derive --manifest-path test_suite/Cargo.toml + cargo add --dev serde_derive --path precompiled/serde_derive --package serde_test_suite git diff - run: cd test_suite && cargo test --features unstable -- --skip ui --exact