---

yaml
---
r: 232379
b: refs/heads/try
c: b7e849b
h: refs/heads/master
i:
  232377: 74a04c2
  232375: 6f20862
v: v3

Author: nikomatsakis

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: edeb4f1c86cbf6af8ef9874d4b3af50f721ea1b8
 refs/heads/snap-stage3: 1af31d4974e33027a68126fa5a5a3c2c6491824f
-refs/heads/try: ff39ee9a90aea76ceb6d28536cc173714ec8157a
+refs/heads/try: b7e849bf6a866aa588a480dd6229aa4ea09a3f22
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try/src/librustc/middle/infer/mod.rs

@@ -189,6 +189,9 @@ pub struct TypeTrace<'tcx> {
 /// See `error_reporting.rs` for more details
 #[derive(Clone, Debug)]
 pub enum SubregionOrigin<'tcx> {
+    // Marker to indicate a constraint that only arises due to new
+    // provisions from RFC 1214. This will result in a warning, not an
+    // error.
     RFC1214Subregion(Rc<SubregionOrigin<'tcx>>),
 
     // Arose from a subtyping relation