---

yaml
---
r: 167715
b: refs/heads/master
c: 7ae1c6b
h: refs/heads/master
i:
  167713: d4650c1
  167711: 96e1481
v: v3

Author: nikomatsakis

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: cadd4335b4150f94b573eb3c87235d653cfba6d2
+refs/heads/master: 7ae1c6bc269cd0fddb45590a91d77e39b47a4965
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: c89417130f042c58adc60012e7cddc4ef70b70b9
 refs/heads/try: 5204084bd2e46af7cc6e0147430e44dd0d657bbb

trunk/src/librustc_typeck/check/wf.rs

@@ -269,14 +269,8 @@ impl<'cx,'tcx> BoundsChecker<'cx,'tcx> {
     pub fn check_trait_ref(&mut self, trait_ref: &ty::TraitRef<'tcx>) {
         let trait_def = ty::lookup_trait_def(self.fcx.tcx(), trait_ref.def_id);
 
-        // TODO uncommented this line causes failures because the impl
-        // obligations are not registered when we do a projection, and
-        // in this case it's those obligations that make the link
-        // between the normalized type ($1) and the result
-        //
-        // let bounds = self.fcx.instantiate_bounds(self.span, trait_ref.substs, &trait_def.generics);
-
-        let bounds = trait_def.generics.to_bounds(self.fcx.tcx(), trait_ref.substs);
+        let bounds = self.fcx.instantiate_bounds(self.span, trait_ref.substs, &trait_def.generics);
+
         self.fcx.add_obligations_for_parameters(
             traits::ObligationCause::new(
                 self.span,