From ed1d1946604f97c35440536a4ddae970d665ce13 Mon Sep 17 00:00:00 2001 From: Taiki Endo Date: Tue, 22 Dec 2020 18:30:50 +0900 Subject: [PATCH] deps: update loom to 0.4 (#452) --- .github/workflows/ci.yml | 12 ++++-------- Cargo.toml | 2 +- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a9111221f..39303d1d7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -75,14 +75,11 @@ jobs: # Nightly nightly: name: nightly - env: - # Pin nightly to avoid being impacted by breakage - RUST_VERSION: nightly-2019-09-25 runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - name: Install Rust - run: rustup update $RUST_VERSION && rustup default $RUST_VERSION + run: rustup update $nightly && rustup default $nightly - name: Test run: . ci/test-stable.sh test @@ -130,14 +127,11 @@ jobs: # Loom loom: name: loom - env: - # Pin nightly to avoid being impacted by breakage - RUST_VERSION: nightly-2020-05-19 runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - name: Install Rust - run: rustup update $RUST_VERSION && rustup default $RUST_VERSION + run: rustup update $nightly && rustup default $nightly - name: Loom tests run: RUSTFLAGS="--cfg loom -Dwarnings" cargo test --lib @@ -150,6 +144,8 @@ jobs: - nightly - minrust - cross + - tsan + - loom runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 diff --git a/Cargo.toml b/Cargo.toml index 8013bff13..d17a5a5d0 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -32,4 +32,4 @@ serde = { version = "1.0.60", optional = true, default-features = false, feature serde_test = "1.0" [target.'cfg(loom)'.dev-dependencies] -loom = "0.3" +loom = "0.4"