Use externally sourced shell-escape

Closes #3374
rust-lang · Dec 30, 2016 · d105e75 · d105e75
1 parent 740f9c0
commit d105e75
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 119 deletions.
diff --git a/.gitignore b/.gitignore
@@ -10,3 +10,4 @@ src/registry/Cargo.lock
 rustc
 __pycache__
 .idea/
+*.iml
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -39,6 +39,7 @@ psapi-sys = "0.1"
 regex = "0.1"
 rustc-serialize = "0.3"
 semver = "0.5.0"
+shell-escape = "0.1"
 tar = { version = "0.4", default-features = false }
 tempdir = "0.3"
 term = "0.4.4"

diff --git a/src/cargo/lib.rs b/src/cargo/lib.rs
@@ -18,6 +18,7 @@ extern crate num_cpus;
 extern crate regex;
 extern crate rustc_serialize;
 extern crate semver;
+extern crate shell_escape;
 extern crate tar;
 extern crate tempdir;
 extern crate term;

diff --git a/src/cargo/util/mod.rs b/src/cargo/util/mod.rs
@@ -39,7 +39,6 @@ mod cfg;
 mod dependency_queue;
 mod rustc;
 mod sha256;
-mod shell_escape;
 mod vcs;
 mod lazy_cell;
 mod flock;

diff --git a/src/cargo/util/process_builder.rs b/src/cargo/util/process_builder.rs
@@ -6,7 +6,7 @@ use std::path::Path;
 use std::process::{Command, Stdio, Output};
 
 use util::{CargoResult, ProcessError, process_error, read2};
-use util::shell_escape::escape;
+use shell_escape::escape;
 
 #[derive(Clone, PartialEq, Debug)]
 pub struct ProcessBuilder {

diff --git a/src/cargo/util/shell_escape.rs b/src/cargo/util/shell_escape.rs
-Original file line number
+Diff line change
@@ Expand Up / @@ -10,3 +10,4 @@ src/registry/Cargo.lock @@
     rustc
     __pycache__
     .idea/
+    *.iml