---

yaml
---
r: 144930
b: refs/heads/try2
c: ed37da2
h: refs/heads/master
v: v3

Author: pnkfelix

[refs]

@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
 refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: 6724317dad11856d6467ca2374e8c8bb6e749612
+refs/heads/try2: ed37da2f799bd95c6398b92a51f7eaf65c62c5fe
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/src/librustc/middle/entry.rs

@@ -39,11 +39,9 @@ struct EntryContext {
     non_main_fns: ~[(NodeId, Span)],
 }
 
-struct EntryVisitor;
-
-impl Visitor<@mut EntryContext> for EntryVisitor {
-    fn visit_item(&mut self, item:@item, ctxt:@mut EntryContext) {
-        find_item(item, ctxt, self);
+impl Visitor<()> for EntryContext {
+    fn visit_item(&mut self, item:@item, _:()) {
+        find_item(item, self);
     }
 }
 
@@ -62,7 +60,7 @@ pub fn find_entry_point(session: Session, crate: &Crate, ast_map: ast_map::map)
         return
     }
 
-    let ctxt = @mut EntryContext {
+    let mut ctxt = EntryContext {
         session: session,
         ast_map: ast_map,
         main_fn: None,
@@ -71,14 +69,12 @@ pub fn find_entry_point(session: Session, crate: &Crate, ast_map: ast_map::map)
         non_main_fns: ~[],
     };
 
-    let mut v = EntryVisitor;
-
-    visit::walk_crate(&mut v, crate, ctxt);
+    visit::walk_crate(&mut ctxt, crate, ());
 
-    configure_main(ctxt);
+    configure_main(&mut ctxt);
 }
 
-fn find_item(item: @item, ctxt: @mut EntryContext, visitor: &mut EntryVisitor) {
+fn find_item(item: @item, ctxt: &mut EntryContext) {
     match item.node {
         item_fn(*) => {
             if item.ident.name == special_idents::main.name {
@@ -125,11 +121,10 @@ fn find_item(item: @item, ctxt: @mut EntryContext, visitor: &mut EntryVisitor) {
         _ => ()
     }
 
-    visit::walk_item(visitor, item, ctxt);
+    visit::walk_item(ctxt, item, ());
 }
 
-fn configure_main(ctxt: @mut EntryContext) {
-    let this = &mut *ctxt;
+fn configure_main(this: &mut EntryContext) {
     if this.start_fn.is_some() {
         *this.session.entry_fn = this.start_fn;
         *this.session.entry_type = Some(session::EntryStart);