Skip to content

Commit 7b579c0

Browse files
committed
try removing basically dead code in resolve
1 parent 5dc1b39 commit 7b579c0

File tree

1 file changed

+3
-15
lines changed

1 file changed

+3
-15
lines changed

src/librustc/middle/resolve.rs

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -4706,25 +4706,13 @@ impl Resolver {
47064706
return NoNameDefinition;
47074707
}
47084708

4709-
pub fn intern_module_part_of_path(@mut self, path: &Path) -> ~[Ident] {
4710-
let mut module_path_idents = ~[];
4711-
for (index, segment) in path.segments.iter().enumerate() {
4712-
if index == path.segments.len() - 1 {
4713-
break;
4714-
}
4715-
4716-
module_path_idents.push(segment.identifier);
4717-
}
4718-
4719-
return module_path_idents;
4720-
}
4721-
4709+
// resolve a "module-relative" path, e.g. a::b::c
47224710
pub fn resolve_module_relative_path(@mut self,
47234711
path: &Path,
47244712
xray: XrayFlag,
47254713
namespace: Namespace)
47264714
-> Option<Def> {
4727-
let module_path_idents = self.intern_module_part_of_path(path);
4715+
let module_path_idents = path.segments.init().map(|ps| ps.identifier);
47284716

47294717
let containing_module;
47304718
match self.resolve_module_path(self.current_module,
@@ -4790,7 +4778,7 @@ impl Resolver {
47904778
xray: XrayFlag,
47914779
namespace: Namespace)
47924780
-> Option<Def> {
4793-
let module_path_idents = self.intern_module_part_of_path(path);
4781+
let module_path_idents = path.segments.init().map(|ps| ps.identifier);
47944782

47954783
let root_module = self.graph_root.get_module();
47964784

0 commit comments

Comments
 (0)