make cargo-miri a separate crate in a workspace

Author: RalfJung

Cargo.lock

@@ -1,13 +1,16 @@
 [package]
-authors = ["Scott Olson <scott@solson.me>"]
-description = "An experimental interpreter for Rust MIR."
+authors = ["Miri Team"]
+description = "An experimental interpreter for Rust MIR (core driver)."
 license = "MIT/Apache-2.0"
 name = "miri"
 repository = "https://github.com/rust-lang/miri"
 version = "0.1.0"
 default-run = "miri"
 edition = "2018"
 
+[workspace]
+members = ["cargo-miri"]
+
 [lib]
 test = true # we have unit tests
 doctest = false # but no doc tests
@@ -17,24 +20,13 @@ name = "miri"
 test = false # we have no unit tests
 doctest = false # and no doc tests
 
-[[bin]]
-name = "cargo-miri"
-test = false # we have no unit tests
-doctest = false # and no doc tests
-required-features = ["cargo_miri"]
-
 [[bin]]
 name = "miri-rustc-tests"
 test = false # we have no unit tests
 doctest = false # and no doc tests
 required-features = ["rustc_tests"]
 
 [dependencies]
-cargo_metadata = { version = "0.9.0", optional = true }
-directories = { version = "2.0", optional = true }
-rustc_version = { version = "0.2.3", optional = true }
-serde_json = { version = "1.0.40", optional = true }
-
 getrandom = { version = "0.1.8", features = ["std"] }
 byteorder = "1.3"
 env_logger = "0.7.1"
@@ -48,19 +40,10 @@ rand = "0.7"
 # for more information.
 rustc-workspace-hack = "1.0.0"
 
-# Some extra dependency for better feature control to avoid having to rebuild
-# between "cargo build" and "cargo intall".
-num-traits = "*"
-serde = { version = "*", features = ["derive"] }
-
-[build-dependencies]
-vergen = "3"
-
 [dev-dependencies]
 compiletest_rs = { version = "0.5", features = ["tmp"] }
+rustc_version = "0.2.3"
 colored = "1.6"
 
 [features]
-default = ["cargo_miri"]
-cargo_miri = ["cargo_metadata", "directories", "rustc_version", "serde_json"]
 rustc_tests = []

Cargo.toml

@@ -0,0 +1,28 @@
+[package]
+authors = ["Miri Team"]
+description = "An experimental interpreter for Rust MIR (cargo wrapper)."
+license = "MIT/Apache-2.0"
+name = "cargo-miri"
+repository = "https://github.com/rust-lang/miri"
+version = "0.1.0"
+edition = "2018"
+
+[[bin]]
+name = "cargo-miri"
+path = "bin.rs"
+test = false # we have no unit tests
+doctest = false # and no doc tests
+
+[dependencies]
+cargo_metadata = "0.9.0"
+directories = "2.0"
+rustc_version = "0.2.3"
+serde_json = "1.0.40"
+
+# A noop dependency that changes in the Rust repository, it's a bit of a hack.
+# See the `src/tools/rustc-workspace-hack/README.md` file in `rust-lang/rust`
+# for more information.
+rustc-workspace-hack = "1.0.0"
+
+[build-dependencies]
+vergen = "3"

cargo-miri/Cargo.toml

@@ -59,9 +59,9 @@ fi
 # Build a sysroot and set MIRI_SYSROOT to use it.  Arguments are passed to `cargo miri setup`.
 build_sysroot() {
     # Build once, for the user to see.
-    cargo run $CARGO_BUILD_FLAGS --bin cargo-miri -- miri setup "$@"
+    cargo run $CARGO_BUILD_FLAGS -p cargo-miri -- miri setup "$@"
     # Call again, to just set env var.
-    export MIRI_SYSROOT="$(cargo run $CARGO_BUILD_FLAGS -q --bin cargo-miri -- miri setup --print-sysroot "$@")"
+    export MIRI_SYSROOT="$(cargo run $CARGO_BUILD_FLAGS -q -p cargo-miri -- miri setup --print-sysroot "$@")"
 }
 
 # Prepare and set MIRI_SYSROOT.  Respects `MIRI_TEST_TARGET` and takes into account
@@ -104,21 +104,23 @@ case "$COMMAND" in
 install|install-debug)
     # "--locked" to respect the Cargo.lock file if it exists,
     # "--offline" to avoid querying the registry (for yanked packages).
-    exec cargo install $CARGO_INSTALL_FLAGS --path "$(dirname "$0")" --force --locked --offline "$@"
+    cargo install $CARGO_INSTALL_FLAGS --path "$(dirname "$0")" --force --locked --offline "$@"
+    cargo install $CARGO_INSTALL_FLAGS --path "$(dirname "$0")"/cargo-miri --force --locked --offline "$@"
     ;;
 check|check-debug)
     # Check, and let caller control flags.
-    exec cargo check $CARGO_BUILD_FLAGS "$@"
+    exec cargo check $CARGO_BUILD_FLAGS --all "$@"
     ;;
 build|build-debug)
     # Build, and let caller control flags.
-    exec cargo build $CARGO_BUILD_FLAGS "$@"
+    exec cargo build $CARGO_BUILD_FLAGS --all "$@"
     ;;
 test|test-debug)
     # First build and get a sysroot.
     cargo build $CARGO_BUILD_FLAGS
     find_sysroot
     # Then test, and let caller control flags.
+    # No `--all` as `cargo-miri` has no tests.
     exec cargo test $CARGO_BUILD_FLAGS "$@"
     ;;
 run|run-debug)