Wrap ProcessBuilder in Execs & make .cargo return that

Author: dwijnand

tests/testsuite/alt_registry.rs

@@ -1,4 +1,3 @@
-use support::ChannelChanger;
 use support::registry::{self, alt_api_path, Package};
 use support::{basic_manifest, execs, paths, project};
 use support::hamcrest::assert_that;

tests/testsuite/bench.rs

@@ -1,7 +1,7 @@
 use std::str;
 
 use cargo::util::process;
-use support::{is_nightly, ChannelChanger};
+use support::is_nightly;
 use support::paths::CargoPathExt;
 use support::{basic_manifest, basic_bin_manifest, basic_lib_manifest, execs, project};
 use support::hamcrest::{assert_that, existing_file};

tests/testsuite/build.rs

@@ -3,13 +3,12 @@ use std::fs::{self, File};
 use std::io::prelude::*;
 
 use cargo::util::paths::dylib_path_envvar;
-use cargo::util::{process, ProcessBuilder};
+use cargo::util::process;
 use support::{basic_manifest, basic_bin_manifest, basic_lib_manifest, is_nightly, rustc_host, sleep_ms};
 use support::paths::{root, CargoPathExt};
 use support::ProjectBuilder;
-use support::{execs, main_file, project};
+use support::{Execs, execs, main_file, project};
 use support::registry::Package;
-use support::ChannelChanger;
 use support::hamcrest::{assert_that, existing_dir, existing_file, is_not};
 
 #[test]
@@ -1553,15 +1552,15 @@ fn crate_authors_env_vars() {
 }
 
 // The tester may already have LD_LIBRARY_PATH=::/foo/bar which leads to a false positive error
-fn setenv_for_removing_empty_component(mut p: ProcessBuilder) -> ProcessBuilder {
+fn setenv_for_removing_empty_component(mut execs: Execs) -> Execs {
     let v = dylib_path_envvar();
     if let Ok(search_path) = env::var(v) {
         let new_search_path = env::join_paths(
             env::split_paths(&search_path).filter(|e| !e.as_os_str().is_empty()),
         ).expect("join_paths");
-        p.env(v, new_search_path); // build_command() will override LD_LIBRARY_PATH accordingly
+        execs.env(v, new_search_path); // build_command() will override LD_LIBRARY_PATH accordingly
     }
-    p
+    execs
 }
 
 // Regression test for #4277

tests/testsuite/build_plan.rs

@@ -1,4 +1,3 @@
-use support::ChannelChanger;
 use support::{basic_manifest, basic_bin_manifest, execs, main_file, project};
 use support::hamcrest::{assert_that, existing_file, is_not};
 

tests/testsuite/cargo_features.rs

@@ -1,4 +1,3 @@
-use support::ChannelChanger;
 use support::{execs, project, publish};
 use support::hamcrest::assert_that;
 

tests/testsuite/doc.rs

@@ -3,7 +3,7 @@ use std::str;
 use std::fs::{self, File};
 use std::io::Read;
 
-use support::{is_nightly, rustc_host, ChannelChanger};
+use support::{is_nightly, rustc_host};
 use support::{basic_manifest, basic_lib_manifest, execs, git, project, path2url};
 use support::paths::CargoPathExt;
 use support::registry::Package;

tests/testsuite/edition.rs

@@ -1,5 +1,4 @@
 use support::{basic_lib_manifest, is_nightly, execs, project};
-use support::ChannelChanger;
 use support::hamcrest::assert_that;
 
 #[test]

tests/testsuite/features.rs

@@ -3,7 +3,6 @@ use std::io::prelude::*;
 
 use support::paths::CargoPathExt;
 use support::{basic_manifest, execs, project};
-use support::ChannelChanger;
 use support::hamcrest::assert_that;
 use support::registry::Package;
 

tests/testsuite/fix.rs

@@ -4,7 +4,7 @@ use git2;
 
 use support::git;
 use support::{basic_manifest, execs, project};
-use support::{is_nightly, ChannelChanger};
+use support::is_nightly;
 use support::hamcrest::assert_that;
 
 #[test]

tests/testsuite/generate_lockfile.rs

@@ -3,7 +3,6 @@ use std::io::prelude::*;
 
 use support::registry::Package;
 use support::{basic_manifest, execs, paths, project, ProjectBuilder};
-use support::ChannelChanger;
 use support::hamcrest::{assert_that, existing_file, is_not};
 
 #[test]