about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2018-05-27 18:08:26 +0000
committerbors <bors@rust-lang.org>2018-05-27 18:08:26 +0000
commitf9f66c134a7f49e4d85cfaf9a2e0b985ff41bbf0 (patch)
tree500c9d039f7ddf40cc59784a6cc8b917a1273e9e
parentdcb405667c3b1726ff4c21da1cc93839d183033a (diff)
parent9bb939d6107b72ced8aa0c8a8c447e88a80fdd30 (diff)
Auto merge of #51108 - simartin:issue_51022_follow-up, r=estebank
Address comments in pull request #51084.

This is a follow-up to https://github.com/rust-lang/rust/pull/51084, that's already been integrated into mainline.
-rw-r--r--src/test/ui/issue-51022.rs (renamed from src/test/compile-fail/issue-51022.rs)2
-rw-r--r--src/test/ui/issue-51022.stderr9
2 files changed, 10 insertions, 1 deletions
diff --git a/src/test/compile-fail/issue-51022.rs b/src/test/ui/issue-51022.rs
index d4d2192b8ae..f9486fa57b1 100644
--- a/src/test/compile-fail/issue-51022.rs
+++ b/src/test/ui/issue-51022.rs
@@ -8,5 +8,5 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// error-pattern: `main` function is not allowed to have lifetime parameters
 fn main<'a>() { }
+    //~^ ERROR `main` function is not allowed to have lifetime parameters [E0131]
diff --git a/src/test/ui/issue-51022.stderr b/src/test/ui/issue-51022.stderr
new file mode 100644
index 00000000000..3b691bbb033
--- /dev/null
+++ b/src/test/ui/issue-51022.stderr
@@ -0,0 +1,9 @@
+error[E0131]: `main` function is not allowed to have lifetime parameters
+  --> $DIR/issue-51022.rs:11:8
+   |
+LL | fn main<'a>() { }
+   |        ^^^^ `main` cannot have lifetime parameters
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0131`.