---

yaml
---
r: 232397
b: refs/heads/try
c: 7f8942c
h: refs/heads/master
i:
  232395: 9cdf9d7
v: v3

Author: nikomatsakis

[refs]

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

branches/try/src/librustc/middle/outlives.rs

@@ -54,6 +54,10 @@ pub enum Component<'tcx> {
     // the future without breaking backwards compat.
     EscapingProjection(Vec<Component<'tcx>>),
 
+    // This is a temporary marker indicating "outlives components"
+    // that are due to the new rules introduced by RFC 1214.  For the
+    // time being, violations of these requirements generally induce
+    // warnings, not errors.
     RFC1214(Vec<Component<'tcx>>),
 }
 
@@ -64,7 +68,7 @@ pub fn components<'a,'tcx>(infcx: &InferCtxt<'a,'tcx>,
                            -> Vec<Component<'tcx>> {
     let mut components = vec![];
     compute_components(infcx, ty0, &mut components);
-    debug!("outlives({:?}) = {:?}", ty0, components);
+    debug!("components({:?}) = {:?}", ty0, components);
     components
 }
 

branches/try/src/librustc/middle/wf.rs

@@ -122,9 +122,9 @@ pub enum ImpliedBound<'tcx> {
     RegionSubProjection(ty::Region, ty::ProjectionTy<'tcx>),
 }
 
-/// This routine computes the full set of well-formedness constraints
-/// that must hold for the type `ty` to appear in a context with
-/// lifetime `outer_region`.
+/// Compute the implied bounds that a callee/impl can assume based on
+/// the fact that caller/projector has ensured that `ty` is WF.  See
+/// the `ImpliedBound` type for more details.
 pub fn implied_bounds<'a,'tcx>(
     infcx: &'a InferCtxt<'a,'tcx>,
     body_id: ast::NodeId,

branches/try/src/librustc_typeck/check/regionck.rs

@@ -1732,11 +1732,6 @@ fn projection_bound<'a, 'tcx>(rcx: &Rcx<'a, 'tcx>,
 
     // see the extensive comment in projection_must_outlive
 
-    // this routine is not invoked in this case
-    assert!(
-        !projection_ty.trait_ref.substs.types.iter().any(|t| t.needs_infer()) &&
-            !projection_ty.trait_ref.substs.regions().iter().any(|r| r.needs_infer()));
-
     let ty = rcx.tcx().mk_projection(projection_ty.trait_ref, projection_ty.item_name);
     let recursive_bound = recursive_type_bound(rcx, span, ty);