CI tweaks

.cirrus.yml

@@ -1,7 +1,7 @@
 task:
   name: nightly x86_64-unknown-freebsd-10
   freebsd_instance:
-    image: freebsd-10-4-release-amd64 
+    image: freebsd-10-4-release-amd64
   setup_script:
     - pkg install -y curl
     - curl https://sh.rustup.rs -sSf --output rustup.sh
@@ -11,7 +11,7 @@ task:
   test_script:
     - . $HOME/.cargo/env
     - LIBC_CI=1 sh ci/run.sh x86_64-unknown-freebsd
- 
+
 task:
   name: stable x86_64-unknown-freebsd-11
   freebsd_instance:
@@ -26,7 +26,7 @@ task:
     - . $HOME/.cargo/env
     - LIBC_CI=1 sh ci/run.sh x86_64-unknown-freebsd
     - sh ci/run.sh x86_64-unknown-freebsd
-    
+
 task:
   name: nightly x86_64-unknown-freebsd-12
   freebsd_instance:

ci/azure-master.yml

@@ -12,7 +12,7 @@ pr: ["master"]
 jobs:
   - job: StyleAndDocs
     pool:
-      vmImage: ubuntu-16.04
+      vmImage: ubuntu-18.04
     steps:
       - template: azure-install-rust.yml
       - script: LIBC_CI=1 sh ci/dox.sh

ci/azure.yml

@@ -47,7 +47,7 @@ jobs:
         arm-unknown-linux-musleabihf:
           TARGET: arm-unknown-linux-musleabihf
         # Disabled because currently broken, see:
-        # https://github.com/rust-lang/libc/issues/1591         
+        # https://github.com/rust-lang/libc/issues/1591
         # asmjs-unknown-emscripten:
         #  TARGET: asmjs-unknown-emscripten
         i686-linux-android:
@@ -77,7 +77,7 @@ jobs:
         sparc64-unknown-linux-gnu:
           TARGET: sparc64-unknown-linux-gnu
         # Disabled because currently broken, see:
-        # https://github.com/rust-lang/libc/issues/1591         
+        # https://github.com/rust-lang/libc/issues/1591
         # wasm32-unknown-emscripten:
         #  TARGET: wasm32-unknown-emscripten
         x86_64-linux-android:
@@ -89,7 +89,7 @@ jobs:
 
   - job: DockerOSX64
     pool:
-      vmImage: macos-10.14
+      vmImage: macos-10.15
     steps:
       - template: azure-install-rust.yml
       - bash: LIBC_CI=1 sh ./ci/run.sh $TARGET
@@ -114,7 +114,7 @@ jobs:
           ARCH: x86_64
         x86_64-pc-windows-msvc:
           TARGET: x86_64-pc-windows-msvc
-        # Disabled because broken:          
+        # Disabled because broken:
         #  https://github.com/rust-lang/libc/issues/1592
         #i686-pc-windows-gnu:
         #  TARGET: i686-pc-windows-gnu
@@ -125,7 +125,7 @@ jobs:
 
   - job: StyleAndDocs
     pool:
-      vmImage: ubuntu-16.04
+      vmImage: ubuntu-18.04
     steps:
       - template: azure-install-rust.yml
       - script: sh ci/style.sh
@@ -141,7 +141,7 @@ jobs:
   #  dependsOn: BuildChannelsLinux
   #  continueOnError: true
   #  pool:
-  #    vmImage: ubuntu-16.04
+  #    vmImage: ubuntu-18.04
   #  steps:
   #    - template: azure-install-rust.yml
   #    - script: sh ci/semver.sh linux
@@ -151,7 +151,7 @@ jobs:
   #  dependsOn: BuildChannelsOSX
   #  continueOnError: true
   #  pool:
-  #    vmImage: macos-10.14
+  #    vmImage: macos-10.15
   #  steps:
   #    - template: azure-install-rust.yml
   #    - script: sh ci/semver.sh osx
