diff options
| author | bors <bors@rust-lang.org> | 2024-05-31 16:12:57 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-05-31 16:12:57 +0000 |
| commit | ada5e2c7b5427a591e30baeeee2698a5eb6db0bd (patch) | |
| tree | 4247c2e818e0681dbfb865479bd017172b70b6c7 /compiler/rustc_data_structures/src/graph | |
| parent | 2a2c29aafa50bf6fe53d66b32070eba59f860ac3 (diff) | |
| parent | df9cd1700d5460c923b7915ec8db6e3e1618f32b (diff) | |
| download | rust-ada5e2c7b5427a591e30baeeee2698a5eb6db0bd.tar.gz rust-ada5e2c7b5427a591e30baeeee2698a5eb6db0bd.zip | |
Auto merge of #125824 - matthiaskrgr:rollup-eam7i0p, r=matthiaskrgr
Rollup of 7 pull requests Successful merges: - #125652 (Revert propagation of drop-live information from Polonius) - #125730 (Apply `x clippy --fix` and `x fmt` on Rustc) - #125756 (coverage: Optionally instrument the RHS of lazy logical operators) - #125776 (Stop using `translate_args` in the new solver) - #125796 (Also InstSimplify `&raw*`) - #125807 (Also resolve the type of constants, even if we already turned it into an error constant) - #125816 (Don't build the `rust-demangler` binary for coverage tests) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_data_structures/src/graph')
| -rw-r--r-- | compiler/rustc_data_structures/src/graph/dominators/mod.rs | 2 | ||||
| -rw-r--r-- | compiler/rustc_data_structures/src/graph/iterate/mod.rs | 4 | ||||
| -rw-r--r-- | compiler/rustc_data_structures/src/graph/scc/mod.rs | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/compiler/rustc_data_structures/src/graph/dominators/mod.rs b/compiler/rustc_data_structures/src/graph/dominators/mod.rs index 30e240cf85b..d1d2de670b8 100644 --- a/compiler/rustc_data_structures/src/graph/dominators/mod.rs +++ b/compiler/rustc_data_structures/src/graph/dominators/mod.rs @@ -93,7 +93,7 @@ fn dominators_impl<G: ControlFlowGraph>(graph: &G) -> Inner<G::Node> { // These are all done here rather than through one of the 'standard' // graph traversals to help make this fast. 'recurse: while let Some(frame) = stack.last_mut() { - while let Some(successor) = frame.iter.next() { + for successor in frame.iter.by_ref() { if real_to_pre_order[successor].is_none() { let pre_order_idx = pre_order_to_real.push(successor); real_to_pre_order[successor] = Some(pre_order_idx); diff --git a/compiler/rustc_data_structures/src/graph/iterate/mod.rs b/compiler/rustc_data_structures/src/graph/iterate/mod.rs index 78d05a6e195..6fca57d32f7 100644 --- a/compiler/rustc_data_structures/src/graph/iterate/mod.rs +++ b/compiler/rustc_data_structures/src/graph/iterate/mod.rs @@ -48,7 +48,7 @@ fn post_order_walk<G: DirectedGraph + Successors>( let node = frame.node; visited[node] = true; - while let Some(successor) = frame.iter.next() { + for successor in frame.iter.by_ref() { if !visited[successor] { stack.push(PostOrderFrame { node: successor, iter: graph.successors(successor) }); continue 'recurse; @@ -112,7 +112,7 @@ where /// This is equivalent to just invoke `next` repeatedly until /// you get a `None` result. pub fn complete_search(&mut self) { - while let Some(_) = self.next() {} + for _ in self.by_ref() {} } /// Returns true if node has been visited thus far. diff --git a/compiler/rustc_data_structures/src/graph/scc/mod.rs b/compiler/rustc_data_structures/src/graph/scc/mod.rs index 914a6a16348..7f36e4ca16d 100644 --- a/compiler/rustc_data_structures/src/graph/scc/mod.rs +++ b/compiler/rustc_data_structures/src/graph/scc/mod.rs @@ -40,7 +40,7 @@ pub struct SccData<S: Idx> { } impl<N: Idx, S: Idx + Ord> Sccs<N, S> { - pub fn new(graph: &(impl DirectedGraph<Node = N> + Successors)) -> Self { + pub fn new(graph: &impl Successors<Node = N>) -> Self { SccsConstruction::construct(graph) } |
