1
Fork 0

Auto merge of #51680 - Mark-Simulacrum:acc-revert, r=Mark-Simulacrum

Revert #51662

This reverts that PR because it was never intended to merge into the master branch.
This commit is contained in:
bors 2018-06-21 13:36:37 +00:00
commit f790780451
3 changed files with 6 additions and 6 deletions

View file

@ -46,7 +46,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"

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: 2018-06-20
rustc: 1.27.0
cargo: 0.28.0
date: 2018-05-10
rustc: beta
cargo: beta
# When making a stable release the process currently looks like:
#
@ -34,4 +34,4 @@ cargo: 0.28.0
# looking at a beta source tarball and it's uncommented we'll shortly comment it
# out.
dev: 1
#dev: 1

@ -1 +1 @@
Subproject commit 89414e44dc94844888e59c08bc31dcccb1792800
Subproject commit 118e078c5badd520d18b92813fd88789c8d341ab