From eafc100b50684b629268acfb58b417ba1bbb3ceb Mon Sep 17 00:00:00 2001
From: Oli Scherer <git-spam-no-reply9815368754983@oli-obk.de>
Date: Wed, 31 Aug 2022 11:06:35 +0000
Subject: [PATCH] Bump ui_test to 0.3.1

---
 Cargo.lock           |  4 ++--
 Cargo.toml           |  2 +-
 tests/compiletest.rs | 21 +++++++++------------
 3 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 1ce41f0a85e3..28be08c467cd 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -754,9 +754,9 @@ dependencies = [
 
 [[package]]
 name = "ui_test"
-version = "0.2.0"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ee6b579f4a09b0cf15b910e8edbaaae5bc66d0674a892ec4dbd5e8a5d094d979"
+checksum = "7d1f546a5883ae78da735bba529ec1116661e2f73582f23920d994dc97da3a22"
 dependencies = [
  "cargo_metadata",
  "color-eyre",
diff --git a/Cargo.toml b/Cargo.toml
index fee63359005e..0a3dfc2a84e3 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -40,7 +40,7 @@ libc = "0.2"
 
 [dev-dependencies]
 colored = "2"
-ui_test = "0.2"
+ui_test = "0.3.1"
 # Features chosen to match those required by env_logger, to avoid rebuilds
 regex = { version = "1.5.5", default-features = false, features = ["perf", "std"] }
 lazy_static = "1.4.0"
diff --git a/tests/compiletest.rs b/tests/compiletest.rs
index 924d253b4cfc..fc5b8c6fa99f 100644
--- a/tests/compiletest.rs
+++ b/tests/compiletest.rs
@@ -2,7 +2,7 @@ use colored::*;
 use regex::Regex;
 use std::path::{Path, PathBuf};
 use std::{env, process::Command};
-use ui_test::{color_eyre::Result, Config, DependencyBuilder, Mode, OutputConflictHandling};
+use ui_test::{color_eyre::Result, Config, Mode, OutputConflictHandling};
 
 fn miri_path() -> PathBuf {
     PathBuf::from(option_env!("MIRI").unwrap_or(env!("CARGO_BIN_EXE_miri")))
@@ -114,17 +114,14 @@ fn run_tests(
     if with_dependencies && use_std {
         config.dependencies_crate_manifest_path =
             Some(Path::new("test_dependencies").join("Cargo.toml"));
-        config.dependency_builder = Some(DependencyBuilder {
-            program: std::env::var_os("CARGO").unwrap().into(),
-            args: vec![
-                "run".into(),
-                "--manifest-path".into(),
-                "cargo-miri/Cargo.toml".into(),
-                "--".into(),
-                "miri".into(),
-            ],
-            envs: vec![],
-        });
+        config.dependency_builder.args = vec![
+            "run".into(),
+            "--manifest-path".into(),
+            "cargo-miri/Cargo.toml".into(),
+            "--".into(),
+            "miri".into(),
+            "run".into(),
+        ];
     }
     ui_test::run_tests(config)
 }