From a227414849caa77a1a336e9e1cae3422e16ca0bb Mon Sep 17 00:00:00 2001
From: Russell Cohen <russell.r.cohen@gmail.com>
Date: Fri, 13 Apr 2018 10:16:16 -0700
Subject: [PATCH] Update error message

---
 src/libsyntax/test.rs                                         | 4 +---
 .../termination-trait-in-test-should-panic.rs                 | 2 +-
 .../termination-trait-in-test-should-panic.stderr             | 4 ++--
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/libsyntax/test.rs b/src/libsyntax/test.rs
index 08a6a92f3db86..325927ed83237 100644
--- a/src/libsyntax/test.rs
+++ b/src/libsyntax/test.rs
@@ -379,9 +379,7 @@ fn is_test_fn(cx: &TestCtxt, i: &ast::Item) -> bool {
                     BadTestSignature::NoArgumentsAllowed =>
                         diag.span_err(i.span, "functions used as tests can not have any arguments"),
                     BadTestSignature::ShouldPanicOnlyWithNoArgs =>
-                        diag.span_err(i.span,
-                                      "functions used as tests returning Result<_, _> must \
-                                      not use #[should_panic]"),
+                        diag.span_err(i.span, "functions using `#[should_panic]` must return `()`"),
                 }
                 false
             }
diff --git a/src/test/ui/rfc-1937-termination-trait/termination-trait-in-test-should-panic.rs b/src/test/ui/rfc-1937-termination-trait/termination-trait-in-test-should-panic.rs
index 5b3a2329b471a..73a0150c0bb3f 100644
--- a/src/test/ui/rfc-1937-termination-trait/termination-trait-in-test-should-panic.rs
+++ b/src/test/ui/rfc-1937-termination-trait/termination-trait-in-test-should-panic.rs
@@ -20,7 +20,7 @@ use test::Bencher;
 #[test]
 #[should_panic]
 fn not_a_num() -> Result<(), ParseIntError> {
-    //~^ ERROR functions used as tests returning Result<_, _> must not use #[should_panic]
+    //~^ ERROR functions using `#[should_panic]` must return `()`
     let _: u32 = "abc".parse()?;
     Ok(())
 }
diff --git a/src/test/ui/rfc-1937-termination-trait/termination-trait-in-test-should-panic.stderr b/src/test/ui/rfc-1937-termination-trait/termination-trait-in-test-should-panic.stderr
index 1c310a9fc1e1a..e3dab82df41b9 100644
--- a/src/test/ui/rfc-1937-termination-trait/termination-trait-in-test-should-panic.stderr
+++ b/src/test/ui/rfc-1937-termination-trait/termination-trait-in-test-should-panic.stderr
@@ -1,8 +1,8 @@
-error: functions used as tests returning Result<_, _> must not use #[should_panic]
+error: functions using `#[should_panic]` must return `()`
   --> $DIR/termination-trait-in-test-should-panic.rs:22:1
    |
 LL | / fn not_a_num() -> Result<(), ParseIntError> {
-LL | |     //~^ ERROR functions used as tests returning Result<_, _> must not use #[should_panic]
+LL | |     //~^ ERROR functions using `#[should_panic]` must return `()`
 LL | |     let _: u32 = "abc".parse()?;
 LL | |     Ok(())
 LL | | }