bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Auto merge of #79762 - Swatinem:remap-doctest-coverage, r=Swatinem

Browse source 
Remap instrument-coverage line numbers in doctests

This uses the `SourceMap::doctest_offset_line` method to re-map line
numbers from doctests. Remapping columns is not yet done, and rustdoc
still does not output the correct filename when running doctests in a
workspace.

Part of #79417 although I dont consider that fixed until both filenames
and columns are mapped correctly.

r? `@richkadel`

I might jump on zulip the comming days. Still need to figure out how to properly write tests for this, and deal with other doctest issues in the meantime.
This commit is contained in:
bors 2020-12-25 02:37:08 +00:00
commit cae1f4ddf2
15 changed files with 599 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

2
compiler/rustc_span/src/lib.rs
View file

@ -182,7 +182,7 @@ impl std::fmt::Display for FileName {
use FileName::*;
match *self {
Real(RealFileName::Named(ref path)) => write!(fmt, "{}", path.display()),
// FIXME: might be nice to display both compoments of Devirtualized.
// FIXME: might be nice to display both components of Devirtualized.
// But for now (to backport fix for issue #70924), best to not
// perturb diagnostics so its obvious test suite still works.
Real(RealFileName::Devirtualized { ref local_path, virtual_name: _ }) => {