Test fixes and rebase conflicts, round 3

This commit is contained in:
Alex Crichton 2015-03-31 16:20:09 -07:00
parent 50b3ecf3bc
commit 72f59732d7
18 changed files with 156 additions and 153 deletions

View file

@ -15,13 +15,14 @@
use std::{fs, net};
fn assert_both<T: Send + Sync>() {}
fn assert_send<T: Send>() {}
fn main() {
assert_both::<fs::File>();
assert_both::<fs::Metadata>();
assert_both::<fs::ReadDir>();
assert_both::<fs::DirEntry>();
assert_both::<fs::WalkDir>();
assert_send::<fs::WalkDir>();
assert_both::<fs::OpenOptions>();
assert_both::<fs::Permissions>();