From 68f70195fa562280f9e23b39bc19e05fe4239856 Mon Sep 17 00:00:00 2001
From: Ralf Jung <post@ralfj.de>
Date: Mon, 2 Mar 2020 22:10:48 +0100
Subject: [PATCH] rename xargo -> xargo_check

---
 src/bin/cargo-miri.rs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/bin/cargo-miri.rs b/src/bin/cargo-miri.rs
index 1a99e5786ff7..8f26aaf4e91a 100644
--- a/src/bin/cargo-miri.rs
+++ b/src/bin/cargo-miri.rs
@@ -100,7 +100,7 @@ fn cargo() -> Command {
     }
 }
 
-fn xargo() -> Command {
+fn xargo_check() -> Command {
     if let Ok(val) = std::env::var("XARGO_CHECK") {
         // Bootstrap tells us where to find xargo
         Command::new(val)
@@ -202,7 +202,7 @@ fn test_sysroot_consistency() {
 }
 
 fn xargo_version() -> Option<(u32, u32, u32)> {
-    let out = xargo().arg("--version").output().ok()?;
+    let out = xargo_check().arg("--version").output().ok()?;
     if !out.status.success() {
         return None;
     }
@@ -376,7 +376,7 @@ path = "lib.rs"
     // Prepare xargo invocation.
     let target = get_arg_flag_value("--target");
     let print_sysroot = !ask_user && has_arg_flag("--print-sysroot"); // whether we just print the sysroot path
-    let mut command = xargo();
+    let mut command = xargo_check();
     command.arg("build").arg("-q");
     command.current_dir(&dir);
     command.env("RUSTFLAGS", miri::miri_default_args().join(" "));