From 027dc201944009ab8ac39f44a7f47ce3cf0baf22 Mon Sep 17 00:00:00 2001 From: kennytm Date: Wed, 22 Nov 2017 23:22:57 +0800 Subject: [PATCH 1/2] [stable] Update cargo. This backport includes rust-lang/cargo#4739, required for building projects in debug mode with cargo on macOS High Sierra. --- src/tools/cargo | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/tools/cargo b/src/tools/cargo index cee38cd30d16b..61fa02415ee1b 160000 --- a/src/tools/cargo +++ b/src/tools/cargo @@ -1 +1 @@ -Subproject commit cee38cd30d16b343b13721ec813dc89eb1c1642d +Subproject commit 61fa02415ee1bc17a0c364c1c67107953d04ea87 From a9749ef3de2f7094dd56759ef92f8c566146dd36 Mon Sep 17 00:00:00 2001 From: kennytm Date: Thu, 23 Nov 2017 03:00:19 +0800 Subject: [PATCH 2/2] Update release version --- src/bootstrap/channel.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bootstrap/channel.rs b/src/bootstrap/channel.rs index de2ce1fa048aa..d9861867cf868 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