bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Gather rustc-specific functions around MatchCheckCtxt

Browse source
This commit is contained in:
Nadrieril 2023-12-10 22:14:00 +01:00
parent 281002d42c
commit 3691a0aee5
8 changed files with 903 additions and 900 deletions
Download patch file Download diff file Expand all files Collapse all files

8
compiler/rustc_pattern_analysis/src/errors.rs
View file

@ -1,4 +1,4 @@
use crate::{pat::WitnessPat, usefulness::MatchCheckCtxt};
use crate::{cx::MatchCheckCtxt, pat::WitnessPat};
use rustc_errors::{AddToDiagnostic, Diagnostic, SubdiagnosticMessage};
use rustc_macros::{LintDiagnostic, Subdiagnostic};
@ -24,18 +24,18 @@ impl<'tcx> Uncovered<'tcx> {
cx: &MatchCheckCtxt<'p, 'tcx>,
witnesses: Vec<WitnessPat<'tcx>>,
) -> Self {
let witness_1 = witnesses.get(0).unwrap().to_diagnostic_pat(cx);
let witness_1 = cx.hoist_witness_pat(witnesses.get(0).unwrap());
Self {
span,
count: witnesses.len(),
// Substitute dummy values if witnesses is smaller than 3. These will never be read.
witness_2: witnesses
.get(1)
.map(|w| w.to_diagnostic_pat(cx))
.map(|w| cx.hoist_witness_pat(w))
.unwrap_or_else(|| witness_1.clone()),
witness_3: witnesses
.get(2)
.map(|w| w.to_diagnostic_pat(cx))
.map(|w| cx.hoist_witness_pat(w))
.unwrap_or_else(|| witness_1.clone()),
witness_1,
remainder: witnesses.len().saturating_sub(3),