Pacify clippy

Author: oli-obk

tests/compiletest.rs

@@ -2,7 +2,7 @@ use colored::*;
 use regex::Regex;
 use std::env;
 use std::path::PathBuf;
-use ui_test::{color_eyre::Result, Config, Mode, OutputConflictHandling};
+use ui_test::{color_eyre::Result, Config, DependencyBuilder, Mode, OutputConflictHandling};
 
 fn miri_path() -> PathBuf {
     PathBuf::from(option_env!("MIRI").unwrap_or(env!("CARGO_BIN_EXE_miri")))
@@ -61,11 +61,11 @@ fn run_tests(mode: Mode, path: &str, target: Option<String>) -> Result<()> {
         program: miri_path(),
         output_conflict_handling,
         manifest_path: Some(std::env::current_dir()?.join("test_dependencies").join("Cargo.toml")),
-        dependency_builder: Some((
-            std::env::current_dir()?.join("miri"),
-            vec!["cargo".to_string()],
-            vec![("MIRI_SYSROOT".to_string(), std::env::var("MIRI_SYSROOT").unwrap())],
-        )),
+        dependency_builder: Some(DependencyBuilder {
+            program: std::env::current_dir()?.join("miri"),
+            args: vec!["cargo".to_string()],
+            envs: vec![("MIRI_SYSROOT".to_string(), std::env::var("MIRI_SYSROOT").unwrap())],
+        }),
     };
     ui_test::run_tests(config)
 }

ui_test/src/dependencies.rs

@@ -13,7 +13,7 @@ pub fn build_dependencies(config: &Config) -> Result<Vec<(String, PathBuf)>> {
         None => return Ok(vec![]),
     };
     let (program, args, envs): (&Path, &[_], &[_]) = match &config.dependency_builder {
-        Some((path, args, envs)) => (path, args, envs),
+        Some(db) => (&db.program, &db.args, &db.envs),
         None => (Path::new("cargo"), &[], &[]),
     };
     let mut build = Command::new(program);

ui_test/src/lib.rs

@@ -44,7 +44,14 @@ pub struct Config {
     pub manifest_path: Option<PathBuf>,
     /// Can be used to override what command to run instead of `cargo` to build the
     /// dependencies in `manifest_path`
-    pub dependency_builder: Option<(PathBuf, Vec<String>, Vec<(String, String)>)>,
+    pub dependency_builder: Option<DependencyBuilder>,
+}
+
+#[derive(Debug)]
+pub struct DependencyBuilder {
+    pub program: PathBuf,
+    pub args: Vec<String>,
+    pub envs: Vec<(String, String)>,
 }
 
 #[derive(Debug)]