diff options
| author | bors <bors@rust-lang.org> | 2021-03-10 01:25:43 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2021-03-10 01:25:43 +0000 |
| commit | 861872bc453bde79b83ff99d443d035225f10e87 (patch) | |
| tree | fd570f707b6a801d7f1e7fd6b72fc983184daa04 /compiler/rustc_mir/src/transform/coverage/graph.rs | |
| parent | 3a5d45f68cadc8fff4fbb557780f92b403b19c19 (diff) | |
| parent | 9dc82face341121e3464a59665bc7c5b394cacc0 (diff) | |
| download | rust-861872bc453bde79b83ff99d443d035225f10e87.tar.gz rust-861872bc453bde79b83ff99d443d035225f10e87.zip | |
Auto merge of #82953 - JohnTitor:rollup-8rtk5g2, r=JohnTitor
Rollup of 10 pull requests Successful merges: - #77511 (Add StatementKind::CopyNonOverlapping) - #79208 (Stabilize `unsafe_op_in_unsafe_fn` lint) - #82411 (Fixes to ExitStatus and its docs) - #82733 (Add powerpc-unknown-openbsd target) - #82802 (Build rustdoc for run-make tests, not just run-make-fulldeps) - #82849 (Add Option::get_or_default) - #82908 (:arrow_up: rust-analyzer) - #82937 (Update README.md to use the correct cmake version number) - #82938 (Bump tracing-tree dependency) - #82942 (Don't hardcode the `v1` prelude in diagnostics, to allow for new preludes.) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_mir/src/transform/coverage/graph.rs')
| -rw-r--r-- | compiler/rustc_mir/src/transform/coverage/graph.rs | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/compiler/rustc_mir/src/transform/coverage/graph.rs b/compiler/rustc_mir/src/transform/coverage/graph.rs index e58b915f126..8ad0d133b17 100644 --- a/compiler/rustc_mir/src/transform/coverage/graph.rs +++ b/compiler/rustc_mir/src/transform/coverage/graph.rs @@ -392,10 +392,7 @@ impl BasicCoverageBlockData { } } let operand = counter_kind.as_operand_id(); - if let Some(replaced) = self - .edge_from_bcbs - .get_or_insert_with(FxHashMap::default) - .insert(from_bcb, counter_kind) + if let Some(replaced) = self.edge_from_bcbs.get_or_default().insert(from_bcb, counter_kind) { Error::from_string(format!( "attempt to set an edge counter more than once; from_bcb: \ |