diff options
| author | bors <bors@rust-lang.org> | 2022-06-20 22:34:50 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-06-20 22:34:50 +0000 |
| commit | 08871139915b95ec868aff807f224f78d00f4311 (patch) | |
| tree | d0a3a324262916625b81467e90b87b7d139e843e /compiler/rustc_mir_transform/src/coverage/mod.rs | |
| parent | 5750a6aa2777382bf421b726f234da23f990a953 (diff) | |
| parent | dfa933d420ac6ba5af66b0be60455c9bd1882bf2 (diff) | |
| download | rust-08871139915b95ec868aff807f224f78d00f4311.tar.gz rust-08871139915b95ec868aff807f224f78d00f4311.zip | |
Auto merge of #98307 - matthiaskrgr:rollup-rb3huha, r=matthiaskrgr
Rollup of 4 pull requests Successful merges: - #98235 (Drop magic value 3 from code) - #98267 (Don't omit comma when suggesting wildcard arm after macro expr) - #98276 (Mention formatting macros when encountering `ArgumentV1` method in const) - #98296 (Add a link to the unstable book page on Generator doc comment) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_mir_transform/src/coverage/mod.rs')
| -rw-r--r-- | compiler/rustc_mir_transform/src/coverage/mod.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/rustc_mir_transform/src/coverage/mod.rs b/compiler/rustc_mir_transform/src/coverage/mod.rs index 2bb9f48f9b7..782b620e28f 100644 --- a/compiler/rustc_mir_transform/src/coverage/mod.rs +++ b/compiler/rustc_mir_transform/src/coverage/mod.rs @@ -121,7 +121,7 @@ impl<'a, 'tcx> Instrumentor<'a, 'tcx> { let source_file = source_map.lookup_source_file(body_span.lo()); let fn_sig_span = match some_fn_sig.filter(|fn_sig| { - fn_sig.span.ctxt() == body_span.ctxt() + fn_sig.span.eq_ctxt(body_span) && Lrc::ptr_eq(&source_file, &source_map.lookup_source_file(fn_sig.span.lo())) }) { Some(fn_sig) => fn_sig.span.with_hi(body_span.lo()), |