Rename some methods

Author: Aaron1011

src/bin/cargo-miri.rs

@@ -112,7 +112,7 @@ fn is_target_crate(is_build_script: bool) -> bool {
 }
 
 
-fn read_cargo_metadata() -> (impl Iterator<Item = cargo_metadata::Target>, String) {
+fn list_targets() -> impl Iterator<Item = cargo_metadata::Target> {
     // We need to get the manifest, and then the metadata, to enumerate targets.
     let manifest_path =
         get_arg_flag_value("--manifest-path").map(|m| Path::new(&m).canonicalize().unwrap());
@@ -152,7 +152,7 @@ fn read_cargo_metadata() -> (impl Iterator<Item = cargo_metadata::Target>, Strin
     let package = metadata.packages.remove(package_index);
 
     // Finally we got the list of targets to build
-    (package.targets.into_iter(), metadata.workspace_root.to_string_lossy().to_string())
+    package.targets.into_iter()
 }
 
 /// Returns the path to the `miri` binary
@@ -486,10 +486,8 @@ fn in_cargo_miri() {
         return;
     }
 
-    let (targets, root_dir) = read_cargo_metadata();
-
     // Now run the command.
-    for target in targets {
+    for target in list_targets() {
         let mut args = std::env::args().skip(skip);
         let kind = target
             .kind
@@ -571,7 +569,7 @@ fn inside_cargo_rustc() {
 
     let rustc_args = std::env::args().skip(2); // skip `cargo rustc`
 
-    let in_build_script = is_build_dep(std::env::args().skip(2));
+    let in_build_script = is_build_dep();
 
     let mut args = if in_build_script {
         rustc_args.collect()