Less ambiguous field name

Author: oli-obk

tests/compiletest.rs

@@ -63,7 +63,7 @@ fn run_tests(mode: Mode, path: &str, target: Option<String>) -> Result<()> {
         path_filter: path_filter.collect(),
         program: miri_path(),
         output_conflict_handling,
-        manifest_path: use_std
+        dependencies_crate_manifest_path: use_std
             .then(|| std::env::current_dir().unwrap().join("test_dependencies").join("Cargo.toml")),
         dependency_builder: Some(DependencyBuilder {
             program: PathBuf::from("bash"),

ui_test/src/dependencies.rs

@@ -8,7 +8,7 @@ use crate::Config;
 
 /// Compiles dependencies and returns the crate names and corresponding rmeta files.
 pub fn build_dependencies(config: &Config) -> Result<Vec<(String, PathBuf)>> {
-    let manifest_path = match &config.manifest_path {
+    let manifest_path = match &config.dependencies_crate_manifest_path {
         Some(path) => path,
         None => return Ok(vec![]),
     };

ui_test/src/lib.rs

@@ -42,7 +42,7 @@ pub struct Config {
     /// Only run tests with one of these strings in their path/name
     pub path_filter: Vec<String>,
     /// Path to a `Cargo.toml` that describes which dependencies the tests can access.
-    pub manifest_path: Option<PathBuf>,
+    pub dependencies_crate_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<DependencyBuilder>,

ui_test/src/tests.rs

@@ -16,7 +16,7 @@ fn config() -> Config {
         path_filter: vec![],
         program: PathBuf::from("cake"),
         output_conflict_handling: OutputConflictHandling::Error,
-        manifest_path: None,
+        dependencies_crate_manifest_path: None,
         dependency_builder: None,
     }
 }