From 85cc3a28eaf997bebbfaeee4d2ad5ea6875c98ce Mon Sep 17 00:00:00 2001 From: Ryan Johnson Date: Tue, 4 Oct 2022 02:12:32 -0700 Subject: [PATCH] Add --workspace flag to commands in CI (#101) --- .github/workflows/ci.yml | 10 +++++----- valence_nbt/src/compound.rs | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 996b20f..408968f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -27,10 +27,10 @@ jobs: - name: Validate formatting run: cargo fmt --all -- --check - name: Validate documentation - run: cargo +stable doc --no-deps --all-features --workspace --document-private-items + run: cargo +stable doc --workspace --no-deps --all-features --document-private-items - name: Run clippy lints - run: cargo +stable clippy --no-deps --all-features --all-targets -- -D warnings + run: cargo +stable clippy --workspace --no-deps --all-features --all-targets -- -D warnings - name: Run tests - run: cargo +stable test --all-features --all-targets - - name: Run valence_nbt tests without preserve_order - run: cargo +stable test -p valence_nbt + run: cargo +stable test --workspace --all-features --all-targets + - name: Run valence_nbt tests without preserve_order feature + run: cargo +stable test -p valence_nbt --all-targets diff --git a/valence_nbt/src/compound.rs b/valence_nbt/src/compound.rs index d379407..f81b35d 100644 --- a/valence_nbt/src/compound.rs +++ b/valence_nbt/src/compound.rs @@ -100,7 +100,7 @@ impl Compound { self.map.append(&mut other.map); #[cfg(feature = "preserve_order")] - for (k, v) in std::mem::replace(&mut other.map, Map::default()) { + for (k, v) in std::mem::take(&mut other.map) { self.map.insert(k, v); } }