From 22039597e103a44b058755e2cc60736cf1fa5392 Mon Sep 17 00:00:00 2001 From: Oliver Scherer Date: Fri, 9 Nov 2018 11:00:51 +0100 Subject: [PATCH] Fix fallout it rustc_driver tests --- src/librustc_driver/test.rs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/librustc_driver/test.rs b/src/librustc_driver/test.rs index 28b7c610a91c..8865c7e438e5 100644 --- a/src/librustc_driver/test.rs +++ b/src/librustc_driver/test.rs @@ -232,20 +232,20 @@ impl<'a, 'gcx, 'tcx> Env<'a, 'gcx, 'tcx> { // 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 @@ impl<'a, 'gcx, 'tcx> Env<'a, 'gcx, 'tcx> { 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