Merge pull request rust-lang#4206 from tgross35/backport-tomato

[0.2] Backports

Author: tgross35

ci/style.rs

@@ -28,10 +28,9 @@
 //! * alignment
 //! * leading colons on paths
 
-use std::env;
-use std::fs;
 use std::io::prelude::*;
 use std::path::Path;
+use std::{env, fs};
 
 macro_rules! t {
     ($e:expr) => {
@@ -130,7 +129,7 @@ fn check_style(file: &str, path: &Path, err: &mut Errors) {
         let line = if is_pub { &line[4..] } else { line };
 
         let line_state = if line.starts_with("use ") {
-            if line.contains("c_void") {
+            if line.contains("c_void") || line.contains("c_char") {
                 continue;
             }
             if is_pub {

libc-test/build.rs

@@ -364,6 +364,9 @@ fn test_apple(target: &str) {
             // FIXME: "'__uint128' undeclared" in C
             "__uint128" => true,
 
+            // `c_char_def` is always public but not always reexported.
+            "c_char_def" => true,
+
             _ => false,
         }
     });
@@ -758,6 +761,8 @@ fn test_windows(target: &str) {
         "ssize_t" if !gnu => true,
         // FIXME: The size and alignment of this type are incorrect
         "time_t" if gnu && i686 => true,
+        // `c_char_def` is always public but not always reexported.
+        "c_char_def" => true,
         _ => false,
     });
 
@@ -975,6 +980,8 @@ fn test_solarish(target: &str) {
 
     cfg.skip_type(move |ty| match ty {
         "sighandler_t" => true,
+        // `c_char_def` is always public but not always reexported.
+        "c_char_def" => true,
         _ => false,
     });
 
@@ -1278,6 +1285,8 @@ fn test_netbsd(target: &str) {
         match ty {
             // FIXME: sighandler_t is crazy across platforms
             "sighandler_t" => true,
+            // `c_char_def` is always public but not always reexported.
+            "c_char_def" => true,
             _ => false,
         }
     });
@@ -1497,7 +1506,8 @@ fn test_dragonflybsd(target: &str) {
         match ty {
             // sighandler_t is crazy across platforms
             "sighandler_t" => true,
-
+            // `c_char_def` is always public but not always reexported.
+            "c_char_def" => true,
             _ => false,
         }
     });
@@ -1659,6 +1669,8 @@ fn test_wasi(target: &str) {
         }
     });
 
+    cfg.skip_type(|ty| ty == "c_char_def");
+
     // These have a different and internal type in header files and are only
     // used here to generate a pointer to them in bindings so skip these tests.
     cfg.skip_static(|c| c.starts_with("_CLOCK_"));
@@ -1907,6 +1919,9 @@ fn test_android(target: &str) {
             // FIXME: "'__uint128' undeclared" in C
             "__uint128" => true,
 
+            // `c_char_def` is always public but not always reexported.
+            "c_char_def" => true,
+
             _ => false,
         }
     });
@@ -2669,6 +2684,9 @@ fn test_freebsd(target: &str) {
             // `eventfd(2)` and things come with it are added in FreeBSD 13
             "eventfd_t" if Some(13) > freebsd_ver => true,
 
+            // `c_char_def` is always public but not always reexported.
+            "c_char_def" => true,
+
             _ => false,
         }
     });
@@ -2989,6 +3007,9 @@ fn test_emscripten(target: &str) {
             // https://github.com/emscripten-core/emscripten/issues/5033
             ty if ty.starts_with("epoll") => true,
 
+            // `c_char_def` is always public but not always reexported.
+            "c_char_def" => true,
+
             // LFS64 types have been removed in Emscripten 3.1.44
             // https://github.com/emscripten-core/emscripten/pull/19812
             t => t.ends_with("64") || t.ends_with("64_t"),
@@ -3260,6 +3281,9 @@ fn test_neutrino(target: &str) {
             // Does not exist in Neutrino
             "locale_t" => true,
 
+            // `c_char_def` is always public but not always reexported.
+            "c_char_def" => true,
+
             _ => false,
         }
     });
