diff options
| author | Matthias Krüger <matthias.krueger@famsik.de> | 2022-06-20 20:13:10 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-20 20:13:10 +0200 |
| commit | 3e5800b8d30fba923c5070ae660c1e45a630a191 (patch) | |
| tree | c04a5a66a82364242edac321dd0d88ccfd92eca1 /compiler/rustc_mir_transform/src/coverage/mod.rs | |
| parent | eac149368b9a681ad80fe642e4205760eb1aa93f (diff) | |
| parent | 3d16c22864087c1ff765ffa60153368226f33968 (diff) | |
| download | rust-3e5800b8d30fba923c5070ae660c1e45a630a191.tar.gz rust-3e5800b8d30fba923c5070ae660c1e45a630a191.zip | |
Rollup merge of #98267 - compiler-errors:suggest-wildcard-arm, r=oli-obk
Don't omit comma when suggesting wildcard arm after macro expr * Also adds `Span::eq_ctxt` to consolidate the various usages of `span.ctxt() == other.ctxt()` * Also fixes an unhygenic usage of spans which caused the suggestion to render weirdly when we had one arm match in a macro * Also always suggests a comma (i.e. even after a block) if we're rendering a wildcard arm in a single-line match (looks prettier :rose:) Fixes #94866
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()), |