diff options
| author | Matthias Krüger <matthias.krueger@famsik.de> | 2022-06-16 09:10:20 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-16 09:10:20 +0200 |
| commit | 95be954af412e4473499a3745c84583c545f15e5 (patch) | |
| tree | 0f3be1f8fa156aa48515f82ebb01fc0841f85da1 /compiler/rustc_errors/src/json.rs | |
| parent | 1b9daa69640970e7858b7c8e1c9f72c604985e11 (diff) | |
| parent | 8527a3d36985bed55de1832c3c1f3d470720bb0b (diff) | |
| download | rust-95be954af412e4473499a3745c84583c545f15e5.tar.gz rust-95be954af412e4473499a3745c84583c545f15e5.zip | |
Rollup merge of #97757 - xFrednet:rfc-2383-expect-with-force-warn, r=wesleywiser,flip1995
Support lint expectations for `--force-warn` lints (RFC 2383) Rustc has a `--force-warn` flag, which overrides lint level attributes and forces the diagnostics to always be warn. This means, that for lint expectations, the diagnostic can't be suppressed as usual. This also means that the expectation would not be fulfilled, even if a lint had been triggered in the expected scope. This PR now also tracks the expectation ID in the `ForceWarn` level. I've also made some minor adjustments, to possibly catch more bugs and make the whole implementation more robust. This will probably conflict with https://github.com/rust-lang/rust/pull/97718. That PR should ideally be reviewed and merged first. The conflict itself will be trivial to fix. --- r? `@wesleywiser` cc: `@flip1995` since you've helped with the initial review and also discussed this topic with me. :upside_down_face: Follow-up of: https://github.com/rust-lang/rust/pull/87835 Issue: https://github.com/rust-lang/rust/issues/85549 Yeah, and that's it.
Diffstat (limited to 'compiler/rustc_errors/src/json.rs')
| -rw-r--r-- | compiler/rustc_errors/src/json.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/rustc_errors/src/json.rs b/compiler/rustc_errors/src/json.rs index fff35ac6ac8..d4d1491c169 100644 --- a/compiler/rustc_errors/src/json.rs +++ b/compiler/rustc_errors/src/json.rs @@ -154,7 +154,7 @@ impl Emitter for JsonEmitter { .into_iter() .map(|mut diag| { if diag.level == crate::Level::Allow { - diag.level = crate::Level::Warning; + diag.level = crate::Level::Warning(None); } FutureBreakageItem { diagnostic: Diagnostic::from_errors_diagnostic(&diag, self) } }) |