change based on review

26 files changed, 60 insertions, 60 deletions

diff --git a/library/test/src/formatters/pretty.rs b/library/test/src/formatters/pretty.rs
index 00d4b18b302..543b9a6924a 100644
--- a/library/test/src/formatters/pretty.rs
+++ b/library/test/src/formatters/pretty.rs
@@ -169,7 +169,7 @@ impl<T: Write> PrettyFormatter<T> {
 
     fn write_test_name(&mut self, desc: &TestDesc) -> io::Result<()> {
         let name = desc.padded_name(self.max_name_len, desc.name.padding());
-        self.write_plain(&format!("test {} {} ... ", name, desc.test_mode_string()))?;
+        self.write_plain(&format!("test {} - {} ... ", name, desc.test_mode_string()))?;
 
         Ok(())
     }
diff --git a/library/test/src/formatters/terse.rs b/library/test/src/formatters/terse.rs
index a68ceb404f9..286b50b525d 100644
--- a/library/test/src/formatters/terse.rs
+++ b/library/test/src/formatters/terse.rs
@@ -158,7 +158,7 @@ impl<T: Write> TerseFormatter<T> {
 
     fn write_test_name(&mut self, desc: &TestDesc) -> io::Result<()> {
         let name = desc.padded_name(self.max_name_len, desc.name.padding());
-        self.write_plain(&format!("test {} {} ... ", name, desc.test_mode_string()))?;
+        self.write_plain(&format!("test {} - {} ... ", name, desc.test_mode_string()))?;
 
         Ok(())
     }
diff --git a/library/test/src/types.rs b/library/test/src/types.rs
index 61c644f7972..a2c3d5fa8ee 100644
--- a/library/test/src/types.rs
+++ b/library/test/src/types.rs
@@ -143,26 +143,26 @@ impl TestDesc {
         }
     }
 
-    pub fn test_mode_string(&self) -> String {
+    pub fn test_mode_string(&self) -> &'static str {
         if self.ignore {
-            return "ignore".to_string();
+            return &"ignore";
         }
         match self.should_panic {
             options::ShouldPanic::Yes | options::ShouldPanic::YesWithMessage(_) => {
-                return "should panic".to_string();
+                return &"should panic";
             }
-            _ => {}
+            options::ShouldPanic::No => {}
         }
         if self.allow_fail {
-            return "allow fail".to_string();
+            return &"allow fail";
         }
         if self.compile_fail {
-            return "compile fail".to_string();
+            return &"compile fail";
         }
         if self.no_run {
-            return "compile".to_string();
+            return &"compile";
         }
-        "run".to_string()
+        &"run"
     }
 }
 
diff --git a/src/test/rustdoc-ui/cfg-test.stdout b/src/test/rustdoc-ui/cfg-test.stdout
index fdd754609ef..42d3fbb48dd 100644
--- a/src/test/rustdoc-ui/cfg-test.stdout
+++ b/src/test/rustdoc-ui/cfg-test.stdout
@@ -1,7 +1,7 @@
 
 running 2 tests
-test $DIR/cfg-test.rs - Bar (line 27) run ... ok
-test $DIR/cfg-test.rs - Foo (line 19) run ... ok
+test $DIR/cfg-test.rs - Bar (line 27) - run ... ok
+test $DIR/cfg-test.rs - Foo (line 19) - run ... ok
 
 test result: ok. 2 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in $TIME
 
diff --git a/src/test/rustdoc-ui/doc-test-doctest-feature.stdout b/src/test/rustdoc-ui/doc-test-doctest-feature.stdout
index ecf5dcd056a..cfcb60332f4 100644
--- a/src/test/rustdoc-ui/doc-test-doctest-feature.stdout
+++ b/src/test/rustdoc-ui/doc-test-doctest-feature.stdout
@@ -1,6 +1,6 @@
 
 running 1 test
