diff options
| author | bors <bors@rust-lang.org> | 2016-02-20 04:48:34 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2016-02-20 04:48:34 +0000 |
| commit | d3ffad7a38d4a203b5c1f97db52ff45849a66b32 (patch) | |
| tree | 1b45113d2b25640d9d76077aa917acb9d5e3fff5 /src/libstd | |
| parent | a212264011289885bdb8b2306a8fdd50e1f83c99 (diff) | |
| parent | 78f6431002b81dc7ef3001965192e6fbfff34d7a (diff) | |
| download | rust-d3ffad7a38d4a203b5c1f97db52ff45849a66b32.tar.gz rust-d3ffad7a38d4a203b5c1f97db52ff45849a66b32.zip | |
Auto merge of #31777 - steveklabnik:rollup, r=steveklabnik
- Successful merges: #31721, #31737, #31741, #31750, #31763, #31764, #31765, #31775 - Failed merges:
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/env.rs | 6 | ||||
| -rw-r--r-- | src/libstd/os/netbsd/raw.rs | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/libstd/env.rs b/src/libstd/env.rs index fa48efb2788..f7e13a35e9e 100644 --- a/src/libstd/env.rs +++ b/src/libstd/env.rs @@ -528,13 +528,13 @@ pub struct ArgsOs { inner: os_imp::Args } /// via the command line). /// /// The first element is traditionally the path to the executable, but it can be -/// set to arbitrary text, and it may not even exist, so this property should +/// set to arbitrary text, and may not even exist. This means this property should /// not be relied upon for security purposes. /// /// # Panics /// /// The returned iterator will panic during iteration if any argument to the -/// process is not valid unicode. If this is not desired it is recommended to +/// process is not valid unicode. If this is not desired, /// use the `args_os` function instead. /// /// # Examples @@ -603,7 +603,7 @@ impl ExactSizeIterator for ArgsOs { /// Constants associated with the current target #[stable(feature = "env", since = "1.0.0")] pub mod consts { - /// A string describing the architecture of the CPU that this is currently + /// A string describing the architecture of the CPU that is currently /// in use. /// /// Some possible values: diff --git a/src/libstd/os/netbsd/raw.rs b/src/libstd/os/netbsd/raw.rs index 7eb3f6d47d1..bc30c1a7f48 100644 --- a/src/libstd/os/netbsd/raw.rs +++ b/src/libstd/os/netbsd/raw.rs @@ -46,9 +46,9 @@ pub struct stat { #[stable(feature = "raw_ext", since = "1.1.0")] pub st_nlink: u32, #[stable(feature = "raw_ext", since = "1.1.0")] - pub st_uid: u32, + pub st_uid: uid_t, #[stable(feature = "raw_ext", since = "1.1.0")] - pub st_gid: u32, + pub st_gid: gid_t, #[stable(feature = "raw_ext", since = "1.1.0")] pub st_rdev: u64, #[stable(feature = "raw_ext", since = "1.1.0")] |