---

yaml
---
r: 39235
b: refs/heads/incoming
c: c5ee981
h: refs/heads/master
i:
  39233: e14894b
  39231: 7d36f5d
v: v3

Author: brson

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: 3d5418789064fdb463e872a4e651af1c628a3650
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: a810c03263670238bccd64cabb12a23a46e3a278
-refs/heads/incoming: e6ab0ca8b1c75f02c37fc57137eb854ac386773e
+refs/heads/incoming: c5ee9818aebbd25e82cbbc4eecc37ff3c2cf8563
 refs/heads/dist-snap: 22efa39382d41b084fde1719df7ae8ce5697d8c9
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/src/librustc/driver/driver.rs

@@ -811,8 +811,8 @@ mod test {
     fn test_switch_implies_cfg_test() {
         let matches =
             &match getopts(~[~"--test"], optgroups()) {
-              Ok(m) => m,
-              Err(f) => fail ~"test_switch_implies_cfg_test: " +
+              Ok(copy m) => m,
+              Err(copy f) => fail ~"test_switch_implies_cfg_test: " +
                              getopts::fail_str(f)
             };
         let sessopts = build_session_options(
@@ -828,8 +828,8 @@ mod test {
     fn test_switch_implies_cfg_test_unless_cfg_test() {
         let matches =
             &match getopts(~[~"--test", ~"--cfg=test"], optgroups()) {
-              Ok(m) => m,
-              Err(f) => {
+              Ok(copy m) => m,
+              Err(copy f) => {
                 fail ~"test_switch_implies_cfg_test_unless_cfg_test: " +
                     getopts::fail_str(f);
               }