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

[rust.git] / Cargo.toml

diff --git a/Cargo.toml b/Cargo.toml
index 6d65ab6e1e469fdec650a54d3f88f3d2ef90e4d0..208b3a764436f67104c8e0e364213e311dfc2b58 100644 (file)
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -29,7 +29,7 @@ smallvec = "1.7"
 # See the `src/tools/rustc-workspace-hack/README.md` file in `rust-lang/rust`
 # for more information.
 rustc-workspace-hack = "1.0.0"
-measureme = "9.1.2"
+measureme = "10.0.0"
 
 # Enable some feature flags that dev-dependencies need but dependencies
 # do not.  This makes `./miri install` after `./miri build` faster.
@@ -37,9 +37,11 @@ measureme = "9.1.2"
 libc = "0.2"
 
 [dev-dependencies]
-compiletest_rs = { version = "0.7", features = ["tmp"] }
-rustc_version = "0.4"
 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)].
@@ -49,3 +51,11 @@ rustc_private = true
 [[test]]
 name = "compiletest"
 harness = false
+
+[features]
+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.