bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Fix --pretty=expanded with --remap-path-prefix

Browse source 
Per https://github.com/rust-lang/rust/issues/80832, using
--pretty=expanded and --remap-path-prefix results in an ICE.

This is becasue the session source files table is stored in remapped
form, whereas --pretty-expanded looks up unremapped files. This remaps
the path prefixes before lookup.
This commit is contained in:
Jeremy Fitzhardinge 2021-01-09 16:04:48 -08:00
parent 6184f23950
commit 67978d56c1
2 changed files with 23 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

11
compiler/rustc_driver/src/pretty.rs
View file

@ -363,8 +363,15 @@ impl<'tcx> pprust_hir::PpAnn for TypedAnnotation<'tcx> {
fn get_source(input: &Input, sess: &Session) -> (String, FileName) {
let src_name = input.source_name();
let src =
String::clone(&sess.source_map().get_source_file(&src_name).unwrap().src.as_ref().unwrap());
let src = String::clone(
&sess
.source_map()
.get_source_file(&src_name)
.expect("get_source_file")
.src
.as_ref()
.expect("src"),
);
(src, src_name)
}