Fix style

Author: malbarbo

src/unix/notbsd/android/mod.rs

@@ -149,6 +149,7 @@ s! {
 }
 
 pub const O_TRUNC: ::c_int = 512;
+pub const O_TMPFILE: ::c_int = 0o20000000 | ::O_DIRECTORY;
 
 pub const O_CLOEXEC: ::c_int = 0x80000;
 

src/unix/notbsd/linux/mips/mod.rs

@@ -49,6 +49,7 @@ pub const O_ACCMODE: ::c_int = 3;
 pub const O_DIRECT: ::c_int = 0x8000;
 pub const O_DIRECTORY: ::c_int = 0x10000;
 pub const O_NOFOLLOW: ::c_int = 0x20000;
+pub const O_TMPFILE: ::c_int = 0o20000000 | O_DIRECTORY;
 pub const ST_RELATIME: ::c_ulong = 4096;
 pub const NI_MAXHOST: ::socklen_t = 1025;
 

src/unix/notbsd/linux/mod.rs

@@ -744,46 +744,58 @@ f! {
         let minor = minor as ::dev_t;
         let mut dev = 0;
         dev |= (major & 0x00000fff) << 8;
-        dev |= (major & 0xfffff000) << 31 << 1; // avoid exceeding_bitshifts
+        dev |= (major & 0xfffff000) << 31 << 1; // allow exceeding_bitshifts
         dev |= (minor & 0x000000ff) << 0;
         dev |= (minor & 0xffffff00) << 12;
         dev
     }
-}
 
-cfg_if! {
-    if #[cfg(target_os = "emscripten")] {
-        f! {
-            pub fn major(dev: ::dev_t) -> ::c_uint {
-                let mut major = 0;
-                major |= (dev & 0x00000fff) >> 8;
-                major |= (dev & 0xfffff000) >> 31 >> 1; // avoid exceeding_bitshifts
-                major as ::c_uint
-            }
-
-            pub fn minor(dev: ::dev_t) -> ::c_uint {
-                let mut minor = 0;
-                minor |= (dev & 0x000000ff) >> 0;
-                minor |= (dev & 0xffffff00) >> 12;
-                minor as ::c_uint
-            }
-        }
-    } else {
-        f! {
-            pub fn major(dev: ::dev_t) -> ::c_uint {
-                let mut major = 0;
-                major |= (dev & 0x00000000000fff00) >> 8;
-                major |= (dev & 0xfffff00000000000) >> 32;
-                major as ::c_uint
+    pub fn major(dev: ::dev_t) -> ::c_uint {
+        cfg_if! {
+            if #[cfg(target_os = "emscripten")] {
+                // see
+                // https://github.com/kripken/emscripten/blob/
+                // master/system/include/libc/sys/sysmacros.h
+                fn inner(dev: ::dev_t) -> ::c_uint {
+                    let mut major = 0;
+                    major |= (dev & 0x00000fff) >> 8;
+                    major |= (dev & 0xfffff000) >> 31 >> 1;
+                    major as ::c_uint
+                }
+            } else {
+                fn inner(dev: ::dev_t) -> ::c_uint {
+                    let mut major = 0;
+                    major |= (dev & 0x00000000000fff00) >> 8;
+                    major |= (dev & 0xfffff00000000000) >> 32;
+                    major as ::c_uint
+                }
             }
+        };
+        inner(dev)
+    }
 
-            pub fn minor(dev: ::dev_t) -> ::c_uint {
-                let mut minor = 0;
-                minor |= (dev & 0xfffff00000000000) >> 0;
-                minor |= (dev & 0x00000ffffff00000) >> 12;
-                minor as ::c_uint
+    pub fn minor(dev: ::dev_t) -> ::c_uint {
+        cfg_if! {
+            if #[cfg(target_os = "emscripten")] {
+                // see
+                // https://github.com/kripken/emscripten/blob/
+                // master/system/include/libc/sys/sysmacros.h
+                fn inner(dev: ::dev_t) -> ::c_uint {
+                    let mut minor = 0;
+                    minor |= (dev & 0x000000ff) >> 0;
+                    minor |= (dev & 0xffffff00) >> 12;
+                    minor as ::c_uint
+                }
+            } else {
+                fn inner(dev: ::dev_t) -> ::c_uint {
+                    let mut minor = 0;
+                    minor |= (dev & 0xfffff00000000000) >> 0;
+                    minor |= (dev & 0x00000ffffff00000) >> 12;
+                    minor as ::c_uint
+                }
             }
-        }
+        };
+        inner(dev)
     }
 }
 

