From e2e975181cc909c90f67f333d3fc903c5dc9a7f3 Mon Sep 17 00:00:00 2001 From: Alex Crichton Date: Mon, 1 Jan 2018 16:00:09 -0800 Subject: [PATCH 1/3] [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 --- src/ci/run.sh | 2 +- src/liballoc/boxed.rs | 6 ++---- src/stage0.txt | 8 ++++---- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/src/ci/run.sh b/src/ci/run.sh index dab385c09649c..fadb5b12a6302 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 6f125cdba8190..31e1184baff06 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 eb0bedf64b23c..182831b3852ee 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 From d5c7ba8b0b1e131a96556034f814743bf3878f10 Mon Sep 17 00:00:00 2001 From: Alex Crichton Date: Tue, 21 Nov 2017 06:30:49 -0800 Subject: [PATCH 2/3] rustbuild: Allow using unstable rustdoc features on beta I believe this was forgotten from #45191 but hopefully is a simple fix! --- src/bootstrap/builder.rs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/bootstrap/builder.rs b/src/bootstrap/builder.rs index bdc00295a2041..16de31406f847 100644 --- a/src/bootstrap/builder.rs +++ b/src/bootstrap/builder.rs @@ -419,7 +419,8 @@ impl<'a> Builder<'a> { .env("RUSTC_LIBDIR", self.sysroot_libdir(compiler, self.build.build)) .env("CFG_RELEASE_CHANNEL", &self.build.config.channel) .env("RUSTDOC_REAL", self.rustdoc(host)) - .env("RUSTDOC_CRATE_VERSION", self.build.rust_version()); + .env("RUSTDOC_CRATE_VERSION", self.build.rust_version()) + .env("RUSTC_BOOTSTRAP", "1"); if let Some(linker) = self.build.linker(host) { cmd.env("RUSTC_TARGET_LINKER", linker); } From 95d5e31e91ff6bf80f004fec04646fb7b727b798 Mon Sep 17 00:00:00 2001 From: Alex Crichton Date: Tue, 2 Jan 2018 10:01:40 -0800 Subject: [PATCH 3/3] Don't verify miri/clippy for now --- src/ci/docker/x86_64-gnu-tools/checktools.sh | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/ci/docker/x86_64-gnu-tools/checktools.sh b/src/ci/docker/x86_64-gnu-tools/checktools.sh index b9268fe62ed06..8ce67518c1658 100755 --- a/src/ci/docker/x86_64-gnu-tools/checktools.sh +++ b/src/ci/docker/x86_64-gnu-tools/checktools.sh @@ -23,16 +23,14 @@ touch "$TOOLSTATE_FILE" set +e python2.7 "$X_PY" test --no-fail-fast \ src/tools/rls \ - src/tools/rustfmt \ - src/tools/miri \ - src/tools/clippy + src/tools/rustfmt set -e cat "$TOOLSTATE_FILE" # If this PR is intended to update one of these tools, do not let the build pass # when they do not test-pass. -for TOOL in rls rustfmt miri clippy; do +for TOOL in rls rustfmt; do echo "Verifying status of $TOOL..." if echo "$CHANGED_FILES" | grep -q "^M[[:blank:]]src/tools/$TOOL$"; then echo "This PR updated 'src/tools/$TOOL', verifying if status is 'test-pass'..."