---

yaml
---
r: 40547
b: refs/heads/dist-snap
c: 082a88e
h: refs/heads/master
i:
  40545: 8234dff
  40543: ef53940
v: v3

Author: graydon

[refs]

@@ -7,7 +7,7 @@ refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: a810c03263670238bccd64cabb12a23a46e3a278
 refs/heads/incoming: e90142e536c150df0d9b4b2f11352152177509b5
-refs/heads/dist-snap: 19f5f91c045ab54fc981029ebb2a9b7d271b7589
+refs/heads/dist-snap: 082a88e42cdefce78a8f1f869971bbabd74ebca2
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0

branches/dist-snap/src/compiletest/compiletest.rs

@@ -35,12 +35,12 @@ fn parse_config(args: ~[~str]) -> config {
     assert (vec::is_not_empty(args));
     let args_ = vec::tail(args);
     let matches =
-        match getopts::getopts(args_, opts) {
+        &match getopts::getopts(args_, opts) {
           Ok(m) => m,
           Err(f) => fail getopts::fail_str(f)
         };
 
-    fn opt_path(m: getopts::Matches, nm: ~str) -> Path {
+    fn opt_path(m: &getopts::Matches, nm: ~str) -> Path {
         Path(getopts::opt_str(m, nm))
     }
 

branches/dist-snap/src/libcargo/cargo.rs

@@ -661,7 +661,7 @@ fn load_source_packages(c: &Cargo, src: @Source) {
 }
 
 fn build_cargo_options(argv: ~[~str]) -> Options {
-    let matches = match getopts::getopts(argv, opts()) {
+    let matches = &match getopts::getopts(argv, opts()) {
         result::Ok(m) => m,
         result::Err(f) => {
             fail fmt!("%s", getopts::fail_str(f));

branches/dist-snap/src/librustc/driver/driver.rs

@@ -458,7 +458,7 @@ fn host_triple() -> ~str {
 }
 
 fn build_session_options(binary: ~str,
-                         matches: getopts::Matches,
+                         matches: &getopts::Matches,
                          demitter: diagnostic::emitter) -> @session::options {
     let crate_type = if opt_present(matches, ~"lib") {
         session::lib_crate
@@ -807,7 +807,7 @@ mod test {
     #[test]
     fn test_switch_implies_cfg_test() {
         let matches =
-            match getopts(~[~"--test"], optgroups()) {
+            &match getopts(~[~"--test"], optgroups()) {
               Ok(m) => m,
               Err(f) => fail ~"test_switch_implies_cfg_test: " +
                              getopts::fail_str(f)
@@ -824,7 +824,7 @@ mod test {
     #[test]
     fn test_switch_implies_cfg_test_unless_cfg_test() {
         let matches =
-            match getopts(~[~"--test", ~"--cfg=test"], optgroups()) {
+            &match getopts(~[~"--test", ~"--cfg=test"], optgroups()) {
               Ok(m) => m,
               Err(f) => {
                 fail ~"test_switch_implies_cfg_test_unless_cfg_test: " +

branches/dist-snap/src/librustc/middle/typeck/infer/test.rs

@@ -34,7 +34,7 @@ struct RH {
 }
 
 fn setup_env(test_name: &str, source_string: &str) -> Env {
-    let matches = getopts(~[~"-Z", ~"verbose"], optgroups()).get();
+    let matches = &getopts(~[~"-Z", ~"verbose"], optgroups()).get();
     let sessopts = build_session_options(~"rustc", matches, diagnostic::emit);
     let sess = build_session(sessopts, diagnostic::emit);
     let cfg = build_configuration(sess, ~"whatever", str_input(~""));

branches/dist-snap/src/librustc/rustc.rs

@@ -85,7 +85,7 @@ fn run_compiler(args: &~[~str], demitter: diagnostic::emitter) {
     if args.is_empty() { usage(binary); return; }
 
     let matches =
-        match getopts::groups::getopts(args, optgroups()) {
+        &match getopts::groups::getopts(args, optgroups()) {
           Ok(m) => m,
           Err(f) => {
             early_error(demitter, getopts::fail_str(f))

branches/dist-snap/src/librustdoc/config.rs

@@ -128,14 +128,14 @@ fn parse_config_(
     args: &[~str],
     +program_output: ProgramOutput
 ) -> Result<Config, ~str> {
-    let args = vec::tail(args);
+    let args = args.tail();
     let opts = vec::unzip(opts()).first();
     match getopts::getopts(args, opts) {
         result::Ok(matches) => {
-            if vec::len(matches.free) == 1u {
+            if matches.free.len() == 1 {
                 let input_crate = Path(vec::head(matches.free));
-                config_from_opts(&input_crate, matches, move program_output)
-            } else if vec::is_empty(matches.free) {
+                config_from_opts(&input_crate, &matches, move program_output)
+            } else if matches.free.is_empty() {
                 result::Err(~"no crates specified")
             } else {
                 result::Err(~"multiple crates specified")
@@ -149,7 +149,7 @@ fn parse_config_(
 
 fn config_from_opts(
     input_crate: &Path,
-    +matches: getopts::Matches,
+    matches: &getopts::Matches,
     +program_output: ProgramOutput
 ) -> Result<Config, ~str> {