change based on review

3 files changed, 10 insertions, 10 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"
     }
 }