Merge pull request #121 from camelid/improve-msg

Improve message for no CI builds found and various cleanup

Author: spastorino

src/main.rs

@@ -38,6 +38,14 @@ pub struct Commit {
 /// however, it does limit the amount of commits somewhat.
 const EPOCH_COMMIT: &str = "927c55d86b0be44337f37cf5b0a76fb8ba86e06c";
 
+const REPORT_HEADER: &str = "\
+==================================================================================
+= Please file this regression report on the rust-lang/rust GitHub repository     =
+=        New issue: https://github.com/rust-lang/rust/issues/new                 =
+=     Known issues: https://github.com/rust-lang/rust/issues                     =
+= Copy and paste the text below into the issue report thread.  Thanks!           =
+==================================================================================";
+
 #[derive(Debug, StructOpt)]
 #[structopt(after_help = "EXAMPLES:
     Run a fully automatic nightly bisect doing `cargo check`:
@@ -682,12 +690,12 @@ fn print_results(cfg: &Config, client: &Client, bisection_result: &BisectionResu
     }
 
     let tc_found = format!("Regression in {}", toolchains[*found]);
-    eprintln!("");
-    eprintln!("");
+    eprintln!();
+    eprintln!();
     eprintln!("{}", "*".repeat(80).dimmed().bold());
     eprintln!("{}", tc_found.red());
     eprintln!("{}", "*".repeat(80).dimmed().bold());
-    eprintln!("");
+    eprintln!();
 }
 
 fn print_final_report(
@@ -707,20 +715,8 @@ fn print_final_report(
         ..
     } = ci_bisection_result;
 
-    #[rustfmt::skip]
-    eprintln!("{}", "==================================================================================".dimmed());
-    #[rustfmt::skip]
-    eprintln!("{}", "= Please file this regression report on the rust-lang/rust GitHub repository     =".dimmed());
-    #[rustfmt::skip]
-    eprintln!("{}", "=        New issue: https://github.com/rust-lang/rust/issues/new                 =".dimmed());
-    #[rustfmt::skip]
-    eprintln!("{}", "=     Known issues: https://github.com/rust-lang/rust/issues                     =".dimmed());
-    #[rustfmt::skip]
-    eprintln!("{}", "= Copy and paste the text below into the issue report thread.  Thanks!           =".dimmed());
-    #[rustfmt::skip]
-    eprintln!("{}", "==================================================================================".dimmed());
-
-    eprintln!("");
+    eprintln!("{}", REPORT_HEADER.dimmed());
+    eprintln!();
 
     let (start, end) = searched_range(cfg, nightly_toolchains);
 
@@ -729,7 +725,7 @@ fn print_final_report(
     eprintln!("regressed nightly: {}", nightly_toolchains[*nightly_found],);
 
     eprintln!(
-        "searched commits: from https://github.com/rust-lang/rust/commit/{} to https://github.com/rust-lang/rust/commit/{1}",
+        "searched commits: from https://github.com/rust-lang/rust/commit/{0} to https://github.com/rust-lang/rust/commit/{1}",
         ci_toolchains.first().unwrap(),
         ci_toolchains.last().unwrap(),
     );
@@ -739,15 +735,15 @@ fn print_final_report(
         ci_toolchains[*ci_found],
     );
 
-    eprintln!("");
+    eprintln!();
     eprintln!("<details>");
     eprintln!(
         "<summary>bisected with <a href='{}'>cargo-bisect-rustc</a> v{}</summary>",
         env!("CARGO_PKG_REPOSITORY"),
         env!("CARGO_PKG_VERSION"),
     );
-    eprintln!("");
-    eprintln!("");
+    eprintln!();
+    eprintln!();
     if let Some(host) = option_env!("HOST") {
         eprintln!("Host triple: {}", host);
     }
@@ -760,7 +756,7 @@ fn print_final_report(
             eprint!("{} ", arg.to_string_lossy());
         }
     }
-    eprintln!("");
+    eprintln!();
     eprintln!("```");
     eprintln!("</details>");
 }
@@ -1149,7 +1145,7 @@ fn bisect_ci_in_commits(
 
     if commits.is_empty() {
         bail!(
-            "no commits between {} and {} within last 167 days",
+            "no CI builds available between {} and {} within last 167 days",
             start,
             end
         );
@@ -1162,7 +1158,7 @@ fn bisect_ci_in_commits(
     }
 
     eprintln!("validated commits found, specifying toolchains");
-    eprintln!("");
+    eprintln!();
 
     let toolchains = commits
         .into_iter()