-test $DIR/doc-test-doctest-feature.rs - Foo (line 9) run ... ok
+test $DIR/doc-test-doctest-feature.rs - Foo (line 9) - run ... ok
 
 test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in $TIME
 
diff --git a/src/test/rustdoc-ui/doc-test-rustdoc-feature.stdout b/src/test/rustdoc-ui/doc-test-rustdoc-feature.stdout
index 7f900cb2858..8d7f1ad21d1 100644
--- a/src/test/rustdoc-ui/doc-test-rustdoc-feature.stdout
+++ b/src/test/rustdoc-ui/doc-test-rustdoc-feature.stdout
@@ -1,6 +1,6 @@
 
 running 1 test
-test $DIR/doc-test-rustdoc-feature.rs - Foo (line 10) run ... ok
+test $DIR/doc-test-rustdoc-feature.rs - Foo (line 10) - run ... ok
 
 test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in $TIME
 
diff --git a/src/test/rustdoc-ui/doctest-output.stdout b/src/test/rustdoc-ui/doctest-output.stdout
index 1b5857d251b..7a07d273e26 100644
--- a/src/test/rustdoc-ui/doctest-output.stdout
+++ b/src/test/rustdoc-ui/doctest-output.stdout
@@ -1,8 +1,8 @@
 
 running 3 tests
-test $DIR/doctest-output.rs - (line 8) run ... ok
-test $DIR/doctest-output.rs - ExpandedStruct (line 24) run ... ok
-test $DIR/doctest-output.rs - foo::bar (line 18) run ... ok
+test $DIR/doctest-output.rs - (line 8) - run ... ok
+test $DIR/doctest-output.rs - ExpandedStruct (line 24) - run ... ok
+test $DIR/doctest-output.rs - foo::bar (line 18) - run ... ok
 
 test result: ok. 3 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in $TIME
 
diff --git a/src/test/rustdoc-ui/failed-doctest-compile-fail.stdout b/src/test/rustdoc-ui/failed-doctest-compile-fail.stdout
index dc811df609c..af3a90a7410 100644
--- a/src/test/rustdoc-ui/failed-doctest-compile-fail.stdout
+++ b/src/test/rustdoc-ui/failed-doctest-compile-fail.stdout
@@ -1,6 +1,6 @@
 
 running 1 test
-test $DIR/failed-doctest-compile-fail.rs - Foo (line 9) compile fail ... FAILED
+test $DIR/failed-doctest-compile-fail.rs - Foo (line 9) - compile fail ... FAILED
 
 failures:
 
diff --git a/src/test/rustdoc-ui/failed-doctest-missing-codes.stdout b/src/test/rustdoc-ui/failed-doctest-missing-codes.stdout
index a76511eb29e..bacbb47b5f9 100644
--- a/src/test/rustdoc-ui/failed-doctest-missing-codes.stdout
+++ b/src/test/rustdoc-ui/failed-doctest-missing-codes.stdout
@@ -1,6 +1,6 @@
 
 running 1 test
-test $DIR/failed-doctest-missing-codes.rs - Foo (line 9) compile fail ... FAILED
+test $DIR/failed-doctest-missing-codes.rs - Foo (line 9) - compile fail ... FAILED
 
 failures:
 
diff --git a/src/test/rustdoc-ui/failed-doctest-output.stdout b/src/test/rustdoc-ui/failed-doctest-output.stdout
index 83c8c5301e0..7ba599ff11b 100644
--- a/src/test/rustdoc-ui/failed-doctest-output.stdout
+++ b/src/test/rustdoc-ui/failed-doctest-output.stdout
@@ -1,7 +1,7 @@
 
 running 2 tests
-test $DIR/failed-doctest-output.rs - OtherStruct (line 22) run ... FAILED
-test $DIR/failed-doctest-output.rs - SomeStruct (line 12) run ... FAILED
+test $DIR/failed-doctest-output.rs - OtherStruct (line 22) - run ... FAILED
+test $DIR/failed-doctest-output.rs - SomeStruct (line 12) - run ... FAILED
 
 failures:
 
