Rollup merge of #102567 - compiler-errors:issue-102561, r=davidtwco

Delay evaluating lint primary message until after it would be suppressed

Fixes #102561
Fixes #102572
This commit is contained in:
Matthias Krüger
2022-10-04 06:14:11 +02:00
committed by GitHub
3 changed files with 23 additions and 1 deletions

View File

@@ -350,7 +350,6 @@ pub fn struct_lint_level(
(Level::Deny | Level::Forbid, None) => sess.diagnostic().struct_err_lint(""),
};
err.set_primary_message(msg);
err.set_is_lint();
// If this code originates in a foreign macro, aka something that this crate
@@ -375,6 +374,10 @@ pub fn struct_lint_level(
}
}
// Delay evaluating and setting the primary message until after we've
// suppressed the lint due to macros.
err.set_primary_message(msg);
// Lint diagnostics that are covered by the expect level will not be emitted outside
// the compiler. It is therefore not necessary to add any information for the user.
// This will therefore directly call the decorate function which will in turn emit