OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Auto merge of #57694 - pietroalbini:revert-beta-on-master, r=pietroalbini

Browse Source 
Revert "Auto merge of #57670 - rust-lang:beta-next, r=Mark-Simulacrum"

For whatever reason bors merged this in master `:/`

r? @ghost
This commit is contained in:
bors 2019-01-17 10:15:57 +00:00
commit daa53a52a2
5 changed files with 6 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/ci/run.sh
View File

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

4
src/libcore/num/mod.rs
View File

@ -47,8 +47,6 @@ assert_eq!(size_of::<Option<std::num::", stringify!($Ty), ">>(), 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::<Option<std::num::", stringify!($Ty), ">>(), size_of::<", st
#[inline]
pub fn new(n: $Int) -> Option<Self> {
if n != 0 {
// FIXME: this unsafe block is actually needed
#[cfg_attr(stage0, allow(unused_unsafe))]
Some(unsafe { $Ty(n) })
} else {
None

16
src/libcore/ptr.rs
View File

@ -2718,8 +2718,6 @@ impl<T: ?Sized> 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<T: ?Sized> {
pointer: *const T,
@ -2785,8 +2783,6 @@ impl<T: ?Sized> Unique<T> {
/// Creates a new `Unique` if `ptr` is non-null.
pub fn new(ptr: *mut T) -> Option<Self> {
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<T: ?Sized> fmt::Pointer for Unique<T> {
#[unstable(feature = "ptr_internals", issue = "0")]
impl<'a, T: ?Sized> From<&'a mut T> for Unique<T> {
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<T> {
#[unstable(feature = "ptr_internals", issue = "0")]
impl<'a, T: ?Sized> From<&'a T> for Unique<T> {
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<T> {
#[unstable(feature = "ptr_internals", issue = "0")]
impl<'a, T: ?Sized> From<NonNull<T>> for Unique<T> {
fn from(p: NonNull<T>) -> 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<T: ?Sized> hash::Hash for NonNull<T> {
impl<T: ?Sized> From<Unique<T>> for NonNull<T> {
#[inline]
fn from(unique: Unique<T>) -> Self {
// FIXME: this unsafe block is actually needed
#[cfg_attr(stage0, allow(unused_unsafe))]
unsafe { NonNull { pointer: unique.pointer } }
}
}
@ -3062,8 +3050,6 @@ impl<T: ?Sized> From<Unique<T>> for NonNull<T> {
impl<'a, T: ?Sized> From<&'a mut T> for NonNull<T> {
#[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<T> {
impl<'a, T: ?Sized> From<&'a T> for NonNull<T> {
#[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 } }
}
}

8
src/stage0.txt
View File

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

2
src/tools/cargo

@ -1 +1 @@
Subproject commit 9b5d4b755617d60dd841912b354be8a6b6b3849a
Subproject commit 2b4a5f1f0bb6e13759e88ea9512527b0beba154f