Change env var name

Author: matklad

src/cargo/ops/cargo_run.rs

@@ -65,7 +65,7 @@ pub fn run(ws: &Workspace,
     let mut process = compile.target_process(exe, &pkg)?;
     process.args(args).cwd(config.cwd());
 
-    if config.wrap_exe() {
+    if config.print_run() {
         machine_message::emit(RunProfile::new(&process));
         Ok(None)
     } else {

src/cargo/ops/cargo_test.rs

@@ -97,7 +97,7 @@ fn run_unit_tests(options: &TestOptions,
             shell.status("Running", to_display.display().to_string())
         })?;
 
-        if config.wrap_exe() {
+        if config.print_run() {
             machine_message::emit(RunProfile::new(&cmd));
         } else {
             config.shell().verbose(|shell| {
@@ -124,7 +124,7 @@ fn run_doc_tests(options: &TestOptions,
 
     // We don't build/rust doctests if target != host or
     // if we are not supposed to run binaries.
-    if config.rustc()?.host != compilation.target || config.wrap_exe()  {
+    if config.rustc()?.host != compilation.target || config.print_run()  {
         return Ok((Test::Doc, errors));
     }
 

src/cargo/util/config.rs

@@ -33,7 +33,10 @@ pub struct Config {
     extra_verbose: Cell<bool>,
     frozen: Cell<bool>,
     locked: Cell<bool>,
-    wrap_exe: Cell<bool>,
+    /// When this is set, Cargo does not run binaries
+    /// during `cargo run`/`cargo test`. Instead it
+    /// prints what it should have run otherwise.
+    print_run: Cell<bool>,
 }
 
 impl Config {
@@ -51,7 +54,7 @@ impl Config {
             extra_verbose: Cell::new(false),
             frozen: Cell::new(false),
             locked: Cell::new(false),
-            wrap_exe: Cell::new(false),
+            print_run: Cell::new(false),
         }
     }
 
@@ -363,7 +366,7 @@ impl Config {
         self.extra_verbose.set(extra_verbose);
         self.frozen.set(frozen);
         self.locked.set(locked);
-        self.wrap_exe.set(env::var("CARGO_WRAP").is_ok());
+        self.print_run.set(env::var("CARGO_PRINT_RUN").is_ok());
 
         Ok(())
     }
@@ -380,8 +383,8 @@ impl Config {
         !self.frozen.get() && !self.locked.get()
     }
 
-    pub fn wrap_exe(&self) -> bool {
-        self.wrap_exe.get()
+    pub fn print_run(&self) -> bool {
+        self.print_run.get()
     }
 
     fn load_values(&self) -> CargoResult<HashMap<String, ConfigValue>> {

tests/intercept_exe.rs renamed to tests/print_run.rs

@@ -18,7 +18,7 @@ fn single_bin() {
             fn main() { println!("hello"); }
         "#);
 
-    assert_that(p.cargo_process("run").env("CARGO_WRAP", "1"),
+    assert_that(p.cargo_process("run").env("CARGO_PRINT_RUN", "1"),
                 execs().with_status(0)
                        .with_stderr(&"\
 [COMPILING] foo v0.0.1 ([..])
@@ -87,7 +87,7 @@ fn several_tests() {
         "CARGO_MANIFEST_DIR": "[..]",
         "CARGO": "[..]"
     }"#;
-    assert_that(p.cargo_process("test").env("CARGO_WRAP", "1"),
+    assert_that(p.cargo_process("test").env("CARGO_PRINT_RUN", "1"),
                 execs().with_status(0)
                        .with_json(&format!(r#"
 {{