diff options
| author | bors <bors@rust-lang.org> | 2017-07-14 19:35:37 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2017-07-14 19:35:37 +0000 |
| commit | 6d9d82d3dff580d2ec31e4db5cdef73c9625a864 (patch) | |
| tree | a59d7e68f9a7283087939fcb1329405546dc7017 | |
| parent | ae4803a750cc415a3b8a69a68cec73400a5e27bf (diff) | |
| parent | cb92ab93a224a7728103f837ec761b1dafd5fbb1 (diff) | |
| download | rust-6d9d82d3dff580d2ec31e4db5cdef73c9625a864.tar.gz rust-6d9d82d3dff580d2ec31e4db5cdef73c9625a864.zip | |
Auto merge of #43180 - oli-obk:compiletest, r=alexcrichton
Reduce the usage of features in compiletest and libtest
| -rw-r--r-- | src/Cargo.lock | 1 | ||||
| -rw-r--r-- | src/libtest/lib.rs | 2 | ||||
| -rw-r--r-- | src/tools/compiletest/Cargo.toml | 1 | ||||
| -rw-r--r-- | src/tools/compiletest/src/main.rs | 2 |
4 files changed, 2 insertions, 4 deletions
diff --git a/src/Cargo.lock b/src/Cargo.lock index 35634d25325..368a503b310 100644 --- a/src/Cargo.lock +++ b/src/Cargo.lock @@ -284,6 +284,7 @@ dependencies = [ "env_logger 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", "filetime 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", "getopts 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)", ] diff --git a/src/libtest/lib.rs b/src/libtest/lib.rs index 92cfb862b16..bf71b11fc77 100644 --- a/src/libtest/lib.rs +++ b/src/libtest/lib.rs @@ -35,9 +35,7 @@ #![feature(asm)] #![feature(libc)] -#![feature(rustc_private)] #![feature(set_stdio)] -#![feature(staged_api)] #![feature(panic_unwind)] extern crate getopts; diff --git a/src/tools/compiletest/Cargo.toml b/src/tools/compiletest/Cargo.toml index 543e6784a72..f8282cc5f8d 100644 --- a/src/tools/compiletest/Cargo.toml +++ b/src/tools/compiletest/Cargo.toml @@ -10,3 +10,4 @@ filetime = "0.1" getopts = "0.2" log = "0.3" rustc-serialize = "0.3" +libc = "0.2" diff --git a/src/tools/compiletest/src/main.rs b/src/tools/compiletest/src/main.rs index cc42544ef02..91f80a7afec 100644 --- a/src/tools/compiletest/src/main.rs +++ b/src/tools/compiletest/src/main.rs @@ -10,9 +10,7 @@ #![crate_name = "compiletest"] -#![feature(box_syntax)] #![feature(test)] -#![feature(libc)] #![deny(warnings)] |