From: Alex Crichton <alex@alexcrichton.com>
Date: Mon, 28 Aug 2017 15:55:45 +0000 (-0700)
Subject: Bump to 1.22.0
X-Git-Url: https://git.lizzy.rs/?a=commitdiff_plain;h=9b9de27101b751415dc6216e51ad4d4d219f6538;p=rust.git

Bump to 1.22.0
---

diff --git a/src/bootstrap/channel.rs b/src/bootstrap/channel.rs
index 9c1ae83d382..6ed504dfe74 100644
--- a/src/bootstrap/channel.rs
+++ b/src/bootstrap/channel.rs
@@ -24,7 +24,7 @@
 use config::Config;
 
 // The version number
-pub const CFG_RELEASE_NUM: &str = "1.21.0";
+pub const CFG_RELEASE_NUM: &str = "1.22.0";
 
 // 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/libstd/lib.rs b/src/libstd/lib.rs
index b57067e35e9..d149e1e9925 100644
--- a/src/libstd/lib.rs
+++ b/src/libstd/lib.rs
@@ -320,16 +320,9 @@
 // Always use alloc_system during stage0 since we don't know if the alloc_*
 // crate the stage0 compiler will pick by default is enabled (e.g.
 // if the user has disabled jemalloc in `./configure`).
-// `force_alloc_system` is *only* intended as a workaround for local rebuilds
-// with a rustc without jemalloc.
-// The not(stage0+msvc) gates will only last until the next stage0 bump
-#![cfg_attr(all(
-        not(all(stage0, target_env = "msvc")),
-        any(stage0, feature = "force_alloc_system")),
-    feature(global_allocator))]
-#[cfg(all(
-    not(all(stage0, target_env = "msvc")),
-    any(stage0, feature = "force_alloc_system")))]
+#![cfg_attr(any(stage0, feature = "force_alloc_system"),
+            feature(global_allocator))]
+#[cfg(any(stage0, feature = "force_alloc_system"))]
 #[global_allocator]
 static ALLOC: alloc_system::System = alloc_system::System;
 
diff --git a/src/stage0.txt b/src/stage0.txt
index 67cb282c09d..892679c1929 100644
--- a/src/stage0.txt
+++ b/src/stage0.txt
@@ -12,9 +12,9 @@
 # source tarball for a stable release you'll likely see `1.x.0` for rustc and
 # `0.x.0` for Cargo where they were released on `date`.
 
-date: 2017-08-25
-rustc: nightly
-cargo: nightly
+date: 2017-08-29
+rustc: beta
+cargo: beta
 
 # When making a stable release the process currently looks like:
 #