diff options
| author | Scott McMurray <scottmcm@users.noreply.github.com> | 2021-12-05 20:17:35 -0800 |
|---|---|---|
| committer | Scott McMurray <scottmcm@users.noreply.github.com> | 2021-12-05 20:17:35 -0800 |
| commit | 308fd59f42dff89e55dff1c7a85fa9fa2411cab3 (patch) | |
| tree | 8225260b030ecb9b41f2db4a423f4fe2dbf60d20 /compiler/rustc_data_structures/src/graph | |
| parent | 2a9e0831d6603d87220cedd1b1293e2eb82ef55c (diff) | |
| download | rust-308fd59f42dff89e55dff1c7a85fa9fa2411cab3.tar.gz rust-308fd59f42dff89e55dff1c7a85fa9fa2411cab3.zip | |
Stop enabling `in_band_lifetimes` in rustc_data_structures
There's a conversation in the tracking issue about possibly unaccepting `in_band_lifetimes`, but it's used heavily in the compiler, and thus there'd need to be a bunch of PRs like this if that were to happen. So here's one to see how much of an impact it has. (Oh, and I removed `nll` while I was here too, since it didn't seem needed. Let me know if I should put that back.)
Diffstat (limited to 'compiler/rustc_data_structures/src/graph')
| -rw-r--r-- | compiler/rustc_data_structures/src/graph/iterate/mod.rs | 6 | ||||
| -rw-r--r-- | compiler/rustc_data_structures/src/graph/scc/mod.rs | 2 | ||||
| -rw-r--r-- | compiler/rustc_data_structures/src/graph/vec_graph/mod.rs | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/compiler/rustc_data_structures/src/graph/iterate/mod.rs b/compiler/rustc_data_structures/src/graph/iterate/mod.rs index a9db3497b23..57007611a76 100644 --- a/compiler/rustc_data_structures/src/graph/iterate/mod.rs +++ b/compiler/rustc_data_structures/src/graph/iterate/mod.rs @@ -79,7 +79,7 @@ where visited: BitSet<G::Node>, } -impl<G> DepthFirstSearch<'graph, G> +impl<'graph, G> DepthFirstSearch<'graph, G> where G: ?Sized + DirectedGraph + WithNumNodes + WithSuccessors, { @@ -209,7 +209,7 @@ where settled: BitSet<G::Node>, } -impl<G> TriColorDepthFirstSearch<'graph, G> +impl<'graph, G> TriColorDepthFirstSearch<'graph, G> where G: ?Sized + DirectedGraph + WithNumNodes + WithSuccessors, { @@ -276,7 +276,7 @@ where } } -impl<G> TriColorDepthFirstSearch<'graph, G> +impl<G> TriColorDepthFirstSearch<'_, G> where G: ?Sized + DirectedGraph + WithNumNodes + WithSuccessors + WithStartNode, { diff --git a/compiler/rustc_data_structures/src/graph/scc/mod.rs b/compiler/rustc_data_structures/src/graph/scc/mod.rs index b84f28b6a9e..508a084b311 100644 --- a/compiler/rustc_data_structures/src/graph/scc/mod.rs +++ b/compiler/rustc_data_structures/src/graph/scc/mod.rs @@ -97,7 +97,7 @@ impl<N: Idx, S: Idx> WithNumEdges for Sccs<N, S> { } } -impl<N: Idx, S: Idx> GraphSuccessors<'graph> for Sccs<N, S> { +impl<'graph, N: Idx, S: Idx> GraphSuccessors<'graph> for Sccs<N, S> { type Item = S; type Iter = std::iter::Cloned<std::slice::Iter<'graph, S>>; diff --git a/compiler/rustc_data_structures/src/graph/vec_graph/mod.rs b/compiler/rustc_data_structures/src/graph/vec_graph/mod.rs index 4ed88878418..5d9bc1b2e51 100644 --- a/compiler/rustc_data_structures/src/graph/vec_graph/mod.rs +++ b/compiler/rustc_data_structures/src/graph/vec_graph/mod.rs @@ -94,7 +94,7 @@ impl<N: Idx> WithNumEdges for VecGraph<N> { } } -impl<N: Idx> GraphSuccessors<'graph> for VecGraph<N> { +impl<'graph, N: Idx> GraphSuccessors<'graph> for VecGraph<N> { type Item = N; type Iter = std::iter::Cloned<std::slice::Iter<'graph, N>>; |
