languages/rust
languages/rust
1
0
Fork 0
mirror of https://github.com/rust-lang/rust synced 2024-09-15 22:50:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rollup merge of #37436 - nrc:save-span-errs, r=petrochenkov

Browse source 
Give variant spans used in derives the correct expansion id

This fixes a problem in save-analysis where it mistakes a path to a variant as the variant itself.

r? @petrochenkov
This commit is contained in:
Guillaume Gomez 2016-10-28 17:05:48 +02:00 committed by GitHub
parent f12e66e642 16e1d36c08
commit 1d7e1b3552
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/librustc_save_analysis/dump_visitor.rs
View file

@ -166,6 +166,7 @@ fn process_path_prefixes(&self, path: &ast::Path) -> Vec<(Span, String)> {
loc.file.name,
loc.line);
}
error!(" master span: {:?}: `{}`", path.span, self.span.snippet(path.span));
return vec!();
}

3
src/libsyntax_ext/deriving/generic/mod.rs
View file

@ -1460,8 +1460,9 @@ fn expand_static_enum_method_body(&self,
.iter()
.map(|v| {
let ident = v.node.name;
let sp = Span { expn_id: trait_.span.expn_id, ..v.span };
let summary = trait_.summarise_struct(cx, &v.node.data);
(ident, v.span, summary)
(ident, sp, summary)
})
.collect();
self.call_substructure_method(cx,