Rollup merge of #87880 - pierwill:graph-duplicate-trait-bound, r=LeSeulArtichaut

JohnTitor · web-flow · commit e72754dc594f · 2021-08-11T04:18:44.000+09:00
Remove duplicate trait bounds in `rustc_data_structures::graph`

Remove duplicate trait bounds in `rustc_data_structures::graph`.
diff --git a/compiler/rustc_data_structures/src/graph/mod.rs b/compiler/rustc_data_structures/src/graph/mod.rs
@@ -60,18 +60,13 @@ pub trait WithStartNode: DirectedGraph {
 }
 
 pub trait ControlFlowGraph:
-    DirectedGraph + WithStartNode + WithPredecessors + WithStartNode + WithSuccessors + WithNumNodes
+    DirectedGraph + WithStartNode + WithPredecessors + WithSuccessors + WithNumNodes
 {
     // convenient trait
 }
 
 impl<T> ControlFlowGraph for T where
-    T: DirectedGraph
-        + WithStartNode
-        + WithPredecessors
-        + WithStartNode
-        + WithSuccessors
-        + WithNumNodes
+    T: DirectedGraph + WithStartNode + WithPredecessors + WithSuccessors + WithNumNodes
 {
 }
 

Original file line number	Diff line number	Diff line change
`@@ -60,18 +60,13 @@ pub trait WithStartNode: DirectedGraph {`
`60`	`60`	`}`
`61`	`61`
`62`	`62`	`pub trait ControlFlowGraph:`
`63`		`- DirectedGraph + WithStartNode + WithPredecessors + WithStartNode + WithSuccessors + WithNumNodes`
	`63`	`+ DirectedGraph + WithStartNode + WithPredecessors + WithSuccessors + WithNumNodes`
`64`	`64`	`{`
`65`	`65`	`// convenient trait`
`66`	`66`	`}`
`67`	`67`
`68`	`68`	`impl<T> ControlFlowGraph for T where`
`69`		`- T: DirectedGraph`
`70`		`- + WithStartNode`
`71`		`- + WithPredecessors`
`72`		`- + WithStartNode`
`73`		`- + WithSuccessors`
`74`		`- + WithNumNodes`
	`69`	`+ T: DirectedGraph + WithStartNode + WithPredecessors + WithSuccessors + WithNumNodes`
`75`	`70`	`{`
`76`	`71`	`}`
`77`	`72`