diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2015-03-06 15:53:32 -0800 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2015-03-06 19:27:36 -0800 |
| commit | aed31ee08e9adff815e8a5df2499f2e4c6e7916b (patch) | |
| tree | 62f22a53145acb3ea1fd95d8d4262ab9a342a421 | |
| parent | 11ddfb8af0fcc69704e09b774de1a382e026f775 (diff) | |
| download | rust-aed31ee08e9adff815e8a5df2499f2e4c6e7916b.tar.gz rust-aed31ee08e9adff815e8a5df2499f2e4c6e7916b.zip | |
Test fixes and rebase conflicts
| -rw-r--r-- | src/librustc_llvm/lib.rs | 2 | ||||
| -rw-r--r-- | src/librustc_trans/lib.rs | 2 | ||||
| -rw-r--r-- | src/libstd/fs/mod.rs | 9 | ||||
| -rw-r--r-- | src/libstd/net/addr.rs | 1 |
4 files changed, 9 insertions, 5 deletions
diff --git a/src/librustc_llvm/lib.rs b/src/librustc_llvm/lib.rs index 5bf872b3a1d..0ff96784e58 100644 --- a/src/librustc_llvm/lib.rs +++ b/src/librustc_llvm/lib.rs @@ -31,8 +31,8 @@ #![feature(libc)] #![feature(link_args)] #![feature(staged_api)] -#![feature(std_misc)] #![feature(path)] +#![cfg_attr(unix, feature(std_misc))] extern crate libc; #[macro_use] #[no_link] extern crate rustc_bitflags; diff --git a/src/librustc_trans/lib.rs b/src/librustc_trans/lib.rs index 08e31a6b339..b74f85aa866 100644 --- a/src/librustc_trans/lib.rs +++ b/src/librustc_trans/lib.rs @@ -40,11 +40,9 @@ #![feature(unicode)] #![feature(io)] #![feature(path)] -#![feature(os)] #![feature(path_ext)] #![feature(fs)] #![feature(hash)] -#![feature(tempdir)] extern crate arena; extern crate flate; diff --git a/src/libstd/fs/mod.rs b/src/libstd/fs/mod.rs index 42bc636d4bd..80ec9909824 100644 --- a/src/libstd/fs/mod.rs +++ b/src/libstd/fs/mod.rs @@ -1313,6 +1313,8 @@ mod tests { check!(fs::set_permissions(&input, p)); check!(fs::copy(&input, &out)); assert!(check!(out.metadata()).permissions().readonly()); + check!(fs::set_permissions(&input, attr.permissions())); + check!(fs::set_permissions(&out, attr.permissions())); } #[cfg(not(windows))] // FIXME(#10264) operation not permitted? @@ -1396,10 +1398,13 @@ mod tests { let attr = check!(fs::metadata(&file)); assert!(attr.permissions().readonly()); - match fs::set_permissions(&tmpdir.join("foo"), p) { - Ok(..) => panic!("wanted a panic"), + match fs::set_permissions(&tmpdir.join("foo"), p.clone()) { + Ok(..) => panic!("wanted an error"), Err(..) => {} } + + p.set_readonly(false); + check!(fs::set_permissions(&file, p)); } #[test] diff --git a/src/libstd/net/addr.rs b/src/libstd/net/addr.rs index d975369af49..101aae3eb24 100644 --- a/src/libstd/net/addr.rs +++ b/src/libstd/net/addr.rs @@ -592,6 +592,7 @@ mod tests { } #[test] + #[cfg(not(windows))] fn to_socket_addr_str_bad() { assert!(tsa("1200::AB00:1234::2552:7777:1313:34300").is_err()); } |