diff --git a/src/test/rustdoc-ui/failed-doctest-should-panic.stdout b/src/test/rustdoc-ui/failed-doctest-should-panic.stdout
index e3d0216441b..6bd21423e69 100644
--- a/src/test/rustdoc-ui/failed-doctest-should-panic.stdout
+++ b/src/test/rustdoc-ui/failed-doctest-should-panic.stdout
@@ -1,6 +1,6 @@
 
 running 1 test
-test $DIR/failed-doctest-should-panic.rs - Foo (line 9) run ... FAILED
+test $DIR/failed-doctest-should-panic.rs - Foo (line 9) - run ... FAILED
 
 failures:
 
diff --git a/src/test/rustdoc-ui/issue-80992.stdout b/src/test/rustdoc-ui/issue-80992.stdout
index e7110dee4fb..d2b1cd1d550 100644
--- a/src/test/rustdoc-ui/issue-80992.stdout
+++ b/src/test/rustdoc-ui/issue-80992.stdout
@@ -1,6 +1,6 @@
 
 running 1 test
-test $DIR/issue-80992.rs - test (line 7) compile fail ... ok
+test $DIR/issue-80992.rs - test (line 7) - compile fail ... ok
 
 test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in $TIME
 
diff --git a/src/test/rustdoc-ui/issue-81662-shortness.stdout b/src/test/rustdoc-ui/issue-81662-shortness.stdout
index 3c2901e70f0..f9fdf7048d8 100644
--- a/src/test/rustdoc-ui/issue-81662-shortness.stdout
+++ b/src/test/rustdoc-ui/issue-81662-shortness.stdout
@@ -1,6 +1,6 @@
 
 running 1 test
-test $DIR/issue-81662-shortness.rs - foo (line 6) run ... FAILED
+test $DIR/issue-81662-shortness.rs - foo (line 6) - run ... FAILED
 
 failures:
 
diff --git a/src/test/rustdoc-ui/no-run-flag.stdout b/src/test/rustdoc-ui/no-run-flag.stdout
index 418691e4f0c..22d927317b3 100644
--- a/src/test/rustdoc-ui/no-run-flag.stdout
+++ b/src/test/rustdoc-ui/no-run-flag.stdout
@@ -1,12 +1,12 @@
 
 running 7 tests
-test $DIR/no-run-flag.rs - f (line 11) compile ... ok
-test $DIR/no-run-flag.rs - f (line 14) ignore ... ignored
-test $DIR/no-run-flag.rs - f (line 17) compile ... ok
-test $DIR/no-run-flag.rs - f (line 23) compile fail ... ok
-test $DIR/no-run-flag.rs - f (line 28) compile ... ok
-test $DIR/no-run-flag.rs - f (line 32) compile ... ok
-test $DIR/no-run-flag.rs - f (line 8) compile ... ok
+test $DIR/no-run-flag.rs - f (line 11) - compile ... ok
+test $DIR/no-run-flag.rs - f (line 14) - ignore ... ignored
+test $DIR/no-run-flag.rs - f (line 17) - compile ... ok
+test $DIR/no-run-flag.rs - f (line 23) - compile fail ... ok
+test $DIR/no-run-flag.rs - f (line 28) - compile ... ok
+test $DIR/no-run-flag.rs - f (line 32) - compile ... ok
+test $DIR/no-run-flag.rs - f (line 8) - compile ... ok
 
 test result: ok. 6 passed; 0 failed; 1 ignored; 0 measured; 0 filtered out; finished in $TIME
 
diff --git a/src/test/rustdoc-ui/run-directory.correct.stdout b/src/test/rustdoc-ui/run-directory.correct.stdout
index a5bc41ece99..1bb84a868a4 100644
--- a/src/test/rustdoc-ui/run-directory.correct.stdout
+++ b/src/test/rustdoc-ui/run-directory.correct.stdout
@@ -1,6 +1,6 @@
 
 running 1 test
