diff options
| author | bors <bors@rust-lang.org> | 2024-03-29 14:00:21 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-03-29 14:00:21 +0000 |
| commit | 685927aae69657b46323cffbeb0062835bd7fa2b (patch) | |
| tree | 48a5a2694795c9a904f17f9cc0b2553bccb0ab95 /compiler/rustc_mir_transform/src/coverage/mod.rs | |
| parent | 45796d1c24445b298567752519471cef2cff3298 (diff) | |
| parent | fefb8f1f9cb830e1ca0b0ba449db7c8e7d4ff7ba (diff) | |
| download | rust-685927aae69657b46323cffbeb0062835bd7fa2b.tar.gz rust-685927aae69657b46323cffbeb0062835bd7fa2b.zip | |
Auto merge of #122450 - Urgau:simplify-trim-paths-feature, r=michaelwoerister
Simplify trim-paths feature by merging all debuginfo options together This PR simplifies the trim-paths feature by merging all debuginfo options together, as described in https://github.com/rust-lang/rust/issues/111540#issuecomment-1994010274. And also do some correctness fixes found during the review. cc `@weihanglo` r? `@michaelwoerister`
Diffstat (limited to 'compiler/rustc_mir_transform/src/coverage/mod.rs')
| -rw-r--r-- | compiler/rustc_mir_transform/src/coverage/mod.rs | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/compiler/rustc_mir_transform/src/coverage/mod.rs b/compiler/rustc_mir_transform/src/coverage/mod.rs index ae3b1a3d1af..d382d2c03c2 100644 --- a/compiler/rustc_mir_transform/src/coverage/mod.rs +++ b/compiler/rustc_mir_transform/src/coverage/mod.rs @@ -123,8 +123,11 @@ fn create_mappings<'tcx>( let body_span = hir_info.body_span; let source_file = source_map.lookup_source_file(body_span.lo()); - use rustc_session::RemapFileNameExt; - let file_name = Symbol::intern(&source_file.name.for_codegen(tcx.sess).to_string_lossy()); + + use rustc_session::{config::RemapPathScopeComponents, RemapFileNameExt}; + let file_name = Symbol::intern( + &source_file.name.for_scope(tcx.sess, RemapPathScopeComponents::MACRO).to_string_lossy(), + ); let term_for_bcb = |bcb| { coverage_counters |