---

yaml
---
r: 129936
b: refs/heads/try
c: 6e27c2f
h: refs/heads/master
v: v3

Author: nikomatsakis

[refs]

@@ -2,7 +2,7 @@
 refs/heads/master: 0bdac78da87605f6f7f6e7924872617226b19c85
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 602592675ce86aeca465c4ac748cee2bff291443
-refs/heads/try: 4c012514169b1c26f47e4b2ec9abc72686fd04e1
+refs/heads/try: 6e27c2fd58e290a05653560199762268d50165ff
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c

branches/try/src/librustc/middle/typeck/infer/combine.rs

@@ -651,7 +651,7 @@ impl<'f> CombineFields<'f> {
             // The original triple was `(a_ty, dir, b_vid)` -- now we have
             // resolved `b_vid` to `b_ty`, so apply `(a_ty, dir, b_ty)`:
             //
-            // FIXME: This code is non-ideal because all these subtype
+            // FIXME(#16847): This code is non-ideal because all these subtype
             // relations wind up attributed to the same spans. We need
             // to associate causes/spans with each of the relations in
             // the stack to get this right.
@@ -674,8 +674,8 @@ impl<'f> CombineFields<'f> {
     }
 
     fn generalize(&self, t: ty::t) -> ty::t {
-        // FIXME: This is non-ideal because we don't give a very descriptive
-        // origin for this region variable.
+        // FIXME(#16847): This is non-ideal because we don't give a
+        // very descriptive origin for this region variable.
 
         let infcx = self.infcx;
         let span = self.trace.origin.span();