From 4887eb7b2d0e427a0dbf07bfade329101389e32a Mon Sep 17 00:00:00 2001 From: xFrednet Date: Thu, 25 Nov 2021 21:59:55 +0100 Subject: [PATCH] Added `panics` for unreachable states for expectations (RFC 2383) --- compiler/rustc_errors/src/lib.rs | 28 ++++++++++++++++------------ compiler/rustc_lint/src/expect.rs | 2 ++ 2 files changed, 18 insertions(+), 12 deletions(-) diff --git a/compiler/rustc_errors/src/lib.rs b/compiler/rustc_errors/src/lib.rs index b53208a6e5d1c..6dc91a5aa9c98 100644 --- a/compiler/rustc_errors/src/lib.rs +++ b/compiler/rustc_errors/src/lib.rs @@ -942,18 +942,22 @@ impl Handler { let mut inner = self.inner.borrow_mut(); for mut diag in diags.into_iter() { - if let Some(mut unstable_id) = diag.level.get_expectation_id() { - let lint_index = unstable_id.get_lint_index(); - - // The unstable to stable map only maps the unstable it to a stable id - // the lint index is manually transferred here. - unstable_id.set_lint_index(None); - if let Some(mut stable_id) = unstable_to_stable.get(&unstable_id).map(|id| *id) { - stable_id.set_lint_index(lint_index); - diag.level = Level::Expect(stable_id); - inner.fulfilled_expectations.insert(stable_id); - } - } + let mut unstable_id = diag + .level + .get_expectation_id() + .expect("all diagnostics inside `unstable_expect_diagnostics` must have a `LintExpectationId`"); + + // The unstable to stable map only maps the unstable it to a stable id + // the lint index is manually transferred here. + let lint_index = unstable_id.get_lint_index(); + unstable_id.set_lint_index(None); + let mut stable_id = *unstable_to_stable + .get(&unstable_id) + .expect("each unstable `LintExpectationId` must have a matching stable id"); + + stable_id.set_lint_index(lint_index); + diag.level = Level::Expect(stable_id); + inner.fulfilled_expectations.insert(stable_id); (*TRACK_DIAGNOSTICS)(&diag); } diff --git a/compiler/rustc_lint/src/expect.rs b/compiler/rustc_lint/src/expect.rs index 5dcd1f0fbe6be..7611b41b97eac 100644 --- a/compiler/rustc_lint/src/expect.rs +++ b/compiler/rustc_lint/src/expect.rs @@ -20,6 +20,8 @@ pub fn check_expectations(tcx: TyCtxt<'_>) { // holds stable ids if let LintExpectationId::Stable { hir_id, .. } = id { emit_unfulfilled_expectation_lint(tcx, *hir_id, expectation); + } else { + unreachable!("at this stage all `LintExpectationId`s are stable"); } } }