mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Auto merge of #116413 - nnethercote:rm-E0551, r=compiler-errors

Browse Source 
Remove E0551

Because it's the same as E0539.

Fixes #51489.

r? `@Nilstrieb`
This commit is contained in:
bors 2023-10-04 16:51:42 +00:00
commit f306362fb9
5 changed files with 14 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
compiler/rustc_attr/Cargo.toml
View File

@ -6,14 +6,14 @@ edition = "2021"
[lib]
[dependencies]
rustc_ast = { path = "../rustc_ast" }
rustc_ast_pretty = { path = "../rustc_ast_pretty" }
rustc_serialize = { path = "../rustc_serialize" }
rustc_errors = { path = "../rustc_errors" }
rustc_fluent_macro = { path = "../rustc_fluent_macro" }
rustc_span = { path = "../rustc_span" }
rustc_data_structures = { path = "../rustc_data_structures" }
rustc_errors = { path = "../rustc_errors" }
rustc_feature = { path = "../rustc_feature" }
rustc_fluent_macro = { path = "../rustc_fluent_macro" }
rustc_lexer = { path = "../rustc_lexer" }
rustc_macros = { path = "../rustc_macros" }
rustc_serialize = { path = "../rustc_serialize" }
rustc_session = { path = "../rustc_session" }
rustc_ast = { path = "../rustc_ast" }
rustc_span = { path = "../rustc_span" }

2
compiler/rustc_attr/src/builtin.rs
View File

@ -846,7 +846,7 @@ pub fn find_deprecation(
),
);
} else {
sess.emit_err(session_diagnostics::IncorrectMetaItem2 {
sess.emit_err(session_diagnostics::IncorrectMetaItem {
span: meta.span,
});
}

9
compiler/rustc_attr/src/session_diagnostics.rs
View File

@ -165,15 +165,6 @@ pub(crate) struct MissingIssue {
pub span: Span,
}
// FIXME: This diagnostic is identical to `IncorrectMetaItem`, barring the error code. Consider
// changing this to `IncorrectMetaItem`. See #51489.
#[derive(Diagnostic)]
#[diag(attr_incorrect_meta_item, code = "E0551")]
pub(crate) struct IncorrectMetaItem2 {
#[primary_span]
pub span: Span,
}
// FIXME: Why is this the same error code as `InvalidReprHintNoParen` and `InvalidReprHintNoValue`?
// It is more similar to `IncorrectReprFormatGeneric`.
#[derive(Diagnostic)]

4
compiler/rustc_error_codes/src/error_codes/E0551.md
View File

@ -1,8 +1,10 @@
#### Note: this error code is no longer emitted by the compiler
An invalid meta-item was used inside an attribute.
Erroneous code example:
```compile_fail,E0551
```compile_fail,E0539
#[deprecated(note)] // error!
fn i_am_deprecated() {}
```

10
tests/ui/deprecation/deprecation-sanity.stderr
View File

@ -16,25 +16,25 @@ error[E0541]: unknown meta item 'reason'
LL | #[deprecated(since = "a", note = "a", reason)]
| ^^^^^^ expected one of `since`, `note`
error[E0551]: incorrect meta item
error[E0539]: incorrect meta item
--> $DIR/deprecation-sanity.rs:7:31
|
LL | #[deprecated(since = "a", note)]
| ^^^^
error[E0551]: incorrect meta item
error[E0539]: incorrect meta item
--> $DIR/deprecation-sanity.rs:10:18
|
LL | #[deprecated(since, note = "a")]
| ^^^^^
error[E0551]: incorrect meta item
error[E0539]: incorrect meta item
--> $DIR/deprecation-sanity.rs:13:31
|
LL | #[deprecated(since = "a", note(b))]
| ^^^^^^^
error[E0551]: incorrect meta item
error[E0539]: incorrect meta item
--> $DIR/deprecation-sanity.rs:16:18
|
LL | #[deprecated(since(b), note = "a")]
@ -70,5 +70,5 @@ LL | #[deprecated = "hello"]
error: aborting due to 10 previous errors
Some errors have detailed explanations: E0538, E0541, E0551, E0565.
Some errors have detailed explanations: E0538, E0539, E0541, E0565.
For more information about an error, try `rustc --explain E0538`.