Auto merge of #2426 - saethlin:unix-exec, r=RalfJung

[rust.git] / Cargo.toml

diff --git a/Cargo.toml b/Cargo.toml
index 4413dab321e72e20557d2ffee6bfdf2316176c58..208b3a764436f67104c8e0e364213e311dfc2b58 100644 (file)
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,12 +1,12 @@
 [package]
 authors = ["Miri Team"]
 description = "An experimental interpreter for Rust MIR (core driver)."
-license = "MIT/Apache-2.0"
+license = "MIT OR Apache-2.0"
 name = "miri"
 repository = "https://github.com/rust-lang/miri"
 version = "0.1.0"
 default-run = "miri"
-edition = "2018"
+edition = "2021"
 
 [lib]
 test = true # we have unit tests
@@ -17,25 +17,19 @@ name = "miri"
 test = false # we have no unit tests
 doctest = false # and no doc tests
 
-[[bin]]
-name = "miri-rustc-tests"
-test = false # we have no unit tests
-doctest = false # and no doc tests
-required-features = ["rustc_tests"]
-
 [dependencies]
 getrandom = { version = "0.2", features = ["std"] }
-env_logger = "0.7.1"
+env_logger = "0.9"
 log = "0.4"
 shell-escape = "0.1.4"
-hex = "0.4.0"
-rand = "0.7"
-smallvec = "1.4.2"
+rand = "0.8"
+smallvec = "1.7"
 
 # 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"
+measureme = "10.0.0"
 
 # Enable some feature flags that dev-dependencies need but dependencies
 # do not.  This makes `./miri install` after `./miri build` faster.
@@ -43,9 +37,25 @@ rustc-workspace-hack = "1.0.0"
 libc = "0.2"
 
 [dev-dependencies]
-compiletest_rs = { version = "0.5", features = ["tmp"] }
-rustc_version = "0.2.3"
 colored = "2"
+ui_test = { path = "ui_test" }
+# Features chosen to match those required by env_logger, to avoid rebuilds
+regex = { version = "1.5.5", default-features = false, features = ["perf", "std"] }
+lazy_static = "1.4.0"
+
+[package.metadata.rust-analyzer]
+# This crate uses #[feature(rustc_private)].
+# See https://github.com/rust-analyzer/rust-analyzer/pull/7891
+rustc_private = true
+
+[[test]]
+name = "compiletest"
+harness = false
 
 [features]
-rustc_tests = []
+default = ["stack-cache"]
+stack-cache = []
+
+# Be aware that this file is inside a workspace when used via the
+# submodule in the rustc repo. That means there are many cargo features
+# we cannot use, such as profiles.