---

yaml
---
r: 114151
b: refs/heads/master
c: d6cf0df
h: refs/heads/master
i:
  114149: ad6acf5
  114147: 403f6f9
  114143: 0400f43
v: v3

Author: pnkfelix

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 579e0a5f5555ed926cf9378ef61b034b0c316e76
+refs/heads/master: d6cf0dfbab35f40abaef345024701ff8112ed2d8
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: ec0258a381b88b5574e3f8ce72ae553ac3a574b7
 refs/heads/try: 7c6c492fb2af9a85f21ff952942df3523b22fd17

trunk/src/librustc/driver/mod.rs

@@ -104,17 +104,17 @@ fn run_compiler(args: &[~str]) {
     driver::compile_input(sess, cfg, &input, &odir, &ofile);
 }
 
-pub fn version(command: &str) {
+pub fn version(argv0: &str) {
     let vers = match option_env!("CFG_VERSION") {
         Some(vers) => vers,
         None => "unknown version"
     };
-    println!("{} {}", command, vers);
+    println!("{} {}", argv0, vers);
     println!("host: {}", driver::host_triple());
 }
 
-fn usage() {
-    let message = format!("Usage: rustc [OPTIONS] INPUT");
+fn usage(argv0: &str) {
+    let message = format!("Usage: {} [OPTIONS] INPUT", argv0);
     println!("{}\n\
 Additional help:
     -C help             Print codegen options
@@ -192,10 +192,9 @@ fn describe_codegen_flags() {
 /// should continue, returns a getopts::Matches object parsed from args, otherwise
 /// returns None.
 pub fn handle_options(mut args: Vec<~str>) -> Option<getopts::Matches> {
-    // Throw away the first argument, the name of the binary
-    let _binary = args.shift().unwrap();
+    let binary = args.shift().unwrap();
 
-    if args.is_empty() { usage(); return None; }
+    if args.is_empty() { usage(binary); return None; }
 
     let matches =
         match getopts::getopts(args.as_slice(), config::optgroups().as_slice()) {
@@ -206,7 +205,7 @@ pub fn handle_options(mut args: Vec<~str>) -> Option<getopts::Matches> {
         };
 
     if matches.opt_present("h") || matches.opt_present("help") {
-        usage();
+        usage(binary);
         return None;
     }
 
@@ -235,7 +234,7 @@ pub fn handle_options(mut args: Vec<~str>) -> Option<getopts::Matches> {
     }
 
     if matches.opt_present("v") || matches.opt_present("version") {
-        version("rustc");
+        version(binary);
         return None;
     }
 

trunk/src/librustdoc/lib.rs

@@ -153,7 +153,7 @@ pub fn main_args(args: &[StrBuf]) -> int {
         usage(args[0].as_slice());
         return 0;
     } else if matches.opt_present("version") {
-        rustc::driver::version("rustdoc");
+        rustc::driver::version(args[0].as_slice());
         return 0;
     }
 

trunk/src/libsyntax/visit.rs

@@ -61,7 +61,17 @@ pub fn generics_of_fn(fk: &FnKind) -> Generics {
     }
 }
 
+/// Each method of the Visitor trait is a hook to be potentially
+/// overriden.  Each method's default implementation recursively visits
+/// the substructure of the input via the corresponding `walk` method;
+/// e.g. the `visit_mod` method by default calls `visit::walk_mod`.
+///
+/// If you want to ensure that your code handles every variant
+/// explicitly, you need to override each method.  (And you also need
+/// to monitor future changes to `Visitor` in case a new method with a
+/// new default implementation gets introduced.)
 pub trait Visitor<E: Clone> {
+
     fn visit_ident(&mut self, _sp: Span, _ident: Ident, _e: E) {
         /*! Visit the idents */
     }
@@ -179,9 +189,9 @@ pub fn walk_local<E: Clone, V: Visitor<E>>(visitor: &mut V, local: &Local, env:
     }
 }
 
-fn walk_explicit_self<E: Clone, V: Visitor<E>>(visitor: &mut V,
-                                               explicit_self: &ExplicitSelf,
-                                               env: E) {
+pub fn walk_explicit_self<E: Clone, V: Visitor<E>>(visitor: &mut V,
+                                                   explicit_self: &ExplicitSelf,
+                                                   env: E) {
     match explicit_self.node {
         SelfStatic | SelfValue | SelfUniq => {}
         SelfRegion(ref lifetime, _) => {