From 4f20348fd338609bc8101b39781fed7646b734cb Mon Sep 17 00:00:00 2001
From: Pietro Albini <pietro@pietroalbini.org>
Date: Wed, 6 Feb 2019 15:16:50 +0100
Subject: [PATCH 1/2] Revert "Rollup merge of #58162 - pietroalbini:track-259,
 r=alexcrichton"

This reverts commit 4c243e2c3d8f02cdcd22fe68acf6a0b3edca2078, reversing
changes made to 64f0032a3739b18ae45387744340d9c7ce48b145.
---
 appveyor.yml  | 5 +----
 src/ci/run.sh | 8 +-------
 2 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index 0ec4210af98b2..d70ad54b1c812 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -207,10 +207,7 @@ test_script:
   - sh src/ci/init_repo.sh . /c/cache/rustsrc
   - set SRC=.
   - set NO_CCACHE=1
-  # Added this debugging code to try tracking down https://github.com/rust-lang/rust/issues/58160
-  # Replace it with the commented line below after the issue with AppVeyor is fixed
-  - "sh src/ci/run.sh & set ret=%errorlevel% & echo exit code in appveyor.yml: %ret% & exit %ret%"
-#  - sh src/ci/run.sh
+  - sh src/ci/run.sh
 
 on_failure:
   # Dump crash log
diff --git a/src/ci/run.sh b/src/ci/run.sh
index 0841e70a6ed29..0f2517c7d1f55 100755
--- a/src/ci/run.sh
+++ b/src/ci/run.sh
@@ -127,13 +127,7 @@ if [ ! -z "$SCRIPT" ]; then
   set +e
   sh -x -c "$SCRIPT"
   ret=$?
-  echo "exit code in src/ci/run.sh: $ret"
-
-  echo "tasklist:"
-  tasklist
-  echo -n "location of sh: "
-  where sh
-
+  echo "script exited with $ret"
   exit $ret
 else
   do_make() {

From 99599245a3cbf056ea090e34e2a3741ef8e0ae88 Mon Sep 17 00:00:00 2001
From: Pietro Albini <pietro@pietroalbini.org>
Date: Wed, 6 Feb 2019 15:17:15 +0100
Subject: [PATCH 2/2] Revert "Auto merge of #57975 -
 alexcrichton:debug-exit-appveyor, r=pietroalbini"

This reverts commit d3d0bf0e9f4d748b95ed143cc636d159bfcb4a6f, reversing
changes made to 40e6a0bd766ca7b1c582b964131400b8c3e89d76.
---
 src/ci/run.sh | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/src/ci/run.sh b/src/ci/run.sh
index 0f2517c7d1f55..42d0d7db5964c 100755
--- a/src/ci/run.sh
+++ b/src/ci/run.sh
@@ -121,14 +121,7 @@ fi
 travis_fold end log-system-info
 
 if [ ! -z "$SCRIPT" ]; then
-  # This `set +e` followed by capturing the return value is a temporary measure
-  # to help debug "error with exit 259" on AppVeyor temporarily, otherwise all
-  # that's needed here is the `sh`
-  set +e
   sh -x -c "$SCRIPT"
-  ret=$?
-  echo "script exited with $ret"
-  exit $ret
 else
   do_make() {
     travis_fold start "make-$1"