From fb3bd58e4f75c6752d0e2d32a04270044515c00d Mon Sep 17 00:00:00 2001
From: Alex Crichton <alex@alexcrichton.com>
Date: Wed, 5 Jun 2019 07:36:19 -0700
Subject: [PATCH] azure: Uninstall previous rustc from builders if any

Looks like Azure has updated images recently to install Rust by default,
but that can interfere with our own compiler (for example Cargo's test
suite we think) so be sure to uninstall it before proceeding.
---
 .azure-pipelines/steps/run.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.azure-pipelines/steps/run.yml b/.azure-pipelines/steps/run.yml
index 05b14eb45b2..a646b34fe7d 100644
--- a/.azure-pipelines/steps/run.yml
+++ b/.azure-pipelines/steps/run.yml
@@ -102,6 +102,10 @@ steps:
 
 - bash: |
     set -e
+    # Remove any preexisting rustup installation since it can interfere
+    # with the cargotest step and its auto-detection of things like Clippy in
+    # the environment
+    rustup self uninstall -y || true
     if [ "$IMAGE" = "" ]; then
       src/ci/run.sh
     else