---

yaml
---
r: 233679
b: refs/heads/beta
c: 06563fe
h: refs/heads/master
i:
  233677: 62a03cd
  233675: 03e5e8a
  233671: 8e7f7fc
  233663: 5236a16
v: v3

Author: arielb1

[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: 1e507d44505a336fb60ee1dbd121bd986788296e
+refs/heads/beta: 06563fe0b7d64b7552d65a7ab00aa360820f05c5
 refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
 refs/heads/tmp: 370fe2786109360f7c35b8ba552b83b773dd71d6
 refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f

branches/beta/src/librustc_driver/test.rs

@@ -17,7 +17,7 @@ use rustc_lint;
 use rustc_resolve as resolve;
 use rustc_typeck::middle::lang_items;
 use rustc_typeck::middle::free_region::FreeRegionMap;
-use rustc_typeck::middle::region::{self, CodeExtent, DestructionScopeData};
+use rustc_typeck::middle::region::{self, CodeExtent};
 use rustc_typeck::middle::region::CodeExtentData;
 use rustc_typeck::middle::resolve_lifetime;
 use rustc_typeck::middle::stability;
@@ -329,8 +329,10 @@ impl<'a, 'tcx> Env<'a, 'tcx> {
     }
 
     pub fn re_free(&self, nid: ast::NodeId, id: u32) -> ty::Region {
-        ty::ReFree(ty::FreeRegion { scope: DestructionScopeData::new(nid),
-                                    bound_region: ty::BrAnon(id)})
+        ty::ReFree(ty::FreeRegion {
+            scope: self.tcx().region_maps.item_extent(nid),
+            bound_region: ty::BrAnon(id)
+        })
     }
 
     pub fn t_rptr_free(&self, nid: ast::NodeId, id: u32) -> Ty<'tcx> {