Auto merge of #48183 - Mark-Simulacrum:beta-next, r=alexcrichton

bors · bors · commit 924c6444d791 · 2018-02-13T21:30:24.000Z
Beta: bootstrap from 1.24.0 stable. r? @alexcrichton I think this is all correct... not sure about Cargo, but seems fine for now, we can always change later.
diff --git a/src/Cargo.lock b/src/Cargo.lock
diff --git 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/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: 2018-01-02
-rustc: beta
-cargo: beta
+date: 2018-02-12
+rustc: 1.24.0
+cargo: 0.25.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
diff --git a/src/tools/cargo b/src/tools/cargo
@@ -1 +1 @@
-Subproject commit 1d6dfea44f97199d5d5c177c7dadcde393eaff9a
+Subproject commit 5891aecf37c6a19893ec1b542079db4b4d5b368e

Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ fi`
`42`	`42`	`#`
`43`	`43`	# FIXME: need a scheme for changing this `nightly` value to `beta` and `stable`
`44`	`44`	`# either automatically or manually.`
`45`		`-export RUST_RELEASE_CHANNEL=nightly`
	`45`	`+export RUST_RELEASE_CHANNEL=beta`
`46`	`46`	`if [ "$DEPLOY$DEPLOY_ALT" != "" ]; then`
`47`	`47`	`RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --release-channel=$RUST_RELEASE_CHANNEL"`
`48`	`48`	`RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --enable-llvm-static-stdcpp"`