rust-lang · bors · Jun 4, 2019 · Jun 3, 2019
diff --git a/src/unix/notbsd/android/b32/arm.rs → src/unix/linux_like/android/b32/arm.rs b/src/unix/notbsd/android/b32/arm.rs → src/unix/linux_like/android/b32/arm.rs
diff --git a/src/unix/notbsd/android/b32/mod.rs → src/unix/linux_like/android/b32/mod.rs b/src/unix/notbsd/android/b32/mod.rs → src/unix/linux_like/android/b32/mod.rs
diff --git a/src/unix/notbsd/android/b32/x86.rs → src/unix/linux_like/android/b32/x86.rs b/src/unix/notbsd/android/b32/x86.rs → src/unix/linux_like/android/b32/x86.rs
diff --git a/src/unix/notbsd/android/b64/aarch64.rs → src/unix/linux_like/android/b64/aarch64.rs b/src/unix/notbsd/android/b64/aarch64.rs → src/unix/linux_like/android/b64/aarch64.rs
diff --git a/src/unix/notbsd/android/b64/mod.rs → src/unix/linux_like/android/b64/mod.rs b/src/unix/notbsd/android/b64/mod.rs → src/unix/linux_like/android/b64/mod.rs
diff --git a/src/unix/notbsd/android/b64/x86_64.rs → src/unix/linux_like/android/b64/x86_64.rs b/src/unix/notbsd/android/b64/x86_64.rs → src/unix/linux_like/android/b64/x86_64.rs
diff --git a/src/unix/notbsd/android/mod.rs → src/unix/linux_like/android/mod.rs b/src/unix/notbsd/android/mod.rs → src/unix/linux_like/android/mod.rs
diff --git a/src/unix/notbsd/emscripten/align.rs → src/unix/linux_like/emscripten/align.rs b/src/unix/notbsd/emscripten/align.rs → src/unix/linux_like/emscripten/align.rs
diff --git a/src/unix/notbsd/emscripten/mod.rs → src/unix/linux_like/emscripten/mod.rs b/src/unix/notbsd/emscripten/mod.rs → src/unix/linux_like/emscripten/mod.rs
@@ -1295,7 +1295,7 @@ pub const RTLD_GLOBAL: ::c_int = 0x100;
 pub const RTLD_NOLOAD: ::c_int = 0x4;
 
 // TODO(#247) Temporarily musl-specific (available since musl 0.9.12 / Linux
-// kernel 3.10).  See also notbsd/mod.rs
+// kernel 3.10).  See also linux_like/mod.rs
 pub const CLOCK_SGI_CYCLE: ::clockid_t = 10;
 pub const CLOCK_TAI: ::clockid_t = 11;
 

