---

nikomatsakis · nikomatsakis · commit 7a9362b1d275 · 2014-12-30T09:36:22.000-05:00
yaml --- r: 167399 b: refs/heads/snap-stage3 c: 00cf176 h: refs/heads/master i: 167397: d8b4cf6 167395: 0e948da 167391: d0c15b9 v: v3
diff --git a/[refs] b/[refs]
@@ -1,7 +1,7 @@
 ---
 refs/heads/master: 023dfb0c898d851dee6ace2f8339b73b5287136b
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: 97d8a668f66377c5adb85e89c2fa207e9d4a511c
+refs/heads/snap-stage3: 00cf176a5ee694907e5bddd5ff56d5e318e0edc8
 refs/heads/try: 5204084bd2e46af7cc6e0147430e44dd0d657bbb
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
diff --git a/branches/snap-stage3/src/librustc/middle/traits/fulfill.rs b/branches/snap-stage3/src/librustc/middle/traits/fulfill.rs
@@ -115,6 +115,8 @@ impl<'tcx> FulfillmentContext<'tcx> {
 
         assert!(!trait_ref.has_escaping_regions());
 
+        // FIXME(#20304) -- cache
+
         let ty_var = infcx.next_ty_var();
         let projection =
             ty::Binder(ty::ProjectionPredicate {
diff --git a/branches/snap-stage3/src/librustc_trans/trans/monomorphize.rs b/branches/snap-stage3/src/librustc_trans/trans/monomorphize.rs
@@ -319,7 +319,7 @@ pub fn normalize_associated_type<'tcx,T>(tcx: &ty::ctxt<'tcx>, t: &T) -> T
         return t.clone();
     }
 
-    // TODO cache
+    // FIXME(#20304) -- cache
 
     let infcx = infer::new_infer_ctxt(tcx);
     let param_env = ty::empty_parameter_environment();

Original file line number	Diff line number	Diff line change
`@@ -319,7 +319,7 @@ pub fn normalize_associated_type<'tcx,T>(tcx: &ty::ctxt<'tcx>, t: &T) -> T`
`319`	`319`	`return t.clone();`
`320`	`320`	`}`
`321`	`321`
`322`		`- // TODO cache`
	`322`	`+ // FIXME(#20304) -- cache`
`323`	`323`
`324`	`324`	`let infcx = infer::new_infer_ctxt(tcx);`
`325`	`325`	`let param_env = ty::empty_parameter_environment();`