yeet unused stuff

Author: lcnr

compiler/rustc_borrowck/messages.ftl

@@ -156,12 +156,6 @@ borrowck_moved_due_to_usage_in_operator =
         *[false] operator
     }
 
-borrowck_opaque_type_lifetime_mismatch =
-    opaque type used twice with different lifetimes
-    .label = lifetime `{$arg}` used here
-    .prev_lifetime_label = lifetime `{$prev}` previously used here
-    .note = if all non-lifetime generic parameters are the same, but the lifetime parameters differ, it is not possible to differentiate the opaque types
-
 borrowck_partial_var_move_by_use_in_closure =
     variable {$is_partial ->
         [true] partially moved

compiler/rustc_borrowck/src/diagnostics/region_errors.rs

@@ -87,9 +87,6 @@ impl<'tcx> RegionErrors<'tcx> {
         let guar = self.1.sess.dcx().delayed_bug(format!("{val:?}"));
         self.0.push((val, guar));
     }
-    pub(crate) fn is_empty(&self) -> bool {
-        self.0.is_empty()
-    }
     pub(crate) fn into_iter(
         self,
     ) -> impl Iterator<Item = (RegionErrorKind<'tcx>, ErrorGuaranteed)> {

compiler/rustc_borrowck/src/region_infer/mod.rs

@@ -22,7 +22,7 @@ use rustc_span::hygiene::DesugaringKind;
 use rustc_span::{DUMMY_SP, Span};
 use tracing::{debug, instrument, trace};
 
-use crate::constraints::graph::{self, NormalConstraintGraph, RegionGraph};
+use crate::constraints::graph::NormalConstraintGraph;
 use crate::constraints::{ConstraintSccIndex, OutlivesConstraint, OutlivesConstraintSet};
 use crate::dataflow::BorrowIndex;
 use crate::diagnostics::{RegionErrorKind, RegionErrors, UniverseInfo};
@@ -271,7 +271,6 @@ enum Trace<'a, 'tcx> {
     StartRegion,
     FromGraph(&'a OutlivesConstraint<'tcx>),
     FromStatic(RegionVid),
-    FromMember(RegionVid, RegionVid, Span),
     NotVisited,
 }
 
@@ -1510,20 +1509,6 @@ impl<'tcx> RegionInferenceContext<'tcx> {
                             result.push(c);
                         }
 
-                        Trace::FromMember(sup, sub, span) => {
-                            let c = OutlivesConstraint {
-                                sup,
-                                sub,
-                                locations: Locations::All(span),
-                                span,
-                                category: ConstraintCategory::OpaqueType,
-                                variance_info: ty::VarianceDiagInfo::default(),
-                                from_closure: false,
-                            };
-                            p = c.sup;
-                            result.push(c);
-                        }
-
                         Trace::StartRegion => {
                             result.reverse();
                             return Some((result, r));
@@ -1892,11 +1877,6 @@ impl<'tcx> RegionInferenceContext<'tcx> {
         &self.constraint_sccs
     }
 
-    /// Access to the region graph, built from the outlives constraints.
-    pub(crate) fn region_graph(&self) -> RegionGraph<'_, 'tcx, graph::Normal> {
-        self.constraint_graph.region_graph(&self.constraints, self.universal_regions().fr_static)
-    }
-
     /// Returns the representative `RegionVid` for a given SCC.
     /// See `RegionTracker` for how a region variable ID is chosen.
     ///

compiler/rustc_borrowck/src/region_infer/opaque_types.rs

@@ -16,8 +16,7 @@ use rustc_middle::ty::{
     Ty, TyCtxt, TypeFoldable, TypeFolder, TypeSuperFoldable, TypeVisitableExt, fold_regions,
 };
 use rustc_mir_dataflow::points::DenseLocationMap;
-use rustc_span::sym::opaque;
-use rustc_span::{ErrorGuaranteed, Span};
+use rustc_span::Span;
 use rustc_trait_selection::error_reporting::infer::region::unexpected_hidden_region_diagnostic;
 use rustc_trait_selection::opaque_types::check_opaque_type_parameter_valid;
 use tracing::{debug, instrument};
@@ -131,7 +130,7 @@ pub(crate) fn handle_opaque_type_uses<'tcx>(
             }
         });
 
-        let mut hidden_type = hidden_type.fold_with(&mut OpaqueHiddenTypeFolder {
+        let hidden_type = hidden_type.fold_with(&mut OpaqueHiddenTypeFolder {
             infcx,
 
             opaque_type_key,
@@ -163,7 +162,7 @@ pub(crate) fn handle_opaque_type_uses<'tcx>(
     }
 
     if !unexpected_hidden_regions.is_empty() {
-        let guar = report_unexpected_hidden_region_errors(
+        report_unexpected_hidden_region_errors(
             root_cx,
             infcx,
             universal_region_relations,
@@ -559,7 +558,7 @@ impl<'tcx> InferCtxt<'tcx> {
     }
 }
 
-pub(super) fn report_unexpected_hidden_region_errors<'tcx>(
+fn report_unexpected_hidden_region_errors<'tcx>(
     root_cx: &mut BorrowCheckRootCtxt<'tcx>,
     infcx: &BorrowckInferCtxt<'tcx>,
     universal_region_relations: &Frozen<UniversalRegionRelations<'tcx>>,

compiler/rustc_borrowck/src/session_diagnostics.rs

@@ -1,7 +1,7 @@
 use rustc_errors::MultiSpan;
 use rustc_errors::codes::*;
 use rustc_macros::{Diagnostic, LintDiagnostic, Subdiagnostic};
-use rustc_middle::ty::{GenericArg, Ty};
+use rustc_middle::ty::Ty;
 use rustc_span::Span;
 
 use crate::diagnostics::RegionName;
@@ -294,19 +294,6 @@ pub(crate) struct MoveBorrow<'a> {
     pub borrow_span: Span,
 }
 
-#[derive(Diagnostic)]
-#[diag(borrowck_opaque_type_lifetime_mismatch)]
-pub(crate) struct LifetimeMismatchOpaqueParam<'tcx> {
-    pub arg: GenericArg<'tcx>,
-    pub prev: GenericArg<'tcx>,
-    #[primary_span]
-    #[label]
-    #[note]
-    pub span: Span,
-    #[label(borrowck_prev_lifetime_label)]
-    pub prev_span: Span,
-}
-
 #[derive(Subdiagnostic)]
 pub(crate) enum CaptureReasonLabel<'a> {
     #[label(borrowck_moved_due_to_call)]