Skip to content

Remove unnecessary allocations / clones during method lookup #14563

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
May 31, 2014
Merged

Remove unnecessary allocations / clones during method lookup #14563

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
44 changes: 10 additions & 34 deletions src/librustc/middle/typeck/check/method.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1026,13 +1026,7 @@ impl<'a> LookupContext<'a> {
fn consider_candidates(&self, rcvr_ty: ty::t,
candidates: &[Candidate])
-> Option<MethodCallee> {
// FIXME(pcwalton): Do we need to clone here?
let relevant_candidates: Vec<Candidate> =
candidates.iter().map(|c| (*c).clone()).
filter(|c| self.is_relevant(rcvr_ty, c)).collect();

let relevant_candidates =
self.merge_candidates(relevant_candidates.as_slice());
let relevant_candidates = self.filter_candidates(rcvr_ty, candidates);

if relevant_candidates.len() == 0 {
return None;
Expand Down Expand Up @@ -1069,22 +1063,16 @@ impl<'a> LookupContext<'a> {
Some(self.confirm_candidate(rcvr_ty, relevant_candidates.get(0)))
}

fn merge_candidates(&self, candidates: &[Candidate]) -> Vec<Candidate> {
let mut merged = Vec::new();
let mut i = 0;
while i < candidates.len() {
let candidate_a = &candidates[i];

let mut skip = false;
fn filter_candidates(&self, rcvr_ty: ty::t, candidates: &[Candidate]) -> Vec<Candidate> {
let mut relevant_candidates: Vec<Candidate> = Vec::new();

let mut j = i + 1;
while j < candidates.len() {
let candidate_b = &candidates[j];
for candidate_a in candidates.iter().filter(|&c| self.is_relevant(rcvr_ty, c)) {
// Skip this one if we already have one like it
if !relevant_candidates.iter().any(|candidate_b| {
debug!("attempting to merge {} and {}",
candidate_a.repr(self.tcx()),
candidate_b.repr(self.tcx()));
let candidates_same = match (&candidate_a.origin,
&candidate_b.origin) {
match (&candidate_a.origin, &candidate_b.origin) {
(&MethodParam(ref p1), &MethodParam(ref p2)) => {
let same_trait = p1.trait_id == p2.trait_id;
let same_method = p1.method_num == p2.method_num;
Expand All @@ -1095,25 +1083,13 @@ impl<'a> LookupContext<'a> {
same_trait && same_method && same_param
}
_ => false
};
if candidates_same {
skip = true;
break;
}
j += 1;
}

i += 1;

if skip {
// There are more than one of these and we need only one
continue;
} else {
merged.push(candidate_a.clone());
}) {
relevant_candidates.push(candidate_a.clone());
}
}

return merged;
relevant_candidates
}

fn confirm_candidate(&self, rcvr_ty: ty::t, candidate: &Candidate)
Expand Down