From 9bb939d6107b72ced8aa0c8a8c447e88a80fdd30 Mon Sep 17 00:00:00 2001
From: Simon Martin <simartin@users.sourceforge.net>
Date: Sun, 27 May 2018 17:04:27 +0200
Subject: [PATCH] Address comments in pull request #51084.

---
 src/test/{compile-fail => ui}/issue-51022.rs | 2 +-
 src/test/ui/issue-51022.stderr               | 9 +++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)
 rename src/test/{compile-fail => ui}/issue-51022.rs (85%)
 create mode 100644 src/test/ui/issue-51022.stderr

diff --git a/src/test/compile-fail/issue-51022.rs b/src/test/ui/issue-51022.rs
similarity index 85%
rename from src/test/compile-fail/issue-51022.rs
rename to src/test/ui/issue-51022.rs
index d4d2192b8ae07..f9486fa57b136 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 0000000000000..3b691bbb0330f
--- /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`.