src/unix/notbsd/linux/musl/b32/arm.rs

@@ -124,6 +124,7 @@ pub const __SIZEOF_PTHREAD_MUTEX_T: usize = 24;
 
 pub const O_DIRECT: ::c_int = 0x4000;
 pub const O_DIRECTORY: ::c_int = 0x10000;
+pub const O_TMPFILE: ::c_int = 0o20000000 | O_DIRECTORY;
 pub const O_NOFOLLOW: ::c_int = 0x20000;
 pub const O_ASYNC: ::c_int = 0x2000;
 

src/unix/notbsd/linux/musl/b32/asmjs.rs

@@ -124,6 +124,7 @@ pub const __SIZEOF_PTHREAD_MUTEX_T: usize = 28;
 
 pub const O_DIRECT: ::c_int = 0x4000;
 pub const O_DIRECTORY: ::c_int = 0x10000;
+pub const O_TMPFILE: ::c_int = 0o20000000;
 pub const O_NOFOLLOW: ::c_int = 0x20000;
 pub const O_ASYNC: ::c_int = 0x2000;
 

src/unix/notbsd/linux/musl/b32/mips.rs

@@ -132,6 +132,7 @@ pub const __SIZEOF_PTHREAD_MUTEX_T: usize = 28;
 
 pub const O_DIRECT: ::c_int = 0o100000;
 pub const O_DIRECTORY: ::c_int = 0o200000;
+pub const O_TMPFILE: ::c_int = 0o20000000 | O_DIRECTORY;
 pub const O_NOFOLLOW: ::c_int = 0o400000;
 pub const O_ASYNC: ::c_int = 0o10000;
 

src/unix/notbsd/linux/musl/b32/x86.rs

@@ -137,6 +137,7 @@ pub const __SIZEOF_PTHREAD_MUTEX_T: usize = 24;
 
 pub const O_DIRECT: ::c_int = 0x4000;
 pub const O_DIRECTORY: ::c_int = 0x10000;
+pub const O_TMPFILE: ::c_int = 0o20000000 | O_DIRECTORY;
 pub const O_NOFOLLOW: ::c_int = 0x20000;
 pub const O_ASYNC: ::c_int = 0x2000;
 

src/unix/notbsd/linux/musl/b64/mod.rs

@@ -150,6 +150,7 @@ pub const __SIZEOF_PTHREAD_MUTEX_T: usize = 40;
 
 pub const O_DIRECT: ::c_int = 0x4000;
 pub const O_DIRECTORY: ::c_int = 0x10000;
+pub const O_TMPFILE: ::c_int = 0o20000000 | O_DIRECTORY;
 pub const O_NOFOLLOW: ::c_int = 0x20000;
 pub const O_ASYNC: ::c_int = 0x2000;
 

src/unix/notbsd/linux/other/mod.rs

@@ -174,6 +174,8 @@ s! {
     }
 }
 
+pub const O_TMPFILE: ::c_int = 0o20000000 | ::O_DIRECTORY;
+
 pub const __UT_LINESIZE: usize = 32;
 pub const __UT_NAMESIZE: usize = 32;
 pub const __UT_HOSTSIZE: usize = 256;

src/unix/notbsd/linux/s390x.rs

@@ -371,6 +371,7 @@ pub const O_FSYNC: ::c_int = 0x101000;
 pub const O_DIRECT: ::c_int = 0x4000;
 pub const O_DIRECTORY: ::c_int = 0x10000;
 pub const O_NOFOLLOW: ::c_int = 0x20000;
+pub const O_TMPFILE: ::c_int = 0o20000000 | O_DIRECTORY;
 
 pub const SOCK_NONBLOCK: ::c_int = O_NONBLOCK;