Skip to content

Commit a74cf7d

Browse files
committed
Auto merge of #47119 - alexcrichton:beta-next, r=alexcrichton
[beta] Prepare the 1.24.0 beta release * Update the channel of this release * Update the bootstrap compiler to the dev artifacts * Fix compile for last-minute backports
2 parents b65f0be + e2e9751 commit a74cf7d

File tree

3 files changed

+7
-9
lines changed

3 files changed

+7
-9
lines changed

src/ci/run.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ fi
4242
#
4343
# FIXME: need a scheme for changing this `nightly` value to `beta` and `stable`
4444
# either automatically or manually.
45-
export RUST_RELEASE_CHANNEL=nightly
45+
export RUST_RELEASE_CHANNEL=beta
4646
if [ "$DEPLOY$DEPLOY_ALT" != "" ]; then
4747
RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --release-channel=$RUST_RELEASE_CHANNEL"
4848
RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --enable-llvm-static-stdcpp"

src/liballoc/boxed.rs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -300,7 +300,7 @@ impl<T: ?Sized> Box<T> {
300300
issue = "27730")]
301301
#[inline]
302302
pub unsafe fn from_unique(u: Unique<T>) -> Self {
303-
Box(u)
303+
mem::transmute(u)
304304
}
305305

306306
/// Consumes the `Box`, returning the wrapped raw pointer.
@@ -362,9 +362,7 @@ impl<T: ?Sized> Box<T> {
362362
issue = "27730")]
363363
#[inline]
364364
pub fn into_unique(b: Box<T>) -> Unique<T> {
365-
let unique = b.0;
366-
mem::forget(b);
367-
unique
365+
unsafe { mem::transmute(b) }
368366
}
369367

370368
/// Consumes and leaks the `Box`, returning a mutable reference,

src/stage0.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@
1212
# source tarball for a stable release you'll likely see `1.x.0` for rustc and
1313
# `0.x.0` for Cargo where they were released on `date`.
1414

15-
date: 2017-11-21
16-
rustc: beta
17-
cargo: beta
15+
date: 2018-01-02
16+
rustc: 1.23.0
17+
cargo: 0.24.0
1818

1919
# When making a stable release the process currently looks like:
2020
#
@@ -34,4 +34,4 @@ cargo: beta
3434
# looking at a beta source tarball and it's uncommented we'll shortly comment it
3535
# out.
3636

37-
#dev: 1
37+
dev: 1

0 commit comments

Comments
 (0)