about summary refs log tree commit diff
path: root/compiler/rustc_errors/src/json.rs
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2022-06-16 07:45:03 +0000
committerbors <bors@rust-lang.org>2022-06-16 07:45:03 +0000
commitd40f24e956a698e47a209541031c4045acc5a684 (patch)
tree2e7c5ead17356f49f1808e39d3a47a904b09be07 /compiler/rustc_errors/src/json.rs
parent392d2728683f140f6125732240e462c43c5caff4 (diff)
parent97a7a3c9ea29b13ced87c4641e5aea10cfb89253 (diff)
downloadrust-d40f24e956a698e47a209541031c4045acc5a684.tar.gz
rust-d40f24e956a698e47a209541031c4045acc5a684.zip
Auto merge of #98161 - matthiaskrgr:rollup-8csenk9, r=matthiaskrgr
Rollup of 4 pull requests

Successful merges:

 - #97757 (Support lint expectations for `--force-warn` lints (RFC 2383))
 - #98125 (Entry and_modify doc)
 - #98137 (debuginfo: Fix NatVis for Rc and Arc with unsized pointees.)
 - #98147 (Make #[cfg(bootstrap)] not error in proc macros on later stages )

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_errors/src/json.rs')
-rw-r--r--compiler/rustc_errors/src/json.rs2
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) }
             })