Rollup merge of #42905 - casey:casey-utf8-null-doc, r=steveklabnik

Reword OsStr docs to clarify that utf8 may contain nulls

The use of the word "but" in the OsStr docs implies (at least to me) that valid UTF-8 does not contain null bytes.

Using "which" instead makes it clear that valid UTF-8 may contain null bytes.
This commit is contained in:
Corey Farwell 2017-06-26 23:34:12 -04:00 committed by GitHub
commit 83d4b43422

View File

@ -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