---

marijnh · marijnh · commit 214d4342d45e · 2012-02-28T16:37:24.000+01:00
yaml --- r: 11514 b: refs/heads/master c: 1ed12f3 h: refs/heads/master v: v3
diff --git a/[refs] b/[refs]
@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 2115cba4ee52099a5fe5611364a69c8b2df99765
+refs/heads/master: 1ed12f36028daea4cfc5ad267bc65a4f02fe4a29
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
 refs/heads/try: 2898dcc5d97da9427ac367542382b6239d9c0bbf
diff --git a/trunk/src/comp/middle/typeck.rs b/trunk/src/comp/middle/typeck.rs
@@ -1756,7 +1756,6 @@ fn lookup_method_inner(fcx: @fn_ctxt, expr: @ast::expr,
               _ {}
             }
         }
-        ret none;
       }
       ty::ty_iface(did, tps) {
         let i = 0u;
@@ -3158,7 +3157,7 @@ mod dict {
                 }
             }
           }
-          ty::ty_iface(did, _) {
+          ty::ty_iface(did, _) if iface_id == did {
             ret dict_iface(did);
           }
           _ {

Original file line number	Diff line number	Diff line change
`@@ -1756,7 +1756,6 @@ fn lookup_method_inner(fcx: @fn_ctxt, expr: @ast::expr,`
`1756`	`1756`	`_ {}`
`1757`	`1757`	`}`
`1758`	`1758`	`}`
`1759`		`- ret none;`
`1760`	`1759`	`}`
`1761`	`1760`	`ty::ty_iface(did, tps) {`
`1762`	`1761`	`let i = 0u;`
`@@ -3158,7 +3157,7 @@ mod dict {`
`3158`	`3157`	`}`
`3159`	`3158`	`}`
`3160`	`3159`	`}`
`3161`		`- ty::ty_iface(did, _) {`
	`3160`	`+ ty::ty_iface(did, _) if iface_id == did {`
`3162`	`3161`	`ret dict_iface(did);`
`3163`	`3162`	`}`
`3164`	`3163`	`_ {`