---

yaml
---
r: 80759
b: refs/heads/try
c: ade7df4
h: refs/heads/master
i:
  80757: 191672b
  80755: 8347d55
  80751: a5d95ee
v: v3

Author: lkuper

[refs]

@@ -2,7 +2,7 @@
 refs/heads/master: 4c6bf4872012c010f84dc7fa2cdfe87522533f89
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: cbd1eefbd350797b783df119fed7956d7e1c74ad
-refs/heads/try: 462dcc8e7a44972b57cb3060a48970c0499d5dee
+refs/heads/try: ade7df43d667a4a10d7f893591e790961422fa68
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c

branches/try/src/etc/emacs/README.md

@@ -1,29 +1,27 @@
-`rust-mode`: A major Emacs mode for editing Rust source code
-============================================================
+rust-mode: A major emacs mode for editing Rust source code
+==========================================================
 
-`rust-mode` makes editing [Rust](http://rust-lang.org) code with Emacs
+`rust-mode` makes editing [Rust](http://rust-lang.org) code with emacs
 enjoyable.
 
 
 ### Manual Installation
 
-To install manually, check out this repository and add this to your
-`.emacs` file:
+To install manually, check out this repository and add this to your .emacs
+file:
 
-```lisp
-(add-to-list 'load-path "/path/to/rust-mode/")
-(require 'rust-mode)
-```
+    (add-to-list 'load-path "/path/to/rust-mode/")
+    (require 'rust-mode)
 
-`rust-mode` will automatically be associated with `.rs` files. To enable it
-explicitly, do <kbd>M-x rust-mode</kbd>.
+Rust mode will automatically be associated with .rs files. To enable it
+explicitly, do `M-x rust-mode`.
 
-### `package.el` installation via Marmalade or MELPA
+### package.el installation via Marmalade or MELPA
 
 It can be more convenient to use Emacs's package manager to handle
 installation for you if you use many elisp libraries. If you have
-`package.el` but haven't added Marmalade or MELPA, the community
-package source, yet, add this to `~/.emacs.d/init.el`:
+package.el but haven't added Marmalade or MELPA, the community package source,
+yet, add this to ~/.emacs.d/init.el:
 
 Using Marmalade:
 
@@ -49,33 +47,32 @@ Then do this to load the package listing:
 * <kbd>M-x package-refresh-contents</kbd>
 
 If you use a version of Emacs prior to 24 that doesn't include
-`package.el`, you can get it from [here](http://bit.ly/pkg-el23).
+package.el, you can get it from http://bit.ly/pkg-el23.
 
-If you have an older ELPA `package.el` installed from tromey.com, you
+If you have an older ELPA package.el installed from tromey.com, you
 should upgrade in order to support installation from multiple sources.
 The ELPA archive is deprecated and no longer accepting new packages,
 so the version there (1.7.1) is very outdated.
 
-#### Install `rust-mode`
+#### Install rust-mode
 
-One you have `package.el`, you can install `rust-mode` or any other
-modes by choosing them from a list:
+From there you can install rust-mode or any other modes by choosing
+them from a list:
 
 * <kbd>M-x package-list-packages</kbd>
 
-Now, to install packages, move your cursor to them and press
-<kbd>i</kbd>. This will mark the packages for installation. When
-you're done with marking, press <kbd>x</kbd>, and ELPA will install
-the packages for you (under `~/.emacs.d/elpa/`).
+Now, to install packages, move your cursor to them and press i. This
+will mark the packages for installation. When you're done with
+marking, press x, and ELPA will install the packages for you (under
+~/.emacs.d/elpa/).
 
-* or using <kbd>M-x package-install rust-mode</kbd>
+* or using <kbd>M-x package-install rust-mode
 
 ### Tests via ERT
 
-The file `rust-mode-tests.el` contains tests that can be run via
-[ERT](http://www.gnu.org/software/emacs/manual/html_node/ert/index.html).
-You can use `run_rust_emacs_tests.sh` to run them in batch mode, if
-Emacs is somewhere in your `$PATH`.
+The file `rust-mode-tests.el` contains tests that can be run via ERT.  You can
+use `run_rust_emacs_tests.sh` to run them in batch mode, if emacs is somewhere
+in your `$PATH`.
 
 ### Known bugs
 

branches/try/src/libsyntax/ast_map.rs

@@ -1,4 +1,4 @@
-// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
+// Copyright 2012-2013 The Rust Project Developers. See the COPYRIGHT
 // file at the top-level directory of this distribution and at
 // http://rust-lang.org/COPYRIGHT.
 //
@@ -362,85 +362,9 @@ impl Visitor<()> for Ctx {
         self.map_block(block)
     }
 
-    // XXX: Methods below can become default methods.
-
-    fn visit_mod(&mut self, module: &_mod, _: Span, _: NodeId, _: ()) {
-        visit::walk_mod(self, module, ())
-    }
-
-    fn visit_view_item(&mut self, view_item: &view_item, _: ()) {
-        visit::walk_view_item(self, view_item, ())
-    }
-
-    fn visit_foreign_item(&mut self, foreign_item: @foreign_item, _: ()) {
-        visit::walk_foreign_item(self, foreign_item, ())
-    }
-
-    fn visit_local(&mut self, local: @Local, _: ()) {
-        visit::walk_local(self, local, ())
-    }
-
-    fn visit_arm(&mut self, arm: &Arm, _: ()) {
-        visit::walk_arm(self, arm, ())
-    }
-
-    fn visit_decl(&mut self, decl: @Decl, _: ()) {
-        visit::walk_decl(self, decl, ())
-    }
-
-    fn visit_expr_post(&mut self, _: @Expr, _: ()) {
-        // Empty!
-    }
-
     fn visit_ty(&mut self, typ: &Ty, _: ()) {
         visit::walk_ty(self, typ, ())
     }
-
-    fn visit_generics(&mut self, generics: &Generics, _: ()) {
-        visit::walk_generics(self, generics, ())
-    }
-
-    fn visit_fn(&mut self,
-                function_kind: &fn_kind,
-                function_declaration: &fn_decl,
-                block: &Block,
-                span: Span,
-                node_id: NodeId,
-                _: ()) {
-        visit::walk_fn(self,
-                        function_kind,
-                        function_declaration,
-                        block,
-                        span,
-                        node_id,
-                        ())
-    }
-
-    fn visit_ty_method(&mut self, ty_method: &TypeMethod, _: ()) {
-        visit::walk_ty_method(self, ty_method, ())
-    }
-
-    fn visit_trait_method(&mut self, trait_method: &trait_method, _: ()) {
-        visit::walk_trait_method(self, trait_method, ())
-    }
-
-    fn visit_struct_def(&mut self,
-                        struct_def: @struct_def,
-                        ident: Ident,
-                        generics: &Generics,
-                        node_id: NodeId,
-                        _: ()) {
-        visit::walk_struct_def(self,
-                                struct_def,
-                                ident,
-                                generics,
-                                node_id,
-                                ())
-    }
-
-    fn visit_struct_field(&mut self, struct_field: @struct_field, _: ()) {
-        visit::walk_struct_field(self, struct_field, ())
-    }
 }
 
 pub fn map_crate(diag: @mut span_handler, c: &Crate) -> map {