diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2015-02-17 19:00:20 -0800 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2015-02-17 19:42:28 -0800 |
| commit | 665ea963d3c29ef7670662707f2f2307f000efa3 (patch) | |
| tree | 9281d6d03436f1c92585c191a7a130d38e1ff9f0 /src/libstd/old_io | |
| parent | ba8ce4c2c27643cccfbbc481a19bcf4b7747cc89 (diff) | |
| download | rust-665ea963d3c29ef7670662707f2f2307f000efa3.tar.gz rust-665ea963d3c29ef7670662707f2f2307f000efa3.zip | |
Test fixes and rebase conflicts
Diffstat (limited to 'src/libstd/old_io')
| -rw-r--r-- | src/libstd/old_io/comm_adapters.rs | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/libstd/old_io/comm_adapters.rs b/src/libstd/old_io/comm_adapters.rs index a75686369ad..207d3d39167 100644 --- a/src/libstd/old_io/comm_adapters.rs +++ b/src/libstd/old_io/comm_adapters.rs @@ -234,10 +234,7 @@ mod test { writer.write_be_u32(42).unwrap(); let wanted = vec![0u8, 0u8, 0u8, 42u8]; - let got = match thread::spawn(move|| { rx.recv().unwrap() }).join() { - Ok(got) => got, - Err(_) => panic!(), - }; + let got = thread::scoped(move|| { rx.recv().unwrap() }).join(); assert_eq!(wanted, got); match writer.write_u8(1) { |