diff options
| author | bors <bors@rust-lang.org> | 2017-06-27 05:12:07 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2017-06-27 05:12:07 +0000 |
| commit | f590a44ce61888c78b9044817d8b798db5cd2ffd (patch) | |
| tree | d1841cfd3dffb71e2c9de0469a4575d4e3ab6834 /src/libstd | |
| parent | 77931c2a04fbb41f3cd92435aa5294222bb5db7f (diff) | |
| parent | d7a5508069000403e303977a474f5bc775b7fc98 (diff) | |
| download | rust-f590a44ce61888c78b9044817d8b798db5cd2ffd.tar.gz rust-f590a44ce61888c78b9044817d8b798db5cd2ffd.zip | |
Auto merge of #42922 - frewsxcv:rollup, r=frewsxcv
Rollup of 5 pull requests - Successful merges: #42519, #42871, #42874, #42905, #42917 - Failed merges:
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/ffi/os_str.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstd/ffi/os_str.rs b/src/libstd/ffi/os_str.rs index f54d79c201f..e9296f33b9e 100644 --- a/src/libstd/ffi/os_str.rs +++ b/src/libstd/ffi/os_str.rs @@ -29,7 +29,7 @@ use sys_common::{AsInner, IntoInner, FromInner}; /// * On Windows, strings are often arbitrary sequences of non-zero 16-bit /// values, interpreted as UTF-16 when it is valid to do so. /// -/// * In Rust, strings are always valid UTF-8, but may contain zeros. +/// * In Rust, strings are always valid UTF-8, which may contain zeros. /// /// `OsString` and [`OsStr`] bridge this gap by simultaneously representing Rust /// and platform-native string values, and in particular allowing a Rust string |