---

yaml
---
r: 124382
b: refs/heads/snap-stage3
c: 6867d91
h: refs/heads/master
v: v3

Author: bgamari

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: 32cb44bfff3facbded5fd9cc74af3f02e81565a8
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: c6c1a22c563e0840f0efcccfe01a496114ac6ef0
+refs/heads/snap-stage3: 6867d91d20a77ad9be4288829cedec2a8c2b72ba
 refs/heads/try: dff46952ab5c4567d1b5b35bfbd8befc45cdd38e
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/src/librustc/middle/kind.rs

@@ -87,7 +87,8 @@ fn check_struct_safe_for_destructor(cx: &mut Context,
                                     span: Span,
                                     struct_did: DefId) {
     let struct_tpt = ty::lookup_item_type(cx.tcx, struct_did);
-    if !struct_tpt.generics.has_type_params(subst::TypeSpace) {
+    if !struct_tpt.generics.has_type_params(subst::TypeSpace)
+      && !struct_tpt.generics.has_region_params(subst::TypeSpace) {
         let struct_ty = ty::mk_struct(cx.tcx, struct_did,
                                       subst::Substs::empty());
         if !ty::type_is_sendable(cx.tcx, struct_ty) {

branches/snap-stage3/src/librustc/middle/ty.rs

@@ -984,6 +984,10 @@ impl Generics {
     pub fn has_type_params(&self, space: subst::ParamSpace) -> bool {
         !self.types.is_empty_in(space)
     }
+
+    pub fn has_region_params(&self, space: subst::ParamSpace) -> bool {
+        !self.regions.is_empty_in(space)
+    }
 }
 
 /// When type checking, we use the `ParameterEnvironment` to track