Auto merge of #44154 - alexcrichton:bump-bootstrap, r=Mark-Simulacrum

Bump to 1.22.0 and update boostrap compiler Time to get a new nightly!

Author: bors

src/Cargo.lock

@@ -56,5 +56,5 @@ debug-assertions = false
 debug = false
 debug-assertions = false
 
-[replace]
-"https://github.com/rust-lang/cargo#0.22.0" = { path = "tools/cargo" }
+[patch.'https://github.com/rust-lang/cargo']
+cargo = { path = "tools/cargo" }

src/Cargo.toml

@@ -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

src/bootstrap/channel.rs

@@ -279,7 +279,7 @@ pub fn symlink_dir(src: &Path, dest: &Path) -> io::Result<()> {
  ptr::null_mut());
 
  let mut data = [0u8; MAXIMUM_REPARSE_DATA_BUFFER_SIZE];
- let mut db = data.as_mut_ptr()
+ let db = data.as_mut_ptr()
  as *mut REPARSE_MOUNTPOINT_DATA_BUFFER;
  let buf = &mut (*db).ReparseTarget as *mut _;
  let mut i = 0;

src/bootstrap/util.rs

@@ -123,14 +123,6 @@ macro_rules! array_impls {
  }
  }
 
- #[stable(feature = "rust1", since = "1.0.0")]
- #[cfg(stage0)]
- impl<T:Copy> Clone for [T; $N] {
- fn clone(&self) -> [T; $N] {
- *self
- }
- }
-
  #[stable(feature = "rust1", since = "1.0.0")]
  impl<T: Hash> Hash for [T; $N] {
  fn hash<H: hash::Hasher>(&self, state: &mut H) {

src/libcore/array.rs

@@ -88,7 +88,7 @@
 /// }
 /// ```
 #[stable(feature = "rust1", since = "1.0.0")]
-#[cfg_attr(not(stage0), lang = "clone")]
+#[lang = "clone"]
 pub trait Clone : Sized {
  /// Returns a copy of the value.
  ///
@@ -130,45 +130,3 @@ pub struct AssertParamIsClone<T: Clone + ?Sized> { _field: ::marker::PhantomData
  reason = "deriving hack, should not be public",
  issue = "0")]
 pub struct AssertParamIsCopy<T: Copy + ?Sized> { _field: ::marker::PhantomData<T> }
-
-#[stable(feature = "rust1", since = "1.0.0")]
-#[cfg(stage0)]
-impl<'a, T: ?Sized> Clone for &'a T {
- /// Returns a shallow copy of the reference.
- #[inline]
- fn clone(&self) -> &'a T { *self }
-}
-
-macro_rules! clone_impl {
- ($t:ty) => {
- #[stable(feature = "rust1", since = "1.0.0")]
- #[cfg(stage0)]
- impl Clone for $t {
- /// Returns a deep copy of the value.
- #[inline]
- fn clone(&self) -> $t { *self }
- }
- }
-}
-
-clone_impl! { isize }
-clone_impl! { i8 }
-clone_impl! { i16 }
-clone_impl! { i32 }
-clone_impl! { i64 }
-clone_impl! { i128 }
-
-clone_impl! { usize }
-clone_impl! { u8 }
-clone_impl! { u16 }
-clone_impl! { u32 }
-clone_impl! { u64 }
-clone_impl! { u128 }
-
-clone_impl! { f32 }
-clone_impl! { f64 }
-
-clone_impl! { ! }
-clone_impl! { () }
-clone_impl! { bool }
-clone_impl! { char }

src/libcore/clone.rs

@@ -8,16 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#[macro_export]
-// This stability attribute is totally useless.
-#[stable(feature = "rust1", since = "1.0.0")]
-#[cfg(stage0)]
-macro_rules! __rust_unstable_column {
- () => {
- column!()
- }
-}
-
 /// Entry point of thread panic, for details, see std::macros
 #[macro_export]
 #[allow_internal_unstable]

src/libcore/macros.rs

@@ -188,26 +188,6 @@ pub fn forget<T>(t: T) {
 /// ```
 #[inline]
 #[stable(feature = "rust1", since = "1.0.0")]
-#[cfg(stage0)]
-pub fn size_of<T>() -> usize {
- unsafe { intrinsics::size_of::<T>() }
-}
-
-/// Returns the size of a type in bytes.
-///
-/// More specifically, this is the offset in bytes between successive
-/// items of the same type, including alignment padding.
-///
-/// # Examples
-///
-/// ```
-/// use std::mem;
-///
-/// assert_eq!(4, mem::size_of::<i32>());
-/// ```
-#[inline]
-#[stable(feature = "rust1", since = "1.0.0")]
-#[cfg(not(stage0))]
 pub const fn size_of<T>() -> usize {
  unsafe { intrinsics::size_of::<T>() }
 }
@@ -299,29 +279,6 @@ pub fn min_align_of_val<T: ?Sized>(val: &T) -> usize {
 /// ```
 #[inline]
 #[stable(feature = "rust1", since = "1.0.0")]
-#[cfg(stage0)]
-pub fn align_of<T>() -> usize {
- unsafe { intrinsics::min_align_of::<T>() }
-}
-
-/// Returns the [ABI]-required minimum alignment of a type.
-///
-/// Every reference to a value of the type `T` must be a multiple of this number.
-///
-/// This is the alignment used for struct fields. It may be smaller than the preferred alignment.
-///
-/// [ABI]: https://en.wikipedia.org/wiki/Application_binary_interface
-///
-/// # Examples
-///
-/// ```
-/// use std::mem;
-///
-/// assert_eq!(4, mem::align_of::<i32>());
-/// ```
-#[inline]
-#[stable(feature = "rust1", since = "1.0.0")]
-#[cfg(not(stage0))]
 pub const fn align_of<T>() -> usize {
  unsafe { intrinsics::min_align_of::<T>() }
 }

src/libcore/mem.rs

@@ -10,8 +10,6 @@
 
 //! Operations and constants for 32-bits floats (`f32` type)
 
-#![cfg_attr(stage0, allow(overflowing_literals))]
-
 #![stable(feature = "rust1", since = "1.0.0")]
 
 use intrinsics;

src/libcore/num/f32.rs

@@ -875,36 +875,9 @@ pub fn eq<T: ?Sized>(a: *const T, b: *const T) -> bool {
  a == b
 }
 
-#[stable(feature = "rust1", since = "1.0.0")]
-#[cfg(stage0)]
-impl<T: ?Sized> Clone for *const T {
- #[inline]
- fn clone(&self) -> *const T {
- *self
- }
-}
-
-#[stable(feature = "rust1", since = "1.0.0")]
-#[cfg(stage0)]
-impl<T: ?Sized> Clone for *mut T {
- #[inline]
- fn clone(&self) -> *mut T {
- *self
- }
-}
-
 // Impls for function pointers
 macro_rules! fnptr_impls_safety_abi {
  ($FnTy: ty, $($Arg: ident),*) => {
- #[stable(feature = "rust1", since = "1.0.0")]
- #[cfg(stage0)]
- impl<Ret, $($Arg),*> Clone for $FnTy {
- #[inline]
- fn clone(&self) -> Self {
- *self
- }
- }
-
  #[stable(feature = "fnptr_impls", since = "1.4.0")]
  impl<Ret, $($Arg),*> PartialEq for $FnTy {
  #[inline]