Avoid extraneous semicolons

oli-obk · Jun 21, 2024 · e7c0428 · e7c0428
1 parent ad6c27e
commit e7c0428
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 14 deletions.
diff --git a/src/status_emitter.rs b/src/status_emitter.rs
@@ -474,16 +474,25 @@ impl StatusEmitter for Text {
                     }
                     println!();
                     print!("test result: {}.", "FAIL".bright_red());
-                    print!(" {} failed;", self.failures.len().to_string().green());
+                    print!(" {} failed", self.failures.len().to_string().green());
+                    if self.succeeded > 0 || self.ignored > 0 || self.filtered > 0 {
+                        print!(";");
+                    }
                 }
                 if self.succeeded > 0 {
-                    print!(" {} passed;", self.succeeded.to_string().green());
+                    print!(" {} passed", self.succeeded.to_string().green());
+                    if self.ignored > 0 || self.filtered > 0 {
+                        print!(";");
+                    }
                 }
                 if self.ignored > 0 {
-                    print!(" {} ignored;", self.ignored.to_string().yellow());
+                    print!(" {} ignored", self.ignored.to_string().yellow());
+                    if self.filtered > 0 {
+                        print!(";");
+                    }
                 }
                 if self.filtered > 0 {
-                    print!(" {} filtered out;", self.filtered.to_string().yellow());
+                    print!(" {} filtered out", self.filtered.to_string().yellow());
                 }
                 println!();
                 println!();

diff --git a/tests/integrations/basic-fail-mode/Cargo.stdout b/tests/integrations/basic-fail-mode/Cargo.stdout
@@ -11,7 +11,7 @@ test result: ok. 3 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; fini
 Building dependencies ... ok
 tests/actual_tests/foomp.rs ... ok
 
-test result: ok. 1 passed;
+test result: ok. 1 passed
 
 
 running 0 tests

diff --git a/tests/integrations/basic-fail/Cargo.stdout b/tests/integrations/basic-fail/Cargo.stdout
@@ -451,7 +451,7 @@ FAILURES:
     tests/actual_tests/touching_above_below.rs
     tests/actual_tests/touching_above_below_chain.rs
 
-test result: FAIL. 15 failed;
+test result: FAIL. 15 failed
 
 Building dependencies ... ok
 tests/actual_tests_bless/abort.rs ... FAILED
@@ -1033,14 +1033,14 @@ FAILURES:
     tests/actual_tests_bless/unknown_revision2.rs
     tests/actual_tests_bless/wrong_diagnostic_code.rs
 
-test result: FAIL. 22 failed; 14 passed; 3 ignored;
+test result: FAIL. 22 failed; 14 passed; 3 ignored
 
 Building dependencies ... ok
 tests/actual_tests_bless_yolo/revisions_bad.rs (revision `foo`) ... ok
 tests/actual_tests_bless_yolo/revisions_bad.rs (revision `bar`) ... ok
 tests/actual_tests_bless_yolo/rustfix-maybe-incorrect.rs ... ok
 
-test result: ok. 3 passed;
+test result: ok. 3 passed
 
 tests/actual_tests/bad_pattern.rs ... FAILED
 tests/actual_tests/executable.rs ... FAILED
@@ -1386,7 +1386,7 @@ FAILURES:
     tests/actual_tests/touching_above_below.rs
     tests/actual_tests/touching_above_below_chain.rs
 
-test result: FAIL. 15 failed;
+test result: FAIL. 15 failed
 
 tests/actual_tests/bad_pattern.rs ... FAILED
 tests/actual_tests/executable.rs ... FAILED
@@ -1618,7 +1618,7 @@ FAILURES:
     tests/actual_tests/touching_above_below.rs
     tests/actual_tests/touching_above_below_chain.rs
 
-test result: FAIL. 15 failed;
+test result: FAIL. 15 failed
 
 
 running 0 tests

diff --git a/tests/integrations/basic/Cargo.stdout b/tests/integrations/basic/Cargo.stdout
@@ -29,7 +29,7 @@ tests/actual_tests/unicode.rs ... ok
 tests/actual_tests/windows_paths.rs ... ok
 tests/actual_tests/subdir/aux_proc_macro.rs ... ok
 
-test result: ok. 17 passed;
+test result: ok. 17 passed
 
 
 running 0 tests

diff --git a/tests/integrations/cargo-run/Cargo.stdout b/tests/integrations/cargo-run/Cargo.stdout
@@ -8,5 +8,5 @@ tests/actual_tests/matching_stdin.rs ... ok
 tests/actual_tests/mismatching_stdin.rs ... ok
 tests/actual_tests/no_stdin.rs ... ok
 
-test result: ok. 4 passed;
+test result: ok. 4 passed
 
diff --git a/tests/integrations/dep-fail/Cargo.stdout b/tests/integrations/dep-fail/Cargo.stdout
@@ -31,7 +31,7 @@ BuildFinished { success: false }
 FAILURES:
     tests/ui/basic_test.rs
 
-test result: FAIL. 1 failed;
+test result: FAIL. 1 failed
 
 
 running 0 tests

diff --git a/tests/integrations/ui_test_dep_bug/Cargo.stdout b/tests/integrations/ui_test_dep_bug/Cargo.stdout
@@ -6,7 +6,7 @@ test result: ok. 0 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; fini
 Building dependencies ... ok
 tests/ui/basic_test.rs ... ok
 
-test result: ok. 1 passed;
+test result: ok. 1 passed
 
 
 running 0 tests