diff options
| author | bors <bors@rust-lang.org> | 2021-03-27 19:38:01 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2021-03-27 19:38:01 +0000 |
| commit | 9b0edb7fddacd6a60a380c1ce59159de597ab270 (patch) | |
| tree | 334eb1b9a4ec064bca2df01036caabb5d4b1ea09 /compiler/rustc_mir/src/transform/coverage/debug.rs | |
| parent | afaf33dcafe9c7068b63eb997df221aa08db7c29 (diff) | |
| parent | 7d6af6751c5726d884440d4e8d462a9ee6c5efc1 (diff) | |
| download | rust-9b0edb7fddacd6a60a380c1ce59159de597ab270.tar.gz rust-9b0edb7fddacd6a60a380c1ce59159de597ab270.zip | |
Auto merge of #83580 - Dylan-DPC:rollup-1zod4p7, r=Dylan-DPC
Rollup of 8 pull requests Successful merges: - #81351 (combine: stop eagerly evaluating consts) - #82525 (make unaligned_references future-incompat lint warn-by-default) - #82626 (update array missing `IntoIterator` msg) - #82917 (Add function core::iter::zip) - #82993 (rustdoc: Use diagnostics for error when including sources) - #83522 (Improve fs error open_from unix) - #83548 (Always preserve `None`-delimited groups in a captured `TokenStream`) - #83555 (Add #[inline] to io::Error methods) Failed merges: - #83130 (escape_ascii take 2) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_mir/src/transform/coverage/debug.rs')
| -rw-r--r-- | compiler/rustc_mir/src/transform/coverage/debug.rs | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/compiler/rustc_mir/src/transform/coverage/debug.rs b/compiler/rustc_mir/src/transform/coverage/debug.rs index aabfee53acb..0e9728df73c 100644 --- a/compiler/rustc_mir/src/transform/coverage/debug.rs +++ b/compiler/rustc_mir/src/transform/coverage/debug.rs @@ -121,6 +121,7 @@ use rustc_middle::mir::coverage::*; use rustc_middle::mir::{self, BasicBlock, TerminatorKind}; use rustc_middle::ty::TyCtxt; +use std::iter; use std::lazy::SyncOnceCell; pub const NESTED_INDENT: &str = " "; @@ -703,9 +704,7 @@ pub(super) fn dump_coverage_graphviz( let edge_counters = from_terminator .successors() .map(|&successor_bb| graphviz_data.get_edge_counter(from_bcb, successor_bb)); - edge_labels - .iter() - .zip(edge_counters) + iter::zip(&edge_labels, edge_counters) .map(|(label, some_counter)| { if let Some(counter) = some_counter { format!("{}\n{}", label, debug_counters.format_counter(counter)) |