-test $DIR/run-directory.rs - foo (line 10) run ... ok
+test $DIR/run-directory.rs - foo (line 10) - run ... ok
 
 test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in $TIME
 
diff --git a/src/test/rustdoc-ui/run-directory.incorrect.stdout b/src/test/rustdoc-ui/run-directory.incorrect.stdout
index 542043bc437..7f6bba8fe47 100644
--- a/src/test/rustdoc-ui/run-directory.incorrect.stdout
+++ b/src/test/rustdoc-ui/run-directory.incorrect.stdout
@@ -1,6 +1,6 @@
 
 running 1 test
-test $DIR/run-directory.rs - foo (line 19) run ... ok
+test $DIR/run-directory.rs - foo (line 19) - run ... ok
 
 test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in $TIME
 
diff --git a/src/test/rustdoc-ui/test-no_std.stdout b/src/test/rustdoc-ui/test-no_std.stdout
index 82dbffcbd55..35d44fa6bbd 100644
--- a/src/test/rustdoc-ui/test-no_std.stdout
+++ b/src/test/rustdoc-ui/test-no_std.stdout
@@ -1,6 +1,6 @@
 
 running 1 test
-test $DIR/test-no_std.rs - f (line 10) run ... ok
+test $DIR/test-no_std.rs - f (line 10) - run ... ok
 
 test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in $TIME
 
diff --git a/src/test/rustdoc-ui/test-type.stdout b/src/test/rustdoc-ui/test-type.stdout
index 8f36d643b2f..fb6c036a608 100644
--- a/src/test/rustdoc-ui/test-type.stdout
+++ b/src/test/rustdoc-ui/test-type.stdout
@@ -1,10 +1,10 @@
 
 running 5 tests
-test $DIR/test-type.rs - f (line 12) ignore ... ignored
-test $DIR/test-type.rs - f (line 15) compile ... ok
-test $DIR/test-type.rs - f (line 21) compile fail ... ok
-test $DIR/test-type.rs - f (line 6) run ... ok
-test $DIR/test-type.rs - f (line 9) run ... ok
+test $DIR/test-type.rs - f (line 12) - ignore ... ignored
+test $DIR/test-type.rs - f (line 15) - compile ... ok
+test $DIR/test-type.rs - f (line 21) - compile fail ... ok
+test $DIR/test-type.rs - f (line 6) - run ... ok
+test $DIR/test-type.rs - f (line 9) - run ... ok
 
 test result: ok. 4 passed; 0 failed; 1 ignored; 0 measured; 0 filtered out; finished in $TIME
 
diff --git a/src/test/rustdoc-ui/unparseable-doc-test.stdout b/src/test/rustdoc-ui/unparseable-doc-test.stdout
index dbbb6541b97..13526acfc47 100644
--- a/src/test/rustdoc-ui/unparseable-doc-test.stdout
+++ b/src/test/rustdoc-ui/unparseable-doc-test.stdout
@@ -1,6 +1,6 @@
 
 running 1 test
-test $DIR/unparseable-doc-test.rs - foo (line 7) run ... FAILED
+test $DIR/unparseable-doc-test.rs - foo (line 7) - run ... FAILED
 
 failures:
 
diff --git a/src/test/ui/test-attrs/test-filter-multiple.run.stdout b/src/test/ui/test-attrs/test-filter-multiple.run.stdout
index 6389d7f998f..5d6d5cbd3c3 100644
--- a/src/test/ui/test-attrs/test-filter-multiple.run.stdout
+++ b/src/test/ui/test-attrs/test-filter-multiple.run.stdout
@@ -1,7 +1,7 @@
 
 running 2 tests
-test test1 run ... ok
-test test2 run ... ok
+test test1 - run ... ok
+test test2 - run ... ok
 
 test result: ok. 2 passed; 0 failed; 0 ignored; 0 measured; 1 filtered out; finished in $TIME
 
