Rename WithNumEdges => NumEdges and WithStartNode => StartNode

Author: WaffleLapkin

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

@@ -1,4 +1,4 @@
-usesuper::{DirectedGraph,Successors,WithStartNode};
+usesuper::{DirectedGraph,StartNode,Successors};
 use rustc_index::bit_set::BitSet;
 use rustc_index::{IndexSlice,IndexVec};
 use std::ops::ControlFlow;
@@ -278,7 +278,7 @@ where
 
 impl<G>TriColorDepthFirstSearch<'_,G>
 where
-G: ?Sized + DirectedGraph + Successors + WithStartNode,
+G: ?Sized + DirectedGraph + Successors + StartNode,
 {
 /// Performs a depth-first search, starting from `G::start_node()`.
 ///

compiler/rustc_data_structures/src/graph/mod.rs

@@ -16,10 +16,14 @@ pub trait DirectedGraph {
 fnnum_nodes(&self) -> usize;
 }
 
-pubtraitWithNumEdges:DirectedGraph{
+pubtraitNumEdges:DirectedGraph{
 fnnum_edges(&self) -> usize;
 }
 
+pubtraitStartNode:DirectedGraph{
+fnstart_node(&self) -> Self::Node;
+}
+
 pubtraitSuccessors:DirectedGraph{
 typeSuccessors<'g>:Iterator<Item = Self::Node>
 where
@@ -40,20 +44,16 @@ pub trait Predecessors: DirectedGraph {
 fnpredecessors(&self,node:Self::Node) -> Self::Predecessors<'_>;
 }
 
-pubtraitWithStartNode:DirectedGraph{
-fnstart_node(&self) -> Self::Node;
-}
-
-pubtraitControlFlowGraph:DirectedGraph + WithStartNode + Predecessors + Successors{
+pubtraitControlFlowGraph:DirectedGraph + StartNode + Predecessors + Successors{
 // convenient trait
 }
 
-impl<T>ControlFlowGraphforTwhereT:DirectedGraph + WithStartNode + Predecessors + Successors{}
+impl<T>ControlFlowGraphforTwhereT:DirectedGraph + StartNode + Predecessors + Successors{}
 
 /// 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 + Successors,
+G: ?Sized + DirectedGraph + StartNode + Successors,
 {
  iterate::TriColorDepthFirstSearch::new(graph)
 .run_from_start(&mut iterate::CycleDetector)

compiler/rustc_data_structures/src/graph/reference.rs

@@ -8,7 +8,7 @@ impl<'graph, G: DirectedGraph> DirectedGraph for &'graph G {
 }
 }
 
-impl<'graph,G:WithStartNode>WithStartNodefor&'graphG{
+impl<'graph,G:StartNode>StartNodefor&'graphG{
 fnstart_node(&self) -> Self::Node{
 (**self).start_node()
 }

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

@@ -7,7 +7,7 @@
 
 usecrate::fx::FxHashSet;
 usecrate::graph::vec_graph::VecGraph;
-usecrate::graph::{DirectedGraph,Successors,WithNumEdges};
+usecrate::graph::{DirectedGraph,NumEdges,Successors};
 use rustc_index::{Idx,IndexSlice,IndexVec};
 use std::ops::Range;
 
@@ -97,7 +97,7 @@ impl<N: Idx, S: Idx + Ord> DirectedGraph for Sccs<N, S> {
 }
 }
 
-impl<N:Idx,S:Idx + Ord>WithNumEdgesforSccs<N,S>{
+impl<N:Idx,S:Idx + Ord>NumEdgesforSccs<N,S>{
 fnnum_edges(&self) -> usize{
 self.scc_data.all_successors.len()
 }

compiler/rustc_data_structures/src/graph/tests.rs

@@ -42,7 +42,7 @@ impl DirectedGraph for TestGraph {
 }
 }
 
-implWithStartNodeforTestGraph{
+implStartNodeforTestGraph{
 fnstart_node(&self) -> usize{
 self.start_node
 }

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

@@ -1,4 +1,4 @@
-usecrate::graph::{DirectedGraph,Successors,WithNumEdges};
+usecrate::graph::{DirectedGraph,NumEdges,Successors};
 use rustc_index::{Idx,IndexVec};
 
 #[cfg(test)]
@@ -86,7 +86,7 @@ impl<N: Idx> DirectedGraph for VecGraph<N> {
 }
 }
 
-impl<N:Idx>WithNumEdgesforVecGraph<N>{
+impl<N:Idx>NumEdgesforVecGraph<N>{
 fnnum_edges(&self) -> usize{
 self.edge_targets.len()
 }

compiler/rustc_middle/src/mir/basic_blocks.rs

@@ -148,7 +148,7 @@ impl<'tcx> graph::DirectedGraph for BasicBlocks<'tcx> {
 }
 }
 
-impl<'tcx> graph::WithStartNodeforBasicBlocks<'tcx>{
+impl<'tcx> graph::StartNodeforBasicBlocks<'tcx>{
 #[inline]
 fnstart_node(&self) -> Self::Node{
 START_BLOCK

compiler/rustc_middle/src/mir/generic_graphviz.rs

@@ -5,7 +5,7 @@ use std::io::{self, Write};
 
 pubstructGraphvizWriter<
 'a,
-G: graph::DirectedGraph + graph::Successors + graph::WithStartNode,
+G: graph::DirectedGraph + graph::Successors + graph::StartNode,
 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::Successors + graph::WithStartNode,
+G: graph::DirectedGraph + graph::Successors + graph::StartNode,
 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/graph.rs

@@ -1,7 +1,7 @@
 use rustc_data_structures::captures::Captures;
 use rustc_data_structures::fx::FxHashSet;
 use rustc_data_structures::graph::dominators::{self,Dominators};
-use rustc_data_structures::graph::{self,DirectedGraph,WithStartNode};
+use rustc_data_structures::graph::{self,DirectedGraph,StartNode};
 use rustc_index::bit_set::BitSet;
 use rustc_index::IndexVec;
 use rustc_middle::mir::{self,BasicBlock,Terminator,TerminatorKind};
@@ -200,7 +200,7 @@ impl graph::DirectedGraph for CoverageGraph {
 }
 }
 
-impl graph::WithStartNodeforCoverageGraph{
+impl graph::StartNodeforCoverageGraph{
 #[inline]
 fnstart_node(&self) -> Self::Node{
 self.bcb_from_bb(mir::START_BLOCK)