Fix fallout it rustc_driver tests

This commit is contained in:
Oliver Scherer 2018-11-09 11:00:51 +01:00
parent 3e5dfdd6f6
commit 22039597e1

View File

@ -232,20 +232,20 @@ impl<'a, 'gcx, 'tcx> Env<'a, 'gcx, 'tcx> {
// children of 1, etc // children of 1, etc
let dscope = region::Scope { let dscope = region::Scope {
id: hir::ItemLocalId(1), id: hir::ItemLocalId::from_u32(1),
data: region::ScopeData::Destruction, data: region::ScopeData::Destruction,
}; };
self.region_scope_tree.record_scope_parent(dscope, None); self.region_scope_tree.record_scope_parent(dscope, None);
self.create_region_hierarchy( self.create_region_hierarchy(
&RH { &RH {
id: hir::ItemLocalId(1), id: hir::ItemLocalId::from_u32(1),
sub: &[ sub: &[
RH { RH {
id: hir::ItemLocalId(10), id: hir::ItemLocalId::from_u32(10),
sub: &[], sub: &[],
}, },
RH { RH {
id: hir::ItemLocalId(11), id: hir::ItemLocalId::from_u32(11),
sub: &[], sub: &[],
}, },
], ],
@ -400,7 +400,7 @@ impl<'a, 'gcx, 'tcx> Env<'a, 'gcx, 'tcx> {
pub fn t_rptr_scope(&self, id: u32) -> Ty<'tcx> { pub fn t_rptr_scope(&self, id: u32) -> Ty<'tcx> {
let r = ty::ReScope(region::Scope { let r = ty::ReScope(region::Scope {
id: hir::ItemLocalId(id), id: hir::ItemLocalId::from_u32(id),
data: region::ScopeData::Node, data: region::ScopeData::Node,
}); });
self.infcx self.infcx