Merge WithNumNodes into DirectedGraph

Author: WaffleLapkin

compiler/rustc_borrowck/src/constraints/graph.rs

@@ -216,9 +216,7 @@ impl<'s, 'tcx, D: ConstraintGraphDirection> Iterator for Successors<'s, 'tcx, D>
 
 impl<'s,'tcx,D:ConstraintGraphDirection> graph::DirectedGraphforRegionGraph<'s,'tcx,D>{
 typeNode = RegionVid;
-}
 
-impl<'s,'tcx,D:ConstraintGraphDirection> graph::WithNumNodesforRegionGraph<'s,'tcx,D>{
 fnnum_nodes(&self) -> usize{
 self.constraint_graph.first_constraints.len()
 }

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

@@ -1,19 +1,19 @@
-usesuper::{DirectedGraph,WithNumNodes,WithStartNode,WithSuccessors};
+usesuper::{DirectedGraph,WithStartNode,WithSuccessors};
 use rustc_index::bit_set::BitSet;
 use rustc_index::{IndexSlice,IndexVec};
 use std::ops::ControlFlow;
 
 #[cfg(test)]
 mod tests;
 
-pubfnpost_order_from<G:DirectedGraph + WithSuccessors + WithNumNodes>(
+pubfnpost_order_from<G:DirectedGraph + WithSuccessors>(
 graph:&G,
 start_node:G::Node,
 ) -> Vec<G::Node>{
 post_order_from_to(graph, start_node,None)
 }
 
-pubfnpost_order_from_to<G:DirectedGraph + WithSuccessors + WithNumNodes>(
+pubfnpost_order_from_to<G:DirectedGraph + WithSuccessors>(
 graph:&G,
 start_node:G::Node,
 end_node:Option<G::Node>,
@@ -27,7 +27,7 @@ pub fn post_order_from_to<G: DirectedGraph + WithSuccessors + WithNumNodes>(
  result
 }
 
-fnpost_order_walk<G:DirectedGraph + WithSuccessors + WithNumNodes>(
+fnpost_order_walk<G:DirectedGraph + WithSuccessors>(
 graph:&G,
 node:G::Node,
 result:&mutVec<G::Node>,
@@ -60,7 +60,7 @@ fn post_order_walk<G: DirectedGraph + WithSuccessors + WithNumNodes>(
 }
 }
 
-pubfnreverse_post_order<G:DirectedGraph + WithSuccessors + WithNumNodes>(
+pubfnreverse_post_order<G:DirectedGraph + WithSuccessors>(
 graph:&G,
 start_node:G::Node,
 ) -> Vec<G::Node>{
@@ -72,7 +72,7 @@ pub fn reverse_post_order<G: DirectedGraph + WithSuccessors + WithNumNodes>(
 /// A "depth-first search" iterator for a directed graph.
 pubstructDepthFirstSearch<'graph,G>
 where
-G: ?Sized + DirectedGraph + WithNumNodes + WithSuccessors,
+G: ?Sized + DirectedGraph + WithSuccessors,
 {
 graph:&'graphG,
 stack:Vec<G::Node>,
@@ -81,7 +81,7 @@ where
 
 impl<'graph,G>DepthFirstSearch<'graph,G>
 where
-G: ?Sized + DirectedGraph + WithNumNodes + WithSuccessors,
+G: ?Sized + DirectedGraph + WithSuccessors,
 {
 pubfnnew(graph:&'graphG) -> Self{
 Self{ graph,stack:vec![],visited:BitSet::new_empty(graph.num_nodes())}
@@ -127,7 +127,7 @@ where
 
 impl<G> std::fmt::DebugforDepthFirstSearch<'_,G>
 where
-G: ?Sized + DirectedGraph + WithNumNodes + WithSuccessors,
+G: ?Sized + DirectedGraph + WithSuccessors,
 {
 fnfmt(&self,fmt:&mut std::fmt::Formatter<'_>) -> std::fmt::Result{
 letmut f = fmt.debug_set();
@@ -140,7 +140,7 @@ where
 
 impl<G>IteratorforDepthFirstSearch<'_,G>
 where
-G: ?Sized + DirectedGraph + WithNumNodes + WithSuccessors,
+G: ?Sized + DirectedGraph + WithSuccessors,
 {
 typeItem = G::Node;
 
@@ -201,7 +201,7 @@ struct Event<N> {
 /// [CLR]: https://en.wikipedia.org/wiki/Introduction_to_Algorithms
 pubstructTriColorDepthFirstSearch<'graph,G>
 where
-G: ?Sized + DirectedGraph + WithNumNodes + WithSuccessors,
+G: ?Sized + DirectedGraph + WithSuccessors,
 {
 graph:&'graphG,
 stack:Vec<Event<G::Node>>,
@@ -211,7 +211,7 @@ where
 
 impl<'graph,G>TriColorDepthFirstSearch<'graph,G>
 where
-G: ?Sized + DirectedGraph + WithNumNodes + WithSuccessors,
+G: ?Sized + DirectedGraph + WithSuccessors,
 {
 pubfnnew(graph:&'graphG) -> Self{
 TriColorDepthFirstSearch{
@@ -278,7 +278,7 @@ where
 
 impl<G>TriColorDepthFirstSearch<'_,G>
 where
-G: ?Sized + DirectedGraph + WithNumNodes + WithSuccessors + WithStartNode,
+G: ?Sized + DirectedGraph + WithSuccessors + WithStartNode,
 {
 /// Performs a depth-first search, starting from `G::start_node()`.
 ///

compiler/rustc_data_structures/src/graph/mod.rs

@@ -12,9 +12,7 @@ mod tests;
 
 pubtraitDirectedGraph{
 typeNode:Idx;
-}
 
-pubtraitWithNumNodes:DirectedGraph{
 fnnum_nodes(&self) -> usize;
 }
 
@@ -28,10 +26,7 @@ where
 {
 fnsuccessors(&self,node:Self::Node) -> <SelfasGraphSuccessors<'_>>::Iter;
 
-fndepth_first_search(&self,from:Self::Node) -> iterate::DepthFirstSearch<'_,Self>
-where
-Self:WithNumNodes,
-{
+fndepth_first_search(&self,from:Self::Node) -> iterate::DepthFirstSearch<'_,Self>{
  iterate::DepthFirstSearch::new(self).with_start_node(from)
 }
 }
@@ -60,20 +55,20 @@ pub trait WithStartNode: DirectedGraph {
 }
 
 pubtraitControlFlowGraph:
-DirectedGraph + WithStartNode + WithPredecessors + WithSuccessors + WithNumNodes
+DirectedGraph + WithStartNode + WithPredecessors + WithSuccessors
 {
 // convenient trait
 }
 
 impl<T>ControlFlowGraphforTwhere
-T:DirectedGraph + WithStartNode + WithPredecessors + WithSuccessors + WithNumNodes
+T:DirectedGraph + WithStartNode + WithPredecessors + WithSuccessors
 {
 }
 
 /// Returns `true` if the graph has a cycle that is reachable from the start node.
 pubfnis_cyclic<G>(graph:&G) -> bool
 where
-G: ?Sized + DirectedGraph + WithStartNode + WithSuccessors + WithNumNodes,
+G: ?Sized + DirectedGraph + WithStartNode + WithSuccessors,
 {
  iterate::TriColorDepthFirstSearch::new(graph)
 .run_from_start(&mut iterate::CycleDetector)

compiler/rustc_data_structures/src/graph/reference.rs

@@ -2,9 +2,7 @@ use super::*;
 
 impl<'graph,G:DirectedGraph>DirectedGraphfor&'graphG{
 typeNode = G::Node;
-}
 
-impl<'graph,G:WithNumNodes>WithNumNodesfor&'graphG{
 fnnum_nodes(&self) -> usize{
 (**self).num_nodes()
 }

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

@@ -7,7 +7,7 @@
 
 usecrate::fx::FxHashSet;
 usecrate::graph::vec_graph::VecGraph;
-usecrate::graph::{DirectedGraph,GraphSuccessors,WithNumEdges,WithNumNodes,WithSuccessors};
+usecrate::graph::{DirectedGraph,GraphSuccessors,WithNumEdges,WithSuccessors};
 use rustc_index::{Idx,IndexSlice,IndexVec};
 use std::ops::Range;
 
@@ -39,7 +39,7 @@ pub struct SccData<S: Idx> {
 }
 
 impl<N:Idx,S:Idx + Ord>Sccs<N,S>{
-pubfnnew(graph:&(implDirectedGraph<Node = N> + WithNumNodes + WithSuccessors)) -> Self{
+pubfnnew(graph:&(implDirectedGraph<Node = N> + WithSuccessors)) -> Self{
 SccsConstruction::construct(graph)
 }
 
@@ -89,17 +89,15 @@ impl<N: Idx, S: Idx + Ord> Sccs<N, S> {
 }
 }
 
-impl<N:Idx,S:Idx>DirectedGraphforSccs<N,S>{
+impl<N:Idx,S:Idx + Ord>DirectedGraphforSccs<N,S>{
 typeNode = S;
-}
 
-impl<N:Idx,S:Idx + Ord>WithNumNodesforSccs<N,S>{
 fnnum_nodes(&self) -> usize{
 self.num_sccs()
 }
 }
 
-impl<N:Idx,S:Idx>WithNumEdgesforSccs<N,S>{
+impl<N:Idx,S:Idx + Ord>WithNumEdgesforSccs<N,S>{
 fnnum_edges(&self) -> usize{
 self.scc_data.all_successors.len()
 }
@@ -158,7 +156,7 @@ impl<S: Idx> SccData<S> {
 }
 }
 
-structSccsConstruction<'c,G:DirectedGraph + WithNumNodes + WithSuccessors,S:Idx>{
+structSccsConstruction<'c,G:DirectedGraph + WithSuccessors,S:Idx>{
 graph:&'cG,
 
 /// The state of each node; used during walk to record the stack
@@ -218,7 +216,7 @@ enum WalkReturn<S> {
 
 impl<'c,G,S>SccsConstruction<'c,G,S>
 where
-G:DirectedGraph + WithNumNodes + WithSuccessors,
+G:DirectedGraph + WithSuccessors,
 S:Idx,
 {
 /// Identifies SCCs in the graph `G` and computes the resulting

compiler/rustc_data_structures/src/graph/tests.rs

@@ -36,6 +36,10 @@ impl TestGraph {
 
 implDirectedGraphforTestGraph{
 typeNode = usize;
+
+fnnum_nodes(&self) -> usize{
+self.num_nodes
+}
 }
 
 implWithStartNodeforTestGraph{
@@ -44,12 +48,6 @@ impl WithStartNode for TestGraph {
 }
 }
 
-implWithNumNodesforTestGraph{
-fnnum_nodes(&self) -> usize{
-self.num_nodes
-}
-}
-
 implWithPredecessorsforTestGraph{
 fnpredecessors(&self,node:usize) -> <SelfasGraphPredecessors<'_>>::Iter{
 self.predecessors[&node].iter().cloned()

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

@@ -1,4 +1,4 @@
-usecrate::graph::{DirectedGraph,GraphSuccessors,WithNumEdges,WithNumNodes,WithSuccessors};
+usecrate::graph::{DirectedGraph,GraphSuccessors,WithNumEdges,WithSuccessors};
 use rustc_index::{Idx,IndexVec};
 
 #[cfg(test)]
@@ -80,9 +80,7 @@ impl<N: Idx + Ord> VecGraph<N> {
 
 impl<N:Idx>DirectedGraphforVecGraph<N>{
 typeNode = N;
-}
 
-impl<N:Idx>WithNumNodesforVecGraph<N>{
 fnnum_nodes(&self) -> usize{
 self.node_starts.len() - 1
 }

compiler/rustc_middle/src/mir/basic_blocks.rs

@@ -141,9 +141,7 @@ impl<'tcx> std::ops::Deref for BasicBlocks<'tcx> {
 
 impl<'tcx> graph::DirectedGraphforBasicBlocks<'tcx>{
 typeNode = BasicBlock;
-}
 
-impl<'tcx> graph::WithNumNodesforBasicBlocks<'tcx>{
 #[inline]
 fnnum_nodes(&self) -> usize{
 self.basic_blocks.len()

compiler/rustc_middle/src/mir/generic_graphviz.rs

@@ -5,7 +5,7 @@ use std::io::{self, Write};
 
 pubstructGraphvizWriter<
 'a,
-G: graph::DirectedGraph + graph::WithSuccessors + graph::WithStartNode + graph::WithNumNodes,
+G: graph::DirectedGraph + graph::WithSuccessors + graph::WithStartNode,
 NodeContentFn:Fn(<Gas graph::DirectedGraph>::Node) -> Vec<String>,
 EdgeLabelsFn:Fn(<Gas graph::DirectedGraph>::Node) -> Vec<String>,
 >{
@@ -19,7 +19,7 @@ pub struct GraphvizWriter<
 
 impl<
 'a,
-G: graph::DirectedGraph + graph::WithSuccessors + graph::WithStartNode + graph::WithNumNodes,
+G: graph::DirectedGraph + graph::WithSuccessors + graph::WithStartNode,
 NodeContentFn:Fn(<Gas graph::DirectedGraph>::Node) -> Vec<String>,
 EdgeLabelsFn:Fn(<Gas graph::DirectedGraph>::Node) -> Vec<String>,
 >GraphvizWriter<'a,G,NodeContentFn,EdgeLabelsFn>

compiler/rustc_mir_transform/src/coverage/counters.rs

@@ -2,7 +2,7 @@ use std::fmt::{self, Debug};
 
 use rustc_data_structures::captures::Captures;
 use rustc_data_structures::fx::FxHashMap;
-use rustc_data_structures::graph::WithNumNodes;
+use rustc_data_structures::graph::DirectedGraph;
 use rustc_index::IndexVec;
 use rustc_middle::mir::coverage::{CounterId,CovTerm,Expression,ExpressionId,Op};