bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

proc_macro: Update Span::def_site to use the proc macro definition location

Browse source 
Which is no longer dummy and is available from metadata now.
This commit is contained in:
Vadim Petrochenkov 2019-08-20 23:35:03 +03:00
parent 2065ee9acc
commit c476b55e52
6 changed files with 143 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/libsyntax/parse/parser.rs
View file

@ -375,10 +375,11 @@ impl<'a> Parser<'a> {
if let Some(directory) = directory {
parser.directory = directory;
} else if !parser.token.span.is_dummy() {
if let FileName::Real(mut path) =
sess.source_map().span_to_unmapped_path(parser.token.span) {
path.pop();
parser.directory.path = Cow::from(path);
if let Some(FileName::Real(path)) =
&sess.source_map().lookup_char_pos(parser.token.span.lo()).file.unmapped_path {
if let Some(directory_path) = path.parent() {
parser.directory.path = Cow::from(directory_path.to_path_buf());
}
}
}