Skip to content

Commit ed1d194

Browse files
authored
deps: update loom to 0.4 (#452)
1 parent e398b0a commit ed1d194

File tree

2 files changed

+5
-9
lines changed

2 files changed

+5
-9
lines changed

.github/workflows/ci.yml

+4-8
Original file line numberDiff line numberDiff line change
@@ -75,14 +75,11 @@ jobs:
7575
# Nightly
7676
nightly:
7777
name: nightly
78-
env:
79-
# Pin nightly to avoid being impacted by breakage
80-
RUST_VERSION: nightly-2019-09-25
8178
runs-on: ubuntu-latest
8279
steps:
8380
- uses: actions/checkout@v2
8481
- name: Install Rust
85-
run: rustup update $RUST_VERSION && rustup default $RUST_VERSION
82+
run: rustup update $nightly && rustup default $nightly
8683
- name: Test
8784
run: . ci/test-stable.sh test
8885

@@ -130,14 +127,11 @@ jobs:
130127
# Loom
131128
loom:
132129
name: loom
133-
env:
134-
# Pin nightly to avoid being impacted by breakage
135-
RUST_VERSION: nightly-2020-05-19
136130
runs-on: ubuntu-latest
137131
steps:
138132
- uses: actions/checkout@v2
139133
- name: Install Rust
140-
run: rustup update $RUST_VERSION && rustup default $RUST_VERSION
134+
run: rustup update $nightly && rustup default $nightly
141135
- name: Loom tests
142136
run: RUSTFLAGS="--cfg loom -Dwarnings" cargo test --lib
143137

@@ -150,6 +144,8 @@ jobs:
150144
- nightly
151145
- minrust
152146
- cross
147+
- tsan
148+
- loom
153149
runs-on: ubuntu-latest
154150
steps:
155151
- uses: actions/checkout@v2

Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,4 +32,4 @@ serde = { version = "1.0.60", optional = true, default-features = false, feature
3232
serde_test = "1.0"
3333

3434
[target.'cfg(loom)'.dev-dependencies]
35-
loom = "0.3"
35+
loom = "0.4"

0 commit comments

Comments
 (0)