@@ -160,7 +160,7 @@ jobs:
   - job: BuildChannelsLinux
     dependsOn: StyleAndDocs
     pool:
-      vmImage: ubuntu-16.04
+      vmImage: ubuntu-18.04
     steps:
       - template: azure-install-rust.yml
       - script: LIBC_CI=1 sh ./ci/build.sh
@@ -189,7 +189,7 @@ jobs:
   - job: BuildChannelsOSX
     dependsOn: StyleAndDocs
     pool:
-      vmImage: macos-10.14
+      vmImage: macos-10.15
     steps:
       - template: azure-install-rust.yml
       - script: LIBC_CI=1 sh ./ci/build.sh

ci/emscripten.sh

@@ -30,7 +30,7 @@ exit 1
 
 git clone https://github.com/emscripten-core/emsdk.git /emsdk-portable
 cd /emsdk-portable
-# TODO: switch to an upstream install once
+# FIXME: switch to an upstream install once
 # https://github.com/rust-lang/rust/pull/63649 lands
 hide_output ./emsdk install 1.38.42
 ./emsdk activate 1.38.42

ci/run.sh

@@ -37,7 +37,7 @@ if [ "$QEMU" != "" ]; then
     # plain qcow2 image: just download it
     qemufile="$(echo "${QEMU}" | sed 's/\//__/g')"
     if [ ! -f "${tmpdir}/${qemufile}" ]; then
-      curl --retry 5 "${MIRRORS_URL}/${QEMU}" | \
+      curl --retry 5 "${MIRRORS_URL}/${QEMU}" \
         > "${tmpdir}/${qemufile}"
     fi
   fi

libc-test/build.rs

@@ -182,6 +182,10 @@ fn test_apple(target: &str) {
             // These OSX constants are removed in Sierra.
             // https://developer.apple.com/library/content/releasenotes/General/APIDiffsMacOS10_12/Swift/Darwin.html
             "KERN_KDENABLE_BG_TRACE" | "KERN_KDDISABLE_BG_TRACE" => true,
+            // FIXME: the value has been changed since Catalina (0xffff0000 -> 0x3fff0000).
+            "SF_SETTABLE" => true,
+            // FIXME: the value has been changed since Catalina (VM_FLAGS_RESILIENT_MEDIA is also contained now).
+            "VM_FLAGS_USER_REMAP" => true,
             _ => false,
         }
     });
@@ -199,6 +203,14 @@ fn test_apple(target: &str) {
         }
     });
 
