Skip to content

Commit

Permalink
Make cargo_miri a feature
Browse files Browse the repository at this point in the history
1. Speeds up the common compilation path (no serde in the dependency tree)
2. Stage 1 rustc is enough (no serde -> no custom derive)
  • Loading branch information
oli-obk committed Aug 9, 2017
1 parent a6096fb commit 7e6c497
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 3 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ script:
xargo/build.sh
- |
# Test plain miri
cargo build --release &&
cargo build --release --features "cargo_miri" &&
cargo test --release &&
cargo install
cargo install --features "cargo_miri"
- |
# Test cargo miri
cd cargo-miri-test &&
Expand Down
6 changes: 5 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ doc = false
name = "cargo-miri"
test = false
path = "miri/bin/cargo-miri.rs"
required-features = ["cargo_miri"]

[lib]
test = false
Expand All @@ -28,9 +29,12 @@ byteorder = { version = "1.1", features = ["i128"]}
env_logger = "0.4.3"
log = "0.3.6"
log_settings = "0.1.1"
cargo_metadata = "0.2"
cargo_metadata = { version = "0.2", optional = true }
rustc_miri = { path = "src/librustc_mir" }

[features]
cargo_miri = ["cargo_metadata"]

[dev-dependencies]
compiletest_rs = "0.2.6"

Expand Down

0 comments on commit 7e6c497

Please sign in to comment.