bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

remove fr_is_local and outlived_fr_is_local fields from ErrorConstraintInfo

Browse source 
`fr_is_local` was fully unused, and `outlived_fr_is_local` was used once
This commit is contained in:
dianne 2025-02-13 19:28:50 -08:00
parent c241e14650
commit 3f9cca3943
1 changed files with 14 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

45
compiler/rustc_borrowck/src/diagnostics/region_errors.rs
View file

@ -147,9 +147,7 @@ pub(crate) enum RegionErrorKind<'tcx> {
pub(crate) struct ErrorConstraintInfo<'tcx> { pub(crate) struct ErrorConstraintInfo<'tcx> {
// fr: outlived_fr // fr: outlived_fr
pub(super) fr: RegionVid, pub(super) fr: RegionVid,
pub(super) fr_is_local: bool,
pub(super) outlived_fr: RegionVid, pub(super) outlived_fr: RegionVid,
pub(super) outlived_fr_is_local: bool,
// Category and span for best blame constraint // Category and span for best blame constraint
pub(super) category: ConstraintCategory<'tcx>, pub(super) category: ConstraintCategory<'tcx>,
@ -471,14 +469,7 @@ impl<'infcx, 'tcx> MirBorrowckCtxt<'_, 'infcx, 'tcx> {
fr_is_local, outlived_fr_is_local, category fr_is_local, outlived_fr_is_local, category
); );
let errci = ErrorConstraintInfo { let errci = ErrorConstraintInfo { fr, outlived_fr, category, span: cause.span };
fr,
outlived_fr,
fr_is_local,
outlived_fr_is_local,
category,
span: cause.span,
};
let mut diag = match (category, fr_is_local, outlived_fr_is_local) { let mut diag = match (category, fr_is_local, outlived_fr_is_local) {
(ConstraintCategory::Return(kind), true, false) if self.is_closure_fn_mut(fr) => { (ConstraintCategory::Return(kind), true, false) if self.is_closure_fn_mut(fr) => {
@ -680,11 +671,7 @@ impl<'infcx, 'tcx> MirBorrowckCtxt<'_, 'infcx, 'tcx> {
&& self.regioncx.universal_regions().defining_ty.is_fn_def()) && self.regioncx.universal_regions().defining_ty.is_fn_def())
|| self.regioncx.universal_regions().defining_ty.is_const() || self.regioncx.universal_regions().defining_ty.is_const()
{ {
return self.report_general_error(&ErrorConstraintInfo { return self.report_general_error(errci);
fr_is_local: true,
outlived_fr_is_local: false,
..*errci
});
} }
let mut diag = let mut diag =
@ -762,15 +749,7 @@ impl<'infcx, 'tcx> MirBorrowckCtxt<'_, 'infcx, 'tcx> {
/// ``` /// ```
#[allow(rustc::diagnostic_outside_of_impl)] // FIXME #[allow(rustc::diagnostic_outside_of_impl)] // FIXME
fn report_general_error(&self, errci: &ErrorConstraintInfo<'tcx>) -> Diag<'infcx> { fn report_general_error(&self, errci: &ErrorConstraintInfo<'tcx>) -> Diag<'infcx> {
let ErrorConstraintInfo { let ErrorConstraintInfo { fr, outlived_fr, span, category, .. } = errci;
fr,
fr_is_local,
outlived_fr,
outlived_fr_is_local,
span,
category,
..
} = errci;
let mir_def_name = self.infcx.tcx.def_descr(self.mir_def_id().to_def_id()); let mir_def_name = self.infcx.tcx.def_descr(self.mir_def_id().to_def_id());
@ -789,13 +768,17 @@ impl<'infcx, 'tcx> MirBorrowckCtxt<'_, 'infcx, 'tcx> {
let outlived_fr_name = self.give_region_a_name(*outlived_fr).unwrap(); let outlived_fr_name = self.give_region_a_name(*outlived_fr).unwrap();
outlived_fr_name.highlight_region_name(&mut diag); outlived_fr_name.highlight_region_name(&mut diag);
let err_category = match (category, outlived_fr_is_local, fr_is_local) { let err_category = match category {
(ConstraintCategory::Return(_), true, _) => LifetimeReturnCategoryErr::WrongReturn { ConstraintCategory::Return(_)
span: *span, if self.regioncx.universal_regions().is_local_free_region(*outlived_fr) =>
mir_def_name, {
outlived_fr_name, LifetimeReturnCategoryErr::WrongReturn {
fr_name: &fr_name, span: *span,
}, mir_def_name,
outlived_fr_name,
fr_name: &fr_name,
}
}
_ => LifetimeReturnCategoryErr::ShortReturn { _ => LifetimeReturnCategoryErr::ShortReturn {
span: *span, span: *span,
category_desc: category.description(), category_desc: category.description(),