---

yaml
---
r: 274093
b: refs/heads/stable
c: ae30294
h: refs/heads/master
i:
  274091: f699821

Author: pitdicker

[refs]

@@ -29,7 +29,7 @@ refs/heads/tmp: e06d2ad9fcd5027bcaac5b08fc9aa39a49d0ecd3
 refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f
 refs/tags/homu-tmp: c0221c8897db309a79990367476177b1230bb264
 refs/tags/1.0.0-beta: 8cbb92b53468ee2b0c2d3eeb8567005953d40828
-refs/heads/stable: 9c569189c8b8b5d635b6704c489a8410c81570a0
+refs/heads/stable: ae30294771e3c5c65a2d70be0e09b5bec2490c66
 refs/tags/1.0.0: 55bd4f8ff2b323f317ae89e254ce87162d52a375
 refs/tags/1.1.0: bc3c16f09287e5545c1d3f76b7abd54f2eca868b
 refs/tags/1.2.0: f557861f822c34f07270347b94b5280de20a597e

branches/stable/src/libstd/fs.rs

@@ -2264,6 +2264,12 @@ mod tests {
         assert_eq!(check!(fs::metadata(&tmpdir.join("h"))).len(), 9);
     }
 
+    #[test]
+    fn _assert_send_sync() {
+        fn _assert_send_sync<T: Send + Sync>() {}
+        _assert_send_sync::<OpenOptions>();
+    }
+
     #[test]
     fn binary_file() {
         let mut bytes = [0; 1024];

branches/stable/src/libstd/sys/windows/fs.rs

@@ -69,7 +69,7 @@ pub struct OpenOptions {
     attributes: c::DWORD,
     share_mode: c::DWORD,
     security_qos_flags: c::DWORD,
-    security_attributes: c::LPSECURITY_ATTRIBUTES,
+    security_attributes: usize, // FIXME: should be a reference
 }
 
 #[derive(Clone, PartialEq, Eq, Debug)]
@@ -170,7 +170,7 @@ impl OpenOptions {
             share_mode: c::FILE_SHARE_READ | c::FILE_SHARE_WRITE | c::FILE_SHARE_DELETE,
             attributes: 0,
             security_qos_flags: 0,
-            security_attributes: ptr::null_mut(),
+            security_attributes: 0,
         }
     }
 
@@ -187,7 +187,7 @@ impl OpenOptions {
     pub fn attributes(&mut self, attrs: u32) { self.attributes = attrs; }
     pub fn security_qos_flags(&mut self, flags: u32) { self.security_qos_flags = flags; }
     pub fn security_attributes(&mut self, attrs: c::LPSECURITY_ATTRIBUTES) {
-        self.security_attributes = attrs;
+        self.security_attributes = attrs as usize;
     }
 
     fn get_access_mode(&self) -> io::Result<c::DWORD> {