bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

rollup merge of #22319: huonw/send-is-not-static

Browse source 
Conflicts:
	src/libstd/sync/task_pool.rs
	src/libstd/thread.rs
	src/libtest/lib.rs
	src/test/bench/shootout-reverse-complement.rs
	src/test/bench/shootout-spectralnorm.rs
This commit is contained in:
Alex Crichton 2015-02-17 17:32:16 -08:00
commit ba8ce4c2c2
49 changed files with 231 additions and 297 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/libstd/process.rs
View file

@ -458,7 +458,7 @@ impl Child {
/// the parent waits for the child to exit.
pub fn wait_with_output(mut self) -> io::Result<Output> {
drop(self.stdin.take());
fn read<T: Read + Send>(stream: Option<T>) -> Receiver<io::Result<Vec<u8>>> {
fn read<T: Read + Send + 'static>(stream: Option<T>) -> Receiver<io::Result<Vec<u8>>> {
let (tx, rx) = channel();
match stream {
Some(stream) => {