diff options
| author | Havvy <ryan.havvy@gmail.com> | 2016-11-01 20:32:02 -0700 |
|---|---|---|
| committer | Havvy <ryan.havvy@gmail.com> | 2016-11-01 20:32:02 -0700 |
| commit | 3d1ecc50ed7e83bb63116bc53f97eee409c7922d (patch) | |
| tree | 4b999e686d7b0abec2324050b3485a0e5975c078 /src/librustc_data_structures/graph | |
| parent | ea4b94dab0d526135dd658d3a314cc5462d439b0 (diff) | |
| download | rust-3d1ecc50ed7e83bb63116bc53f97eee409c7922d.tar.gz rust-3d1ecc50ed7e83bb63116bc53f97eee409c7922d.zip | |
Normalize generic bounds in graph iterators
Use where clasues and only where clauses for bounds in the iterators for Graph. The rest of the code uses bounds on the generic declarations for Debug, and we may want to change those to for consistency. I did not do that here because I don't know whether or not that's a good idea. But for the iterators, they were inconsistent causing confusion, at least for me.
Diffstat (limited to 'src/librustc_data_structures/graph')
| -rw-r--r-- | src/librustc_data_structures/graph/mod.rs | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/librustc_data_structures/graph/mod.rs b/src/librustc_data_structures/graph/mod.rs index fdb629ca5a5..111f3a2cd87 100644 --- a/src/librustc_data_structures/graph/mod.rs +++ b/src/librustc_data_structures/graph/mod.rs @@ -336,7 +336,7 @@ impl<'g, N: Debug, E: Debug> Iterator for AdjacentEdges<'g, N, E> { } } -pub struct AdjacentTargets<'g, N: 'g, E: 'g> +pub struct AdjacentTargets<'g, N, E> where N: 'g, E: 'g { @@ -351,7 +351,7 @@ impl<'g, N: Debug, E: Debug> Iterator for AdjacentTargets<'g, N, E> { } } -pub struct AdjacentSources<'g, N: 'g, E: 'g> +pub struct AdjacentSources<'g, N, E> where N: 'g, E: 'g { @@ -366,7 +366,10 @@ impl<'g, N: Debug, E: Debug> Iterator for AdjacentSources<'g, N, E> { } } -pub struct DepthFirstTraversal<'g, N: 'g, E: 'g> { +pub struct DepthFirstTraversal<'g, N, E> + where N: 'g, + E: 'g +{ graph: &'g Graph<N, E>, stack: Vec<NodeIndex>, visited: BitVector, |
