bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Rollup merge of #32174 - cmbrandenburg:spell_fix, r=steveklabnik

Browse source 
Spell fixes for std::ffi doc comments
This commit is contained in:
Manish Goregaokar 2016-03-12 02:41:26 +05:30
commit baea278e75
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/libstd/ffi/os_str.rs
View file

@ -22,7 +22,7 @@ use sys::os_str::{Buf, Slice};
use sys_common::{AsInner, IntoInner, FromInner}; use sys_common::{AsInner, IntoInner, FromInner};
/// A type that can represent owned, mutable platform-native strings, but is /// A type that can represent owned, mutable platform-native strings, but is
/// cheaply interconvertable with Rust strings. /// cheaply inter-convertible with Rust strings.
/// ///
/// The need for this type arises from the fact that: /// The need for this type arises from the fact that:
/// ///
@ -272,7 +272,7 @@ impl OsStr {
unsafe { mem::transmute(inner) } unsafe { mem::transmute(inner) }
} }
/// Yields a `&str` slice if the `OsStr` is valid unicode. /// Yields a `&str` slice if the `OsStr` is valid Unicode.
/// ///
/// This conversion may entail doing a check for UTF-8 validity. /// This conversion may entail doing a check for UTF-8 validity.
#[stable(feature = "rust1", since = "1.0.0")] #[stable(feature = "rust1", since = "1.0.0")]
@ -301,7 +301,7 @@ impl OsStr {
/// On Unix systems, this is a no-op. /// On Unix systems, this is a no-op.
/// ///
/// On Windows systems, this returns `None` unless the `OsStr` is /// On Windows systems, this returns `None` unless the `OsStr` is
/// valid unicode, in which case it produces UTF-8-encoded /// valid Unicode, in which case it produces UTF-8-encoded
/// data. This may entail checking validity. /// data. This may entail checking validity.
#[unstable(feature = "convert", reason = "recently added", issue = "27704")] #[unstable(feature = "convert", reason = "recently added", issue = "27704")]
#[rustc_deprecated(reason = "RFC was closed, hides subtle Windows semantics", #[rustc_deprecated(reason = "RFC was closed, hides subtle Windows semantics",