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/old_io/net/pipe.rs
View file

@ -287,7 +287,7 @@ mod tests {
pub fn smalltest<F,G>(server: F, client: G)
where F : FnOnce(UnixStream), F : Send,
G : FnOnce(UnixStream), G : Send
G : FnOnce(UnixStream), G : Send + 'static
{
let path1 = next_test_unix();
let path2 = path1.clone();