From 2529b730874985cc2d8d97032d9790ae6c5bcbae Mon Sep 17 00:00:00 2001 From: Niko Matsakis Date: Sat, 5 Mar 2016 06:54:24 -0500 Subject: [PATCH] adopt new header style to sidestep rust-lang-nursery/rustfmt#836 --- src/librustc_data_structures/graph/mod.rs | 18 ++++++------------ src/librustc_data_structures/unify/mod.rs | 6 +++--- 2 files changed, 9 insertions(+), 15 deletions(-) diff --git a/src/librustc_data_structures/graph/mod.rs b/src/librustc_data_structures/graph/mod.rs index f33769f39e83..99a87d1e760c 100644 --- a/src/librustc_data_structures/graph/mod.rs +++ b/src/librustc_data_structures/graph/mod.rs @@ -121,8 +121,7 @@ impl Graph { } } - /////////////////////////////////////////////////////////////////////////// - // Simple accessors + // # Simple accessors #[inline] pub fn all_nodes(&self) -> &[Node] { @@ -144,8 +143,7 @@ impl Graph { self.edges.len() } - /////////////////////////////////////////////////////////////////////////// - // Node construction + // # Node construction pub fn next_node_index(&self) -> NodeIndex { NodeIndex(self.nodes.len()) @@ -172,8 +170,7 @@ impl Graph { &self.nodes[idx.0] } - /////////////////////////////////////////////////////////////////////////// - // Edge construction and queries + // # Edge construction and queries pub fn next_edge_index(&self) -> EdgeIndex { EdgeIndex(self.edges.len()) @@ -232,8 +229,7 @@ impl Graph { self.edges[edge.0].next_edge[dir.repr] } - /////////////////////////////////////////////////////////////////////////// - // Iterating over nodes, edges + // # Iterating over nodes, edges pub fn each_node<'a, F>(&'a self, mut f: F) -> bool where F: FnMut(NodeIndex, &'a Node) -> bool @@ -274,8 +270,7 @@ impl Graph { self.incoming_edges(target).sources() } - /////////////////////////////////////////////////////////////////////////// - // Fixed-point iteration + // # Fixed-point iteration // // A common use for graphs in our compiler is to perform // fixed-point iteration. In this case, each edge represents a @@ -306,8 +301,7 @@ impl Graph { } } -/////////////////////////////////////////////////////////////////////////// -// Iterators +// # Iterators pub struct AdjacentEdges<'g, N, E> where N: 'g, diff --git a/src/librustc_data_structures/unify/mod.rs b/src/librustc_data_structures/unify/mod.rs index fe7fa06c9622..7a1ac830b229 100644 --- a/src/librustc_data_structures/unify/mod.rs +++ b/src/librustc_data_structures/unify/mod.rs @@ -251,8 +251,7 @@ impl sv::SnapshotVecDelegate for Delegate { fn reverse(_: &mut Vec>, _: ()) {} } -/////////////////////////////////////////////////////////////////////////// -// Base union-find algorithm, where we are just making sets +// # Base union-find algorithm, where we are just making sets impl<'tcx, K: UnifyKey> UnificationTable where K::Value: Combine @@ -281,7 +280,8 @@ impl<'tcx, K: UnifyKey> UnificationTable } } -/////////////////////////////////////////////////////////////////////////// +// # Non-subtyping unification +// // Code to handle keys which carry a value, like ints, // floats---anything that doesn't have a subtyping relationship we // need to worry about.