diff options
| author | bors <bors@rust-lang.org> | 2020-05-07 16:03:59 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-05-07 16:03:59 +0000 |
| commit | a08c47310c7d49cbdc5d7afb38408ba519967ecd (patch) | |
| tree | 7590b52787e44e129f2b5ac8281ef5d87b80297b /src/libstd/sys | |
| parent | 4802f097c86452cd2e09d44e88dbcb8e08266552 (diff) | |
| parent | c818e84821e5babc18ac222220b3171247eb974b (diff) | |
| download | rust-a08c47310c7d49cbdc5d7afb38408ba519967ecd.tar.gz rust-a08c47310c7d49cbdc5d7afb38408ba519967ecd.zip | |
Auto merge of #71985 - Dylan-DPC:rollup-9ceqump, r=Dylan-DPC
Rollup of 6 pull requests Successful merges: - #71938 (Use trait_object_dummy_self instead of err) - #71952 (Add some regression tests) - #71959 (tests: Fix warnings in `rust_test_helpers.c`) - #71962 (Grammar) - #71972 (use hex for pointers in Miri error messages) - #71980 (Allow a few warnings.) Failed merges: r? @ghost
Diffstat (limited to 'src/libstd/sys')
| -rw-r--r-- | src/libstd/sys/unix/ext/net.rs | 1 | ||||
| -rw-r--r-- | src/libstd/sys/unix/ext/raw.rs | 5 |
2 files changed, 6 insertions, 0 deletions
diff --git a/src/libstd/sys/unix/ext/net.rs b/src/libstd/sys/unix/ext/net.rs index bfdc39ada75..32c2ac43129 100644 --- a/src/libstd/sys/unix/ext/net.rs +++ b/src/libstd/sys/unix/ext/net.rs @@ -7,6 +7,7 @@ use libc; // FIXME(#43348): Make libc adapt #[doc(cfg(...))] so we don't need these fake definitions here? #[cfg(not(unix))] +#[allow(non_camel_case_types)] mod libc { pub use libc::c_int; pub type socklen_t = u32; diff --git a/src/libstd/sys/unix/ext/raw.rs b/src/libstd/sys/unix/ext/raw.rs index d81368a18b4..40fa53d484f 100644 --- a/src/libstd/sys/unix/ext/raw.rs +++ b/src/libstd/sys/unix/ext/raw.rs @@ -11,10 +11,15 @@ #![allow(deprecated)] #[stable(feature = "raw_ext", since = "1.1.0")] +#[allow(non_camel_case_types)] pub type uid_t = u32; + #[stable(feature = "raw_ext", since = "1.1.0")] +#[allow(non_camel_case_types)] pub type gid_t = u32; + #[stable(feature = "raw_ext", since = "1.1.0")] +#[allow(non_camel_case_types)] pub type pid_t = i32; #[doc(inline)] |