Resolve rebase

2023-01-21 20:55:37 +03:00
parent 35dbec338a
commit 8d590dc303
4 changed files with 2 additions and 40 deletions
--- a/compiler/rustc_infer/src/errors/note_and_explain.rs
+++ b/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",
        }