Make it easier to debug where a region error was created

This commit is contained in:
Oli Scherer 2022-12-19 12:10:26 +00:00
parent 8b5a96ec45
commit 562d846ff0
2 changed files with 19 additions and 3 deletions

View File

@ -22,7 +22,7 @@
use rustc_middle::ty::TypeVisitor;
use rustc_middle::ty::{self, RegionVid, Ty};
use rustc_span::symbol::{kw, Ident};
use rustc_span::Span;
use rustc_span::{Span, DUMMY_SP};
use crate::borrowck_errors;
use crate::session_diagnostics::{
@ -70,7 +70,23 @@ fn description(&self) -> &'static str {
///
/// Usually we expect this to either be empty or contain a small number of items, so we can avoid
/// allocation most of the time.
pub(crate) type RegionErrors<'tcx> = Vec<RegionErrorKind<'tcx>>;
#[derive(Default)]
pub(crate) struct RegionErrors<'tcx>(Vec<RegionErrorKind<'tcx>>);
impl<'tcx> RegionErrors<'tcx> {
#[track_caller]
pub fn push(&mut self, val: impl Into<RegionErrorKind<'tcx>>) {
let val = val.into();
ty::tls::with(|tcx| tcx.sess.delay_span_bug(DUMMY_SP, "{val:?}"));
self.0.push(val);
}
pub fn is_empty(&self) -> bool {
self.0.is_empty()
}
pub fn into_iter(self) -> impl Iterator<Item = RegionErrorKind<'tcx>> {
self.0.into_iter()
}
}
#[derive(Clone, Debug)]
pub(crate) enum RegionErrorKind<'tcx> {

View File

@ -562,7 +562,7 @@ pub(super) fn solve(
let mir_def_id = body.source.def_id();
self.propagate_constraints(body);
let mut errors_buffer = RegionErrors::new();
let mut errors_buffer = RegionErrors::default();
// If this is a closure, we can propagate unsatisfied
// `outlives_requirements` to our creator, so create a vector