Skip to content

Commit

Permalink
Update error code numbers
Browse files Browse the repository at this point in the history
  • Loading branch information
estebank committed Jun 20, 2018
1 parent d4bfae1 commit 28cea50
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 11 deletions.
4 changes: 2 additions & 2 deletions src/libsyntax/diagnostic_list.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
4 changes: 2 additions & 2 deletions src/libsyntax/parse/parser.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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");
Expand Down
4 changes: 2 additions & 2 deletions src/test/ui/codemap_tests/unicode.stderr
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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`.
10 changes: 5 additions & 5 deletions src/test/ui/pub/pub-restricted.stderr
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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`.

0 comments on commit 28cea50

Please sign in to comment.