bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

add RegionName::span

Browse source
This commit is contained in:
SNCPlay42 2020-07-21 22:50:56 +01:00
parent 8ad7bc3f42
commit c27633489d
2 changed files with 19 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/librustc_mir/borrow_check/diagnostics/region_errors.rs
View file

@ -19,7 +19,7 @@ use crate::borrow_check::{
MirBorrowckCtxt, MirBorrowckCtxt,
}; };
use super::{OutlivesSuggestionBuilder, RegionName, RegionNameSource}; use super::{OutlivesSuggestionBuilder, RegionName};
impl ConstraintDescription for ConstraintCategory { impl ConstraintDescription for ConstraintCategory {
fn description(&self) -> &'static str { fn description(&self) -> &'static str {
@ -396,18 +396,8 @@ impl<'a, 'tcx> MirBorrowckCtxt<'a, 'tcx> {
diag.span_label(upvar_span, "variable captured here"); diag.span_label(upvar_span, "variable captured here");
} }
match self.give_region_a_name(*outlived_fr).unwrap().source { if let Some(fr_span) = self.give_region_a_name(*outlived_fr).unwrap().span() {
RegionNameSource::NamedEarlyBoundRegion(fr_span) diag.span_label(fr_span, "inferred to be a `FnMut` closure");
| RegionNameSource::NamedFreeRegion(fr_span)
| RegionNameSource::SynthesizedFreeEnvRegion(fr_span, _)
| RegionNameSource::CannotMatchHirTy(fr_span, _)
| RegionNameSource::MatchedHirTy(fr_span)
| RegionNameSource::MatchedAdtAndSegment(fr_span)
| RegionNameSource::AnonRegionFromUpvar(fr_span, _)
| RegionNameSource::AnonRegionFromOutput(fr_span, _, _) => {
diag.span_label(fr_span, "inferred to be a `FnMut` closure");
}
_ => {}
} }
diag.note( diag.note(

16
src/librustc_mir/borrow_check/diagnostics/region_name.rs
View file

@ -68,6 +68,22 @@ impl RegionName {
} }
} }
crate fn span(&self) -> Option<Span> {
match self.source {
RegionNameSource::Static => None,
RegionNameSource::NamedEarlyBoundRegion(span)
| RegionNameSource::NamedFreeRegion(span)
| RegionNameSource::SynthesizedFreeEnvRegion(span, _)
| RegionNameSource::CannotMatchHirTy(span, _)
| RegionNameSource::MatchedHirTy(span)
| RegionNameSource::MatchedAdtAndSegment(span)
| RegionNameSource::AnonRegionFromUpvar(span, _)
| RegionNameSource::AnonRegionFromOutput(span, _, _)
| RegionNameSource::AnonRegionFromYieldTy(span, _)
| RegionNameSource::AnonRegionFromAsyncFn(span) => Some(span),
}
}
crate fn highlight_region_name(&self, diag: &mut DiagnosticBuilder<'_>) { crate fn highlight_region_name(&self, diag: &mut DiagnosticBuilder<'_>) {
match &self.source { match &self.source {
RegionNameSource::NamedFreeRegion(span) RegionNameSource::NamedFreeRegion(span)