diff --git a/src/unix/notbsd/emscripten/no_align.rs → src/unix/linux_like/emscripten/no_align.rs b/src/unix/notbsd/emscripten/no_align.rs → src/unix/linux_like/emscripten/no_align.rs
diff --git a/src/unix/notbsd/linux/align.rs → src/unix/linux_like/linux/align.rs b/src/unix/notbsd/linux/align.rs → src/unix/linux_like/linux/align.rs
diff --git a/src/unix/notbsd/linux/mips/align.rs → src/unix/linux_like/linux/mips/align.rs b/src/unix/notbsd/linux/mips/align.rs → src/unix/linux_like/linux/mips/align.rs
diff --git a/src/unix/notbsd/linux/mips/mips32.rs → src/unix/linux_like/linux/mips/mips32.rs b/src/unix/notbsd/linux/mips/mips32.rs → src/unix/linux_like/linux/mips/mips32.rs
diff --git a/src/unix/notbsd/linux/mips/mips64.rs → src/unix/linux_like/linux/mips/mips64.rs b/src/unix/notbsd/linux/mips/mips64.rs → src/unix/linux_like/linux/mips/mips64.rs
diff --git a/src/unix/notbsd/linux/mips/mod.rs → src/unix/linux_like/linux/mips/mod.rs b/src/unix/notbsd/linux/mips/mod.rs → src/unix/linux_like/linux/mips/mod.rs
diff --git a/src/unix/notbsd/linux/mips/no_align.rs → src/unix/linux_like/linux/mips/no_align.rs b/src/unix/notbsd/linux/mips/no_align.rs → src/unix/linux_like/linux/mips/no_align.rs
diff --git a/src/unix/notbsd/linux/mod.rs → src/unix/linux_like/linux/mod.rs b/src/unix/notbsd/linux/mod.rs → src/unix/linux_like/linux/mod.rs
diff --git a/src/unix/notbsd/linux/musl/b32/arm.rs → src/unix/linux_like/linux/musl/b32/arm.rs b/src/unix/notbsd/linux/musl/b32/arm.rs → src/unix/linux_like/linux/musl/b32/arm.rs
diff --git a/src/unix/notbsd/linux/musl/b32/mips.rs → src/unix/linux_like/linux/musl/b32/mips.rs b/src/unix/notbsd/linux/musl/b32/mips.rs → src/unix/linux_like/linux/musl/b32/mips.rs
diff --git a/src/unix/notbsd/linux/musl/b32/mod.rs → src/unix/linux_like/linux/musl/b32/mod.rs b/src/unix/notbsd/linux/musl/b32/mod.rs → src/unix/linux_like/linux/musl/b32/mod.rs
diff --git a/src/unix/notbsd/linux/musl/b32/powerpc.rs → ...unix/linux_like/linux/musl/b32/powerpc.rs b/src/unix/notbsd/linux/musl/b32/powerpc.rs → ...unix/linux_like/linux/musl/b32/powerpc.rs
diff --git a/src/unix/notbsd/linux/musl/b32/x86.rs → src/unix/linux_like/linux/musl/b32/x86.rs b/src/unix/notbsd/linux/musl/b32/x86.rs → src/unix/linux_like/linux/musl/b32/x86.rs
diff --git a/src/unix/notbsd/linux/musl/b64/aarch64.rs → ...unix/linux_like/linux/musl/b64/aarch64.rs b/src/unix/notbsd/linux/musl/b64/aarch64.rs → ...unix/linux_like/linux/musl/b64/aarch64.rs
diff --git a/src/unix/notbsd/linux/musl/b64/mod.rs → src/unix/linux_like/linux/musl/b64/mod.rs b/src/unix/notbsd/linux/musl/b64/mod.rs → src/unix/linux_like/linux/musl/b64/mod.rs
diff --git a/src/unix/notbsd/linux/musl/b64/powerpc64.rs → ...ix/linux_like/linux/musl/b64/powerpc64.rs b/src/unix/notbsd/linux/musl/b64/powerpc64.rs → ...ix/linux_like/linux/musl/b64/powerpc64.rs
diff --git a/src/unix/notbsd/linux/musl/b64/x86_64.rs → src/unix/linux_like/linux/musl/b64/x86_64.rs b/src/unix/notbsd/linux/musl/b64/x86_64.rs → src/unix/linux_like/linux/musl/b64/x86_64.rs
diff --git a/src/unix/notbsd/linux/musl/mod.rs → src/unix/linux_like/linux/musl/mod.rs b/src/unix/notbsd/linux/musl/mod.rs → src/unix/linux_like/linux/musl/mod.rs
@@ -301,7 +301,7 @@ pub const RTLD_GLOBAL: ::c_int = 0x100;
 pub const RTLD_NOLOAD: ::c_int = 0x4;
 
 // TODO(#247) Temporarily musl-specific (available since musl 0.9.12 / Linux
-// kernel 3.10).  See also notbsd/mod.rs
+// kernel 3.10).  See also linux_like/mod.rs
 pub const CLOCK_SGI_CYCLE: ::clockid_t = 10;
 pub const CLOCK_TAI: ::clockid_t = 11;
 

