Auto merge of #1756 - RalfJung:getrandom, r=RalfJung

[rust.git] / Cargo.toml

diff --git a/Cargo.toml b/Cargo.toml
index bd345ea2b7f55fad51014984bcdce39e048e44a9..2483cb2c81293d4538535651a831b5fdb4287f16 100644 (file)
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [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"
@@ -17,47 +17,31 @@ 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.8", optional = true }
-directories = { version = "2.0", optional = true }
-rustc_version = { version = "0.2.3", optional = true }
-getrandom = { version = "0.1.8", features = ["std"] }
-byteorder = "1.3"
-env_logger = "0.6"
+getrandom = { version = "0.2", features = ["std"] }
+env_logger = "0.8"
 log = "0.4"
 shell-escape = "0.1.4"
-hex = "0.3.2"
-rand = "0.7"
+hex = "0.4.0"
+rand = "0.8"
+smallvec = "1.4.2"
 
 # 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"
 
-# Depend on num-traits with default features to avoid having to rebuild
-# between "cargo build" and "cargo intall".
-num-traits = "*"
-
-[build-dependencies]
-vergen = "3"
-
-[features]
-default = ["cargo_miri"]
-cargo_miri = ["cargo_metadata", "directories", "rustc_version"]
-rustc_tests = []
+# Enable some feature flags that dev-dependencies need but dependencies
+# do not.  This makes `./miri install` after `./miri build` faster.
+[target."cfg(unix)".dependencies]
+libc = "0.2"
 
 [dev-dependencies]
-compiletest_rs = { version = "0.3.24", features = ["tmp"] }
-colored = "1.6"
+compiletest_rs = { version = "0.6", features = ["tmp"] }
+rustc_version = "0.3"
+colored = "2"
+
+[package.metadata.rust-analyzer]
+# This crate uses #[feature(rustc_private)]. 
+# See https://github.com/rust-analyzer/rust-analyzer/pull/7891
+rustc_private = true