---

yaml
---
r: 233381
b: refs/heads/beta
c: c9a49f9
h: refs/heads/master
i:
  233379: 13cc0aa
v: v3

Author: nikomatsakis

[refs]

@@ -23,7 +23,7 @@ refs/tags/0.9: 36870b185fc5f5486636d4515f0e22677493f225
 refs/tags/0.10: ac33f2b15782272ae348dbd7b14b8257b2148b5a
 refs/tags/0.11.0: e1247cb1d0d681be034adb4b558b5a0c0d5720f9
 refs/tags/0.12.0: f0c419429ef30723ceaf6b42f9b5a2aeb5d2e2d1
-refs/heads/beta: 9c3a8664b6c6ab0e5650166220f870c3a0c2b60b
+refs/heads/beta: c9a49f93ac8e9cdbaa22b33c9e3b9a9adffd360c
 refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
 refs/heads/tmp: 370fe2786109360f7c35b8ba552b83b773dd71d6
 refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f

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

@@ -1562,47 +1562,6 @@ fn components_must_outlive<'a, 'tcx>(rcx: &Rcx<'a, 'tcx>,
     }
 }
 
-/// Checks that all data reachable via `ty` *strictly* outlives `scope`.
-/// This is used by dropck.
-///
-/// CAUTION: It is mostly but not entirely equivalent to `T:'parent`
-/// where `'parent` is the parent of `scope`. The difference is subtle
-/// and has to do with trait objects, primarily. In particular, if you
-/// have `Foo<'y>+'z`, then we require that `'z:'parent` but not
-/// `'y:'parent` (same with lifetimes appearing in fn arguments). This
-/// is because there is no actual reference to the trait object that
-/// outlives `scope`, so we don't need to require that the type could
-/// be named outside `scope`.  Because trait objects are always
-/// considered "suspicious" by dropck, if we don't add this special
-/// case, you wind up with some kind of annoying and odd limitations
-/// that crop up
-/// `src/test/compile-fail/regions-early-bound-trait-param.rs`.
-/// Basically there we have `&'foo Trait<'foo>+'bar`, and thus forcing
-/// `'foo` to outlive `'parent` also forces the borrow to outlive
-/// `'parent`, which is longer than should be necessary. The existence
-/// of this "the same but different" predicate is somewhat bothersome
-/// and questionable.
-pub fn type_strictly_outlives<'a, 'tcx>(rcx: &mut Rcx<'a, 'tcx>,
-                                        origin: infer::SubregionOrigin<'tcx>,
-                                        ty: Ty<'tcx>,
-                                        scope: CodeExtent)
-{
-    debug!("type_strictly_outlives(ty={:?}, scope={:?})",
-           ty, scope);
-
-    let span = origin.span();
-
-    let parent_region =
-        match rcx.tcx().region_maps.opt_encl_scope(scope) {
-            Some(parent_scope) => ty::ReScope(parent_scope),
-            None => rcx.tcx().sess.span_bug(
-                span, &format!("no enclosing scope found for scope: {:?}",
-                               scope)),
-        };
-
-    type_must_outlive(rcx, origin, ty, parent_region);
-}
-
 fn param_ty_must_outlive<'a, 'tcx>(rcx: &Rcx<'a, 'tcx>,
                                    origin: infer::SubregionOrigin<'tcx>,
                                    region: ty::Region,