diff --git a/src/unix/notbsd/linux/no_align.rs → src/unix/linux_like/linux/no_align.rs b/src/unix/notbsd/linux/no_align.rs → src/unix/linux_like/linux/no_align.rs
diff --git a/src/unix/notbsd/linux/other/align.rs → src/unix/linux_like/linux/other/align.rs b/src/unix/notbsd/linux/other/align.rs → src/unix/linux_like/linux/other/align.rs
diff --git a/src/unix/notbsd/linux/other/b32/arm.rs → src/unix/linux_like/linux/other/b32/arm.rs b/src/unix/notbsd/linux/other/b32/arm.rs → src/unix/linux_like/linux/other/b32/arm.rs
diff --git a/src/unix/notbsd/linux/other/b32/mod.rs → src/unix/linux_like/linux/other/b32/mod.rs b/src/unix/notbsd/linux/other/b32/mod.rs → src/unix/linux_like/linux/other/b32/mod.rs
diff --git a/src/unix/notbsd/linux/other/b32/powerpc.rs → ...nix/linux_like/linux/other/b32/powerpc.rs b/src/unix/notbsd/linux/other/b32/powerpc.rs → ...nix/linux_like/linux/other/b32/powerpc.rs
diff --git a/src/unix/notbsd/linux/other/b32/x86.rs → src/unix/linux_like/linux/other/b32/x86.rs b/src/unix/notbsd/linux/other/b32/x86.rs → src/unix/linux_like/linux/other/b32/x86.rs
diff --git a/src/unix/notbsd/linux/other/b64/aarch64.rs → ...nix/linux_like/linux/other/b64/aarch64.rs b/src/unix/notbsd/linux/other/b64/aarch64.rs → ...nix/linux_like/linux/other/b64/aarch64.rs
diff --git a/src/unix/notbsd/linux/other/b64/mod.rs → src/unix/linux_like/linux/other/b64/mod.rs b/src/unix/notbsd/linux/other/b64/mod.rs → src/unix/linux_like/linux/other/b64/mod.rs
diff --git a/src/unix/notbsd/linux/other/b64/not_x32.rs → ...nix/linux_like/linux/other/b64/not_x32.rs b/src/unix/notbsd/linux/other/b64/not_x32.rs → ...nix/linux_like/linux/other/b64/not_x32.rs
diff --git a/src/unix/notbsd/linux/other/b64/powerpc64.rs → ...x/linux_like/linux/other/b64/powerpc64.rs b/src/unix/notbsd/linux/other/b64/powerpc64.rs → ...x/linux_like/linux/other/b64/powerpc64.rs
diff --git a/src/unix/notbsd/linux/other/b64/sparc64.rs → ...nix/linux_like/linux/other/b64/sparc64.rs b/src/unix/notbsd/linux/other/b64/sparc64.rs → ...nix/linux_like/linux/other/b64/sparc64.rs
diff --git a/src/unix/notbsd/linux/other/b64/x32.rs → src/unix/linux_like/linux/other/b64/x32.rs b/src/unix/notbsd/linux/other/b64/x32.rs → src/unix/linux_like/linux/other/b64/x32.rs
diff --git a/src/unix/notbsd/linux/other/b64/x86_64.rs → ...unix/linux_like/linux/other/b64/x86_64.rs b/src/unix/notbsd/linux/other/b64/x86_64.rs → ...unix/linux_like/linux/other/b64/x86_64.rs
diff --git a/src/unix/notbsd/linux/other/mod.rs → src/unix/linux_like/linux/other/mod.rs b/src/unix/notbsd/linux/other/mod.rs → src/unix/linux_like/linux/other/mod.rs
@@ -1101,11 +1101,10 @@ extern {
     pub fn getauxval(type_: ::c_ulong) -> ::c_ulong;
     #[cfg_attr(target_os = "netbsd", link_name = "__getpwent_r50")]
     #[cfg_attr(target_os = "solaris", link_name = "__posix_getpwent_r")]
-    pub fn getpwent_r(pwd: *mut ::unix::notbsd::linux::passwd,
+    pub fn getpwent_r(pwd: *mut ::passwd,
                       buf: *mut ::c_char,
                       buflen: ::size_t,
-                      result: *mut *mut ::unix::notbsd
-                                        ::linux::passwd) -> ::c_int;
+                      result: *mut *mut ::passwd) -> ::c_int;
     #[cfg_attr(target_os = "netbsd", link_name = "__getgrent_r50")]
     #[cfg_attr(target_os = "solaris", link_name = "__posix_getgrent_r")]
     pub fn getgrent_r(grp: *mut ::group,

diff --git a/src/unix/notbsd/linux/other/no_align.rs → src/unix/linux_like/linux/other/no_align.rs b/src/unix/notbsd/linux/other/no_align.rs → src/unix/linux_like/linux/other/no_align.rs
diff --git a/src/unix/notbsd/linux/s390x/align.rs → src/unix/linux_like/linux/s390x/align.rs b/src/unix/notbsd/linux/s390x/align.rs → src/unix/linux_like/linux/s390x/align.rs
diff --git a/src/unix/notbsd/linux/s390x/mod.rs → src/unix/linux_like/linux/s390x/mod.rs b/src/unix/notbsd/linux/s390x/mod.rs → src/unix/linux_like/linux/s390x/mod.rs
diff --git a/src/unix/notbsd/linux/s390x/no_align.rs → src/unix/linux_like/linux/s390x/no_align.rs b/src/unix/notbsd/linux/s390x/no_align.rs → src/unix/linux_like/linux/s390x/no_align.rs
diff --git a/src/unix/notbsd/mod.rs → src/unix/linux_like/mod.rs b/src/unix/notbsd/mod.rs → src/unix/linux_like/mod.rs
diff --git a/src/unix/mod.rs b/src/unix/mod.rs
@@ -1147,8 +1147,8 @@ cfg_if! {
     } else if #[cfg(any(target_os = "linux",
                         target_os = "android",
                         target_os = "emscripten"))] {
-        mod notbsd;
-        pub use self::notbsd::*;
+        mod linux_like;
+        pub use self::linux_like::*;
     } else if #[cfg(any(target_os = "macos",
                         target_os = "ios",
                         target_os = "freebsd",

