Auto merge of #46183 - kennytm:backport-cargo-4739, r=aturon

[stable] Update cargo to fix breakage on macOS High Sierra; Update version to 1.22.1. This backport includes rust-lang/cargo#4739, required for building projects in debug mode with Cargo on macOS High Sierra (see the Cargo PR for details).
rust-lang · Nov 22, 2017 · bb408b5 · bb408b5
2 parents 9c21f8f + a9749ef
commit bb408b5
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/bootstrap/channel.rs b/src/bootstrap/channel.rs
@@ -24,7 +24,7 @@ use Build;
 use config::Config;
 
 // The version number
-pub const CFG_RELEASE_NUM: &str = "1.22.0";
+pub const CFG_RELEASE_NUM: &str = "1.22.1";
 
 // An optional number to put after the label, e.g. '.2' -> '-beta.2'
 // Be sure to make this starts with a dot to conform to semver pre-release

diff --git a/src/tools/cargo b/src/tools/cargo
+20 −7		src/cargo/ops/cargo_rustc/mod.rs
+7 −0		tests/build.rs
+4 −5		tests/cargotest/support/paths.rs