---

yaml
---
r: 147375
b: refs/heads/try2
c: 5399c82
h: refs/heads/master
i:
  147373: 700c52d
  147371: 7e171b3
  147367: df51821
  147359: a142ff1
v: v3

Author: bors

[refs]

@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
 refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: f89b61ba3ada6f4e343437edc1f1d2a91ad9ad8a
+refs/heads/try2: 5399c82d56bcd276a026d6fdd2e2b14523c6e01f
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/src/etc/mklldeps.py

@@ -7,6 +7,7 @@
 f = open(sys.argv[1], 'wb')
 
 components = sys.argv[2].split(' ')
+components = [i for i in components if i]  # ignore extra whitespaces
 
 f.write("""// Copyright 2013 The Rust Project Developers. See the COPYRIGHT
 // file at the top-level directory of this distribution and at
@@ -51,6 +52,10 @@
     proc = subprocess.Popen(args, stdout = subprocess.PIPE)
     out, err = proc.communicate()
 
+    if err:
+        print("failed to run llconfig: args = `{}`".format(args))
+        sys.exit(1)
+
     for lib in out.strip().split(' '):
         lib = lib[2:] # chop of the leading '-l'
         f.write("#[link(name = \"" + lib + "\", kind = \"static\")]\n")

branches/try2/src/libextra/comm.rs

@@ -101,7 +101,7 @@ mod test {
 
     #[test]
     pub fn DuplexStream1() {
-        let (mut left, mut right) = DuplexStream::new();
+        let (left, right) = DuplexStream::new();
 
         left.send(~"abc");
         right.send(123);
@@ -112,10 +112,9 @@ mod test {
 
     #[test]
     pub fn basic_rendezvous_test() {
-        let (mut port, chan) = rendezvous();
+        let (port, chan) = rendezvous();
 
         do spawn {
-            let mut chan = chan;
             chan.send("abc");
         }
 
@@ -126,9 +125,8 @@ mod test {
     fn recv_a_lot() {
         // Rendezvous streams should be able to handle any number of messages being sent
         do run_in_uv_task {
-            let (mut port, chan) = rendezvous();
+            let (port, chan) = rendezvous();
             do spawn {
-                let mut chan = chan;
                 1000000.times(|| { chan.send(()) })
             }
             1000000.times(|| { port.recv() })
@@ -137,9 +135,8 @@ mod test {
 
     #[test]
     fn send_and_fail_and_try_recv() {
-        let (mut port, chan) = rendezvous();
+        let (port, chan) = rendezvous();
         do spawn {
-            let mut chan = chan;
             chan.duplex_stream.send(()); // Can't access this field outside this module
             fail!()
         }
@@ -148,9 +145,8 @@ mod test {
 
     #[test]
     fn try_send_and_recv_then_fail_before_ack() {
-        let (port, mut chan) = rendezvous();
+        let (port, chan) = rendezvous();
         do spawn {
-            let mut port = port;
             port.duplex_stream.recv();
             fail!()
         }
@@ -160,9 +156,8 @@ mod test {
     #[test]
     #[should_fail]
     fn send_and_recv_then_fail_before_ack() {
-        let (port, mut chan) = rendezvous();
+        let (port, chan) = rendezvous();
         do spawn {
-            let mut port = port;
             port.duplex_stream.recv();
             fail!()
         }