bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Rollup merge of #39453 - nrc:save-path, r=nikomatsakis

Browse source 
save-analysis: be more paranoid about generated paths

fixes https://github.com/rust-lang-nursery/rls/issues/160
This commit is contained in:
Corey Farwell 2017-02-05 09:14:49 -05:00 • committed by GitHub
commit ece9240824
2 changed files with 4 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/librustc_save_analysis/lib.rs
View file

@ -430,6 +430,9 @@ impl<'l, 'tcx: 'l> SaveContext<'l, 'tcx> {
-> Option<TypeRefData> { -> Option<TypeRefData> {
self.lookup_ref_id(trait_ref.ref_id).and_then(|def_id| { self.lookup_ref_id(trait_ref.ref_id).and_then(|def_id| {
let span = trait_ref.path.span; let span = trait_ref.path.span;
if generated_code(span) {
return None;
}
let sub_span = self.span_utils.sub_span_for_type_name(span).or(Some(span)); let sub_span = self.span_utils.sub_span_for_type_name(span).or(Some(span));
filter!(self.span_utils, sub_span, span, None); filter!(self.span_utils, sub_span, span, None);
Some(TypeRefData { Some(TypeRefData {

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

@ -1691,6 +1691,7 @@ impl<'a> Parser<'a> {
} }
// Assemble the span. // Assemble the span.
// FIXME(#39450) This is bogus if part of the path is macro generated.
let span = mk_sp(lo, self.prev_span.hi); let span = mk_sp(lo, self.prev_span.hi);
// Assemble the result. // Assemble the result.