diff options
| author | Manish Goregaokar <manishsmail@gmail.com> | 2016-05-28 19:52:16 +0530 |
|---|---|---|
| committer | Manish Goregaokar <manishsmail@gmail.com> | 2016-05-28 19:52:16 +0530 |
| commit | 81aeb0cddea5a614a4eebc0f0384fa27a7eb011f (patch) | |
| tree | ff8d50bbfe60ef76696169dbbbdc73f24097fa16 /src/libsyntax | |
| parent | edd7d422b7269d68e63d475869c287ef9fdad1cd (diff) | |
| parent | 40285ca717f687f8c1df8f28e53fb97392ac6eb5 (diff) | |
| download | rust-81aeb0cddea5a614a4eebc0f0384fa27a7eb011f.tar.gz rust-81aeb0cddea5a614a4eebc0f0384fa27a7eb011f.zip | |
Rollup merge of #33854 - petrochenkov:prefvis, r=eddyb
Apply visit_path to import prefixes by default Overriding `visit_path` is not enough to visit all paths, some import prefixes are not visited and `visit_path_list_item` need to be overridden as well. This PR removes this catch, it should be less error prone this way. Also, the prefix is visited once now, not repeatedly for each path list item. r? @eddyb
Diffstat (limited to 'src/libsyntax')
| -rw-r--r-- | src/libsyntax/visit.rs | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/src/libsyntax/visit.rs b/src/libsyntax/visit.rs index 8a02e549d4c..a1d8e056b02 100644 --- a/src/libsyntax/visit.rs +++ b/src/libsyntax/visit.rs @@ -233,12 +233,9 @@ pub fn walk_item<'v, V: Visitor<'v>>(visitor: &mut V, item: &'v Item) { visitor.visit_path(path, item.id); } ViewPathList(ref prefix, ref list) => { - if !list.is_empty() { - for item in list { - visitor.visit_path_list_item(prefix, item) - } - } else { - visitor.visit_path(prefix, item.id); + visitor.visit_path(prefix, item.id); + for item in list { + visitor.visit_path_list_item(prefix, item) } } } @@ -368,12 +365,8 @@ pub fn walk_path<'v, V: Visitor<'v>>(visitor: &mut V, path: &'v Path) { } } -pub fn walk_path_list_item<'v, V: Visitor<'v>>(visitor: &mut V, prefix: &'v Path, +pub fn walk_path_list_item<'v, V: Visitor<'v>>(visitor: &mut V, _prefix: &'v Path, item: &'v PathListItem) { - for segment in &prefix.segments { - visitor.visit_path_segment(prefix.span, segment); - } - walk_opt_ident(visitor, item.span, item.node.name()); walk_opt_ident(visitor, item.span, item.node.rename()); } |
