Bump to 1.22.0
This commit is contained in:
parent
2972687d10
commit
9b9de27101
|
@ -24,7 +24,7 @@ use Build;
|
|||
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
|
||||
|
|
|
@ -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;
|
||||
|
||||
|
|
|
@ -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:
|
||||
#
|
||||
|
|
Loading…
Reference in New Issue