---

yaml
---
r: 226958
b: refs/heads/master
c: b7e849b
h: refs/heads/master
v: v3

Author: nikomatsakis

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: ff39ee9a90aea76ceb6d28536cc173714ec8157a
+refs/heads/master: b7e849bf6a866aa588a480dd6229aa4ea09a3f22
 refs/heads/snap-stage3: 1af31d4974e33027a68126fa5a5a3c2c6491824f
 refs/heads/try: b53c0f93eedcdedd4fd89bccc5a3a09d1c5cd23e
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105

trunk/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