Auto merge of #1284 - apasel422:issue-1277, r=alexcrichton

This is a WIP for #1277. I would like to add a test for the new behavior in `tests/test_cargo_test.rs`, but I'm having a hard time getting the output to match.

Some feedback would be great to see if this is even the right approach.

Author: bors

Cargo.lock

@@ -1,4 +1,4 @@
-use std::os;
+use std::env;
 
 use cargo::ops::CompileOptions;
 use cargo::ops;
@@ -47,7 +47,7 @@ the --release flag will use the `release` profile instead.
 ";
 
 pub fn execute(options: Options, config: &Config) -> CliResult<Option<()>> {
-    debug!("executing; cmd=cargo-build; args={:?}", os::args());
+    debug!("executing; cmd=cargo-build; args={:?}", env::args().collect::<Vec<_>>());
     config.shell().set_verbose(options.flag_verbose);
 
     let root = try!(find_root_manifest_for_cwd(options.flag_manifest_path));

src/bin/build.rs

@@ -245,7 +245,7 @@ fn list_command_directory() -> Vec<Path> {
         dirs.push(path.join("../lib/cargo"));
         dirs.push(path);
     }
-    if let Some(val) = env::var("PATH") {
+    if let Some(val) = env::var_os("PATH") {
         dirs.extend(env::split_paths(&val));
     }
     dirs

src/bin/cargo.rs

@@ -1,4 +1,4 @@
-use std::os;
+use std::env;
 
 use cargo::ops;
 use cargo::util::{CliResult, CliError, Config};
@@ -33,7 +33,7 @@ and its format, see the `cargo help pkgid` command.
 
 pub fn execute(options: Options, config: &Config) -> CliResult<Option<()>> {
     config.shell().set_verbose(options.flag_verbose);
-    debug!("executing; cmd=cargo-clean; args={:?}", os::args());
+    debug!("executing; cmd=cargo-clean; args={:?}", env::args().collect::<Vec<_>>());
 
     let root = try!(find_root_manifest_for_cwd(options.flag_manifest_path));
     let opts = ops::CleanOptions {

src/bin/clean.rs

@@ -1,4 +1,4 @@
-use std::os;
+use std::env;
 
 use cargo::ops;
 use cargo::util::{CliResult, CliError, Config};
@@ -23,7 +23,7 @@ Options:
 ";
 
 pub fn execute(options: Options, config: &Config) -> CliResult<Option<()>> {
-    debug!("executing; cmd=cargo-generate-lockfile; args={:?}", os::args());
+    debug!("executing; cmd=cargo-generate-lockfile; args={:?}", env::args().collect::<Vec<_>>());
     config.shell().set_verbose(options.flag_verbose);
     let root = try!(find_root_manifest_for_cwd(options.flag_manifest_path));
 

src/bin/generate_lockfile.rs

@@ -1,4 +1,4 @@
-use std::os;
+use std::env;
 
 use cargo::ops;
 use cargo::util::{CliResult, CliError, Config};
@@ -28,7 +28,7 @@ Options:
 ";
 
 pub fn execute(options: Options, config: &Config) -> CliResult<Option<()>> {
-    debug!("executing; cmd=cargo-new; args={:?}", os::args());
+    debug!("executing; cmd=cargo-new; args={:?}", env::args().collect::<Vec<_>>());
     config.shell().set_verbose(options.flag_verbose);
 
     let Options { flag_bin, arg_path, flag_vcs, .. } = options;

src/bin/new.rs

@@ -1,4 +1,4 @@
-use std::os;
+use std::env;
 
 use cargo::ops;
 use cargo::util::{CliResult, CliError, Config};
@@ -49,7 +49,7 @@ For more information about package id specifications, see `cargo help pkgid`.
 ";
 
 pub fn execute(options: Options, config: &Config) -> CliResult<Option<()>> {
-    debug!("executing; cmd=cargo-update; args={:?}", os::args());
+    debug!("executing; cmd=cargo-update; args={:?}", env::args().collect::<Vec<_>>());
     config.shell().set_verbose(options.flag_verbose);
     let root = try!(find_root_manifest_for_cwd(options.flag_manifest_path));
 

src/bin/update.rs

@@ -1,8 +1,8 @@
 extern crate toml;
 
 use std::collections::HashMap;
+use std::env;
 use std::old_io::File;
-use std::os;
 
 use cargo::util::{CliResult, Config};
 
@@ -47,6 +47,6 @@ pub fn execute(args: Flags, config: &Config) -> CliResult<Option<Error>> {
 fn fail(reason: &str, value: &str) -> CliResult<Option<Error>>{
     let mut h = HashMap::new();
     h.insert(reason.to_string(), value.to_string());
-    os::set_exit_status(1);
+    env::set_exit_status(1);
     Ok(Some(h))
 }

src/bin/verify_project.rs

@@ -1,4 +1,4 @@
-use std::os;
+use std::env;
 
 use cargo;
 use cargo::util::{CliResult, Config};
@@ -16,7 +16,7 @@ Options:
 ";
 
 pub fn execute(_: Options, _: &Config) -> CliResult<Option<()>> {
-    debug!("executing; cmd=cargo-version; args={:?}", os::args());
+    debug!("executing; cmd=cargo-version; args={:?}", env::args().collect::<Vec<_>>());
 
     println!("{}", cargo::version());
 

src/bin/version.rs

@@ -95,7 +95,7 @@ fn process<V, F>(mut callback: F)
     let mut shell = shell(true);
     process_executed((|| {
         let config = try!(Config::new(&mut shell));
-        let args: Vec<_> = try!(env::args().map(|s| {
+        let args: Vec<_> = try!(env::args_os().map(|s| {
             s.into_string().map_err(|s| {
                 human(format!("invalid unicode in argument: {:?}", s))
             })

src/cargo/lib.rs

@@ -134,8 +134,8 @@ fn discover_author() -> CargoResult<(String, Option<String>)> {
     let git_config = git_config.as_ref();
     let name = git_config.and_then(|g| g.get_str("user.name").ok())
                          .map(|s| s.to_string())
-                         .or_else(|| env::var_string("USER").ok())      // unix
-                         .or_else(|| env::var_string("USERNAME").ok()); // windows
+                         .or_else(|| env::var("USER").ok())      // unix
+                         .or_else(|| env::var("USERNAME").ok()); // windows
     let name = match name {
         Some(name) => name,
         None => {

src/cargo/ops/cargo_new.rs

@@ -1,4 +1,4 @@
-use std::collections::HashMap;
+use std::collections::{HashMap, HashSet};
 use std::dynamic_lib::DynamicLibrary;
 use std::ffi::CString;
 use std::old_path::BytesContainer;
@@ -42,6 +42,9 @@ pub struct Compilation {
 
     /// Top-level package that was compiled
     pub package: Package,
+
+    /// Features enabled during this compilation.
+    pub features: HashSet<String>,
 }
 
 impl Compilation {
@@ -55,6 +58,7 @@ impl Compilation {
             binaries: Vec::new(),
             extra_env: HashMap::new(),
             package: pkg.clone(),
+            features: HashSet::new(),
         }
     }
 

src/cargo/ops/cargo_rustc/compilation.rs

@@ -85,7 +85,7 @@ impl CommandPrototype {
 
     pub fn get_env(&self, var: &str) -> Option<CString> {
         self.env.get(var).cloned().or_else(|| {
-            Some(env::var_string(var).ok().map(|s| CString::from_vec(s.into_bytes())))
+            Some(env::var(var).ok().map(|s| CString::from_vec(s.into_bytes())))
         }).and_then(|val| val)
     }
 

src/cargo/ops/cargo_rustc/engine.rs

@@ -189,6 +189,11 @@ pub fn compile_targets<'a, 'b>(env: &str,
     let out_dir = cx.layout(pkg, Kind::Target).build_out(pkg)
                     .display().to_string();
     cx.compilation.extra_env.insert("OUT_DIR".to_string(), Some(out_dir));
+
+    if let Some(feats) = cx.resolve.features(pkg.package_id()) {
+        cx.compilation.features.extend(feats.iter().cloned());
+    }
+
     for (&(ref pkg, _), output) in cx.build_state.outputs.lock().unwrap().iter() {
         let any_dylib = output.library_links.iter().any(|l| {
             !l.ends_with(":static") && !l.ends_with(":framework")

src/cargo/ops/cargo_rustc/mod.rs

@@ -72,6 +72,10 @@ pub fn run_tests(manifest_path: &Path,
             p = p.arg("--test-args").arg(test_args.connect(" "));
         }
 
+        for feat in compile.features.iter() {
+            p = p.arg("--cfg").arg(format!("feature=\"{}\"", feat));
+        }
+
         for (pkg, libs) in compile.libraries.iter() {
             for lib in libs.iter() {
                 let mut arg = pkg.name().as_bytes().to_vec();

src/cargo/ops/cargo_test.rs

@@ -191,15 +191,15 @@ pub fn http_proxy(config: &Config) -> CargoResult<Option<String>> {
         }
         Err(..) => {}
     }
-    Ok(env::var_string("HTTP_PROXY").ok())
+    Ok(env::var("HTTP_PROXY").ok())
 }
 
 pub fn http_timeout(config: &Config) -> CargoResult<Option<i64>> {
     match try!(config.get_i64("http.timeout")) {
         Some((s, _)) => return Ok(Some(s)),
         None => {}
     }
-    Ok(env::var_string("HTTP_TIMEOUT").ok().and_then(|s| s.parse().ok()))
+    Ok(env::var("HTTP_TIMEOUT").ok().and_then(|s| s.parse().ok()))
 }
 
 pub fn registry_login(config: &Config, token: String) -> CargoResult<()> {

src/cargo/ops/registry.rs

@@ -308,7 +308,8 @@ impl<'a> GitCheckout<'a> {
                 // as the submodule's head, then we can bail out and go to the
                 // next submodule.
                 let head_and_repo = child.open().and_then(|repo| {
-                    Ok((try!(repo.head()).target(), repo))
+                    let target = try!(repo.head()).target();
+                    Ok((target, repo))
                 });
                 let repo = match head_and_repo {
                     Ok((head, repo)) => {

src/cargo/sources/git/utils.rs

@@ -380,7 +380,7 @@ impl ConfigValue {
 }
 
 fn homedir() -> Option<Path> {
-    let cargo_home = env::var_string("CARGO_HOME").map(|p| Path::new(p)).ok();
+    let cargo_home = env::var("CARGO_HOME").map(|p| Path::new(p)).ok();
     let user_home = env::home_dir().map(|p| p.join(".cargo"));
     return cargo_home.or(user_home);
 }

src/cargo/util/config.rs

@@ -1,12 +1,11 @@
-use std::old_io::MemWriter;
 use std::hash::{Hasher, Hash, SipHasher};
 
 use rustc_serialize::hex::ToHex;
 
 pub fn to_hex(num: u64) -> String {
-    let mut writer = MemWriter::with_capacity(8);
+    let mut writer = Vec::with_capacity(8);
     writer.write_le_u64(num).unwrap(); // this should never fail
-    writer.get_ref().to_hex()
+    writer.to_hex()
 }
 
 pub fn short_hash<H: Hash<SipHasher>>(hashable: &H) -> String {

src/cargo/util/hex.rs

@@ -14,7 +14,7 @@ pub struct Profiler {
     desc: String,
 }
 
-fn enabled() -> bool { env::var("CARGO_PROFILE").is_some() }
+fn enabled() -> bool { env::var_os("CARGO_PROFILE").is_some() }
 
 pub fn start<T: fmt::Display>(desc: T) -> Profiler {
     if !enabled() { return Profiler { desc: String::new() } }

src/cargo/util/profile.rs

@@ -1 +1 @@
-2015-02-09
+2015-02-12

src/rustversion.txt

@@ -227,7 +227,7 @@ impl<T, E: fmt::Display> ErrMsg<T> for Result<T, E> {
 
 // Path to cargo executables
 pub fn cargo_dir() -> Path {
-    env::var_string("CARGO_BIN_PATH").map(Path::new).ok()
+    env::var("CARGO_BIN_PATH").map(Path::new).ok()
         .or_else(|| env::current_exe().ok().map(|s| s.dir_path()))
         .unwrap_or_else(|| {
             panic!("CARGO_BIN_PATH wasn't set. Cannot continue running test")

tests/support/mod.rs

@@ -25,7 +25,7 @@ fn fake_executable(proj: ProjectBuilder, dir: &Path, name: &str) -> ProjectBuild
 }
 
 fn path() -> Vec<Path> {
-    env::split_paths(&env::var("PATH").unwrap_or(OsString::new())).collect()
+    env::split_paths(&env::var_os("PATH").unwrap_or(OsString::new())).collect()
 }
 
 test!(list_commands_looks_at_path {