---

yaml
---
r: 30058
b: refs/heads/incoming
c: 2c96a43
h: refs/heads/master
v: v3

Author: msullivan

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df
-refs/heads/incoming: 7706262a730ac7bbea73decc551cdafffa8f1dbd
+refs/heads/incoming: 2c96a43cf196a54f3494da24c32e1f50a0f58ad7
 refs/heads/dist-snap: 2f32a1581f522e524009138b33b1c7049ced668d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/src/rustc/middle/resolve3.rs

@@ -676,7 +676,7 @@ struct Resolver {
     }
 
     /// The main name resolution procedure.
-    fn resolve(this: @Resolver) {
+    fn resolve(@self, this: @Resolver) {
         self.build_reduced_graph(this);
         self.session.abort_if_errors();
 
@@ -2792,25 +2792,22 @@ struct Resolver {
         return none;
     }
 
-    // XXX: This shouldn't be unsafe!
-    fn resolve_crate() unsafe {
+    fn resolve_crate(@self) {
         debug!("(resolving crate) starting");
 
-        // XXX: This is awful!
-        let this = ptr::addr_of(self);
         visit_crate(*self.crate, (), mk_vt(@{
             visit_item: |item, _context, visitor|
-                (*this).resolve_item(item, visitor),
+                self.resolve_item(item, visitor),
             visit_arm: |arm, _context, visitor|
-                (*this).resolve_arm(arm, visitor),
+                self.resolve_arm(arm, visitor),
             visit_block: |block, _context, visitor|
-                (*this).resolve_block(block, visitor),
+                self.resolve_block(block, visitor),
             visit_expr: |expr, _context, visitor|
-                (*this).resolve_expr(expr, visitor),
+                self.resolve_expr(expr, visitor),
             visit_local: |local, _context, visitor|
-                (*this).resolve_local(local, visitor),
+                self.resolve_local(local, visitor),
             visit_ty: |ty, _context, visitor|
-                (*this).resolve_type(ty, visitor)
+                self.resolve_type(ty, visitor)
             with *default_visitor()
         }));
     }
@@ -4542,7 +4539,7 @@ fn resolve_crate(session: session, lang_items: LanguageItems, crate: @crate)
                    trait_map: TraitMap } {
 
     let resolver = @Resolver(session, lang_items, crate);
-    (*resolver).resolve(resolver);
+    resolver.resolve(resolver);
     return {
         def_map: resolver.def_map,
         exp_map: resolver.export_map,