diff options
| author | bors <bors@rust-lang.org> | 2017-11-22 21:30:29 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2017-11-22 21:30:29 +0000 |
| commit | 05e2e1c41414e8fc73d0f267ea8dab1a3eeeaa99 (patch) | |
| tree | b4c024b1291a3865053ca27b70de318753816b8c | |
| parent | 9c21f8ff4d80824972910e0c4bbfd1f89620cb0d (diff) | |
| parent | a9749ef3de2f7094dd56759ef92f8c566146dd36 (diff) | |
| download | rust-05e2e1c41414e8fc73d0f267ea8dab1a3eeeaa99.tar.gz rust-05e2e1c41414e8fc73d0f267ea8dab1a3eeeaa99.zip | |
Auto merge of #46183 - kennytm:backport-cargo-4739, r=aturon 1.22.1
[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).
| -rw-r--r-- | src/bootstrap/channel.rs | 2 | ||||
| m--------- | src/tools/cargo | 0 |
2 files changed, 1 insertions, 1 deletions
diff --git a/src/bootstrap/channel.rs b/src/bootstrap/channel.rs index de2ce1fa048..d9861867cf8 100644 --- 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 -Subproject cee38cd30d16b343b13721ec813dc89eb1c1642 +Subproject 61fa02415ee1bc17a0c364c1c67107953d04ea8 |