From 24b485b918a988208cfd95c9101d01b46f550f92 Mon Sep 17 00:00:00 2001 From: Mark Simulacrum Date: Sun, 18 Feb 2018 16:50:53 -0700 Subject: [PATCH 1/2] Bootstrap from the 1.25 beta --- src/bootstrap/channel.rs | 2 +- src/stage0.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/bootstrap/channel.rs b/src/bootstrap/channel.rs index e412dd9e3e670..72841cb0616c1 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.25.0"; +pub const CFG_RELEASE_NUM: &str = "1.26.0"; pub struct GitInfo { inner: Option, diff --git a/src/stage0.txt b/src/stage0.txt index 38a8ef2acd261..b9578386ce5bc 100644 --- a/src/stage0.txt +++ b/src/stage0.txt @@ -12,7 +12,7 @@ # 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: 2018-01-02 +date: 2018-02-20 rustc: beta cargo: beta From 33f5ceee1f2183b979aa0eccea7081ac7e43adfb Mon Sep 17 00:00:00 2001 From: Mark Simulacrum Date: Sun, 18 Feb 2018 16:57:21 -0700 Subject: [PATCH 2/2] stage0 cfg cleanup --- src/libcore/any.rs | 26 -------------------------- src/librustc/lib.rs | 1 - src/librustc_const_eval/lib.rs | 1 - src/librustc_driver/lib.rs | 8 -------- src/librustc_metadata/lib.rs | 1 - src/librustc_mir/lib.rs | 1 - src/librustc_passes/lib.rs | 1 - src/librustc_plugin/lib.rs | 1 - src/librustc_privacy/lib.rs | 1 - src/librustc_resolve/lib.rs | 1 - src/librustc_trans/lib.rs | 2 -- src/librustc_trans_utils/lib.rs | 1 - src/librustc_typeck/lib.rs | 1 - src/librustdoc/Cargo.toml | 2 -- src/libstd/lib.rs | 1 - src/libsyntax/lib.rs | 1 - 16 files changed, 50 deletions(-) diff --git a/src/libcore/any.rs b/src/libcore/any.rs index 566bfe2a3fb5e..a6ba53087ac30 100644 --- a/src/libcore/any.rs +++ b/src/libcore/any.rs @@ -349,31 +349,6 @@ pub struct TypeId { } impl TypeId { - /// Returns the `TypeId` of the type this generic function has been - /// instantiated with. - /// - /// # Examples - /// - /// ``` - /// use std::any::{Any, TypeId}; - /// - /// fn is_string(_s: &T) -> bool { - /// TypeId::of::() == TypeId::of::() - /// } - /// - /// fn main() { - /// assert_eq!(is_string(&0), false); - /// assert_eq!(is_string(&"cookie monster".to_string()), true); - /// } - /// ``` - #[stable(feature = "rust1", since = "1.0.0")] - #[cfg(stage0)] - pub fn of() -> TypeId { - TypeId { - t: unsafe { intrinsics::type_id::() }, - } - } - /// Returns the `TypeId` of the type this generic function has been /// instantiated with. /// @@ -393,7 +368,6 @@ impl TypeId { /// ``` #[stable(feature = "rust1", since = "1.0.0")] #[rustc_const_unstable(feature="const_type_id")] - #[cfg(not(stage0))] pub const fn of() -> TypeId { TypeId { t: unsafe { intrinsics::type_id::() }, diff --git a/src/librustc/lib.rs b/src/librustc/lib.rs index a7a2619505931..9520fa96856a5 100644 --- a/src/librustc/lib.rs +++ b/src/librustc/lib.rs @@ -179,5 +179,4 @@ fn noop() { // Build the diagnostics array at the end so that the metadata includes error use sites. -#[cfg(not(stage0))] // remove after the next snapshot __build_diagnostic_array! { librustc, DIAGNOSTICS } diff --git a/src/librustc_const_eval/lib.rs b/src/librustc_const_eval/lib.rs index b4563f6cf2e75..9d636b48bd0c5 100644 --- a/src/librustc_const_eval/lib.rs +++ b/src/librustc_const_eval/lib.rs @@ -56,5 +56,4 @@ pub fn provide(providers: &mut Providers) { } // Build the diagnostics array at the end so that the metadata includes error use sites. -#[cfg(not(stage0))] // remove after the next snapshot __build_diagnostic_array! { librustc_const_eval, DIAGNOSTICS } diff --git a/src/librustc_driver/lib.rs b/src/librustc_driver/lib.rs index 05dcaf731352a..f872fd475461e 100644 --- a/src/librustc_driver/lib.rs +++ b/src/librustc_driver/lib.rs @@ -1478,14 +1478,6 @@ pub fn monitor(f: F) { } } -#[cfg(stage0)] -pub fn diagnostics_registry() -> errors::registry::Registry { - use errors::registry::Registry; - - Registry::new(&[]) -} - -#[cfg(not(stage0))] pub fn diagnostics_registry() -> errors::registry::Registry { use errors::registry::Registry; diff --git a/src/librustc_metadata/lib.rs b/src/librustc_metadata/lib.rs index 33075e404321c..2d015fa81f925 100644 --- a/src/librustc_metadata/lib.rs +++ b/src/librustc_metadata/lib.rs @@ -59,5 +59,4 @@ pub mod cstore; pub mod dynamic_lib; pub mod locator; -#[cfg(not(stage0))] // remove after the next snapshot __build_diagnostic_array! { librustc_metadata, DIAGNOSTICS } diff --git a/src/librustc_mir/lib.rs b/src/librustc_mir/lib.rs index 1699ad0f19cf6..8c15d1cf8b03a 100644 --- a/src/librustc_mir/lib.rs +++ b/src/librustc_mir/lib.rs @@ -79,5 +79,4 @@ pub fn provide(providers: &mut Providers) { providers.const_eval = interpret::const_eval_provider; } -#[cfg(not(stage0))] // remove after the next snapshot __build_diagnostic_array! { librustc_mir, DIAGNOSTICS } diff --git a/src/librustc_passes/lib.rs b/src/librustc_passes/lib.rs index 73c71ec0b2f00..7db1f5665fbe5 100644 --- a/src/librustc_passes/lib.rs +++ b/src/librustc_passes/lib.rs @@ -44,7 +44,6 @@ pub mod loops; mod mir_stats; pub mod static_recursion; -#[cfg(not(stage0))] // remove after the next snapshot __build_diagnostic_array! { librustc_passes, DIAGNOSTICS } pub fn provide(providers: &mut Providers) { diff --git a/src/librustc_plugin/lib.rs b/src/librustc_plugin/lib.rs index 38df5986ce2a9..c0f830f1fbe2e 100644 --- a/src/librustc_plugin/lib.rs +++ b/src/librustc_plugin/lib.rs @@ -82,5 +82,4 @@ pub mod registry; pub mod load; pub mod build; -#[cfg(not(stage0))] // remove after the next snapshot __build_diagnostic_array! { librustc_plugin, DIAGNOSTICS } diff --git a/src/librustc_privacy/lib.rs b/src/librustc_privacy/lib.rs index 6ae047609535e..e9f970d886f64 100644 --- a/src/librustc_privacy/lib.rs +++ b/src/librustc_privacy/lib.rs @@ -1717,5 +1717,4 @@ fn privacy_access_levels<'a, 'tcx>(tcx: TyCtxt<'a, 'tcx, 'tcx>, Rc::new(visitor.access_levels) } -#[cfg(not(stage0))] // remove after the next snapshot __build_diagnostic_array! { librustc_privacy, DIAGNOSTICS } diff --git a/src/librustc_resolve/lib.rs b/src/librustc_resolve/lib.rs index d8e03552a6a6f..a9ba278ea745b 100644 --- a/src/librustc_resolve/lib.rs +++ b/src/librustc_resolve/lib.rs @@ -4183,5 +4183,4 @@ pub enum MakeGlobMap { No, } -#[cfg(not(stage0))] // remove after the next snapshot __build_diagnostic_array! { librustc_resolve, DIAGNOSTICS } diff --git a/src/librustc_trans/lib.rs b/src/librustc_trans/lib.rs index 908d3790170ac..6c281ab5e7a40 100644 --- a/src/librustc_trans/lib.rs +++ b/src/librustc_trans/lib.rs @@ -194,7 +194,6 @@ impl TransCrate for LlvmTransCrate { llvm_util::print_version(); } - #[cfg(not(stage0))] fn diagnostics(&self) -> &[(&'static str, &'static str)] { &DIAGNOSTICS } @@ -404,5 +403,4 @@ struct CrateInfo { used_crates_dynamic: Vec<(CrateNum, LibSource)>, } -#[cfg(not(stage0))] // remove after the next snapshot __build_diagnostic_array! { librustc_trans, DIAGNOSTICS } diff --git a/src/librustc_trans_utils/lib.rs b/src/librustc_trans_utils/lib.rs index 9b7ab204492ae..bfecb20198366 100644 --- a/src/librustc_trans_utils/lib.rs +++ b/src/librustc_trans_utils/lib.rs @@ -119,5 +119,4 @@ pub fn find_exported_symbols<'a, 'tcx>(tcx: TyCtxt<'a, 'tcx, 'tcx>) -> NodeSet { }).collect() } -#[cfg(not(stage0))] // remove after the next snapshot __build_diagnostic_array! { librustc_trans_utils, DIAGNOSTICS } diff --git a/src/librustc_typeck/lib.rs b/src/librustc_typeck/lib.rs index bd7e200d620e6..af32738d9d04b 100644 --- a/src/librustc_typeck/lib.rs +++ b/src/librustc_typeck/lib.rs @@ -383,5 +383,4 @@ pub fn hir_trait_to_predicates<'a, 'tcx>(tcx: TyCtxt<'a, 'tcx, 'tcx>, hir_trait: (principal, projections) } -#[cfg(not(stage0))] // remove after the next snapshot __build_diagnostic_array! { librustc_typeck, DIAGNOSTICS } diff --git a/src/librustdoc/Cargo.toml b/src/librustdoc/Cargo.toml index 09d0a0f610b7b..cfbb0a52b8842 100644 --- a/src/librustdoc/Cargo.toml +++ b/src/librustdoc/Cargo.toml @@ -6,8 +6,6 @@ version = "0.0.0" [lib] name = "rustdoc" path = "lib.rs" -# SNAP/stage0(cargo) -doctest = false [dependencies] pulldown-cmark = { version = "0.1.0", default-features = false } diff --git a/src/libstd/lib.rs b/src/libstd/lib.rs index 3c9004cdd19bc..854cefcb59725 100644 --- a/src/libstd/lib.rs +++ b/src/libstd/lib.rs @@ -324,7 +324,6 @@ #![feature(doc_spotlight)] #![cfg_attr(test, feature(update_panic_count))] #![cfg_attr(windows, feature(used))] -#![cfg_attr(stage0, feature(repr_align))] #![default_lib_allocator] diff --git a/src/libsyntax/lib.rs b/src/libsyntax/lib.rs index 9181cca215c84..14e39b5af42d0 100644 --- a/src/libsyntax/lib.rs +++ b/src/libsyntax/lib.rs @@ -152,5 +152,4 @@ pub mod ext { #[cfg(test)] mod test_snippet; -#[cfg(not(stage0))] // remove after the next snapshot __build_diagnostic_array! { libsyntax, DIAGNOSTICS }