diff --git a/src/ci/run.sh b/src/ci/run.sh index dab385c09649..fadb5b12a630 100755 --- a/src/ci/run.sh +++ b/src/ci/run.sh @@ -42,7 +42,7 @@ fi # # FIXME: need a scheme for changing this `nightly` value to `beta` and `stable` # either automatically or manually. -export RUST_RELEASE_CHANNEL=nightly +export RUST_RELEASE_CHANNEL=beta 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/liballoc/boxed.rs b/src/liballoc/boxed.rs index 6f125cdba819..31e1184baff0 100644 --- a/src/liballoc/boxed.rs +++ b/src/liballoc/boxed.rs @@ -300,7 +300,7 @@ impl Box { issue = "27730")] #[inline] pub unsafe fn from_unique(u: Unique) -> Self { - Box(u) + mem::transmute(u) } /// Consumes the `Box`, returning the wrapped raw pointer. @@ -362,9 +362,7 @@ impl Box { issue = "27730")] #[inline] pub fn into_unique(b: Box) -> Unique { - let unique = b.0; - mem::forget(b); - unique + unsafe { mem::transmute(b) } } /// Consumes and leaks the `Box`, returning a mutable reference, diff --git a/src/stage0.txt b/src/stage0.txt index eb0bedf64b23..182831b3852e 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: 2017-11-21 -rustc: beta -cargo: beta +date: 2018-01-02 +rustc: 1.23.0 +cargo: 0.24.0 # When making a stable release the process currently looks like: # @@ -34,4 +34,4 @@ cargo: beta # looking at a beta source tarball and it's uncommented we'll shortly comment it # out. -#dev: 1 +dev: 1