From cb7348bf6794371e96147927d707c841dff6c9a3 Mon Sep 17 00:00:00 2001
From: Alex Crichton <alex@alexcrichton.com>
Date: Mon, 1 Jan 2018 11:20:10 -0800
Subject: [PATCH] Prepare the 1.23.0 stable release

* Update the release channel to `stable`
* Update the Cargo submodule to the latest tip for 1.23.0
---
 src/ci/run.sh   | 2 +-
 src/tools/cargo | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/ci/run.sh b/src/ci/run.sh
index ba37e6aee55b1..3f3836d767a33 100755
--- a/src/ci/run.sh
+++ b/src/ci/run.sh
@@ -43,7 +43,7 @@ fi
 # FIXME: need a scheme for changing this `nightly` value to `beta` and `stable`
 #        either automatically or manually.
 if [ "$DEPLOY$DEPLOY_ALT" != "" ]; then
-  RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --release-channel=beta"
+  RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --release-channel=stable"
   RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --enable-llvm-static-stdcpp"
 
   if [ "$NO_LLVM_ASSERTIONS" = "1" ]; then
diff --git a/src/tools/cargo b/src/tools/cargo
index 6a1aee06680d8..45043115c9094 160000
--- a/src/tools/cargo
+++ b/src/tools/cargo
@@ -1 +1 @@
-Subproject commit 6a1aee06680d8f074a25431c938c42d7e8d0ab4e
+Subproject commit 45043115c9094d82f0f407ebc7ef7e583f438d12