diff --git a/src/ci/run.sh b/src/ci/run.sh
index b7e8176255997..b0e1b1651055f 100755
--- a/src/ci/run.sh
+++ b/src/ci/run.sh
@@ -43,7 +43,7 @@ fi
#
# FIXME: need a scheme for changing this `nightly` value to `beta` and `stable`
# either automatically or manually.
-export RUST_RELEASE_CHANNEL=beta
+export RUST_RELEASE_CHANNEL=nightly
if [ "$DEPLOY$DEPLOY_ALT" != "" ]; then
RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --release-channel=$RUST_RELEASE_CHANNEL"
RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --enable-llvm-static-stdcpp"
diff --git a/src/libcore/num/mod.rs b/src/libcore/num/mod.rs
index 3a3fd27d52532..6827364c0f805 100644
--- a/src/libcore/num/mod.rs
+++ b/src/libcore/num/mod.rs
@@ -47,8 +47,6 @@ assert_eq!(size_of::>(), size_of::<", st
#[stable(feature = "nonzero", since = "1.28.0")]
#[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd, Hash)]
#[repr(transparent)]
- // FIXME: the rustc_layout_scalar_valid_range_start attr is marked as unused
- #[cfg_attr(stage0, allow(unused_attributes))]
#[rustc_layout_scalar_valid_range_start(1)]
pub struct $Ty($Int);
}
@@ -70,8 +68,6 @@ assert_eq!(size_of:: >(), size_of::<", st
#[inline]
pub fn new(n: $Int) -> Option {
if n != 0 {
- // FIXME: this unsafe block is actually needed
- #[cfg_attr(stage0, allow(unused_unsafe))]
Some(unsafe { $Ty(n) })
} else {
None
diff --git a/src/libcore/ptr.rs b/src/libcore/ptr.rs
index 979a7b231ecf3..02eef07afd7ab 100644
--- a/src/libcore/ptr.rs
+++ b/src/libcore/ptr.rs
@@ -2718,8 +2718,6 @@ impl PartialOrd for *mut T {
(if you also use #[may_dangle]), Send, and/or Sync")]
#[doc(hidden)]
#[repr(transparent)]
-// FIXME: the rustc_layout_scalar_valid_range_start attr is marked as unused
-#[cfg_attr(stage0, allow(unused_attributes))]
#[rustc_layout_scalar_valid_range_start(1)]
pub struct Unique {
pointer: *const T,
@@ -2785,8 +2783,6 @@ impl Unique {
/// Creates a new `Unique` if `ptr` is non-null.
pub fn new(ptr: *mut T) -> Option {
if !ptr.is_null() {
- // FIXME: this unsafe block is actually needed
- #[cfg_attr(stage0, allow(unused_unsafe))]
Some(unsafe { Unique { pointer: ptr as _, _marker: PhantomData } })
} else {
None
@@ -2843,8 +2839,6 @@ impl fmt::Pointer for Unique {
#[unstable(feature = "ptr_internals", issue = "0")]
impl<'a, T: ?Sized> From<&'a mut T> for Unique {
fn from(reference: &'a mut T) -> Self {
- // FIXME: this unsafe block is actually needed
- #[cfg_attr(stage0, allow(unused_unsafe))]
unsafe { Unique { pointer: reference as *mut T, _marker: PhantomData } }
}
}
@@ -2852,8 +2846,6 @@ impl<'a, T: ?Sized> From<&'a mut T> for Unique {
#[unstable(feature = "ptr_internals", issue = "0")]
impl<'a, T: ?Sized> From<&'a T> for Unique {
fn from(reference: &'a T) -> Self {
- // FIXME: this unsafe block is actually needed
- #[cfg_attr(stage0, allow(unused_unsafe))]
unsafe { Unique { pointer: reference as *const T, _marker: PhantomData } }
}
}
@@ -2861,8 +2853,6 @@ impl<'a, T: ?Sized> From<&'a T> for Unique {
#[unstable(feature = "ptr_internals", issue = "0")]
impl<'a, T: ?Sized> From> for Unique {
fn from(p: NonNull) -> Self {
- // FIXME: this unsafe block is actually needed
- #[cfg_attr(stage0, allow(unused_unsafe))]
unsafe { Unique { pointer: p.pointer, _marker: PhantomData } }
}
}
@@ -3052,8 +3042,6 @@ impl hash::Hash for NonNull {
impl From> for NonNull {
#[inline]
fn from(unique: Unique) -> Self {
- // FIXME: this unsafe block is actually needed
- #[cfg_attr(stage0, allow(unused_unsafe))]
unsafe { NonNull { pointer: unique.pointer } }
}
}
@@ -3062,8 +3050,6 @@ impl From> for NonNull {
impl<'a, T: ?Sized> From<&'a mut T> for NonNull {
#[inline]
fn from(reference: &'a mut T) -> Self {
- // FIXME: this unsafe block is actually needed
- #[cfg_attr(stage0, allow(unused_unsafe))]
unsafe { NonNull { pointer: reference as *mut T } }
}
}
@@ -3072,8 +3058,6 @@ impl<'a, T: ?Sized> From<&'a mut T> for NonNull {
impl<'a, T: ?Sized> From<&'a T> for NonNull {
#[inline]
fn from(reference: &'a T) -> Self {
- // FIXME: this unsafe block is actually needed
- #[cfg_attr(stage0, allow(unused_unsafe))]
unsafe { NonNull { pointer: reference as *const T } }
}
}
diff --git a/src/stage0.txt b/src/stage0.txt
index 0983add49ca77..2e376ed1cede5 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: 2019-01-16
-rustc: 1.32.0
-cargo: 0.33.0
+date: 2019-01-04
+rustc: beta
+cargo: beta
# When making a stable release the process currently looks like:
#
@@ -34,4 +34,4 @@ cargo: 0.33.0
# looking at a beta source tarball and it's uncommented we'll shortly comment it
# out.
-dev: 1
+#dev: 1
diff --git a/src/tools/cargo b/src/tools/cargo
index 9b5d4b755617d..2b4a5f1f0bb6e 160000
--- a/src/tools/cargo
+++ b/src/tools/cargo
@@ -1 +1 @@
-Subproject commit 9b5d4b755617d60dd841912b354be8a6b6b3849a
+Subproject commit 2b4a5f1f0bb6e13759e88ea9512527b0beba154f