squiid/rust
1
0
Fork 0
Code Issues Pull requests Projects Activity

auto merge of #7029 : luqmana/rust/issue-4228, r=catamorphism

Browse source 
Fixes #4228
This commit is contained in:
bors 2013-06-09 14:46:24 -07:00
commit 9bcf9119d8
2 changed files with 49 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
src/librustc/middle/resolve.rs
View file

@ -409,6 +409,7 @@ pub enum ParentLink {
}
/// The type of module this is.
#[deriving(Eq)]
pub enum ModuleKind {
NormalModuleKind,
ExternModuleKind,
@ -1228,25 +1229,34 @@ impl Resolver {
match (trait_ref_opt, ty) {
(None, @Ty { node: ty_path(path, _), _ }) if
has_static_methods && path.idents.len() == 1 => {
// Create the module.
let name = path_to_ident(path);
let (name_bindings, new_parent) =
self.add_child(name,
parent,
ForbidDuplicateModules,
sp);
let parent_link = self.get_parent_link(new_parent,
ident);
let def_id = local_def(item.id);
name_bindings.define_module(Public,
parent_link,
Some(def_id),
ImplModuleKind,
sp);
let new_parent = match parent.children.find(&name) {
// It already exists
Some(&child) if child.get_module_if_available().is_some() &&
child.get_module().kind == ImplModuleKind => {
ModuleReducedGraphParent(child.get_module())
}
// Create the module
_ => {
let (name_bindings, new_parent) =
self.add_child(name,
parent,
ForbidDuplicateModules,
sp);
let new_parent = ModuleReducedGraphParent(
name_bindings.get_module());
let parent_link = self.get_parent_link(new_parent,
ident);
let def_id = local_def(item.id);
name_bindings.define_module(Public,
parent_link,
Some(def_id),
ImplModuleKind,
sp);
ModuleReducedGraphParent(name_bindings.get_module())
}
};
// For each static method...
for methods.each |method| {

23
src/test/run-pass/issue-4228.rs Normal file
View file

@ -0,0 +1,23 @@
// Copyright 2013 The Rust Project Developers. See the COPYRIGHT
// file at the top-level directory of this distribution and at
// http://rust-lang.org/COPYRIGHT.
//
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
// option. This file may not be copied, modified, or distributed
// except according to those terms.
struct Foo;
impl Foo {
fn first() {}
}
impl Foo {
fn second() {}
}
pub fn main() {
Foo::first();
Foo::second();
}