---

lkuper · lkuper · commit d26c018d3032 · 2012-08-10T13:38:21.000-07:00
yaml --- r: 29732 b: refs/heads/incoming c: 0c35489 h: refs/heads/master v: v3
diff --git a/[refs] b/[refs]
@@ -6,7 +6,7 @@ refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df
-refs/heads/incoming: 9a1a2580fc87e5761189e93d53d51da84b281ddd
+refs/heads/incoming: 0c354898581e195703a887082bf25ea0ea971838
 refs/heads/dist-snap: 2f32a1581f522e524009138b33b1c7049ced668d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
diff --git a/branches/incoming/src/rustc/middle/typeck/check/method.rs b/branches/incoming/src/rustc/middle/typeck/check/method.rs
@@ -118,11 +118,12 @@ class lookup {
         }
 
         loop {
-            // First, see whether this is a bounded parameter.
             match ty::get(self.self_ty).struct {
+              // First, see whether this is a bounded parameter.
               ty::ty_param(p) => {
                 self.add_candidates_from_param(p.idx, p.def_id);
               }
+
               ty::ty_trait(did, substs) => {
                 self.add_candidates_from_trait(did, substs);
               }

Original file line number	Diff line number	Diff line change
`@@ -118,11 +118,12 @@ class lookup {`
`118`	`118`	`}`
`119`	`119`
`120`	`120`	`loop {`
`121`		`- // First, see whether this is a bounded parameter.`
`122`	`121`	`match ty::get(self.self_ty).struct {`
	`122`	`+ // First, see whether this is a bounded parameter.`
`123`	`123`	`ty::ty_param(p) => {`
`124`	`124`	`self.add_candidates_from_param(p.idx, p.def_id);`
`125`	`125`	`}`
	`126`	`+`
`126`	`127`	`ty::ty_trait(did, substs) => {`
`127`	`128`	`self.add_candidates_from_trait(did, substs);`
`128`	`129`	`}`