From 640b22852f59e4505cedfd02c01cc343d5ec0d9e Mon Sep 17 00:00:00 2001
From: Alex Crichton <alex@alexcrichton.com>
Date: Thu, 13 Feb 2014 12:50:46 -0800
Subject: [PATCH] Rebase conflicts from this giant stack of patches
List of PRs contained in this rollup:
Closes #12167 r=alexcrichton
Closes #12200 r=alexcrichton
Closes #12206 r=pcwalton
Closes #12209 r=huonw
Closes #12211 r=pcwalton
Closes #12217 r=brson
Closes #12218 r=alexcrichton
Closes #12220 r=alexcrichton
Closes #12222 r=kballard
Closes #12225 r=alexcrichton
Closes #12227 r=kballard
Closes #12237 r=alexcrichton
Closes #12240 r=kballard
---
src/libstd/comm/select.rs | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/libstd/comm/select.rs b/src/libstd/comm/select.rs
index 3efd72be7b1..e41fa60aa42 100644
--- a/src/libstd/comm/select.rs
+++ b/src/libstd/comm/select.rs
@@ -531,7 +531,7 @@ mod test {
let (p, c) = Chan::new();
c.send(());
select!(
- () = p.recv() => {},
+ () = p.recv() => {}
)
})
@@ -540,7 +540,7 @@ mod test {
c.send(());
c.send(());
select!(
- () = p.recv() => {},
+ () = p.recv() => {}
)
})
@@ -549,7 +549,7 @@ mod test {
drop(c.clone());
c.send(());
select!(
- () = p.recv() => {},
+ () = p.recv() => {}
)
})