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