---

yaml
---
r: 52478
b: refs/heads/dist-snap
c: 4f88ed3
h: refs/heads/master
v: v3

Author: pcwalton

[refs]

@@ -7,7 +7,7 @@ refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
 refs/heads/incoming: 44d4d6de762f3f9aae1fedcf454c66b79b3ad58d
-refs/heads/dist-snap: d9c842847d8d0d99dab6431d5e0fd05843599e7b
+refs/heads/dist-snap: 4f88ed36a132cf74d45d996b26c3587e0d54a2cf
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0

branches/dist-snap/src/librustc/middle/typeck/collect.rs

@@ -633,12 +633,7 @@ fn convert(ccx: @crate_ctxt, it: @ast::item) {
         let (_, provided_methods) =
             split_trait_methods(/*bad*/copy *trait_methods);
         let {bounds, _} = mk_substs(ccx, /*bad*/copy *tps, rp);
-        let _cms = convert_methods(ccx, provided_methods, rp, bounds);
-        // FIXME (#2616): something like this, when we start having
-        // trait inheritance?
-        // for trait_ref.each |t| {
-        // check_methods_against_trait(ccx, tps, rp, selfty, *t, cms);
-        // }
+        let _ = convert_methods(ccx, provided_methods, rp, bounds);
       }
       ast::item_struct(struct_def, tps) => {
         // Write the class type