diff options
| author | bors <bors@rust-lang.org> | 2015-05-01 14:50:51 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2015-05-01 14:50:51 +0000 |
| commit | 1320c293c16dd61093a9b7e8e3c441df6b59ea9e (patch) | |
| tree | 474df956d29dcc2a2409e179c8b1d6bd5741c56a /src/libstd/os | |
| parent | aecf3d8b659c1f5bc457a5a146357ba484e27346 (diff) | |
| parent | 616b94b66c20085e81ed43e450e78207177f54c6 (diff) | |
| download | rust-1320c293c16dd61093a9b7e8e3c441df6b59ea9e.tar.gz rust-1320c293c16dd61093a9b7e8e3c441df6b59ea9e.zip | |
Auto merge of #25025 - Manishearth:rollup, r=Manishearth
- Successful merges: #24979, #24980, #24981, #24982, #24983, #24987, #24988, #24991, #24992, #24994, #24998, #25002, #25010, #25014, #25020, #25021 - Failed merges:
Diffstat (limited to 'src/libstd/os')
| -rw-r--r-- | src/libstd/os/dragonfly/raw.rs | 2 | ||||
| -rw-r--r-- | src/libstd/os/freebsd/raw.rs | 2 | ||||
| -rw-r--r-- | src/libstd/os/ios/raw.rs | 2 | ||||
| -rw-r--r-- | src/libstd/os/openbsd/raw.rs | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/src/libstd/os/dragonfly/raw.rs b/src/libstd/os/dragonfly/raw.rs index 22c811ead43..86522cc1e79 100644 --- a/src/libstd/os/dragonfly/raw.rs +++ b/src/libstd/os/dragonfly/raw.rs @@ -11,7 +11,7 @@ //! Dragonfly-specific raw type definitions use os::raw::c_long; -use os::unix::raw::{pid_t, uid_t, gid_t}; +use os::unix::raw::{uid_t, gid_t}; pub type blkcnt_t = i64; pub type blksize_t = u32; diff --git a/src/libstd/os/freebsd/raw.rs b/src/libstd/os/freebsd/raw.rs index a810eff45d3..a3b95738a1a 100644 --- a/src/libstd/os/freebsd/raw.rs +++ b/src/libstd/os/freebsd/raw.rs @@ -11,7 +11,7 @@ //! FreeBSD-specific raw type definitions use os::raw::c_long; -use os::unix::raw::{uid_t, gid_t, pid_t}; +use os::unix::raw::{uid_t, gid_t}; pub type blkcnt_t = i64; pub type blksize_t = i64; diff --git a/src/libstd/os/ios/raw.rs b/src/libstd/os/ios/raw.rs index 3266b3846d8..a66e01b2c39 100644 --- a/src/libstd/os/ios/raw.rs +++ b/src/libstd/os/ios/raw.rs @@ -11,7 +11,7 @@ //! iOS-specific raw type definitions use os::raw::c_long; -use os::unix::raw::{uid_t, gid_t, pid_t}; +use os::unix::raw::{uid_t, gid_t}; pub type blkcnt_t = i64; pub type blksize_t = i32; diff --git a/src/libstd/os/openbsd/raw.rs b/src/libstd/os/openbsd/raw.rs index 632a8c336b7..0bdba9e3487 100644 --- a/src/libstd/os/openbsd/raw.rs +++ b/src/libstd/os/openbsd/raw.rs @@ -11,7 +11,7 @@ //! OpenBSD-specific raw type definitions use os::raw::c_long; -use os::unix::raw::{uid_t, gid_t, pid_t}; +use os::unix::raw::{uid_t, gid_t}; pub type blkcnt_t = i64; pub type blksize_t = u32; |