rust/compiler/rustc_errors/src, branch 1.77.2

Don't hash lints differently to non-lints.

2024-01-30T21:25:29+00:00

`Diagnostic::keys`, which is used for hashing and equating diagnostics, has a surprising behaviour: it ignores children, but only for lints. This was added in #88493 to fix some duplicated diagnostics, but it doesn't seem necessary any more. This commit removes the special case and only four tests have changed output, with additional errors. And those additional errors aren't exact duplicates, they're just similar. For example, in src/tools/clippy/tests/ui/same_name_method.rs we currently have this error: ``` error: method's name is the same as an existing method in a trait --> $DIR/same_name_method.rs:75:13 | LL | fn foo() {} | ^^^^^^^^^^^ | note: existing `foo` defined here --> $DIR/same_name_method.rs:79:9 | LL | impl T1 for S {} | ^^^^^^^^^^^^^^^^ ``` and with this change we also get this error: ``` error: method's name is the same as an existing method in a trait --> $DIR/same_name_method.rs:75:13 | LL | fn foo() {} | ^^^^^^^^^^^ | note: existing `foo` defined here --> $DIR/same_name_method.rs:81:9 | LL | impl T2 for S {} | ^^^^^^^^^^^^^^^^ ``` I think printing this second argument is reasonable, possibly even preferable to hiding it. And the other cases are similar.

Rollup merge of #118533 - chenyukang:yukang-fix-118455, r=petrochenkov

2024-01-30T15:57:46+00:00

Suppress unhelpful diagnostics for unresolved top level attributes Fixes #118455, unresolved top level attribute error didn't imported prelude and already have emitted an error, report builtin macro and attributes error by the way, so `check_invalid_crate_level_attr` in can ignore them. Also fixes #89566, fixes #67107. r? `@petrochenkov`

Remove the second lifetime from `DiagnosticArg`.

2024-01-30T07:46:08+00:00

Because it's always static. I'm surprised the compiler allowed this unused lifetime without any complaint.

Remove the lifetime from `DiagnosticArgName`.

2024-01-30T07:46:08+00:00

Because it's always 'static.

Remove `DiagnosticArgName` from `rustc_codegen_ssa`.

2024-01-30T07:46:08+00:00

It's identical to the one in `rustc_errors`; use that instead. Also remove some `rustc_errors::` qualifiers.

Remove the lifetime from `DiagnosticArgValue`.

2024-01-30T07:46:06+00:00

Because it's almost always static. This makes `impl IntoDiagnosticArg for DiagnosticArgValue` trivial, which is nice. There are a few diagnostics constructed in `compiler/rustc_mir_build/src/check_unsafety.rs` and `compiler/rustc_mir_transform/src/errors.rs` that now need symbols converted to `String` with `to_string` instead of `&str` with `as_str`, but that' no big deal, and worth it for the simplifications elsewhere.

Supress unhelpful diagnostics for unresolved top level attributes

2024-01-29T09:43:07+00:00

Stop using `String` for error codes.

2024-01-28T20:41:41+00:00

Error codes are integers, but `String` is used everywhere to represent them. Gross! This commit introduces `ErrCode`, an integral newtype for error codes, replacing `String`. It also introduces a constant for every error code, e.g. `E0123`, and removes the `error_code!` macro. The constants are imported wherever used with `use rustc_errors::codes::*`. With the old code, we have three different ways to specify an error code at a use point: ``` error_code!(E0123) // macro call struct_span_code_err!(dcx, span, E0123, "msg"); // bare ident arg to macro call \#[diag(name, code = "E0123")] // string struct Diag; ``` With the new code, they all use the `E0123` constant. ``` E0123 // constant struct_span_code_err!(dcx, span, E0123, "msg"); // constant \#[diag(name, code = E0123)] // constant struct Diag; ``` The commit also changes the structure of the error code definitions: - `rustc_error_codes` now just defines a higher-order macro listing the used error codes and nothing else. - Because that's now the only thing in the `rustc_error_codes` crate, I moved it into the `lib.rs` file and removed the `error_codes.rs` file. - `rustc_errors` uses that macro to define everything, e.g. the error code constants and the `DIAGNOSTIC_TABLES`. This is in its new `codes.rs` file.

Sort attributes in `compiler/rustc_errors/src/lib.rs`.

2024-01-28T20:40:08+00:00

As is already done in `rustc_span` and `rustc_data_structures`.

Fix typo

2024-01-26T20:01:45+00:00

Co-authored-by: Michael Goulet