Skip to content

Commit

Permalink
Rollup merge of rust-lang#33248 - jseyfried:fix_save_analysis_bug, r=nrc
Browse files Browse the repository at this point in the history
rustc_save_analysis: fix a bug in which glob imports are not dumped

This fixes rust-lang#33213, a bug that prevents glob imports from being included in the save-analysis data.
r? @nrc
  • Loading branch information
Manishearth committed Apr 29, 2016
2 parents c0c08e2 + e9c4225 commit 13c1956
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/librustc_save_analysis/dump_visitor.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1032,8 +1032,8 @@ impl<'v, 'l, 'tcx: 'l, 'll, D: Dump +'ll> Visitor<'v> for DumpVisitor<'l, 'tcx,
}

let sub_span = self.span
.sub_span_of_token(path.span, token::BinOp(token::Star));
if !self.span.filter_generated(sub_span, path.span) {
.sub_span_of_token(item.span, token::BinOp(token::Star));
if !self.span.filter_generated(sub_span, item.span) {
self.dumper.use_glob(UseGlobData {
span: sub_span.expect("No span found for use glob"),
id: item.id,
Expand Down

0 comments on commit 13c1956

Please sign in to comment.