rustfmt

Author: weihanglo

src/bin/cargo/commands/pkgid.rs

@@ -18,9 +18,7 @@ pub fn exec(config: &mut Config, args: &ArgMatches<'_>) -> CliResult {
     if !args.is_present("spec") && args.is_present_with_zero_values("package") {
         print_available_packages(&ws)?
     }
-    let spec = args.value_of("spec").or_else(|| {
-        args.value_of("package")
-    });
+    let spec = args.value_of("spec").or_else(|| args.value_of("package"));
     let spec = ops::pkgid(&ws, spec)?;
     cargo::drop_println!(config, "{}", spec);
     Ok(())

src/bin/cargo/commands/uninstall.rs

@@ -20,7 +20,8 @@ pub fn exec(config: &mut Config, args: &ArgMatches<'_>) -> CliResult {
         return Err(anyhow::anyhow!(
             "\"--package <SPEC>\" requires a SPEC format value.\n\
             Run `cargo help pkgid` for more information about SPEC format."
-        ).into())
+        )
+        .into());
     }
 
     let specs = args

src/cargo/util/command_prelude.rs

@@ -56,7 +56,11 @@ pub trait AppExt: Sized {
     }
 
     fn arg_package(self, package: &'static str) -> Self {
-        self._arg(optinal_opt("package", package).short("p").value_name("SPEC"))
+        self._arg(
+            optinal_opt("package", package)
+                .short("p")
+                .value_name("SPEC"),
+        )
     }
 
     fn arg_jobs(self) -> Self {

src/cargo/util/workspace.rs

@@ -67,14 +67,13 @@ pub fn print_available_packages(ws: &Workspace<'_>) -> CargoResult<()> {
         writeln!(output, "No packages available.")?;
     } else {
         writeln!(output, "Possible packages/workspace members:")?;
-        for package in packages  {
+        for package in packages {
             writeln!(output, "    {}", package)?;
         }
     }
     bail!("{}", output)
 }
 
-
 pub fn print_available_examples(ws: &Workspace<'_>, options: &CompileOptions) -> CargoResult<()> {
     print_available_targets(Target::is_example, ws, options, "--example", "examples")
 }

tests/testsuite/install.rs

@@ -1185,7 +1185,8 @@ fn uninstall_multiple_and_specifying_bin() {
 fn uninstall_with_empty_pakcage_option() {
     cargo_process("uninstall -p")
         .with_status(101)
-        .with_stderr("\
+        .with_stderr(
+            "\
 [ERROR] \"--package <SPEC>\" requires a SPEC format value.
 Run `cargo help pkgid` for more information about SPEC format.
 ",