From 411f94c3b903abe548574c9de8e939a28cd86afc Mon Sep 17 00:00:00 2001
From: Guillaume Gomez <guillaume1.gomez@gmail.com>
Date: Wed, 13 Nov 2019 18:01:19 +0100
Subject: [PATCH] move E0623 into the new error code format

---
 src/librustc_error_codes/error_codes.rs       |  2 +-
 src/librustc_error_codes/error_codes/E0623.md | 41 +++++++++++++++++++
 2 files changed, 42 insertions(+), 1 deletion(-)
 create mode 100644 src/librustc_error_codes/error_codes/E0623.md

diff --git a/src/librustc_error_codes/error_codes.rs b/src/librustc_error_codes/error_codes.rs
index 23ea48d4b72..e8d5499ac58 100644
--- a/src/librustc_error_codes/error_codes.rs
+++ b/src/librustc_error_codes/error_codes.rs
@@ -338,6 +338,7 @@
 E0620: include_str!("./error_codes/E0620.md"),
 E0621: include_str!("./error_codes/E0621.md"),
 E0622: include_str!("./error_codes/E0622.md"),
+E0623: include_str!("./error_codes/E0623.md"),
 E0624: include_str!("./error_codes/E0624.md"),
 E0626: include_str!("./error_codes/E0626.md"),
 E0633: include_str!("./error_codes/E0633.md"),
@@ -565,7 +566,6 @@
 //  E0611, // merged into E0616
 //  E0612, // merged into E0609
 //  E0613, // Removed (merged with E0609)
-    E0623, // lifetime mismatch where both parameters are anonymous regions
     E0625, // thread-local statics cannot be accessed at compile-time
     E0627, // yield statement outside of generator literal
     E0628, // generators cannot have explicit parameters
diff --git a/src/librustc_error_codes/error_codes/E0623.md b/src/librustc_error_codes/error_codes/E0623.md
new file mode 100644
index 00000000000..1290edd0a0e
--- /dev/null
+++ b/src/librustc_error_codes/error_codes/E0623.md
@@ -0,0 +1,41 @@
+A lifetime didn't match what was expected.
+
+Erroneous code example:
+
+```compile_fail,E0623
+struct Foo<'a> {
+    x: &'a isize,
+}
+
+fn bar<'short, 'long>(c: Foo<'short>, l: &'long isize) {
+    let _: Foo<'long> = c; // error!
+}
+```
+
+In this example, we tried to set a value with an incompatible lifetime to
+another one (`'long` is unrelated to `'short`). We can solve this issue in
+two different ways:
+
+Either we make `'short` live at least as long as `'long`:
+
+```
+struct Foo<'a> {
+    x: &'a isize,
+}
+
+// we set 'short to live at least as long as 'long
+fn bar<'short: 'long, 'long>(c: Foo<'short>, l: &'long isize) {
+    let _: Foo<'long> = c; // ok!
+}
+```
+
+Or we use only one lifetime:
+
+```
+struct Foo<'a> {
+    x: &'a isize,
+}
+fn bar<'short>(c: Foo<'short>, l: &'short isize) {
+    let _: Foo<'short> = c; // ok!
+}
+```