@@ -3426,6 +3450,8 @@ fn test_vxworks(target: &str) {
     // FIXME
     cfg.skip_type(move |ty| match ty {
         "stat64" | "sighandler_t" | "off64_t" => true,
+        // `c_char_def` is always public but not always reexported.
+        "c_char_def" => true,
         _ => false,
     });
 
@@ -3773,6 +3799,9 @@ fn test_linux(target: &str) {
             // FIXME: "'__uint128' undeclared" in C
             "__uint128" => true,
 
+            // `c_char_def` is always public but not always reexported.
+            "c_char_def" => true,
+
             t => {
                 if musl {
                     // LFS64 types have been removed in musl 1.2.4+
@@ -4725,6 +4754,8 @@ fn test_linux_like_apis(target: &str) {
             })
             .skip_type(move |ty| match ty {
                 "Elf64_Phdr" | "Elf32_Phdr" => false,
+                // `c_char_def` is always public but not always reexported.
+                "c_char_def" => true,
                 _ => true,
             });
         cfg.generate(src_hotfix_dir().join("lib.rs"), "linux_elf.rs");
@@ -4960,6 +4991,8 @@ fn test_haiku(target: &str) {
             "pthread_condattr_t" => true,
             "pthread_mutexattr_t" => true,
             "pthread_rwlockattr_t" => true,
+            // `c_char_def` is always public but not always reexported.
+            "c_char_def" => true,
             _ => false,
         }
     });

libc-test/semver/freebsd.txt

@@ -1504,6 +1504,17 @@ S_IWRITE
 TAB0
 TAB3
 TABDLY
+TCP_BBR_ALGORITHM
+TCP_BBR_DRAIN_PG
+TCP_BBR_IWINTSO
+TCP_BBR_MAX_RTO
+TCP_BBR_MIN_RTO
+TCP_BBR_PACE_OH
+TCP_BBR_PROBE_RTT_INT
+TCP_BBR_STARTUP_LOSS_EXIT
+TCP_BBR_STARTUP_PG
+TCP_BBR_TSLIMITS
+TCP_BBR_USEDEL_RATE
 TCP_CCALGOOPT
 TCP_CONGESTION
 TCP_DELACK
@@ -1530,7 +1541,18 @@ TCP_PCAP_IN
 TCP_PCAP_OUT
 TCP_PERF_INFO
 TCP_PROC_ACCOUNTING
+TCP_RACK_EARLY_SEG
+TCP_RACK_MBUF_QUEUE
+TCP_RACK_MIN_TO
+TCP_RACK_PACE_ALWAYS
+TCP_RACK_PACE_MAX_SEG
+TCP_RACK_PKT_DELAY
+TCP_RACK_PRR_SENDALOT
+TCP_RACK_REORD_FADE
+TCP_RACK_REORD_THRESH
+TCP_RACK_TLP_REDUCE
 TCP_REMOTE_UDP_ENCAPS_PORT
+TCP_REUSPORT_LB_NUMA
 TCP_SHARED_CWND_ALLOWED
 TCP_USE_CMP_ACKS
 THOUSEP

libc-test/semver/fuchsia.txt

@@ -1446,6 +1446,7 @@ sigwait
 sigwaitinfo
 sockaddr_ll
 sockaddr_nl
+sockaddr_vm
 splice
 spwd
 srand

src/fuchsia/mod.rs

@@ -357,6 +357,14 @@ s! {
         pub sin6_scope_id: u32,
     }
 
+    pub struct sockaddr_vm {
+        pub svm_family: sa_family_t,
+        pub svm_reserved1: c_ushort,
+        pub svm_port: crate::in_port_t,
+        pub svm_cid: c_uint,
+        pub svm_zero: [u8; 4],
+    }
+
     pub struct addrinfo {
         pub ai_flags: c_int,
         pub ai_family: c_int,

src/hermit.rs

@@ -1,15 +1,8 @@
 //! Hermit C type definitions
 
+pub use crate::arch::c_char_def as c_char;
 use crate::prelude::*;
 
-cfg_if! {
-    if #[cfg(any(target_arch = "aarch64", target_arch = "riscv64"))] {
-        pub type c_char = u8;
-    } else {
-        pub type c_char = i8;
-    }
-}
-
 pub type c_schar = i8;
 pub type c_uchar = u8;
 pub type c_short = i16;

src/lib.rs

@@ -41,6 +41,44 @@ cfg_if! {
 
 pub use core::ffi::c_void;
 
+/// Type definitions that are coupled tighter to architecture than OS.
+mod arch {
+    cfg_if! {
+        // This configuration comes from `rust-lang/rust` in `library/core/src/ffi/mod.rs`.
+        if #[cfg(all(
+            not(windows),
+            // FIXME(ctest): just use `target_vendor` = "apple"` once `ctest` supports it
+            not(any(
+                target_os = "macos",
+                target_os = "ios",
+                target_os = "tvos",
+                target_os = "watchos",
+                target_os = "visionos",
+            )),
+            any(
+                target_arch = "aarch64",
+                target_arch = "arm",
+                target_arch = "csky",
+                target_arch = "hexagon",
+                target_arch = "msp430",
+                target_arch = "powerpc",
+                target_arch = "powerpc64",
+                target_arch = "riscv64",
+                target_arch = "riscv32",
+                target_arch = "s390x",
+                target_arch = "xtensa",
+            )
+        ))] {
+            // To be reexported as `c_char`
+            // FIXME(ctest): just name these `c_char` once `ctest` learns that these don't get
+            // exported.
+            pub type c_char_def = u8;
+        } else {
+            pub type c_char_def = i8;
+        }
+    }
+}
+
 cfg_if! {
     if #[cfg(windows)] {
         mod fixed_width_ints;

src/solid/aarch64.rs

@@ -1,4 +1,4 @@
-pub type c_char = i8;
+pub type c_char = u8;
 pub type wchar_t = u32;
 pub type c_long = i64;
 pub type c_ulong = u64;

src/solid/arm.rs

@@ -1,4 +1,4 @@
-pub type c_char = i8;
+pub type c_char = u8;
 pub type wchar_t = u32;
 pub type c_long = i32;
 pub type c_ulong = u32;

src/teeos/mod.rs

@@ -5,9 +5,6 @@
 #![allow(non_camel_case_types)]
 #![allow(non_snake_case)]
 
-// only supported on Rust > 1.59, so we can directly reexport c_void from core.
-pub use core::ffi::c_void;
-
 use crate::prelude::*;
 
 pub type c_schar = i8;