@@ -676,7 +676,7 @@ struct Resolver {
676
676
}
677
677
678
678
/// The main name resolution procedure.
679
- fn resolve( this: @Resolver ) {
679
+ fn resolve( @ self , this : @Resolver ) {
680
680
self . build_reduced_graph( this) ;
681
681
self . session. abort_if_errors( ) ;
682
682
@@ -2792,25 +2792,22 @@ struct Resolver {
2792
2792
return none;
2793
2793
}
2794
2794
2795
- // XXX: This shouldn't be unsafe!
2796
- fn resolve_crate ( ) unsafe {
2795
+ fn resolve_crate ( @self ) {
2797
2796
debug ! ( "(resolving crate) starting" ) ;
2798
2797
2799
- // XXX: This is awful!
2800
- let this = ptr:: addr_of ( self ) ;
2801
2798
visit_crate ( * self . crate , ( ) , mk_vt ( @{
2802
2799
visit_item: |item, _context, visitor|
2803
- ( * this ) . resolve_item ( item, visitor) ,
2800
+ self . resolve_item ( item, visitor) ,
2804
2801
visit_arm: |arm, _context, visitor|
2805
- ( * this ) . resolve_arm ( arm, visitor) ,
2802
+ self . resolve_arm ( arm, visitor) ,
2806
2803
visit_block: |block, _context, visitor|
2807
- ( * this ) . resolve_block ( block, visitor) ,
2804
+ self . resolve_block ( block, visitor) ,
2808
2805
visit_expr: |expr, _context, visitor|
2809
- ( * this ) . resolve_expr ( expr, visitor) ,
2806
+ self . resolve_expr ( expr, visitor) ,
2810
2807
visit_local: |local, _context, visitor|
2811
- ( * this ) . resolve_local ( local, visitor) ,
2808
+ self . resolve_local ( local, visitor) ,
2812
2809
visit_ty: |ty, _context, visitor|
2813
- ( * this ) . resolve_type ( ty, visitor)
2810
+ self . resolve_type ( ty, visitor)
2814
2811
with * default_visitor ( )
2815
2812
} ) ) ;
2816
2813
}
@@ -4542,7 +4539,7 @@ fn resolve_crate(session: session, lang_items: LanguageItems, crate: @crate)
4542
4539
trait_map: TraitMap } {
4543
4540
4544
4541
let resolver = @Resolver ( session, lang_items, crate ) ;
4545
- ( * resolver) . resolve( resolver) ;
4542
+ resolver. resolve( resolver) ;
4546
4543
return {
4547
4544
def_map: resolver. def_map,
4548
4545
exp_map: resolver. export_map,
0 commit comments