Use RPITIT for Successors and Predecessors traits

Now with RPITIT instead of GAT!

Author: WaffleLapkin

compiler/rustc_borrowck/src/constraints/graph.rs

@@ -223,9 +223,7 @@ impl<'s, 'tcx, D: ConstraintGraphDirection> graph::DirectedGraph for RegionGraph
 }
 
 impl<'s,'tcx,D:ConstraintGraphDirection> graph::SuccessorsforRegionGraph<'s,'tcx,D>{
-typeSuccessors<'g> = Successors<'s,'tcx,D>whereSelf:'g;
-
-fnsuccessors(&self,node:Self::Node) -> Self::Successors<'_>{
+fnsuccessors(&self,node:Self::Node) -> implIterator<Item = Self::Node>{
 self.outgoing_regions(node)
 }
 }

compiler/rustc_data_structures/src/graph/mod.rs

@@ -25,19 +25,11 @@ pub trait StartNode: DirectedGraph {
 }
 
 pubtraitSuccessors:DirectedGraph{
-typeSuccessors<'g>:Iterator<Item = Self::Node>
-where
-Self:'g;
-
-fnsuccessors(&self,node:Self::Node) -> Self::Successors<'_>;
+fnsuccessors(&self,node:Self::Node) -> implIterator<Item = Self::Node>;
 }
 
 pubtraitPredecessors:DirectedGraph{
-typePredecessors<'g>:Iterator<Item = Self::Node>
-where
-Self:'g;
-
-fnpredecessors(&self,node:Self::Node) -> Self::Predecessors<'_>;
+fnpredecessors(&self,node:Self::Node) -> implIterator<Item = Self::Node>;
 }
 
 /// Alias for [`DirectedGraph`] + [`StartNode`] + [`Predecessors`] + [`Successors`].

compiler/rustc_data_structures/src/graph/reference.rs

@@ -15,17 +15,13 @@ impl<'graph, G: StartNode> StartNode for &'graph G {
 }
 
 impl<'graph,G:Successors>Successorsfor&'graphG{
-typeSuccessors<'g> = G::Successors<'g>where'graph:'g;
-
-fnsuccessors(&self,node:Self::Node) -> Self::Successors<'_>{
+fnsuccessors(&self,node:Self::Node) -> implIterator<Item = Self::Node>{
 (**self).successors(node)
 }
 }
 
 impl<'graph,G:Predecessors>Predecessorsfor&'graphG{
-typePredecessors<'g> = G::Predecessors<'g>where'graph:'g;
-
-fnpredecessors(&self,node:Self::Node) -> Self::Predecessors<'_>{
+fnpredecessors(&self,node:Self::Node) -> implIterator<Item = Self::Node>{
 (**self).predecessors(node)
 }
 }

compiler/rustc_data_structures/src/graph/scc/mod.rs

@@ -104,9 +104,7 @@ impl<N: Idx, S: Idx + Ord> NumEdges for Sccs<N, S> {
 }
 
 impl<N:Idx,S:Idx + Ord>SuccessorsforSccs<N,S>{
-typeSuccessors<'g> = std::iter::Cloned<std::slice::Iter<'g,S>>;
-
-fnsuccessors(&self,node:S) -> Self::Successors<'_>{
+fnsuccessors(&self,node:S) -> implIterator<Item = Self::Node>{
 self.successors(node).iter().cloned()
 }
 }

compiler/rustc_data_structures/src/graph/tests.rs

@@ -1,7 +1,5 @@
 usecrate::fx::FxHashMap;
 use std::cmp::max;
-use std::iter;
-use std::slice;
 
 usesuper::*;
 
@@ -49,17 +47,13 @@ impl StartNode for TestGraph {
 }
 
 implPredecessorsforTestGraph{
-typePredecessors<'g> = iter::Cloned<slice::Iter<'g,usize>>;
-
-fnpredecessors(&self,node:usize) -> Self::Predecessors<'_>{
+fnpredecessors(&self,node:usize) -> implIterator<Item = Self::Node>{
 self.predecessors[&node].iter().cloned()
 }
 }
 
 implSuccessorsforTestGraph{
-typeSuccessors<'g> = iter::Cloned<slice::Iter<'g,usize>>;
-
-fnsuccessors(&self,node:usize) -> Self::Successors<'_>{
+fnsuccessors(&self,node:usize) -> implIterator<Item = Self::Node>{
 self.successors[&node].iter().cloned()
 }
 }

compiler/rustc_data_structures/src/graph/vec_graph/mod.rs

@@ -93,9 +93,7 @@ impl<N: Idx> NumEdges for VecGraph<N> {
 }
 
 impl<N:Idx + Ord>SuccessorsforVecGraph<N>{
-typeSuccessors<'g> = std::iter::Cloned<std::slice::Iter<'g,N>>;
-
-fnsuccessors(&self,node:N) -> Self::Successors<'_>{
+fnsuccessors(&self,node:N) -> implIterator<Item = Self::Node>{
 self.successors(node).iter().cloned()
 }
 }

compiler/rustc_middle/src/mir/basic_blocks.rs

@@ -1,5 +1,5 @@
 usecrate::mir::traversal::Postorder;
-usecrate::mir::{BasicBlock,BasicBlockData,Successors,Terminator,TerminatorKind,START_BLOCK};
+usecrate::mir::{BasicBlock,BasicBlockData,Terminator,TerminatorKind,START_BLOCK};
 
 use rustc_data_structures::fx::FxHashMap;
 use rustc_data_structures::graph;
@@ -156,19 +156,15 @@ impl<'tcx> graph::StartNode for BasicBlocks<'tcx> {
 }
 
 impl<'tcx> graph::SuccessorsforBasicBlocks<'tcx>{
-typeSuccessors<'b> = Successors<'b>where'tcx:'b;
-
 #[inline]
-fnsuccessors(&self,node:Self::Node) -> Self::Successors<'_>{
+fnsuccessors(&self,node:Self::Node) -> implIterator<Item = Self::Node>{
 self.basic_blocks[node].terminator().successors()
 }
 }
 
 impl<'tcx> graph::PredecessorsforBasicBlocks<'tcx>{
-typePredecessors<'b> = std::iter::Copied<std::slice::Iter<'b,BasicBlock>>where'tcx:'b;
-
 #[inline]
-fnpredecessors(&self,node:Self::Node) -> Self::Predecessors<'_>{
+fnpredecessors(&self,node:Self::Node) -> implIterator<Item = Self::Node>{
 self.predecessors()[node].iter().copied()
 }
 }

compiler/rustc_mir_transform/src/coverage/graph.rs

@@ -209,19 +209,15 @@ impl graph::StartNode for CoverageGraph {
 }
 
 impl graph::SuccessorsforCoverageGraph{
-typeSuccessors<'g> = std::iter::Cloned<std::slice::Iter<'g,BasicCoverageBlock>>;
-
 #[inline]
-fnsuccessors(&self,node:Self::Node) -> Self::Successors<'_>{
+fnsuccessors(&self,node:Self::Node) -> implIterator<Item = Self::Node>{
 self.successors[node].iter().cloned()
 }
 }
 
 impl graph::PredecessorsforCoverageGraph{
-typePredecessors<'g> = std::iter::Copied<std::slice::Iter<'g,BasicCoverageBlock>>;
-
 #[inline]
-fnpredecessors(&self,node:Self::Node) -> Self::Predecessors<'_>{
+fnpredecessors(&self,node:Self::Node) -> implIterator<Item = Self::Node>{
 self.predecessors[node].iter().copied()
 }
 }