Skip to content

Commit 394ac1a

Browse files
committed
resolve: don't resolve paths that point to non-static methods
Fixes #6698
1 parent 45441e0 commit 394ac1a

File tree

1 file changed

+22
-3
lines changed

1 file changed

+22
-3
lines changed

src/librustc/middle/resolve.rs

Lines changed: 22 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4595,7 +4595,7 @@ impl Resolver {
45954595
}
45964596

45974597
let name = *path.idents.last();
4598-
match self.resolve_definition_of_name_in_module(containing_module,
4598+
let def = match self.resolve_definition_of_name_in_module(containing_module,
45994599
name,
46004600
namespace,
46014601
xray) {
@@ -4604,9 +4604,28 @@ impl Resolver {
46044604
return None;
46054605
}
46064606
ChildNameDefinition(def) | ImportNameDefinition(def) => {
4607-
return Some(def);
4607+
def
46084608
}
4609-
}
4609+
};
4610+
match containing_module.kind {
4611+
TraitModuleKind | ImplModuleKind => {
4612+
match self.method_map.find(&name) {
4613+
Some(s) => {
4614+
match containing_module.def_id {
4615+
Some(def_id) if s.contains(&def_id) => {
4616+
debug!("containing module was a trait or impl \
4617+
and name was a method -> not resolved");
4618+
return None;
4619+
},
4620+
_ => (),
4621+
}
4622+
},
4623+
None => (),
4624+
}
4625+
},
4626+
_ => (),
4627+
};
4628+
return Some(def);
46104629
}
46114630

46124631
/// Invariant: This must be called only during main resolution, not during

0 commit comments

Comments
 (0)