From 28cea50a46f4669b94d8332bf64d07e7e5a02d79 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Esteban=20K=C3=BCber?= <esteban@kuber.com.ar>
Date: Tue, 19 Jun 2018 16:22:37 -0700
Subject: [PATCH] Update error code numbers

---
 src/libsyntax/diagnostic_list.rs         |  4 ++--
 src/libsyntax/parse/parser.rs            |  4 ++--
 src/test/ui/codemap_tests/unicode.stderr |  4 ++--
 src/test/ui/pub/pub-restricted.stderr    | 10 +++++-----
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/libsyntax/diagnostic_list.rs b/src/libsyntax/diagnostic_list.rs
index 20318854758..8534969c623 100644
--- a/src/libsyntax/diagnostic_list.rs
+++ b/src/libsyntax/diagnostic_list.rs
@@ -397,6 +397,6 @@ register_diagnostics! {
     E0630, // rustc_const_unstable attribute must be paired with stable/unstable attribute
     E0693, // incorrect `repr(align)` attribute format
     E0694, // an unknown tool name found in scoped attributes
-    E0697, // invalid ABI
-    E0698, // incorrect visibility restriction
+    E0703, // invalid ABI
+    E0704, // incorrect visibility restriction
 }
diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs
index 398d2f04d0f..2c6ea50d2c8 100644
--- a/src/libsyntax/parse/parser.rs
+++ b/src/libsyntax/parse/parser.rs
@@ -6000,7 +6000,7 @@ impl<'a> Parser<'a> {
                 let sp = self.prev_span;
                 let help_msg = format!("make this visible only to module `{}` with `in`", path);
                 self.expect(&token::CloseDelim(token::Paren))?;  // `)`
-                let mut err = struct_span_err!(self.sess.span_diagnostic, sp, E0698, "{}", msg);
+                let mut err = struct_span_err!(self.sess.span_diagnostic, sp, E0704, "{}", msg);
                 err.help(suggestion);
                 err.span_suggestion_with_applicability(
                     sp, &help_msg, format!("in {}", path), Applicability::MachineApplicable
@@ -6550,7 +6550,7 @@ impl<'a> Parser<'a> {
                         let mut err = struct_span_err!(
                             self.sess.span_diagnostic,
                             prev_span,
-                            E0697,
+                            E0703,
                             "invalid ABI: found `{}`",
                             s);
                         err.span_label(prev_span, "invalid ABI");
diff --git a/src/test/ui/codemap_tests/unicode.stderr b/src/test/ui/codemap_tests/unicode.stderr
index d2e79a0b47d..4271382ed5b 100644
--- a/src/test/ui/codemap_tests/unicode.stderr
+++ b/src/test/ui/codemap_tests/unicode.stderr
@@ -1,4 +1,4 @@
-error[E0697]: invalid ABI: found `路濫狼á́́`
+error[E0703]: invalid ABI: found `路濫狼á́́`
   --> $DIR/unicode.rs:11:8
    |
 LL | extern "路濫狼á́́" fn foo() {} //~ ERROR invalid ABI
@@ -8,4 +8,4 @@ LL | extern "路濫狼á́́" fn foo() {} //~ ERROR invalid ABI
 
 error: aborting due to previous error
 
-For more information about this error, try `rustc --explain E0697`.
+For more information about this error, try `rustc --explain E0703`.
diff --git a/src/test/ui/pub/pub-restricted.stderr b/src/test/ui/pub/pub-restricted.stderr
index 114732c39f2..de755dd6a46 100644
--- a/src/test/ui/pub/pub-restricted.stderr
+++ b/src/test/ui/pub/pub-restricted.stderr
@@ -1,4 +1,4 @@
-error[E0698]: incorrect visibility restriction
+error[E0704]: incorrect visibility restriction
   --> $DIR/pub-restricted.rs:15:6
    |
 LL | pub (a) fn afn() {} //~ incorrect visibility restriction
@@ -9,7 +9,7 @@ LL | pub (a) fn afn() {} //~ incorrect visibility restriction
            `pub(super)`: visible only in the current module's parent
            `pub(in path::to::module)`: visible only on the specified path
 
-error[E0698]: incorrect visibility restriction
+error[E0704]: incorrect visibility restriction
   --> $DIR/pub-restricted.rs:16:6
    |
 LL | pub (b) fn bfn() {} //~ incorrect visibility restriction
@@ -20,7 +20,7 @@ LL | pub (b) fn bfn() {} //~ incorrect visibility restriction
            `pub(super)`: visible only in the current module's parent
            `pub(in path::to::module)`: visible only on the specified path
 
-error[E0698]: incorrect visibility restriction
+error[E0704]: incorrect visibility restriction
   --> $DIR/pub-restricted.rs:32:14
    |
 LL |         pub (a) invalid: usize, //~ incorrect visibility restriction
@@ -31,7 +31,7 @@ LL |         pub (a) invalid: usize, //~ incorrect visibility restriction
            `pub(super)`: visible only in the current module's parent
            `pub(in path::to::module)`: visible only on the specified path
 
-error[E0698]: incorrect visibility restriction
+error[E0704]: incorrect visibility restriction
   --> $DIR/pub-restricted.rs:41:6
    |
 LL | pub (xyz) fn xyz() {} //~ incorrect visibility restriction
@@ -50,4 +50,4 @@ LL |         pub (in x) non_parent_invalid: usize, //~ ERROR visibilities can on
 
 error: aborting due to 5 previous errors
 
-For more information about this error, try `rustc --explain E0698`.
+For more information about this error, try `rustc --explain E0704`.