Skip to content

Don't resolve paths to non-static methods #6910

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 22 additions & 3 deletions src/librustc/middle/resolve.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4595,7 +4595,7 @@ impl Resolver {
}

let name = *path.idents.last();
match self.resolve_definition_of_name_in_module(containing_module,
let def = match self.resolve_definition_of_name_in_module(containing_module,
name,
namespace,
xray) {
Expand All @@ -4604,9 +4604,28 @@ impl Resolver {
return None;
}
ChildNameDefinition(def) | ImportNameDefinition(def) => {
return Some(def);
def
}
}
};
match containing_module.kind {
TraitModuleKind | ImplModuleKind => {
match self.method_map.find(&name) {
Some(s) => {
match containing_module.def_id {
Some(def_id) if s.contains(&def_id) => {
debug!("containing module was a trait or impl \
and name was a method -> not resolved");
return None;
},
_ => (),
}
},
None => (),
}
},
_ => (),
};
return Some(def);
}

/// Invariant: This must be called only during main resolution, not during
Expand Down
17 changes: 17 additions & 0 deletions src/test/compile-fail/call-extern-trait-as-function.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
// 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.

// issue #6698

fn V() -> bool {
std::clone::Clone::clone(true) //~ ERROR error: unresolved name `std::clone::Clone::clone`.
}

fn main() {}