diff --git a/src/unix/uclibc/arm/mod.rs b/src/unix/uclibc/arm/mod.rs
@@ -215,8 +215,8 @@ pub const CLONE_NEWCGROUP: ::c_int = 0x02000000; // from linux/mod.rs
 pub const EPOLLEXCLUSIVE: ::c_int = 0x10000000; // from linux/mod.rs
 pub const EPOLLWAKEUP: ::c_int = 0x20000000; // from linux/other/mod.rs
 pub const EXTPROC: ::tcflag_t = 0o200000; // from asm-generic/termbits.h
-pub const F_GETPIPE_SZ: ::c_int = 1032; // from notbsd/mod.rs
-pub const F_SETPIPE_SZ: ::c_int = 1031; // from notbsd/mod.rs
+pub const F_GETPIPE_SZ: ::c_int = 1032; // from linux_like/mod.rs
+pub const F_SETPIPE_SZ: ::c_int = 1031; // from linux_like/mod.rs
 pub const LIO_NOP: ::c_int = 2; // from linux/mod.rs
 pub const LIO_NOWAIT: ::c_int = 1; // from linux/mod.rs
 pub const LIO_READ: ::c_int = 0; // from linux/mod.rs
@@ -226,12 +226,12 @@ pub const MAP_HUGETLB: ::c_int = 0x040000; // from linux/other/mod.rs
 pub const O_TMPFILE: ::c_int = 0o20000000 | O_DIRECTORY;
 pub const RB_KEXEC: ::c_int = 0x45584543u32 as i32; // from linux/mod.rs
 pub const RB_SW_SUSPEND: ::c_int = 0xd000fce2u32 as i32; // from linux/mod.rs
-pub const SO_BUSY_POLL: ::c_int = 46; // from src/unix/notbsd/mod.rs
-pub const SO_PEEK_OFF: ::c_int = 42; // from src/unix/notbsd/mod.rs
-pub const SO_REUSEPORT: ::c_int = 15; // from src/unix/notbsd/mod.rs
-pub const SOL_NETLINK: ::c_int = 270; // from src/unix/notbsd/mod.rs
+pub const SO_BUSY_POLL: ::c_int = 46; // from src/unix/linux_like/mod.rs
+pub const SO_PEEK_OFF: ::c_int = 42; // from src/unix/linux_like/mod.rs
+pub const SO_REUSEPORT: ::c_int = 15; // from src/unix/linux_like/mod.rs
+pub const SOL_NETLINK: ::c_int = 270; // from src/unix/linux_like/mod.rs
 pub const _POSIX_VDISABLE: ::cc_t = 0; // from linux/mod.rs
-pub const AT_EMPTY_PATH: ::c_int = 0x1000; // from notbsd/mod.rs
+pub const AT_EMPTY_PATH: ::c_int = 0x1000; // from linux_like/mod.rs
 
 // autogenerated constants with hand tuned types
 pub const AT_NO_AUTOMOUNT: ::c_int = 0x800;