Skip to content

Commit f8cd8e7

Browse files
authored
gate loom dependency under feature flag (#844)
1 parent 5402046 commit f8cd8e7

File tree

3 files changed

+4
-3
lines changed

3 files changed

+4
-3
lines changed

.github/workflows/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ jobs:
6060
- name: Check (without default features)
6161
run: cargo check --workspace --no-default-features
6262
- name: Check (loom)
63-
run: RUSTFLAGS="--cfg loom" cargo check --workspace
63+
run: RUSTFLAGS="--cfg loom" cargo check --workspace --features loom
6464

6565
miri:
6666
name: Miri

Cargo.toml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,13 @@ rayon = { version = "1.10.0", optional = true }
3030
# Stuff we want Update impls for by default
3131
compact_str = { version = "0.9", optional = true }
3232
thin-vec = "0.2.13"
33-
loom = "0.7.2"
33+
loom = { version = "0.7.2", optional = true }
3434

3535
[features]
3636
default = ["salsa_unstable", "rayon", "macros"]
3737
# FIXME: remove `salsa_unstable` before 1.0.
3838
salsa_unstable = []
39+
loom = ["dep:loom"]
3940
macros = ["dep:salsa-macros"]
4041

4142
# This interlocks the `salsa-macros` and `salsa` versions together

justfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@ miri:
55
cargo +nightly miri test --no-fail-fast --all-features
66

77
loom:
8-
RUSTFLAGS="--cfg loom" cargo check --workspace
8+
RUSTFLAGS="--cfg loom" cargo check --workspace --features loom
99

1010
all: test miri

0 commit comments

Comments
 (0)