Permalink
Browse files

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).
  • Loading branch information...
bors committed Nov 22, 2017
2 parents 9c21f8f + a9749ef commit 05e2e1c41414e8fc73d0f267ea8dab1a3eeeaa99
Showing with 2 additions and 2 deletions.
  1. +1 −1 src/bootstrap/channel.rs
  2. +1 −1 src/tools/cargo
View
@@ -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

0 comments on commit 05e2e1c

Please sign in to comment.