---

yaml
---
r: 147369
b: refs/heads/try2
c: 2afa97a
h: refs/heads/master
i:
  147367: df51821
v: v3

Author: klutzy

[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: 415e55a02c0aeb3b091155c3e801335d80b99ae4
+refs/heads/try2: 2afa97a346650f2cfd2db892e2dd7eb98642ffc8
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/.gitignore

@@ -52,7 +52,7 @@
 lexer.ml
 TAGS
 TAGS.emacs
-TAGS.vi
+TAGS.vim
 version.ml
 version.texi
 /Makefile

branches/try2/src/etc/combine-tests.py

@@ -44,7 +44,6 @@ def scrub(b):
 c.write(
 """
 // AUTO-GENERATED FILE: DO NOT EDIT
-#[crate_id=\"run_pass_stage2#0.1\"];
 #[pkgid=\"run_pass_stage2#0.1\"];
 #[link(name=\"run_pass_stage2\", vers=\"0.1\")];
 #[feature(globs, macro_rules, struct_variant, managed_boxes)];

branches/try2/src/etc/ctags.rust

@@ -1,12 +1,11 @@
---langdef=Rust
---langmap=Rust:.rs
---regex-Rust=/^[ \t]*(pub[ \t]+)?fn[ \t]+([a-zA-Z0-9_]+)/\2/f,functions,function definitions/
---regex-Rust=/^[ \t]*(pub[ \t]+)?type[ \t]+([a-zA-Z0-9_]+)/\2/T,types,type definitions/
---regex-Rust=/^[ \t]*(pub[ \t]+)?enum[ \t]+([a-zA-Z0-9_]+)/\2/g,enum,enumeration names/
---regex-Rust=/^[ \t]*(pub[ \t]+)?enum[ \t]+([a-zA-Z0-9_]+)/\2/g,enum,enumeration names/
---regex-Rust=/^[ \t]*(pub[ \t]+)?struct[ \t]+([a-zA-Z0-9_]+)/\2/s,structure names/
---regex-Rust=/^[ \t]*(pub[ \t]+)?mod[ \t]+([a-zA-Z0-9_]+)/\2/m,modules,module names/
---regex-Rust=/^[ \t]*(pub[ \t]+)?static[ \t]+([a-zA-Z0-9_]+)/\2/c,consts,static constants/
---regex-Rust=/^[ \t]*(pub[ \t]+)?trait[ \t]+([a-zA-Z0-9_]+)/\2/t,traits,traits/
---regex-Rust=/^[ \t]*(pub[ \t]+)?impl([ \t\n]+<.*>)?[ \t]+([a-zA-Z0-9_]+)/\3/i,impls,trait implementations/
---regex-Rust=/^[ \t]*macro_rules![ \t]+([a-zA-Z0-9_]+)/\2/d,macros,macro definitions/
+--langdef=rust
+--langmap=rust:.rs
+--regex-rust=/[ \t]*fn[ \t]+([a-zA-Z0-9_]+)/\1/f,function/
+--regex-rust=/[ \t]*type[ \t]+([a-zA-Z0-9_]+)/\1/T,types/
+--regex-rust=/[ \t]*enum[ \t]+([a-zA-Z0-9_]+)/\1/T,types/
+--regex-rust=/[ \t]*struct[ \t]+([a-zA-Z0-9_]+)/\1/m,types/
+--regex-rust=/[ \t]*mod[ \t]+([a-zA-Z0-9_]+)/\1/m,modules/
+--regex-rust=/[ \t]*static[ \t]+([a-zA-Z0-9_]+)/\1/m,consts/
+--regex-rust=/[ \t]*trait[ \t]+([a-zA-Z0-9_]+)/\1/m,traits/
+--regex-rust=/[ \t]*impl[ \t]+([a-zA-Z0-9_]+)/\1/m,impls/
+--regex-rust=/[ \t]*macro_rules![ \t]+([a-zA-Z0-9_]+)/\1/m,macros/

branches/try2/src/libextra/comm.rs

@@ -101,7 +101,7 @@ mod test {
 
     #[test]
     pub fn DuplexStream1() {
-        let (left, right) = DuplexStream::new();
+        let (mut left, mut right) = DuplexStream::new();
 
         left.send(~"abc");
         right.send(123);
@@ -112,9 +112,10 @@ mod test {
 
     #[test]
     pub fn basic_rendezvous_test() {
-        let (port, chan) = rendezvous();
+        let (mut port, chan) = rendezvous();
 
         do spawn {
+            let mut chan = chan;
             chan.send("abc");
         }
 
@@ -125,8 +126,9 @@ 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 (port, chan) = rendezvous();
+            let (mut port, chan) = rendezvous();
             do spawn {
+                let mut chan = chan;
                 1000000.times(|| { chan.send(()) })
             }
             1000000.times(|| { port.recv() })
@@ -135,8 +137,9 @@ mod test {
 
     #[test]
     fn send_and_fail_and_try_recv() {
-        let (port, chan) = rendezvous();
+        let (mut port, chan) = rendezvous();
         do spawn {
+            let mut chan = chan;
             chan.duplex_stream.send(()); // Can't access this field outside this module
             fail!()
         }
@@ -145,8 +148,9 @@ mod test {
 
     #[test]
     fn try_send_and_recv_then_fail_before_ack() {
-        let (port, chan) = rendezvous();
+        let (port, mut chan) = rendezvous();
         do spawn {
+            let mut port = port;
             port.duplex_stream.recv();
             fail!()
         }
@@ -156,8 +160,9 @@ mod test {
     #[test]
     #[should_fail]
     fn send_and_recv_then_fail_before_ack() {
-        let (port, chan) = rendezvous();
+        let (port, mut chan) = rendezvous();
         do spawn {
+            let mut port = port;
             port.duplex_stream.recv();
             fail!()
         }