Use concat() instead of join("")

[rust.git] / src / cargo-fmt / main.rs

diff --git a/src/cargo-fmt/main.rs b/src/cargo-fmt/main.rs
index c31caa1447d050390346fb509fef84ef885643a3..eee102b6bf8b8ab03e0df774000cfd24b2798065 100644 (file)
--- a/src/cargo-fmt/main.rs
+++ b/src/cargo-fmt/main.rs
@@ -147,7 +147,10 @@ fn format_crate(
     strategy: &CargoFmtStrategy,
 ) -> Result<ExitStatus, io::Error> {
     let rustfmt_args = get_fmt_args();
-    let targets = if rustfmt_args.iter().any(|s| s == "--dump-default-config") {
+    let targets = if rustfmt_args
+        .iter()
+        .any(|s| ["--print-config", "-h", "--help", "-V", "--version"].contains(&s.as_str()))
+    {
         HashSet::new()
     } else {
         get_targets(strategy)?
@@ -371,9 +374,6 @@ fn run_rustfmt(
 fn get_cargo_metadata(manifest_path: Option<&Path>) -> Result<cargo_metadata::Metadata, io::Error> {
     match cargo_metadata::metadata(manifest_path) {
         Ok(metadata) => Ok(metadata),
-        Err(..) => Err(io::Error::new(
-            io::ErrorKind::Other,
-            "`cargo manifest` failed.",
-        )),
+        Err(error) => Err(io::Error::new(io::ErrorKind::Other, error.to_string())),
     }
 }