---

yaml
---
r: 152176
b: refs/heads/try2
c: 096f80e
h: refs/heads/master
v: v3

Author: fhartwig

[refs]

@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
 refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: 2f221c766b10867a30d799d0899125b2dcccb872
+refs/heads/try2: 096f80e770efd586d614ee3b695c8461587cf9ec
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/src/librustc/middle/typeck/check/method.rs

@@ -1026,7 +1026,13 @@ impl<'a> LookupContext<'a> {
     fn consider_candidates(&self, rcvr_ty: ty::t,
                            candidates: &[Candidate])
                            -> Option<MethodCallee> {
-        let relevant_candidates = self.filter_candidates(rcvr_ty, candidates);
+        // 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());
 
         if relevant_candidates.len() == 0 {
             return None;
@@ -1063,16 +1069,22 @@ impl<'a> LookupContext<'a> {
         Some(self.confirm_candidate(rcvr_ty, relevant_candidates.get(0)))
     }
 
-    fn filter_candidates(&self, rcvr_ty: ty::t, candidates: &[Candidate]) -> Vec<Candidate> {
-        let mut relevant_candidates: Vec<Candidate> = Vec::new();
+    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;
 
-        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| {
+            let mut j = i + 1;
+            while j < candidates.len() {
+                let candidate_b = &candidates[j];
                 debug!("attempting to merge {} and {}",
                        candidate_a.repr(self.tcx()),
                        candidate_b.repr(self.tcx()));
-                match (&candidate_a.origin, &candidate_b.origin) {
+                let candidates_same = 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;
@@ -1083,13 +1095,25 @@ impl<'a> LookupContext<'a> {
                         same_trait && same_method && same_param
                     }
                     _ => false
+                };
+                if candidates_same {
+                    skip = true;
+                    break;
                 }
-            }) {
-                relevant_candidates.push(candidate_a.clone());
+                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
+        return merged;
     }
 
     fn confirm_candidate(&self, rcvr_ty: ty::t, candidate: &Candidate)

branches/try2/src/liburl/lib.rs

@@ -452,8 +452,8 @@ fn query_from_str(rawquery: &str) -> Query {
  *
  * ```rust
  * let query = vec!(("title".to_string(), "The Village".to_string()),
-                    ("north".to_string(), "52.91".to_string()),
-                    ("west".to_string(), "4.10".to_string()));
+ *                  ("north".to_string(), "52.91".to_string()),
+ *                  ("west".to_string(), "4.10".to_string()));
  * println!("{}", url::query_to_str(&query));  // title=The%20Village&north=52.91&west=4.10
  * ```
  */