+    cfg.skip_field(move |struct_, field| {
+        match (struct_, field) {
+            // FIXME: the array size has been changed since macOS 10.15 ([8] -> [7]).
+            ("statfs", "f_reserved") => true,
+            _ => false,
+        }
+    });
+
     cfg.skip_field_type(move |struct_, field| {
         match (struct_, field) {
             // FIXME: actually a union

src/cloudabi/mod.rs

@@ -120,7 +120,7 @@ impl ::Clone for FILE {
     }
 }
 #[cfg_attr(feature = "extra_traits", derive(Debug))]
-pub enum fpos_t {} // TODO: fill this out with a struct
+pub enum fpos_t {} // FIXME: fill this out with a struct
 impl ::Copy for fpos_t {}
 impl ::Clone for fpos_t {
     fn clone(&self) -> fpos_t {

src/fuchsia/mod.rs

@@ -109,7 +109,7 @@ impl ::Clone for DIR {
 }
 
 #[cfg_attr(feature = "extra_traits", derive(Debug))]
-pub enum fpos64_t {} // TODO: fill this out with a struct
+pub enum fpos64_t {} // FIXME: fill this out with a struct
 impl ::Copy for fpos64_t {}
 impl ::Clone for fpos64_t {
     fn clone(&self) -> fpos64_t {
@@ -1416,7 +1416,7 @@ pub const F_SEAL_SHRINK: ::c_int = 0x0002;
 pub const F_SEAL_GROW: ::c_int = 0x0004;
 pub const F_SEAL_WRITE: ::c_int = 0x0008;
 
-// TODO(#235): Include file sealing fcntls once we have a way to verify them.
+// FIXME(#235): Include file sealing fcntls once we have a way to verify them.
 
 pub const SIGTRAP: ::c_int = 5;
 
@@ -1433,7 +1433,7 @@ pub const CLOCK_MONOTONIC_COARSE: ::clockid_t = 6;
 pub const CLOCK_BOOTTIME: ::clockid_t = 7;
 pub const CLOCK_REALTIME_ALARM: ::clockid_t = 8;
 pub const CLOCK_BOOTTIME_ALARM: ::clockid_t = 9;
-// TODO(#247) Someday our Travis shall have glibc 2.21 (released in Sep
+// FIXME(#247) Someday our Travis shall have glibc 2.21 (released in Sep
 // 2014.) See also musl/mod.rs
 // pub const CLOCK_SGI_CYCLE: ::clockid_t = 10;
 // pub const CLOCK_TAI: ::clockid_t = 11;
@@ -2773,7 +2773,7 @@ pub const TIOCINQ: ::c_int = ::FIONREAD;
 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
+// FIXME(#247) Temporarily musl-specific (available since musl 0.9.12 / Linux
 // kernel 3.10).  See also notbsd/mod.rs
 pub const CLOCK_SGI_CYCLE: ::clockid_t = 10;
 pub const CLOCK_TAI: ::clockid_t = 11;
@@ -3273,7 +3273,7 @@ impl ::Clone for FILE {
     }
 }
 #[cfg_attr(feature = "extra_traits", derive(Debug))]
-pub enum fpos_t {} // TODO: fill this out with a struct
+pub enum fpos_t {} // FIXME: fill this out with a struct
 impl ::Copy for fpos_t {}
 impl ::Clone for fpos_t {
     fn clone(&self) -> fpos_t {

src/unix/haiku/mod.rs

@@ -662,7 +662,7 @@ pub const LC_NUMERIC: ::c_int = 4;
 pub const LC_TIME: ::c_int = 5;
 pub const LC_MESSAGES: ::c_int = 6;
 
-// TODO: Haiku does not have MAP_FILE, but libstd/os.rs requires it
+// FIXME: Haiku does not have MAP_FILE, but libstd/os.rs requires it
 pub const MAP_FILE: ::c_int = 0x00;
 pub const MAP_SHARED: ::c_int = 0x01;
 pub const MAP_PRIVATE: ::c_int = 0x02;
@@ -994,7 +994,7 @@ pub const PTHREAD_MUTEX_NORMAL: ::c_int = 1;
 pub const PTHREAD_MUTEX_ERRORCHECK: ::c_int = 2;
 pub const PTHREAD_MUTEX_RECURSIVE: ::c_int = 3;
 
-pub const FIOCLEX: c_ulong = 0; // TODO: does not exist on Haiku!
+pub const FIOCLEX: c_ulong = 0; // FIXME: does not exist on Haiku!
 
 pub const RUSAGE_CHILDREN: ::c_int = -1;
 

src/unix/linux_like/emscripten/mod.rs

@@ -35,7 +35,7 @@ pub type c_ulong = u32;
 pub type nlink_t = u32;
 
 #[cfg_attr(feature = "extra_traits", derive(Debug))]
-pub enum fpos64_t {} // TODO: fill this out with a struct
+pub enum fpos64_t {} // FIXME: fill this out with a struct
 impl ::Copy for fpos64_t {}
 impl ::Clone for fpos64_t {
     fn clone(&self) -> fpos64_t {
@@ -1286,7 +1286,7 @@ pub const TIOCINQ: ::c_int = ::FIONREAD;
 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
+// FIXME(#247) Temporarily musl-specific (available since musl 0.9.12 / Linux
 // kernel 3.10).  See also linux_like/mod.rs
 pub const CLOCK_SGI_CYCLE: ::clockid_t = 10;
 pub const CLOCK_TAI: ::clockid_t = 11;

src/unix/linux_like/linux/gnu/b64/aarch64/mod.rs

@@ -695,7 +695,7 @@ pub const HWCAP_SSBS: ::c_ulong = 1 << 28;
 pub const HWCAP_SB: ::c_ulong = 1 << 29;
 pub const HWCAP_PACA: ::c_ulong = 1 << 30;
 pub const HWCAP_PACG: ::c_ulong = 1 << 31;
-// TODO: enable these again once linux-api-headers are up to date enough on CI.
+// FIXME: enable these again once linux-api-headers are up to date enough on CI.
 // See discussion in https://github.com/rust-lang/libc/pull/1638
 //pub const HWCAP2_DCPODP: ::c_ulong = 1 << 0;
 //pub const HWCAP2_SVE2: ::c_ulong = 1 << 1;

src/unix/linux_like/linux/mod.rs

@@ -37,7 +37,7 @@ pub type Elf32_Section = u16;
 pub type Elf64_Section = u16;
 
 #[cfg_attr(feature = "extra_traits", derive(Debug))]
-pub enum fpos64_t {} // TODO: fill this out with a struct
+pub enum fpos64_t {} // FIXME: fill this out with a struct
 impl ::Copy for fpos64_t {}
 impl ::Clone for fpos64_t {
     fn clone(&self) -> fpos64_t {

src/unix/linux_like/linux/musl/mod.rs

@@ -327,7 +327,7 @@ pub const TCSAFLUSH: ::c_int = 2;
 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
+// FIXME(#247) Temporarily musl-specific (available since musl 0.9.12 / Linux
 // kernel 3.10).  See also linux_like/mod.rs
 pub const CLOCK_SGI_CYCLE: ::clockid_t = 10;
 pub const CLOCK_TAI: ::clockid_t = 11;

src/unix/linux_like/mod.rs

@@ -482,7 +482,7 @@ pub const F_SEAL_SHRINK: ::c_int = 0x0002;
 pub const F_SEAL_GROW: ::c_int = 0x0004;
 pub const F_SEAL_WRITE: ::c_int = 0x0008;
 
-// TODO(#235): Include file sealing fcntls once we have a way to verify them.
+// FIXME(#235): Include file sealing fcntls once we have a way to verify them.
 
 pub const SIGTRAP: ::c_int = 5;
 
@@ -499,7 +499,7 @@ pub const CLOCK_MONOTONIC_COARSE: ::clockid_t = 6;
 pub const CLOCK_BOOTTIME: ::clockid_t = 7;
 pub const CLOCK_REALTIME_ALARM: ::clockid_t = 8;
 pub const CLOCK_BOOTTIME_ALARM: ::clockid_t = 9;
-// TODO(#247) Someday our Travis shall have glibc 2.21 (released in Sep
+// FIXME(#247) Someday our Travis shall have glibc 2.21 (released in Sep
 // 2014.) See also musl/mod.rs
 // pub const CLOCK_SGI_CYCLE: ::clockid_t = 10;
 // pub const CLOCK_TAI: ::clockid_t = 11;

src/unix/mod.rs

@@ -365,7 +365,7 @@ impl ::Clone for FILE {
     }
 }
 #[cfg_attr(feature = "extra_traits", derive(Debug))]
-pub enum fpos_t {} // TODO: fill this out with a struct
+pub enum fpos_t {} // FIXME: fill this out with a struct
 impl ::Copy for fpos_t {}
 impl ::Clone for fpos_t {
     fn clone(&self) -> fpos_t {

src/unix/redox/mod.rs

@@ -258,7 +258,7 @@ pub const F_GETLK: ::c_int = 5;
 pub const F_SETLK: ::c_int = 6;
 pub const F_SETLKW: ::c_int = 7;
 
-// TODO: relibc {
+// FIXME: relibc {
 pub const RTLD_DEFAULT: *mut ::c_void = 0i64 as *mut ::c_void;
 // }
 
@@ -413,7 +413,7 @@ pub const F_GETFD: ::c_int = 1;
 pub const F_SETFD: ::c_int = 2;
 pub const F_GETFL: ::c_int = 3;
 pub const F_SETFL: ::c_int = 4;
-// TODO: relibc {
+// FIXME: relibc {
 pub const F_DUPFD_CLOEXEC: ::c_int = ::F_DUPFD;
 // }
 pub const FD_CLOEXEC: ::c_int = 0x0100_0000;
@@ -435,14 +435,14 @@ pub const O_DIRECTORY: ::c_int = 0x1000_0000;
 pub const O_PATH: ::c_int = 0x2000_0000;
 pub const O_SYMLINK: ::c_int = 0x4000_0000;
 // Negative to allow it to be used as int
-// TODO: Fix negative values missing from includes
+// FIXME: Fix negative values missing from includes
 pub const O_NOFOLLOW: ::c_int = -0x8000_0000;
 
 // netdb.h
 pub const EAI_SYSTEM: ::c_int = -11;
 
 // netinet/in.h
-// TODO: relibc {
+// FIXME: relibc {
 pub const IP_TTL: ::c_int = 2;
 pub const IPV6_UNICAST_HOPS: ::c_int = 16;
 pub const IPV6_MULTICAST_IF: ::c_int = 17;
@@ -460,7 +460,7 @@ pub const IP_DROP_MEMBERSHIP: ::c_int = 36;
 
 // netinet/tcp.h
 pub const TCP_NODELAY: ::c_int = 1;
-// TODO: relibc {
+// FIXME: relibc {
 pub const TCP_KEEPIDLE: ::c_int = 1;
 // }
 
@@ -575,7 +575,7 @@ pub const EXIT_SUCCESS: ::c_int = 0;
 pub const EXIT_FAILURE: ::c_int = 1;
 
 // sys/ioctl.h
-// TODO: relibc {
+// FIXME: relibc {
 pub const FIONBIO: ::c_ulong = 0x5421;
 pub const FIOCLEX: ::c_ulong = 0x5451;
 // }

src/unix/uclibc/mod.rs

@@ -23,7 +23,7 @@ pub type nl_item = ::c_int;
 pub type idtype_t = ::c_uint;
 
 #[cfg_attr(feature = "extra_traits", derive(Debug))]
-pub enum fpos64_t {} // TODO: fill this out with a struct
+pub enum fpos64_t {} // FIXME: fill this out with a struct
 impl ::Copy for fpos64_t {}
 impl ::Clone for fpos64_t {
     fn clone(&self) -> fpos64_t {
@@ -501,7 +501,7 @@ pub const F_GETLEASE: ::c_int = 1025;
 pub const F_NOTIFY: ::c_int = 1026;
 pub const F_DUPFD_CLOEXEC: ::c_int = 1030;
 
-// TODO(#235): Include file sealing fcntls once we have a way to verify them.
+// FIXME(#235): Include file sealing fcntls once we have a way to verify them.
 
 pub const SIGTRAP: ::c_int = 5;
 
@@ -512,7 +512,7 @@ pub const CLOCK_REALTIME: ::clockid_t = 0;
 pub const CLOCK_MONOTONIC: ::clockid_t = 1;
 pub const CLOCK_PROCESS_CPUTIME_ID: ::clockid_t = 2;
 pub const CLOCK_THREAD_CPUTIME_ID: ::clockid_t = 3;
-// TODO(#247) Someday our Travis shall have glibc 2.21 (released in Sep
+// FIXME(#247) Someday our Travis shall have glibc 2.21 (released in Sep
 // 2014.) See also musl/mod.rs
 // pub const CLOCK_SGI_CYCLE: ::clockid_t = 10;
 // pub const CLOCK_TAI: ::clockid_t = 11;