---

yaml
---
r: 79317
b: refs/heads/try
c: 7b579c0
h: refs/heads/master
i:
  79315: 4d9d4a6
v: v3

Author: jbclements

[refs]

@@ -2,7 +2,7 @@
 refs/heads/master: 3e6de6b7da8ee88bf84b0e217900051334be08da
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 60fba4d7d677ec098e6a43014132fe99f7547363
-refs/heads/try: 5dc1b39b6a12ae791aea1273667fa7359467340b
+refs/heads/try: 7b579c065a82ee00956ee26fddf48e84d8132936
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c

branches/try/src/librustc/middle/resolve.rs

@@ -4706,25 +4706,13 @@ impl Resolver {
         return NoNameDefinition;
     }
 
-    pub fn intern_module_part_of_path(@mut self, path: &Path) -> ~[Ident] {
-        let mut module_path_idents = ~[];
-        for (index, segment) in path.segments.iter().enumerate() {
-            if index == path.segments.len() - 1 {
-                break;
-            }
-
-            module_path_idents.push(segment.identifier);
-        }
-
-        return module_path_idents;
-    }
-
+    // resolve a "module-relative" path, e.g. a::b::c
     pub fn resolve_module_relative_path(@mut self,
                                         path: &Path,
                                         xray: XrayFlag,
                                         namespace: Namespace)
                                         -> Option<Def> {
-        let module_path_idents = self.intern_module_part_of_path(path);
+        let module_path_idents = path.segments.init().map(|ps| ps.identifier);
 
         let containing_module;
         match self.resolve_module_path(self.current_module,
@@ -4790,7 +4778,7 @@ impl Resolver {
                                        xray: XrayFlag,
                                        namespace: Namespace)
                                        -> Option<Def> {
-        let module_path_idents = self.intern_module_part_of_path(path);
+        let module_path_idents = path.segments.init().map(|ps| ps.identifier);
 
         let root_module = self.graph_root.get_module();