rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Resolve rebase

Browse Source
This commit is contained in:
Nikita Tomashevich
2023-01-21 20:55:37 +03:00
committed by IQuant
parent 35dbec338a
commit 8d590dc303
4 changed files with 2 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
compiler/rustc_infer/src/infer/error_reporting/note.rs
View File

@@ -1,6 +1,6 @@
use crate::errors::{
note_and_explain, BorrowedTooLong, FullfillReqLifetime, LfBoundNotSatisfied, OutlivesBound,
OutlivesContent, RefLongerThanData, RegionOriginNote,
note_and_explain, FullfillReqLifetime, LfBoundNotSatisfied, OutlivesBound, OutlivesContent,
RefLongerThanData, RegionOriginNote,
};
use crate::infer::error_reporting::{note_and_explain_region, TypeErrCtxt};
use crate::infer::{self, SubregionOrigin};
@@ -200,28 +200,6 @@ impl<'tcx> TypeErrCtxt<'_, 'tcx> {
}
.into_diagnostic(&self.tcx.sess.parse_sess.span_diagnostic)
}
infer::DataBorrowed(ty, span) => {
let type_valid = note_and_explain::RegionExplanation::new(
self.tcx,
sub,
None,
note_and_explain::PrefixKind::TypeValidFor,
note_and_explain::SuffixKind::Empty,
);
let borrow_lasts_for = note_and_explain::RegionExplanation::new(
self.tcx,
sup,
None,
note_and_explain::PrefixKind::BorrowLastsFor,
note_and_explain::SuffixKind::Empty,
);
BorrowedTooLong {
span,
ty: self.resolve_vars_if_possible(ty),
notes: type_valid.into_iter().chain(borrow_lasts_for).collect(),
}
.into_diagnostic(&self.tcx.sess.parse_sess.span_diagnostic)
}
infer::ReferenceOutlivesReferent(ty, span) => {
let pointer_valid = note_and_explain::RegionExplanation::new(
self.tcx,