diff options
| author | Dylan DPC <dylan.dpc@gmail.com> | 2020-05-07 17:59:00 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-07 17:59:00 +0200 |
| commit | c818e84821e5babc18ac222220b3171247eb974b (patch) | |
| tree | 7590b52787e44e129f2b5ac8281ef5d87b80297b | |
| parent | 806089ad70b025ba2d48f2de4f47115cea592292 (diff) | |
| parent | d14f000ccc5104de1aecceabc97f2934caec1144 (diff) | |
| download | rust-c818e84821e5babc18ac222220b3171247eb974b.tar.gz rust-c818e84821e5babc18ac222220b3171247eb974b.zip | |
Rollup merge of #71980 - steveklabnik:warnings-fixes, r=Mark-Simulacrum
Allow a few warnings. On Windows, these types were causing warnings to be emitted during the build. These types are allowed to not have idiomatic names, so the warning should be supressed.
| -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)] |