---

yaml
---
r: 13465
b: refs/heads/master
c: 24f9f45
h: refs/heads/master
i:
  13463: bdf7dba
v: v3

Author: catamorphism

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 699b14b99d9892f3573ee8a69c3c24b7af93ecdd
+refs/heads/master: 24f9f45ac68f4b29997a20b63de7997536f89dd1
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
 refs/heads/try: 2898dcc5d97da9427ac367542382b6239d9c0bbf

trunk/src/rustc/middle/typeck/infer.rs

@@ -329,7 +329,7 @@ fn can_mk_assignty(cx: infer_ctxt, anmnt: assignment,
     // FIXME---this will not unroll any entries we make in the
     // borrowings table.  But this is OK for the moment because this
     // is only used in method lookup, and there must be exactly one
-    // match or an error is reported. Still, it should be fixed.
+    // match or an error is reported. Still, it should be fixed. (#2593)
 
     indent {|| cx.probe {||
         cx.assign_tys(anmnt, a, b)
@@ -1501,6 +1501,7 @@ fn super_fns<C:combine>(
                     self.purities(a_f.purity, b_f.purity).chain {|purity|
                     //FIXME self.infcx().constrvecs(a_f.constraints,
                     //FIXME                         b_f.constraints).then {||
+                    // (Fix this if #2588 doesn't get accepted)
                         ok({purity: purity,
                             proto: p,
                             inputs: inputs,