Merge remote-tracking branch 'origin/master' into gen

[rust.git] / src / librustc_typeck / diagnostics.rs

diff --git a/src/librustc_typeck/diagnostics.rs b/src/librustc_typeck/diagnostics.rs
index c74dc24ddc3406583bbaa96eb2406787508ffff8..f5ecedcebb49389738486d44631be6abaf63010c 100644 (file)
--- a/src/librustc_typeck/diagnostics.rs
+++ b/src/librustc_typeck/diagnostics.rs
@@ -4649,7 +4649,7 @@ fn i_am_a_function() {}
 
 Erroneous code example:
 
-```compile_fail,E0624
+```compile_fail,E0627
 mod inner {
     pub struct Foo;
 
@@ -4774,4 +4774,5 @@ pub fn method(&self) {} // It's now public.
     E0588, // packed struct cannot transitively contain a `[repr(align)]` struct
     E0592, // duplicate definitions with name `{}`
 //  E0613, // Removed (merged with E0609)
+    E0627, // yield statement outside of generator literal
 }