Skip to content

Commit 83b4222

Browse files
committed
Auto merge of #1422 - RalfJung:cargo-miri-workspace, r=oli-obk
Move cargo-miri into separate package So far, `cargo-miri` depended on the Miri library crate. That was mostly for convenience (to avoid having to deal with workspaces), but also because until recently `cargo-miri` needed access to the ["Miri default flags"](https://github.com/rust-lang/miri/blob/af044209b02f561adb3dad9f5f0deea7378f0ac0/src/lib.rs#L75). But with `MIRI_BE_RUSTC` that is no longer the case, so we can remove this fake dependency. :) @oli-obk what do you think? Also I expect the rustc bootstrap integration will need updates, hints would be appreciated. :D
2 parents c7f2665 + ac454a2 commit 83b4222

File tree

9 files changed

+423
-124
lines changed

9 files changed

+423
-124
lines changed

Cargo.lock

Lines changed: 1 addition & 86 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 7 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
2-
authors = ["Scott Olson <[email protected]>"]
3-
description = "An experimental interpreter for Rust MIR."
2+
authors = ["Miri Team"]
3+
description = "An experimental interpreter for Rust MIR (core driver)."
44
license = "MIT/Apache-2.0"
55
name = "miri"
66
repository = "https://github.com/rust-lang/miri"
@@ -17,24 +17,13 @@ name = "miri"
1717
test = false # we have no unit tests
1818
doctest = false # and no doc tests
1919

20-
[[bin]]
21-
name = "cargo-miri"
22-
test = false # we have no unit tests
23-
doctest = false # and no doc tests
24-
required-features = ["cargo_miri"]
25-
2620
[[bin]]
2721
name = "miri-rustc-tests"
2822
test = false # we have no unit tests
2923
doctest = false # and no doc tests
3024
required-features = ["rustc_tests"]
3125

3226
[dependencies]
33-
cargo_metadata = { version = "0.9.0", optional = true }
34-
directories = { version = "2.0", optional = true }
35-
rustc_version = { version = "0.2.3", optional = true }
36-
serde_json = { version = "1.0.40", optional = true }
37-
3827
getrandom = { version = "0.1.8", features = ["std"] }
3928
byteorder = "1.3"
4029
env_logger = "0.7.1"
@@ -48,19 +37,15 @@ rand = "0.7"
4837
# for more information.
4938
rustc-workspace-hack = "1.0.0"
5039

51-
# Some extra dependency for better feature control to avoid having to rebuild
52-
# between "cargo build" and "cargo intall".
53-
num-traits = "*"
54-
serde = { version = "*", features = ["derive"] }
55-
56-
[build-dependencies]
57-
vergen = "3"
40+
# Enable some feature flags that dev-dependencies need but dependencies
41+
# do not. This makes `./miri install` after `./miri build` faster.
42+
[target."cfg(unix)".dependencies]
43+
libc = "0.2"
5844

5945
[dev-dependencies]
6046
compiletest_rs = { version = "0.5", features = ["tmp"] }
47+
rustc_version = "0.2.3"
6148
colored = "1.6"
6249

6350
[features]
64-
default = ["cargo_miri"]
65-
cargo_miri = ["cargo_metadata", "directories", "rustc_version", "serde_json"]
6651
rustc_tests = []

0 commit comments

Comments
 (0)