@@ -295,58 +295,62 @@ impl<'a, 'tcx> Env<'a, 'tcx> {
295
295
} )
296
296
}
297
297
298
- pub fn t_param ( & self , space : subst:: ParamSpace , index : uint ) -> Ty < ' tcx > {
298
+ pub fn t_param ( & self , space : subst:: ParamSpace , index : u32 ) -> Ty < ' tcx > {
299
299
ty:: mk_param ( self . infcx . tcx , space, index, ast_util:: local_def ( ast:: DUMMY_NODE_ID ) )
300
300
}
301
301
302
302
pub fn re_early_bound ( & self ,
303
303
space : subst:: ParamSpace ,
304
- index : uint ,
304
+ index : u32 ,
305
305
name : & ' static str )
306
306
-> ty:: Region
307
307
{
308
308
let name = token:: intern ( name) ;
309
309
ty:: ReEarlyBound ( ast:: DUMMY_NODE_ID , space, index, name)
310
310
}
311
311
312
- pub fn re_late_bound_with_debruijn ( & self , id : uint , debruijn : ty:: DebruijnIndex ) -> ty:: Region {
312
+ pub fn re_late_bound_with_debruijn ( & self , id : u32 , debruijn : ty:: DebruijnIndex ) -> ty:: Region {
313
313
ty:: ReLateBound ( debruijn, ty:: BrAnon ( id) )
314
314
}
315
315
316
316
pub fn t_rptr ( & self , r : ty:: Region ) -> Ty < ' tcx > {
317
- ty:: mk_imm_rptr ( self . infcx . tcx , r , ty:: mk_int ( ) )
317
+ ty:: mk_imm_rptr ( self . infcx . tcx , self . infcx . tcx . mk_region ( r ) , ty:: mk_int ( ) )
318
318
}
319
319
320
- pub fn t_rptr_late_bound ( & self , id : uint ) -> Ty < ' tcx > {
320
+ pub fn t_rptr_late_bound ( & self , id : u32 ) -> Ty < ' tcx > {
321
+ let r = self . re_late_bound_with_debruijn ( id, ty:: DebruijnIndex :: new ( 1 ) ) ;
321
322
ty:: mk_imm_rptr ( self . infcx . tcx ,
322
- self . re_late_bound_with_debruijn ( id , ty :: DebruijnIndex :: new ( 1 ) ) ,
323
+ self . infcx . tcx . mk_region ( r ) ,
323
324
ty:: mk_int ( ) )
324
325
}
325
326
326
327
pub fn t_rptr_late_bound_with_debruijn ( & self ,
327
- id : uint ,
328
+ id : u32 ,
328
329
debruijn : ty:: DebruijnIndex )
329
330
-> Ty < ' tcx > {
331
+ let r = self . re_late_bound_with_debruijn ( id, debruijn) ;
330
332
ty:: mk_imm_rptr ( self . infcx . tcx ,
331
- self . re_late_bound_with_debruijn ( id , debruijn ) ,
333
+ self . infcx . tcx . mk_region ( r ) ,
332
334
ty:: mk_int ( ) )
333
335
}
334
336
335
337
pub fn t_rptr_scope ( & self , id : ast:: NodeId ) -> Ty < ' tcx > {
336
- ty:: mk_imm_rptr ( self . infcx . tcx , ty:: ReScope ( CodeExtent :: from_node_id ( id) ) , ty:: mk_int ( ) )
338
+ let r = ty:: ReScope ( CodeExtent :: from_node_id ( id) ) ;
339
+ ty:: mk_imm_rptr ( self . infcx . tcx , self . infcx . tcx . mk_region ( r) , ty:: mk_int ( ) )
337
340
}
338
341
339
- pub fn re_free ( & self , nid : ast:: NodeId , id : uint ) -> ty:: Region {
342
+ pub fn re_free ( & self , nid : ast:: NodeId , id : u32 ) -> ty:: Region {
340
343
ty:: ReFree ( ty:: FreeRegion { scope : CodeExtent :: from_node_id ( nid) ,
341
344
bound_region : ty:: BrAnon ( id) } )
342
345
}
343
346
344
- pub fn t_rptr_free ( & self , nid : ast:: NodeId , id : uint ) -> Ty < ' tcx > {
345
- ty:: mk_imm_rptr ( self . infcx . tcx , self . re_free ( nid, id) , ty:: mk_int ( ) )
347
+ pub fn t_rptr_free ( & self , nid : ast:: NodeId , id : u32 ) -> Ty < ' tcx > {
348
+ let r = self . re_free ( nid, id) ;
349
+ ty:: mk_imm_rptr ( self . infcx . tcx , self . infcx . tcx . mk_region ( r) , ty:: mk_int ( ) )
346
350
}
347
351
348
352
pub fn t_rptr_static ( & self ) -> Ty < ' tcx > {
349
- ty:: mk_imm_rptr ( self . infcx . tcx , ty:: ReStatic , ty:: mk_int ( ) )
353
+ ty:: mk_imm_rptr ( self . infcx . tcx , self . infcx . tcx . mk_region ( ty:: ReStatic ) , ty:: mk_int ( ) )
350
354
}
351
355
352
356
pub fn dummy_type_trace ( & self ) -> infer:: TypeTrace < ' tcx > {
0 commit comments