Skip to content

Commit

Permalink
Rollup merge of rust-lang#29169 - apasel422:spell, r=steveklabnik
Browse files Browse the repository at this point in the history
  • Loading branch information
steveklabnik committed Oct 19, 2015
2 parents ea3bf79 + 9431f3c commit 2f2d8df
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion src/doc/nomicon/safe-unsafe-meaning.md
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ Some examples of unsafe functions:
* `slice::get_unchecked` will perform unchecked indexing, allowing memory
safety to be freely violated.
* every raw pointer to sized type has intrinsic `offset` method that invokes
Undefined Behaviour if it is not "in bounds" as defined by LLVM.
Undefined Behavior if it is not "in bounds" as defined by LLVM.
* `mem::transmute` reinterprets some value as having the given type,
bypassing type safety in arbitrary ways. (see [conversions] for details)
* All FFI functions are `unsafe` because they can do arbitrary things.
Expand Down
2 changes: 1 addition & 1 deletion src/libcollections/str.rs
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ impl<S: Borrow<str>> SliceConcatExt<str> for [S] {
}
}

/// External iterator for a string's UTF16 codeunits.
/// External iterator for a string's UTF-16 code units.
///
/// For use with the `std::iter` module.
#[derive(Clone)]
Expand Down
2 changes: 1 addition & 1 deletion src/libcore/iter.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3248,7 +3248,7 @@ impl<T> Default for Empty<T> {

/// Creates an iterator that yields nothing.
///
/// # Exampes
/// # Examples
///
/// Basic usage:
///
Expand Down
4 changes: 2 additions & 2 deletions src/libstd/process.rs
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ impl IntoInner<AnonPipe> for ChildStdin {
fn into_inner(self) -> AnonPipe { self.inner }
}

/// A handle to a child procesess's stdout
/// A handle to a child process's stdout
#[stable(feature = "process", since = "1.0.0")]
pub struct ChildStdout {
inner: AnonPipe
Expand All @@ -121,7 +121,7 @@ impl IntoInner<AnonPipe> for ChildStdout {
fn into_inner(self) -> AnonPipe { self.inner }
}

/// A handle to a child procesess's stderr
/// A handle to a child process's stderr
#[stable(feature = "process", since = "1.0.0")]
pub struct ChildStderr {
inner: AnonPipe
Expand Down

0 comments on commit 2f2d8df

Please sign in to comment.