Auto merge of #48343 - Mark-Simulacrum:release-step, r=kennytm

Update nightly to 1.26.0 and bootstrap from beta.

Author: bors

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<Info>,

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<T: ?Sized + Any>(_s: &T) -> bool {
-    ///     TypeId::of::<String>() == TypeId::of::<T>()
-    /// }
-    ///
-    /// 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<T: ?Sized + 'static>() -> TypeId {
-        TypeId {
-            t: unsafe { intrinsics::type_id::<T>() },
-        }
-    }
-
     /// 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<T: ?Sized + 'static>() -> TypeId {
         TypeId {
             t: unsafe { intrinsics::type_id::<T>() },

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 }

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 }

src/librustc_driver/lib.rs

@@ -1478,14 +1478,6 @@ pub fn monitor<F: FnOnce() + Send + 'static>(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;
 

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 }

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 }

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) {

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 }

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 }

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 }

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 }

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 }

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 }

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.2", default-features = false }

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]
 

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 }

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