From 97b9c8b8d37ec21212d9c54ae510eae0220fbf7e Mon Sep 17 00:00:00 2001
From: Guillaume Gomez <guillaume1.gomez@gmail.com>
Date: Thu, 26 Jan 2017 11:17:17 +0100
Subject: [PATCH] Update error code number

---
 src/librustc/diagnostics.rs                  | 4 ++--
 src/librustc/infer/error_reporting.rs        | 2 +-
 src/test/compile-fail/{E0579.rs => E0580.rs} | 2 +-
 src/test/compile-fail/bad-main.rs            | 2 +-
 src/test/compile-fail/extern-main-fn.rs      | 2 +-
 src/test/compile-fail/main-wrong-type-2.rs   | 2 +-
 src/test/compile-fail/main-wrong-type.rs     | 2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)
 rename src/test/compile-fail/{E0579.rs => E0580.rs} (92%)

diff --git a/src/librustc/diagnostics.rs b/src/librustc/diagnostics.rs
index 6d94e1d7259..2878ff5e284 100644
--- a/src/librustc/diagnostics.rs
+++ b/src/librustc/diagnostics.rs
@@ -1694,12 +1694,12 @@ fn main() {
 https://doc.rust-lang.org/book/closures.html
 "##,
 
-E0579: r##"
+E0580: r##"
 The `main` function was incorrectly declared.
 
 Erroneous code example:
 
-```compile_fail,E0579
+```compile_fail,E0580
 fn main() -> i32 { // error: main function has wrong type
     0
 }
diff --git a/src/librustc/infer/error_reporting.rs b/src/librustc/infer/error_reporting.rs
index 2bed8148b9f..d859a8b44db 100644
--- a/src/librustc/infer/error_reporting.rs
+++ b/src/librustc/infer/error_reporting.rs
@@ -631,7 +631,7 @@ pub fn report_and_explain_type_error(&self,
                 struct_span_err!(self.tcx.sess, span, E0317, "{}", failure_str)
             }
             ObligationCauseCode::MainFunctionType => {
-                struct_span_err!(self.tcx.sess, span, E0579, "{}", failure_str)
+                struct_span_err!(self.tcx.sess, span, E0580, "{}", failure_str)
             }
             _ => {
                 struct_span_err!(self.tcx.sess, span, E0308, "{}", failure_str)
diff --git a/src/test/compile-fail/E0579.rs b/src/test/compile-fail/E0580.rs
similarity index 92%
rename from src/test/compile-fail/E0579.rs
rename to src/test/compile-fail/E0580.rs
index beb6c792fa1..a2ef7da78a8 100644
--- a/src/test/compile-fail/E0579.rs
+++ b/src/test/compile-fail/E0580.rs
@@ -8,4 +8,4 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-fn main() -> i32 { 0 } //~ ERROR E0579
+fn main() -> i32 { 0 } //~ ERROR E0580
diff --git a/src/test/compile-fail/bad-main.rs b/src/test/compile-fail/bad-main.rs
index 6cd033da4bd..b73b4a6af6e 100644
--- a/src/test/compile-fail/bad-main.rs
+++ b/src/test/compile-fail/bad-main.rs
@@ -8,4 +8,4 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-fn main(x: isize) { } //~ ERROR: main function has wrong type [E0579]
+fn main(x: isize) { } //~ ERROR: main function has wrong type [E0580]
diff --git a/src/test/compile-fail/extern-main-fn.rs b/src/test/compile-fail/extern-main-fn.rs
index 479b3e532c6..d9bdb4ecd04 100644
--- a/src/test/compile-fail/extern-main-fn.rs
+++ b/src/test/compile-fail/extern-main-fn.rs
@@ -8,4 +8,4 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-extern fn main() {} //~ ERROR: main function has wrong type [E0579]
+extern fn main() {} //~ ERROR: main function has wrong type [E0580]
diff --git a/src/test/compile-fail/main-wrong-type-2.rs b/src/test/compile-fail/main-wrong-type-2.rs
index da1455403c2..9d74d1a9049 100644
--- a/src/test/compile-fail/main-wrong-type-2.rs
+++ b/src/test/compile-fail/main-wrong-type-2.rs
@@ -9,6 +9,6 @@
 // except according to those terms.
 
 fn main() -> char {
-//~^ ERROR: main function has wrong type [E0579]
+//~^ ERROR: main function has wrong type [E0580]
     ' '
 }
diff --git a/src/test/compile-fail/main-wrong-type.rs b/src/test/compile-fail/main-wrong-type.rs
index dc517775035..402cd3a2d31 100644
--- a/src/test/compile-fail/main-wrong-type.rs
+++ b/src/test/compile-fail/main-wrong-type.rs
@@ -14,5 +14,5 @@ struct S {
 }
 
 fn main(foo: S) {
-//~^ ERROR: main function has wrong type [E0579]
+//~^ ERROR: main function has wrong type [E0580]
 }
-- 
GitLab