nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-10-30 22:12:15 +00:00
Code Issues 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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
compiler/rustc_error_messages/locales/en-US/infer.ftl
View File

@ -150,8 +150,6 @@ infer_region_explanation = {$pref_kind ->
[lf_param_must_outlive] but lifetime parameter must outlive
[lf_instantiated_with] lifetime instantiated with
[lf_must_outlive] but lifetime must outlive
[type_valid_for] the type is valid for
[borrow_lasts_for] but the borrow lasts for
[pointer_valid_for] the pointer is valid for
[data_valid_for] but the referenced data is only valid for
[empty] {""}

10
compiler/rustc_infer/src/errors/mod.rs
View File

@ -971,16 +971,6 @@ pub struct LfBoundNotSatisfied<'a> {
pub notes: Vec<note_and_explain::RegionExplanation<'a>>,
}
#[derive(Diagnostic)]
#[diag(infer_borrowed_too_long, code = "E0490")]
pub struct BorrowedTooLong<'a> {
#[primary_span]
pub span: Span,
pub ty: Ty<'a>,
#[subdiagnostic]
pub notes: Vec<note_and_explain::RegionExplanation<'a>>,
}
#[derive(Diagnostic)]
#[diag(infer_ref_longer_than_data, code = "E0491")]
pub struct RefLongerThanData<'a> {

4
compiler/rustc_infer/src/errors/note_and_explain.rs
View File

@ -131,8 +131,6 @@ pub enum PrefixKind {
LfParamMustOutlive,
LfInstantiatedWith,
LfMustOutlive,
TypeValidFor,
BorrowLastsFor,
PointerValidFor,
DataValidFor,
}
@ -157,8 +155,6 @@ impl IntoDiagnosticArg for PrefixKind {
Self::LfParamMustOutlive => "lf_param_must_outlive",
Self::LfInstantiatedWith => "lf_instantiated_with",
Self::LfMustOutlive => "lf_must_outlive",
Self::TypeValidFor => "type_valid_for",
Self::BorrowLastsFor => "borrow_lasts_for",
Self::PointerValidFor => "pointer_valid_for",
Self::DataValidFor => "data_valid_for",
}

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,