diff options
| author | bors <bors@rust-lang.org> | 2020-10-16 20:43:27 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-10-16 20:43:27 +0000 |
| commit | e3051d8c24467b54c81da9d9ad70a3e82e106ec1 (patch) | |
| tree | 873bd9741598b37674e9fbf07a65d6e2f39d2d52 /compiler/rustc_mir/src/transform | |
| parent | 5a51185fd4600e96cc79a3db9da3c4bf927f2281 (diff) | |
| parent | 001fcd96d5b88a541df4657f2df0d5125023f13b (diff) | |
| download | rust-e3051d8c24467b54c81da9d9ad70a3e82e106ec1.tar.gz rust-e3051d8c24467b54c81da9d9ad70a3e82e106ec1.zip | |
Auto merge of #78028 - JohnTitor:rollup-jt3hikb, r=JohnTitor
Rollup of 10 pull requests Successful merges: - #75209 (Suggest imports of unresolved macros) - #77547 (stabilize union with 'ManuallyDrop' fields and 'impl Drop for Union') - #77827 (Don't link to nightly primitives on stable channel) - #77855 (resolve: further improvements to "try using the enum's variant" diagnostic) - #77900 (Use fdatasync for File::sync_data on more OSes) - #77925 (Suggest minimal subset features in `incomplete_features` lint) - #77971 (Deny broken intra-doc links in linkchecker) - #77991 (Bump backtrace-rs) - #77992 (instrument-coverage: try our best to not ICE) - #78013 (Fix sidebar scroll on mobile devices) Failed merges: r? `@ghost`
Diffstat (limited to 'compiler/rustc_mir/src/transform')
| -rw-r--r-- | compiler/rustc_mir/src/transform/instrument_coverage.rs | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/compiler/rustc_mir/src/transform/instrument_coverage.rs b/compiler/rustc_mir/src/transform/instrument_coverage.rs index babe10a0f14..6824c73ab60 100644 --- a/compiler/rustc_mir/src/transform/instrument_coverage.rs +++ b/compiler/rustc_mir/src/transform/instrument_coverage.rs @@ -22,9 +22,7 @@ use rustc_middle::ty::query::Providers; use rustc_middle::ty::TyCtxt; use rustc_span::def_id::DefId; use rustc_span::source_map::original_sp; -use rustc_span::{ - BytePos, CharPos, FileName, Pos, RealFileName, SourceFile, Span, Symbol, SyntaxContext, -}; +use rustc_span::{BytePos, CharPos, Pos, SourceFile, Span, Symbol, SyntaxContext}; use std::cmp::Ordering; @@ -549,13 +547,7 @@ impl<'a, 'tcx> Instrumentor<'a, 'tcx> { let mir_body = &self.mir_body; let body_span = self.body_span(); let source_file = source_map.lookup_source_file(body_span.lo()); - let file_name = match &source_file.name { - FileName::Real(RealFileName::Named(path)) => Symbol::intern(&path.to_string_lossy()), - _ => bug!( - "source_file.name should be a RealFileName, but it was: {:?}", - source_file.name - ), - }; + let file_name = Symbol::intern(&source_file.name.to_string()); debug!("instrumenting {:?}, span: {}", def_id, source_map.span_to_string(body_span)); |
