about summary refs log tree commit diff
path: root/src/librustc/error_codes.rs
diff options
context:
space:
mode:
authorMazdak Farrokhzad <twingoow@gmail.com>2019-05-03 16:24:57 +0200
committerGitHub <noreply@github.com>2019-05-03 16:24:57 +0200
commit3ca0d365386a640ba17b9b436a3dafff079cd71e (patch)
treea008a7f1cadd673e80fe11d340cb8a1592584fbc /src/librustc/error_codes.rs
parent9199bb5f81eae1f8ea47c9945fc3f4c4dded4989 (diff)
parentc6e13bc20b5664ba9a8bd4152412bcc497e4f041 (diff)
Rollup merge of #60388 - cramertj:elided-lifetime-async, r=nikomatsakis
Disallow non-explicit elided lifetimes in async fn

Fix https://github.com/rust-lang/rust/issues/60203

r? @nikomatsakis
Diffstat (limited to 'src/librustc/error_codes.rs')
-rw-r--r--src/librustc/error_codes.rs5
1 files changed, 1 insertions, 4 deletions
diff --git a/src/librustc/error_codes.rs b/src/librustc/error_codes.rs
index 7f68b35d014..fd089fc688e 100644
--- a/src/librustc/error_codes.rs
+++ b/src/librustc/error_codes.rs
@@ -362,10 +362,6 @@ struct Foo1 { x: &bool }
               // ^ expected lifetime parameter
 struct Foo2<'a> { x: &'a bool } // correct
 
-impl Foo2 {}
-  // ^^^^ expected lifetime parameter
-impl<'a> Foo2<'a> {} // correct
-
 struct Bar1 { x: Foo2 }
               // ^^^^ expected lifetime parameter
 struct Bar2<'a> { x: Foo2<'a> } // correct
@@ -2208,4 +2204,5 @@ register_diagnostics! {
     E0710, // an unknown tool name found in scoped lint
     E0711, // a feature has been declared with conflicting stability attributes
 //  E0702, // replaced with a generic attribute input check
+    E0726, // non-explicit (not `'_`) elided lifetime in unsupported position
 }