From 0ae30e608c5823a195af62051bfc4e9460f4bd25 Mon Sep 17 00:00:00 2001
From: Barosl Lee <vcs@barosl.com>
Date: Tue, 26 May 2015 11:27:15 +0900
Subject: Associate each path in a `use` declaration with the item in the AST
 map

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.
---
 src/libsyntax/ast_map/mod.rs | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'src/libsyntax')

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);
-- 
cgit 1.4.1-3-g733a5