diff --git a/src/librustc_typeck/check/mod.rs b/src/librustc_typeck/check/mod.rs
index abc1c5e4b4cc..9c8d7caefe5f 100644
--- a/src/librustc_typeck/check/mod.rs
+++ b/src/librustc_typeck/check/mod.rs
@@ -3708,7 +3708,7 @@ impl<'a, 'gcx, 'tcx> FnCtxt<'a, 'gcx, 'tcx> {
           hir::ExprAgain(_) => { tcx.types.never }
           hir::ExprRet(ref expr_opt) => {
             if self.ret_ty.is_none() {
-                struct_span_err!(self.tcx.sess, expr.span, E0571,
+                struct_span_err!(self.tcx.sess, expr.span, E0572,
                                  "return statement outside of function body").emit();
             } else if let Some(ref e) = *expr_opt {
                 self.check_expr_coercable_to_type(&e, self.ret_ty.unwrap());
diff --git a/src/librustc_typeck/diagnostics.rs b/src/librustc_typeck/diagnostics.rs
index 86220cf57c44..71507063ffc4 100644
--- a/src/librustc_typeck/diagnostics.rs
+++ b/src/librustc_typeck/diagnostics.rs
@@ -4164,12 +4164,12 @@ target / ABI combination is currently unsupported by llvm.
 If necessary, you can circumvent this check using custom target specifications.
 "##,
 
-E0571: r##"
+E0572: r##"
 A return statement was found outside of a function body.
 
 Erroneous code example:
 
-```compile_fail,E0571
+```compile_fail,E0572
 const FOO: u32 = return 0; // error: return statement outside of function body
 
 fn main() {}
diff --git a/src/test/compile-fail/E0571.rs b/src/test/compile-fail/E0572.rs
similarity index 91%
rename from src/test/compile-fail/E0571.rs
rename to src/test/compile-fail/E0572.rs
index d300c5970082..bbaab102de7d 100644
--- a/src/test/compile-fail/E0571.rs
+++ b/src/test/compile-fail/E0572.rs
@@ -8,6 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-const FOO: u32 = return 0; //~ ERROR E0571
+const FOO: u32 = return 0; //~ ERROR E0572
 
 fn main() {}