diff --git a/src/test/ui/test-attrs/test-type.run.stdout b/src/test/ui/test-attrs/test-type.run.stdout
index 5f10c784f89..9f789526615 100644
--- a/src/test/ui/test-attrs/test-type.run.stdout
+++ b/src/test/ui/test-attrs/test-type.run.stdout
@@ -1,8 +1,8 @@
 
 running 3 tests
-test test_no_run ignore ... ignored
-test test_ok run ... ok
-test test_panic should panic ... ok
+test test_no_run - ignore ... ignored
+test test_ok - run ... ok
+test test_panic - should panic ... ok
 
 test result: ok. 2 passed; 0 failed; 1 ignored; 0 measured; 0 filtered out; finished in $TIME
 
diff --git a/src/test/ui/test-panic-abort-nocapture.run.stdout b/src/test/ui/test-panic-abort-nocapture.run.stdout
index 29d5172ce8c..e335cf05153 100644
--- a/src/test/ui/test-panic-abort-nocapture.run.stdout
+++ b/src/test/ui/test-panic-abort-nocapture.run.stdout
@@ -1,12 +1,12 @@
 
 running 4 tests
-test it_fails run ... about to fail
+test it_fails - run ... about to fail
 FAILED
-test it_panics should panic ... about to panic
+test it_panics - should panic ... about to panic
 ok
-test it_works run ... about to succeed
+test it_works - run ... about to succeed
 ok
-test it_writes_to_stdio run ... hello, world
+test it_writes_to_stdio - run ... hello, world
 testing123
 ok
 
diff --git a/src/test/ui/test-panic-abort.run.stdout b/src/test/ui/test-panic-abort.run.stdout
index 2842f08f6cc..0d9de10c981 100644
--- a/src/test/ui/test-panic-abort.run.stdout
+++ b/src/test/ui/test-panic-abort.run.stdout
@@ -1,10 +1,10 @@
 
 running 5 tests
-test it_exits run ... FAILED
-test it_fails run ... FAILED
-test it_panics should panic ... ok
-test it_works run ... ok
-test no_residual_environment run ... ok
+test it_exits - run ... FAILED
+test it_fails - run ... FAILED
+test it_panics - should panic ... ok
+test it_works - run ... ok
+test no_residual_environment - run ... ok
 
 failures:
 
diff --git a/src/test/ui/test-passed.run.stdout b/src/test/ui/test-passed.run.stdout
index cd4b0e466a3..995643a62c8 100644
--- a/src/test/ui/test-passed.run.stdout
+++ b/src/test/ui/test-passed.run.stdout
@@ -1,7 +1,7 @@
 
 running 2 tests
-test it_works run ... ok
-test it_works_too run ... ok
+test it_works - run ... ok
+test it_works_too - run ... ok
 
 test result: ok. 2 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in $TIME
 
diff --git a/src/test/ui/test-thread-capture.run.stdout b/src/test/ui/test-thread-capture.run.stdout
index db9d90f20f2..ce9ec63b526 100644
--- a/src/test/ui/test-thread-capture.run.stdout
+++ b/src/test/ui/test-thread-capture.run.stdout
@@ -1,7 +1,7 @@
 
 running 2 tests
-test thready_fail run ... FAILED
-test thready_pass run ... ok
+test thready_fail - run ... FAILED
+test thready_pass - run ... ok
 
 failures:
 
diff --git a/src/test/ui/test-thread-nocapture.run.stdout b/src/test/ui/test-thread-nocapture.run.stdout
index 42e6d40a4d1..bd1971ab7d3 100644
--- a/src/test/ui/test-thread-nocapture.run.stdout
+++ b/src/test/ui/test-thread-nocapture.run.stdout
@@ -1,11 +1,11 @@
 
 running 2 tests
-test thready_fail run ... fee
+test thready_fail - run ... fee
 fie
 foe
 fum
 FAILED
-test thready_pass run ... fee
+test thready_pass - run ... fee
 fie
 foe
 fum