Make rustc an opt-in feature, use tester for test crate

Author: Munksgaard

.travis.yml

@@ -2,15 +2,15 @@ language: rust
 matrix:
  include:
    - rust: nightly
-     env: FEATURES=""
+     env: FEATURES="--features rustc"
      before_script:
        rustup component add rustc-dev
    - rust: beta
-     env: FEATURES="--features stable"
+     env: FEATURES=""
    - rust: stable
-     env: FEATURES="--features stable"
+     env: FEATURES=""
    - rust: nightly
-     env: FEATURES="--features stable"
+     env: FEATURES=""
 
 script: cd test-project && cargo test $FEATURES
 

Cargo.toml

@@ -25,7 +25,7 @@ serde = "1.0"
 serde_json = "1.0"
 serde_derive = "1.0"
 rustfix = "0.4.1"
-tester = { version = "0.5", optional = true }
+tester = { version = "0.5" }
 
 [target."cfg(unix)".dependencies]
 libc = "0.2"
@@ -36,5 +36,4 @@ winapi = { version = "0.3", features = ["winerror"] }
 
 [features]
 tmp = ["tempfile"]
-norustc = []
-stable = ["norustc", "tester"]
+rustc = []

appveyor.yml

@@ -8,6 +8,7 @@ environment:
 install:
   - curl -sSf -o rustup-init.exe https://win.rustup.rs
   - rustup-init.exe --default-host %TARGET% --default-toolchain %CHANNEL% -y
+  - if %CHANNEL%==nightly (rustup component add rustc-dev) else (true)
   - set PATH=%PATH%;C:\Users\appveyor\.cargo\bin;C:\mingw-w64\x86_64-8.1.0-posix-seh-rt_v6-rev0\mingw64\bin
   - gcc --version
   - rustc -Vv
@@ -16,8 +17,8 @@ install:
 build: false
 
 test_script:
-  - if %CHANNEL%==stable (cargo build --features stable) else (cargo build)
-  - cd test-project && if %CHANNEL%==stable (cargo test --features stable) else (cargo test)
+  - if %CHANNEL%==nightly (cargo build --features rustc) else (cargo build)
+  - cd test-project && if %CHANNEL%==nightly (cargo test --features rustc) else (cargo test)
 
 branches:
   only:

build.rs

@@ -1,7 +1,7 @@
 use std::env;
 
 pub fn main() {
-    if env::var("CARGO_FEATURE_NORUSTC").is_ok() {
+    if env::var("CARGO_FEATURE_RUSTC").is_err() {
         println!("cargo:rustc-env=TARGET={}", env::var("TARGET").unwrap());
         println!("cargo:rustc-env=HOST={}", env::var("HOST").unwrap());
     }

src/common.rs

@@ -14,7 +14,7 @@ use std::fmt;
 use std::fs::{read_dir, remove_file};
 use std::str::FromStr;
 use std::path::PathBuf;
-#[cfg(not(feature = "norustc"))]
+#[cfg(feature = "rustc")]
 use rustc;
 
 use test::ColorConfig;
@@ -331,7 +331,7 @@ pub use self::config_tempdir::ConfigWithTemp;
 
 impl Default for Config {
     fn default() -> Config {
-        #[cfg(not(feature = "norustc"))]
+        #[cfg(feature = "rustc")]
         let platform = rustc::session::config::host_triple().to_string();
 
         Config {
@@ -355,13 +355,13 @@ impl Default for Config {
             runtool: None,
             host_rustcflags: None,
             target_rustcflags: None,
-            #[cfg(not(feature = "norustc"))]
+            #[cfg(feature = "rustc")]
             target: platform.clone(),
-            #[cfg(feature = "norustc")]
+            #[cfg(not(feature = "rustc"))]
             target: env!("TARGET").to_string(),
-            #[cfg(not(feature = "norustc"))]
+            #[cfg(feature = "rustc")]
             host: platform.clone(),
-            #[cfg(feature = "norustc")]
+            #[cfg(not(feature = "rustc"))]
             host: env!("HOST").to_string(),
             rustfix_coverage: false,
             gdb: None,

src/lib.rs

@@ -10,12 +10,11 @@
 
 #![crate_type = "lib"]
 
-#![cfg_attr(not(feature = "norustc"), feature(rustc_private))]
-#![cfg_attr(not(feature = "stable"), feature(test))]
+#![cfg_attr(feature = "rustc", feature(rustc_private))]
 
 #![deny(unused_imports)]
 
-#[cfg(not(feature = "norustc"))]
+#[cfg(feature = "rustc")]
 extern crate rustc;
 
 #[cfg(unix)]
@@ -110,8 +109,6 @@ pub fn test_opts(config: &Config) -> test::TestOpts {
     test::TestOpts {
         filter: config.filter.clone(),
         filter_exact: config.filter_exact,
-        #[cfg(not(feature = "stable"))]
-        exclude_should_panic: false,
         run_ignored: if config.run_ignored { test::RunIgnored::Yes } else { test::RunIgnored::No },
         format: if config.quiet { test::OutputFormat::Terse } else { test::OutputFormat::Pretty },
         logfile: config.logfile.clone(),
@@ -126,8 +123,6 @@ pub fn test_opts(config: &Config) -> test::TestOpts {
         skip: vec![],
         list: false,
         options: test::Options::new(),
-        #[cfg(not(feature = "stable"))]
-        time_options: None,
     }
 }
 
@@ -259,8 +254,6 @@ pub fn make_test(config: &Config, testpaths: &TestPaths) -> test::TestDescAndFn
             ignore: early_props.ignore,
             should_panic: should_panic,
             allow_fail: false,
-            #[cfg(not(feature = "stable"))]
-            test_type: test::TestType::IntegrationTest,
         },
         testfn: make_test_closure(config, testpaths),
     }
@@ -291,7 +284,6 @@ pub fn make_test_closure(config: &Config, testpaths: &TestPaths) -> test::TestFn
     let config = config.clone();
     let testpaths = testpaths.clone();
     test::DynTestFn(Box::new(move || {
-        #[cfg(feature = "stable")]
         let config = config.clone();  // FIXME: why is this needed?
         runtest::run(config, &testpaths)
     }))

test-project/Cargo.toml

@@ -10,4 +10,4 @@ path = ".."
 features = ["tmp"]
 
 [features]
-stable = ["compiletest_rs/stable"]
+rustc = ["compiletest_rs/rustc"]

test-project/tests/tests.rs

@@ -22,8 +22,8 @@ fn compile_test() {
     run_mode("run-pass", None);
     run_mode("ui", None);
 
-    #[cfg(not(feature = "stable"))]
+    #[cfg(feature = "rustc")]
     run_mode("pretty", None);
-    #[cfg(not(feature = "stable"))]
+    #[cfg(feature = "rustc")]
     run_mode("ui", Some("nightly"));
 }