diff options
| author | bors <bors@rust-lang.org> | 2015-05-27 07:14:45 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2015-05-27 07:14:45 +0000 |
| commit | a2cf2c66e0999b2028d99900d797b971dc1c531b (patch) | |
| tree | 6060067032763033a65bf711da66f0eabf5b861e /src/libsyntax | |
| parent | 5a2c766cdd5e8f2652b30b8b4dfa9db050e574eb (diff) | |
| parent | 0ae30e608c5823a195af62051bfc4e9460f4bd25 (diff) | |
| download | rust-a2cf2c66e0999b2028d99900d797b971dc1c531b.tar.gz rust-a2cf2c66e0999b2028d99900d797b971dc1c531b.zip | |
Auto merge of #25791 - barosl:use-paths-as-items, r=alexcrichton
Currently, for `use` declarations with multiple paths, only the `use` item itself is saved in the AST map, not the individual path nodes. This can lead to a problem when a span of a specific path node is needed. For example, #24818 caused an ICE because of this, in `ImportResolver::check_for_conflicting_import()`. Fixes #25763.
Diffstat (limited to 'src/libsyntax')
| -rw-r--r-- | src/libsyntax/ast_map/mod.rs | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/src/libsyntax/ast_map/mod.rs b/src/libsyntax/ast_map/mod.rs index 795391d4009..ce6c33c6ab6 100644 --- a/src/libsyntax/ast_map/mod.rs +++ b/src/libsyntax/ast_map/mod.rs @@ -714,6 +714,16 @@ impl<'ast> Visitor<'ast> for NodeCollector<'ast> { self.insert(ti.id, NodeTraitItem(ti)); } } + ItemUse(ref view_path) => { + match view_path.node { + ViewPathList(_, ref paths) => { + for path in paths { + self.insert(path.node.id(), NodeItem(i)); + } + } + _ => () + } + } _ => {} } visit::walk_item(self, i); |
