[beta]: Prepare the 1.31.0 stable release

alexcrichton · pietroalbini · commit a330092af0ee · 2018-10-29T14:50:15.000+01:00
* Update to Cargo's branched 1.31.0 branch
* Update bootstrap compiler to stable 1.30.0
* Update the channel to `beta`
diff --git a/src/ci/run.sh b/src/ci/run.sh
@@ -51,7 +51,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/tools/cargo b/src/tools/cargo
@@ -1 +1 @@
-Subproject commit 2d0863f657e6f45159fc7412267eee3e659185e5
+Subproject commit efb7972a095bcd043dfd55edca3a3fd1590b34c8

Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ fi`
`51`	`51`	`#`
`52`	`52`	# FIXME: need a scheme for changing this `nightly` value to `beta` and `stable`
`53`	`53`	`# either automatically or manually.`
`54`		`-export RUST_RELEASE_CHANNEL=nightly`
	`54`	`+export RUST_RELEASE_CHANNEL=beta`
`55`	`55`	`if [ "$DEPLOY$DEPLOY_ALT" != "" ]; then`
`56`	`56`	`RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --release-channel=$RUST_RELEASE_CHANNEL"`
`57`	`57`	`RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --enable-llvm-static-stdcpp"`