---

yaml
---
r: 193551
b: refs/heads/beta
c: aed31ee
h: refs/heads/master
i:
  193549: 416997a
  193547: d00af36
  193543: d668a65
  193535: dba2ce2
v: v3

Author: alexcrichton

[refs]

@@ -31,7 +31,7 @@ refs/heads/automation-fail: 1bf06495443584539b958873e04cc2f864ab10e4
 refs/heads/issue-18208-method-dispatch-3-quick-reject: 2009f85b9f99dedcec4404418eda9ddba90258a2
 refs/heads/batch: b7fd822592a4fb577552d93010c4a4e14f314346
 refs/heads/building: 126db549b038c84269a1e4fe46f051b2c15d6970
-refs/heads/beta: 11ddfb8af0fcc69704e09b774de1a382e026f775
+refs/heads/beta: aed31ee08e9adff815e8a5df2499f2e4c6e7916b
 refs/heads/windistfix: 7608dbad651f02e837ed05eef3d74a6662a6e928
 refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
 refs/heads/tmp: de8a23bbc3a7b9cbd7574b5b91a34af59bf030e6

branches/beta/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;

branches/beta/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;

branches/beta/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]

branches/beta/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());
     }