Resolve rebase

compiler/rustc_error_messages/locales/en-US/infer.ftl

@@ -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] {""}

compiler/rustc_infer/src/errors/mod.rs

@@ -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> {

compiler/rustc_infer/src/errors/note_and_explain.rs

@@ -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",
         }

compiler/rustc_infer/src/infer/error_reporting/note.rs

@@ -1,6 +1,6 @@
 use crate::errors::{
-    note_and_explain, BorrowedTooLong, FullfillReqLifetime, LfBoundNotSatisfied, OutlivesBound,
+    note_and_explain, FullfillReqLifetime, LfBoundNotSatisfied, OutlivesBound, OutlivesContent,
-    OutlivesContent, RefLongerThanData, RegionOriginNote,
+    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,