Skip to content

Commit

Permalink
Rollup merge of #71980 - steveklabnik:warnings-fixes, r=Mark-Simulacrum
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
Dylan-DPC authored May 7, 2020
2 parents 806089a + d14f000 commit c818e84
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 0 deletions.
1 change: 1 addition & 0 deletions src/libstd/sys/unix/ext/net.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
5 changes: 5 additions & 0 deletions src/libstd/sys/unix/ext/raw.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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)]
Expand Down

0 comments on commit c818e84

Please sign in to comment.