---

yaml
---
r: 154682
b: refs/heads/try2
c: 6e27c2f
h: refs/heads/master
v: v3

Author: nikomatsakis

[refs]

@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
 refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: 4c012514169b1c26f47e4b2ec9abc72686fd04e1
+refs/heads/try2: 6e27c2fd58e290a05653560199762268d50165ff
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/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();