---

yaml
---
r: 131353
b: refs/heads/dist-snap
c: 2823be0
h: refs/heads/master
i:
  131351: 6fc3593
v: v3

Author: alexcrichton

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: 457a3c991d79b971be07fce75f9d0c12848fb37c
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
-refs/heads/dist-snap: de337f3ddfbef800a8cf731e0b593e341af1e3e5
+refs/heads/dist-snap: 2823be08b7d1b9106cbbd454437384c093c5a5fa
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0

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

@@ -320,7 +320,7 @@ fn run_debuginfo_gdb_test(config: &Config, props: &TestProps, testfile: &Path) {
 
     let config = &mut config;
     let DebuggerCommands { commands, check_lines, .. } = parse_debugger_commands(testfile, "gdb");
-    let mut cmds = commands.connect("\n");
+    let mut cmds = commands.connect("\n").to_string();
 
     // compile test file (it shoud have 'compile-flags:-g' in the header)
     let compiler_run_result = compile_test(config, props, testfile);
@@ -1035,7 +1035,10 @@ fn compose_and_run_compiler(
             make_compile_args(config,
                               &aux_props,
                               crate_type.append(
-                                  extra_link_args.as_slice()),
+                                  extra_link_args.iter()
+                                                 .map(|x| x.to_string())
+                                                 .collect::<Vec<_>>()
+                                                 .as_slice()),
                               |a,b| {
                                   let f = make_lib_name(a, b, testfile);
                                   ThisDirectory(f.dir_path())

branches/dist-snap/src/doc/guide-macros.md

@@ -355,7 +355,6 @@ macro_rules! biased_match_rec (
             _ => { $err }
         }
     );
-    // Produce the requested values
     ( binds $( $bind_res:ident ),* ) => ( ($( $bind_res ),*) )
 )
 
@@ -365,7 +364,7 @@ macro_rules! biased_match (
     ( $( ($e:expr) ~ ($p:pat) else $err:stmt ; )*
       binds $bind_res:ident
     ) => (
-        let $bind_res = biased_match_rec!(
+        let ( $( $bind_res ),* ) = biased_match_rec!(
             $( ($e) ~ ($p) else $err ; )*
             binds $bind_res
         );