Prefer write_str over write! (2)

src/cli.rs

@@ -881,17 +881,16 @@ impl fmt::Display for Help {
             let size = term_size - indent;
             for s in desc.split(' ') {
                 if written + s.len() + 1 >= size {
-                    writeln!(f)?;
+                    f.write_str("\n")?;
                     (0..indent).try_for_each(|_| f.write_str(" "))?;
-                    f.write_str(s)?;
-                    written = s.len();
+                    written = 0;
                 } else if written == 0 {
-                    f.write_str(s)?;
-                    written += s.len();
                 } else {
-                    write!(f, " {s}")?;
-                    written += s.len() + 1;
+                    f.write_str(" ")?;
+                    written += 1;
                 }
+                f.write_str(s)?;
+                written += s.len();
             }
             Ok(())
         }
@@ -912,16 +911,16 @@ OPTIONS:",
         for &(short, long, value_name, desc, additional) in HELP {
             write!(f, "    {short:2}{} ", if short.is_empty() { " " } else { "," })?;
             if self.long {
-                if value_name.is_empty() {
-                    writeln!(f, "{long}")?;
-                } else {
-                    writeln!(f, "{long} {value_name}")?;
+                f.write_str(long)?;
+                if !value_name.is_empty() {
+                    write!(f, " {value_name}")?;
                 }
+                f.write_str("\n")?;
                 write(f, 12, true, self.term_size, desc)?;
-                writeln!(f, ".\n")?;
+                f.write_str(".\n\n")?;
                 for desc in additional {
                     write(f, 12, true, self.term_size, desc)?;
-                    writeln!(f, "\n")?;
+                    f.write_str("\n\n")?;
                 }
             } else {
                 if value_name.is_empty() {
@@ -931,21 +930,21 @@ OPTIONS:",
                     write!(f, "{long:32} ")?;
                 }
                 write(f, 41, false, self.term_size, desc)?;
-                writeln!(f)?;
+                f.write_str("\n")?;
             }
         }
         if !self.long {
-            writeln!(f)?;
+            f.write_str("\n")?;
         }
 
-        writeln!(
-            f,
+        f.write_str(
             "\
 Some common cargo commands are (see all commands with --list):
     build       Compile the current package
     check       Analyze the current package and report errors, but don't build object files
     run         Run a binary or example of the local package
-    test        Run the tests"
+    test        Run the tests
+",
         )
     }
 }

src/main.rs

@@ -503,8 +503,7 @@ struct KeepGoing {
 
 impl fmt::Display for KeepGoing {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        writeln!(f, "failed to run {} commands", self.count)?;
-        writeln!(f)?;
+        writeln!(f, "failed to run {} commands\n", self.count)?;
         writeln!(f, "failed commands:")?;
         for (pkg, commands) in &self.failed_commands {
             writeln!(f, "    {pkg}:")?;

src/version.rs

@@ -66,7 +66,7 @@ impl fmt::Display for VersionRange {
         if let MaybeVersion::Version(start) = self.start_inclusive {
             write!(f, "{start}")?;
         }
-        write!(f, "..")?;
+        f.write_str("..")?;
         if let MaybeVersion::Version(end) = self.end_inclusive {
             write!(f, "={end}")?;
         }