rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

auto merge of #13671 : dcrewi/rust/lint-directives-on-use-items, r=alexcrichton

Browse Source 
Fixes #10534
This commit is contained in:
bors
2014-04-24 17:16:14 -07:00
parent b55394415a e72d49a806
commit 5ea0509685
3 changed files with 46 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/libsyntax/ast_util.rs
View File

@@ -1,4 +1,4 @@
// Copyright 2012-2013 The Rust Project Developers. See the COPYRIGHT
// Copyright 2012-2014 The Rust Project Developers. See the COPYRIGHT
// file at the top-level directory of this distribution and at
// http://rust-lang.org/COPYRIGHT.
//
@@ -396,6 +396,13 @@ impl<'a, O: IdVisitingOperation> Visitor<()> for IdVisitor<'a, O> {
}
fn visit_view_item(&mut self, view_item: &ViewItem, env: ()) {
if !self.pass_through_items {
if self.visited_outermost {
return;
} else {
self.visited_outermost = true;
}
}
match view_item.node {
ViewItemExternCrate(_, _, node_id) => {
self.operation.visit_id(node_id)
@@ -417,7 +424,8 @@ impl<'a, O: IdVisitingOperation> Visitor<()> for IdVisitor<'a, O> {
}
}
}
visit::walk_view_item(self, view_item, env)
visit::walk_view_item(self, view_item, env);
self.visited_outermost = false;
}
fn visit_foreign_item(&mut self, foreign_item: &ForeignItem, env: ()) {