Skip to content

Avoid delayed bug for disabled on_type_error arguments #158682

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rust-bors merged 2 commits into from
Jul 5, 2026
Merged

Avoid delayed bug for disabled on_type_error arguments #158682

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f3d4f18
add a test for malformed disabled on_type_error arguments
TaKO8Ki Jul 2, 2026
673dcf0
ignore on_type_error args when the feature is disabled
TaKO8Ki Jul 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions compiler/rustc_attr_parsing/src/attributes/diagnostic/on_type_error.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ pub(crate) struct OnTypeErrorParser {
impl OnTypeErrorParser {
fn parse<'sess>(&mut self, cx: &mut AcceptContext<'_, 'sess>, args: &ArgParser, mode: Mode) {
if !cx.features().diagnostic_on_type_error() {
// `UnknownDiagnosticAttribute` is emitted in rustc_resolve/macros.rs
args.ignore_args();
return;
}

Expand Down
9 changes: 9 additions & 0 deletions tests/ui/feature-gates/feature-gate-diagnostic-on-type-error-malformed-args.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
//@ check-pass

// Regression test for https://github.com/rust-lang/rust/issues/158628.

#[diagnostic::on_type_error(unknown = "")]
//~^ WARN unknown diagnostic attribute
pub struct Foo {}

fn main() {}
11 changes: 11 additions & 0 deletions tests/ui/feature-gates/feature-gate-diagnostic-on-type-error-malformed-args.stderr
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
warning: unknown diagnostic attribute
--> $DIR/feature-gate-diagnostic-on-type-error-malformed-args.rs:5:15
|
LL | #[diagnostic::on_type_error(unknown = "")]
| ^^^^^^^^^^^^^
|
= help: add `#![feature(diagnostic_on_type_error)]` to the crate attributes to enable
= note: `#[warn(unknown_diagnostic_attributes)]` (part of `#[warn(unknown_or_malformed_diagnostic_attributes)]`) on by default

warning: 1 warning emitted

Loading