Skip to content
This repository was archived by the owner on May 28, 2025. It is now read-only.
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit ca828a1

Browse files
rust-timerrust-timer
authoredJan 11, 2024
Unrolled build for rust-lang#119763
Rollup merge of rust-lang#119763 - nnethercote:cleanup-Diagnostic, r=oli-obk Cleanup things in and around `Diagnostic` These changes all arose when I was looking closely at how to simplify `DiagCtxtInner::emit_diagnostic`. r? `@compiler-errors`
2 parents 0a89233 + dd61eba commit ca828a1

File tree

13 files changed

+72
-95
lines changed

13 files changed

+72
-95
lines changed
 

‎compiler/rustc_builtin_macros/src/test.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -394,7 +394,7 @@ fn not_testable_error(cx: &ExtCtxt<'_>, attr_sp: Span, item: Option<&ast::Item>)
394394
let level = match item.map(|i| &i.kind) {
395395
// These were a warning before #92959 and need to continue being that to avoid breaking
396396
// stable user code (#94508).
397-
Some(ast::ItemKind::MacCall(_)) => Level::Warning(None),
397+
Some(ast::ItemKind::MacCall(_)) => Level::Warning,
398398
_ => Level::Error,
399399
};
400400
let mut err = DiagnosticBuilder::<()>::new(dcx, level, msg);

‎compiler/rustc_codegen_llvm/src/back/write.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -417,7 +417,7 @@ fn report_inline_asm(
417417
}
418418
let level = match level {
419419
llvm::DiagnosticLevel::Error => Level::Error,
420-
llvm::DiagnosticLevel::Warning => Level::Warning(None),
420+
llvm::DiagnosticLevel::Warning => Level::Warning,
421421
llvm::DiagnosticLevel::Note | llvm::DiagnosticLevel::Remark => Level::Note,
422422
};
423423
cgcx.diag_emitter.inline_asm_error(cookie as u32, msg, level, source);

‎compiler/rustc_codegen_ssa/src/back/write.rs

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1847,14 +1847,9 @@ impl SharedEmitterMain {
18471847
dcx.emit_diagnostic(d);
18481848
}
18491849
Ok(SharedEmitterMessage::InlineAsmError(cookie, msg, level, source)) => {
1850-
let err_level = match level {
1851-
Level::Error => Level::Error,
1852-
Level::Warning(_) => Level::Warning(None),
1853-
Level::Note => Level::Note,
1854-
_ => bug!("Invalid inline asm diagnostic level"),
1855-
};
1850+
assert!(matches!(level, Level::Error | Level::Warning | Level::Note));
18561851
let msg = msg.strip_prefix("error: ").unwrap_or(&msg).to_string();
1857-
let mut err = DiagnosticBuilder::<()>::new(sess.dcx(), err_level, msg);
1852+
let mut err = DiagnosticBuilder::<()>::new(sess.dcx(), level, msg);
18581853

18591854
// If the cookie is 0 then we don't have span information.
18601855
if cookie != 0 {

‎compiler/rustc_errors/src/annotate_snippet_emitter_writer.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ fn source_string(file: Lrc<SourceFile>, line: &Line) -> String {
8787
fn annotation_type_for_level(level: Level) -> AnnotationType {
8888
match level {
8989
Level::Bug | Level::DelayedBug | Level::Fatal | Level::Error => AnnotationType::Error,
90-
Level::Warning(_) => AnnotationType::Warning,
90+
Level::ForceWarning(_) | Level::Warning => AnnotationType::Warning,
9191
Level::Note | Level::OnceNote => AnnotationType::Note,
9292
Level::Help | Level::OnceHelp => AnnotationType::Help,
9393
// FIXME(#59346): Not sure how to map this level

‎compiler/rustc_errors/src/diagnostic.rs

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,6 @@ pub enum DiagnosticId {
152152
name: String,
153153
/// Indicates whether this lint should show up in cargo's future breakage report.
154154
has_future_breakage: bool,
155-
is_force_warn: bool,
156155
},
157156
}
158157

@@ -248,7 +247,8 @@ impl Diagnostic {
248247
true
249248
}
250249

251-
Level::Warning(_)
250+
Level::ForceWarning(_)
251+
| Level::Warning
252252
| Level::Note
253253
| Level::OnceNote
254254
| Level::Help
@@ -262,7 +262,7 @@ impl Diagnostic {
262262
&mut self,
263263
unstable_to_stable: &FxIndexMap<LintExpectationId, LintExpectationId>,
264264
) {
265-
if let Level::Expect(expectation_id) | Level::Warning(Some(expectation_id)) =
265+
if let Level::Expect(expectation_id) | Level::ForceWarning(Some(expectation_id)) =
266266
&mut self.level
267267
{
268268
if expectation_id.is_stable() {
@@ -292,8 +292,11 @@ impl Diagnostic {
292292
}
293293

294294
pub(crate) fn is_force_warn(&self) -> bool {
295-
match self.code {
296-
Some(DiagnosticId::Lint { is_force_warn, .. }) => is_force_warn,
295+
match self.level {
296+
Level::ForceWarning(_) => {
297+
assert!(self.is_lint);
298+
true
299+
}
297300
_ => false,
298301
}
299302
}
@@ -472,7 +475,7 @@ impl Diagnostic {
472475
/// Add a warning attached to this diagnostic.
473476
#[rustc_lint_diagnostics]
474477
pub fn warn(&mut self, msg: impl Into<SubdiagnosticMessage>) -> &mut Self {
475-
self.sub(Level::Warning(None), msg, MultiSpan::new());
478+
self.sub(Level::Warning, msg, MultiSpan::new());
476479
self
477480
}
478481

@@ -484,7 +487,7 @@ impl Diagnostic {
484487
sp: S,
485488
msg: impl Into<SubdiagnosticMessage>,
486489
) -> &mut Self {
487-
self.sub(Level::Warning(None), msg, sp.into());
490+
self.sub(Level::Warning, msg, sp.into());
488491
self
489492
}
490493

‎compiler/rustc_errors/src/json.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ impl Emitter for JsonEmitter {
198198
.into_iter()
199199
.map(|mut diag| {
200200
if diag.level == crate::Level::Allow {
201-
diag.level = crate::Level::Warning(None);
201+
diag.level = crate::Level::Warning;
202202
}
203203
FutureBreakageItem {
204204
diagnostic: EmitTyped::Diagnostic(Diagnostic::from_errors_diagnostic(

‎compiler/rustc_errors/src/lib.rs

Lines changed: 41 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -420,15 +420,21 @@ pub struct DiagCtxt {
420420
/// as well as inconsistent state observation.
421421
struct DiagCtxtInner {
422422
flags: DiagCtxtFlags,
423+
423424
/// The number of lint errors that have been emitted.
424425
lint_err_count: usize,
425426
/// The number of errors that have been emitted, including duplicates.
426427
///
427428
/// This is not necessarily the count that's reported to the user once
428429
/// compilation ends.
429430
err_count: usize,
430-
warn_count: usize,
431431
deduplicated_err_count: usize,
432+
/// The warning count, used for a recap upon finishing
433+
deduplicated_warn_count: usize,
434+
/// Has this diagnostic context printed any diagnostics? (I.e. has
435+
/// `self.emitter.emit_diagnostic()` been called?
436+
has_printed: bool,
437+
432438
emitter: Box<DynEmitter>,
433439
span_delayed_bugs: Vec<DelayedDiagnostic>,
434440
good_path_delayed_bugs: Vec<DelayedDiagnostic>,
@@ -455,9 +461,6 @@ struct DiagCtxtInner {
455461
/// When `.abort_if_errors()` is called, these are also emitted.
456462
stashed_diagnostics: FxIndexMap<(Span, StashKey), Diagnostic>,
457463

458-
/// The warning count, used for a recap upon finishing
459-
deduplicated_warn_count: usize,
460-
461464
future_breakage_diagnostics: Vec<Diagnostic>,
462465

463466
/// The [`Self::unstable_expect_diagnostics`] should be empty when this struct is
@@ -513,7 +516,7 @@ fn default_track_diagnostic(diag: Diagnostic, f: &mut dyn FnMut(Diagnostic)) {
513516
(*f)(diag)
514517
}
515518

516-
pub static TRACK_DIAGNOSTICS: AtomicRef<fn(Diagnostic, &mut dyn FnMut(Diagnostic))> =
519+
pub static TRACK_DIAGNOSTIC: AtomicRef<fn(Diagnostic, &mut dyn FnMut(Diagnostic))> =
517520
AtomicRef::new(&(default_track_diagnostic as _));
518521

519522
#[derive(Copy, Clone, Default)]
@@ -547,8 +550,7 @@ impl Drop for DiagCtxtInner {
547550
// instead of "require some error happened". Sadly that isn't ideal, as
548551
// lints can be `#[allow]`'d, potentially leading to this triggering.
549552
// Also, "good path" should be replaced with a better naming.
550-
let has_any_message = self.err_count > 0 || self.lint_err_count > 0 || self.warn_count > 0;
551-
if !has_any_message && !self.suppressed_expected_diag && !std::thread::panicking() {
553+
if !self.has_printed && !self.suppressed_expected_diag && !std::thread::panicking() {
552554
let bugs = std::mem::replace(&mut self.good_path_delayed_bugs, Vec::new());
553555
self.flush_delayed(
554556
bugs,
@@ -594,9 +596,9 @@ impl DiagCtxt {
594596
flags: DiagCtxtFlags { can_emit_warnings: true, ..Default::default() },
595597
lint_err_count: 0,
596598
err_count: 0,
597-
warn_count: 0,
598599
deduplicated_err_count: 0,
599600
deduplicated_warn_count: 0,
601+
has_printed: false,
600602
emitter,
601603
span_delayed_bugs: Vec::new(),
602604
good_path_delayed_bugs: Vec::new(),
@@ -647,10 +649,11 @@ impl DiagCtxt {
647649
/// the overall count of emitted error diagnostics.
648650
pub fn reset_err_count(&self) {
649651
let mut inner = self.inner.borrow_mut();
652+
inner.lint_err_count = 0;
650653
inner.err_count = 0;
651-
inner.warn_count = 0;
652654
inner.deduplicated_err_count = 0;
653655
inner.deduplicated_warn_count = 0;
656+
inner.has_printed = false;
654657

655658
// actually free the underlying memory (which `clear` would not do)
656659
inner.span_delayed_bugs = Default::default();
@@ -669,16 +672,11 @@ impl DiagCtxt {
669672
let key = (span.with_parent(None), key);
670673

671674
if diag.is_error() {
672-
if diag.level == Error && diag.is_lint {
675+
if diag.is_lint {
673676
inner.lint_err_count += 1;
674677
} else {
675678
inner.err_count += 1;
676679
}
677-
} else {
678-
// Warnings are only automatically flushed if they're forced.
679-
if diag.is_force_warn() {
680-
inner.warn_count += 1;
681-
}
682680
}
683681

684682
// FIXME(Centril, #69537): Consider reintroducing panic on overwriting a stashed diagnostic
@@ -693,15 +691,11 @@ impl DiagCtxt {
693691
let key = (span.with_parent(None), key);
694692
let diag = inner.stashed_diagnostics.remove(&key)?;
695693
if diag.is_error() {
696-
if diag.level == Error && diag.is_lint {
694+
if diag.is_lint {
697695
inner.lint_err_count -= 1;
698696
} else {
699697
inner.err_count -= 1;
700698
}
701-
} else {
702-
if diag.is_force_warn() {
703-
inner.warn_count -= 1;
704-
}
705699
}
706700
Some(DiagnosticBuilder::new_diagnostic(self, diag))
707701
}
@@ -738,7 +732,7 @@ impl DiagCtxt {
738732
#[rustc_lint_diagnostics]
739733
#[track_caller]
740734
pub fn struct_warn(&self, msg: impl Into<DiagnosticMessage>) -> DiagnosticBuilder<'_, ()> {
741-
DiagnosticBuilder::new(self, Warning(None), msg)
735+
DiagnosticBuilder::new(self, Warning, msg)
742736
}
743737

744738
/// Construct a builder at the `Allow` level with the `msg`.
@@ -1005,7 +999,7 @@ impl DiagCtxt {
1005999
(0, 0) => return,
10061000
(0, _) => inner
10071001
.emitter
1008-
.emit_diagnostic(&Diagnostic::new(Warning(None), DiagnosticMessage::Str(warnings))),
1002+
.emit_diagnostic(&Diagnostic::new(Warning, DiagnosticMessage::Str(warnings))),
10091003
(_, 0) => {
10101004
inner.emit_diagnostic(Diagnostic::new(Fatal, errors));
10111005
}
@@ -1094,7 +1088,7 @@ impl DiagCtxt {
10941088
&'a self,
10951089
warning: impl IntoDiagnostic<'a, ()>,
10961090
) -> DiagnosticBuilder<'a, ()> {
1097-
warning.into_diagnostic(self, Warning(None))
1091+
warning.into_diagnostic(self, Warning)
10981092
}
10991093

11001094
#[track_caller]
@@ -1241,21 +1235,17 @@ impl DiagCtxtInner {
12411235
for diag in diags {
12421236
// Decrement the count tracking the stash; emitting will increment it.
12431237
if diag.is_error() {
1244-
if diag.level == Error && diag.is_lint {
1238+
if diag.is_lint {
12451239
self.lint_err_count -= 1;
12461240
} else {
12471241
self.err_count -= 1;
12481242
}
12491243
} else {
1250-
if diag.is_force_warn() {
1251-
self.warn_count -= 1;
1252-
} else {
1253-
// Unless they're forced, don't flush stashed warnings when
1254-
// there are errors, to avoid causing warning overload. The
1255-
// stash would've been stolen already if it were important.
1256-
if has_errors {
1257-
continue;
1258-
}
1244+
// Unless they're forced, don't flush stashed warnings when
1245+
// there are errors, to avoid causing warning overload. The
1246+
// stash would've been stolen already if it were important.
1247+
if !diag.is_force_warn() && has_errors {
1248+
continue;
12591249
}
12601250
}
12611251
let reported_this = self.emit_diagnostic(diag);
@@ -1304,23 +1294,20 @@ impl DiagCtxtInner {
13041294
self.fulfilled_expectations.insert(expectation_id.normalize());
13051295
}
13061296

1307-
if matches!(diagnostic.level, Warning(_))
1308-
&& !self.flags.can_emit_warnings
1309-
&& !diagnostic.is_force_warn()
1310-
{
1297+
if diagnostic.level == Warning && !self.flags.can_emit_warnings {
13111298
if diagnostic.has_future_breakage() {
1312-
(*TRACK_DIAGNOSTICS)(diagnostic, &mut |_| {});
1299+
(*TRACK_DIAGNOSTIC)(diagnostic, &mut |_| {});
13131300
}
13141301
return None;
13151302
}
13161303

13171304
if matches!(diagnostic.level, Expect(_) | Allow) {
1318-
(*TRACK_DIAGNOSTICS)(diagnostic, &mut |_| {});
1305+
(*TRACK_DIAGNOSTIC)(diagnostic, &mut |_| {});
13191306
return None;
13201307
}
13211308

13221309
let mut guaranteed = None;
1323-
(*TRACK_DIAGNOSTICS)(diagnostic, &mut |mut diagnostic| {
1310+
(*TRACK_DIAGNOSTIC)(diagnostic, &mut |mut diagnostic| {
13241311
if let Some(ref code) = diagnostic.code {
13251312
self.emitted_diagnostic_codes.insert(code.clone());
13261313
}
@@ -1359,12 +1346,13 @@ impl DiagCtxtInner {
13591346
self.emitter.emit_diagnostic(&diagnostic);
13601347
if diagnostic.is_error() {
13611348
self.deduplicated_err_count += 1;
1362-
} else if let Warning(_) = diagnostic.level {
1349+
} else if matches!(diagnostic.level, ForceWarning(_) | Warning) {
13631350
self.deduplicated_warn_count += 1;
13641351
}
1352+
self.has_printed = true;
13651353
}
13661354
if diagnostic.is_error() {
1367-
if diagnostic.level == Error && diagnostic.is_lint {
1355+
if diagnostic.is_lint {
13681356
self.bump_lint_err_count();
13691357
} else {
13701358
self.bump_err_count();
@@ -1374,8 +1362,6 @@ impl DiagCtxtInner {
13741362
{
13751363
guaranteed = Some(ErrorGuaranteed::unchecked_claim_error_was_emitted());
13761364
}
1377-
} else {
1378-
self.bump_warn_count();
13791365
}
13801366
});
13811367

@@ -1471,10 +1457,6 @@ impl DiagCtxtInner {
14711457
self.panic_if_treat_err_as_bug();
14721458
}
14731459

1474-
fn bump_warn_count(&mut self) {
1475-
self.warn_count += 1;
1476-
}
1477-
14781460
fn panic_if_treat_err_as_bug(&self) {
14791461
if self.treat_err_as_bug() {
14801462
match (
@@ -1562,14 +1544,17 @@ pub enum Level {
15621544
/// Its `EmissionGuarantee` is `ErrorGuaranteed`.
15631545
Error,
15641546

1565-
/// A warning about the code being compiled. Does not prevent compilation from finishing.
1547+
/// A `force-warn` lint warning about the code being compiled. Does not prevent compilation
1548+
/// from finishing.
15661549
///
1567-
/// This [`LintExpectationId`] is used for expected lint diagnostics, which should
1568-
/// also emit a warning due to the `force-warn` flag. In all other cases this should
1569-
/// be `None`.
1550+
/// The [`LintExpectationId`] is used for expected lint diagnostics. In all other cases this
1551+
/// should be `None`.
1552+
ForceWarning(Option<LintExpectationId>),
1553+
1554+
/// A warning about the code being compiled. Does not prevent compilation from finishing.
15701555
///
15711556
/// Its `EmissionGuarantee` is `()`.
1572-
Warning(Option<LintExpectationId>),
1557+
Warning,
15731558

15741559
/// A message giving additional context. Rare, because notes are more commonly attached to other
15751560
/// diagnostics such as errors.
@@ -1622,7 +1607,7 @@ impl Level {
16221607
Bug | DelayedBug | Fatal | Error => {
16231608
spec.set_fg(Some(Color::Red)).set_intense(true);
16241609
}
1625-
Warning(_) => {
1610+
ForceWarning(_) | Warning => {
16261611
spec.set_fg(Some(Color::Yellow)).set_intense(cfg!(windows));
16271612
}
16281613
Note | OnceNote => {
@@ -1641,7 +1626,7 @@ impl Level {
16411626
match self {
16421627
Bug | DelayedBug => "error: internal compiler error",
16431628
Fatal | Error => "error",
1644-
Warning(_) => "warning",
1629+
ForceWarning(_) | Warning => "warning",
16451630
Note | OnceNote => "note",
16461631
Help | OnceHelp => "help",
16471632
FailureNote => "failure-note",
@@ -1655,7 +1640,7 @@ impl Level {
16551640

16561641
pub fn get_expectation_id(&self) -> Option<LintExpectationId> {
16571642
match self {
1658-
Expect(id) | Warning(Some(id)) => Some(*id),
1643+
Expect(id) | ForceWarning(Some(id)) => Some(*id),
16591644
_ => None,
16601645
}
16611646
}

‎compiler/rustc_expand/src/proc_macro_server.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -380,7 +380,7 @@ impl ToInternal<rustc_errors::Level> for Level {
380380
fn to_internal(self) -> rustc_errors::Level {
381381
match self {
382382
Level::Error => rustc_errors::Level::Error,
383-
Level::Warning => rustc_errors::Level::Warning(None),
383+
Level::Warning => rustc_errors::Level::Warning,
384384
Level::Note => rustc_errors::Level::Note,
385385
Level::Help => rustc_errors::Level::Help,
386386
_ => unreachable!("unknown proc_macro::Level variant: {:?}", self),

‎compiler/rustc_interface/src/callbacks.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
//! The functions in this file should fall back to the default set in their
1010
//! origin crate when the `TyCtxt` is not present in TLS.
1111
12-
use rustc_errors::{Diagnostic, TRACK_DIAGNOSTICS};
12+
use rustc_errors::{Diagnostic, TRACK_DIAGNOSTIC};
1313
use rustc_middle::dep_graph::{DepNodeExt, TaskDepsRef};
1414
use rustc_middle::ty::tls;
1515
use rustc_query_system::dep_graph::dep_node::default_dep_kind_debug;
@@ -103,5 +103,5 @@ pub fn setup_callbacks() {
103103
.swap(&(dep_kind_debug as fn(_, &mut fmt::Formatter<'_>) -> _));
104104
rustc_query_system::dep_graph::dep_node::DEP_NODE_DEBUG
105105
.swap(&(dep_node_debug as fn(_, &mut fmt::Formatter<'_>) -> _));
106-
TRACK_DIAGNOSTICS.swap(&(track_diagnostic as _));
106+
TRACK_DIAGNOSTIC.swap(&(track_diagnostic as _));
107107
}

‎compiler/rustc_middle/src/lint.rs

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -312,8 +312,9 @@ pub fn struct_lint_level(
312312
// create a `DiagnosticBuilder` and continue as we would for warnings.
313313
rustc_errors::Level::Expect(expect_id)
314314
}
315-
Level::ForceWarn(Some(expect_id)) => rustc_errors::Level::Warning(Some(expect_id)),
316-
Level::Warn | Level::ForceWarn(None) => rustc_errors::Level::Warning(None),
315+
Level::ForceWarn(Some(expect_id)) => rustc_errors::Level::ForceWarning(Some(expect_id)),
316+
Level::ForceWarn(None) => rustc_errors::Level::ForceWarning(None),
317+
Level::Warn => rustc_errors::Level::Warning,
317318
Level::Deny | Level::Forbid => rustc_errors::Level::Error,
318319
};
319320
let mut err = DiagnosticBuilder::new(sess.dcx(), err_level, "");
@@ -350,22 +351,19 @@ pub fn struct_lint_level(
350351
// suppressed the lint due to macros.
351352
err.primary_message(msg);
352353

354+
let name = lint.name_lower();
355+
err.code(DiagnosticId::Lint { name, has_future_breakage });
356+
353357
// Lint diagnostics that are covered by the expect level will not be emitted outside
354358
// the compiler. It is therefore not necessary to add any information for the user.
355359
// This will therefore directly call the decorate function which will in turn emit
356360
// the `Diagnostic`.
357361
if let Level::Expect(_) = level {
358-
let name = lint.name_lower();
359-
err.code(DiagnosticId::Lint { name, has_future_breakage, is_force_warn: false });
360362
decorate(&mut err);
361363
err.emit();
362364
return;
363365
}
364366

365-
let name = lint.name_lower();
366-
let is_force_warn = matches!(level, Level::ForceWarn(_));
367-
err.code(DiagnosticId::Lint { name, has_future_breakage, is_force_warn });
368-
369367
if let Some(future_incompatible) = future_incompatible {
370368
let explanation = match future_incompatible.reason {
371369
FutureIncompatibilityReason::FutureReleaseErrorDontReportInDeps

‎compiler/rustc_session/src/parse.rs

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -143,11 +143,7 @@ pub fn feature_warn_issue(
143143
// Decorate this as a future-incompatibility lint as in rustc_middle::lint::struct_lint_level
144144
let lint = UNSTABLE_SYNTAX_PRE_EXPANSION;
145145
let future_incompatible = lint.future_incompatible.as_ref().unwrap();
146-
err.code(DiagnosticId::Lint {
147-
name: lint.name_lower(),
148-
has_future_breakage: false,
149-
is_force_warn: false,
150-
});
146+
err.code(DiagnosticId::Lint { name: lint.name_lower(), has_future_breakage: false });
151147
err.warn(lint.desc);
152148
err.note(format!("for more information, see {}", future_incompatible.reference));
153149

‎src/tools/miri/src/diagnostics.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -455,7 +455,7 @@ pub fn report_msg<'tcx>(
455455
let sess = machine.tcx.sess;
456456
let level = match diag_level {
457457
DiagLevel::Error => Level::Error,
458-
DiagLevel::Warning => Level::Warning(None),
458+
DiagLevel::Warning => Level::Warning,
459459
DiagLevel::Note => Level::Note,
460460
};
461461
let mut err = DiagnosticBuilder::<()>::new(sess.dcx(), level, title);

‎src/tools/rustfmt/src/parse/session.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -446,7 +446,7 @@ mod tests {
446446
Some(ignore_list),
447447
);
448448
let span = MultiSpan::from_span(mk_sp(BytePos(0), BytePos(1)));
449-
let non_fatal_diagnostic = build_diagnostic(DiagnosticLevel::Warning(None), Some(span));
449+
let non_fatal_diagnostic = build_diagnostic(DiagnosticLevel::Warning, Some(span));
450450
emitter.emit_diagnostic(&non_fatal_diagnostic);
451451
assert_eq!(num_emitted_errors.load(Ordering::Acquire), 0);
452452
assert_eq!(can_reset_errors.load(Ordering::Acquire), true);
@@ -470,7 +470,7 @@ mod tests {
470470
None,
471471
);
472472
let span = MultiSpan::from_span(mk_sp(BytePos(0), BytePos(1)));
473-
let non_fatal_diagnostic = build_diagnostic(DiagnosticLevel::Warning(None), Some(span));
473+
let non_fatal_diagnostic = build_diagnostic(DiagnosticLevel::Warning, Some(span));
474474
emitter.emit_diagnostic(&non_fatal_diagnostic);
475475
assert_eq!(num_emitted_errors.load(Ordering::Acquire), 1);
476476
assert_eq!(can_reset_errors.load(Ordering::Acquire), false);
@@ -507,8 +507,8 @@ mod tests {
507507
);
508508
let bar_span = MultiSpan::from_span(mk_sp(BytePos(0), BytePos(1)));
509509
let foo_span = MultiSpan::from_span(mk_sp(BytePos(21), BytePos(22)));
510-
let bar_diagnostic = build_diagnostic(DiagnosticLevel::Warning(None), Some(bar_span));
511-
let foo_diagnostic = build_diagnostic(DiagnosticLevel::Warning(None), Some(foo_span));
510+
let bar_diagnostic = build_diagnostic(DiagnosticLevel::Warning, Some(bar_span));
511+
let foo_diagnostic = build_diagnostic(DiagnosticLevel::Warning, Some(foo_span));
512512
let fatal_diagnostic = build_diagnostic(DiagnosticLevel::Fatal, None);
513513
emitter.emit_diagnostic(&bar_diagnostic);
514514
emitter.emit_diagnostic(&foo_diagnostic);

0 commit comments

Comments
 (0)
This repository has been archived.