about summary refs log tree commit diff
diff options
context:
space:
mode:
authorSteve Klabnik <steve@steveklabnik.com>2015-10-19 17:14:08 -0400
committerSteve Klabnik <steve@steveklabnik.com>2015-10-19 17:14:08 -0400
commit2f2d8df534ce97d5bea408a79388b97ae6d9fa38 (patch)
treec6d32d53aa11d118ee8062fc52802e5f292d6759
parentea3bf79baced33bd21d876261e01bed968f8eca1 (diff)
parent9431f3cc7b131a3413508901ed98e0c6cc0505c7 (diff)
downloadrust-2f2d8df534ce97d5bea408a79388b97ae6d9fa38.tar.gz
rust-2f2d8df534ce97d5bea408a79388b97ae6d9fa38.zip
Rollup merge of #29169 - apasel422:spell, r=steveklabnik
r? @steveklabnik
-rw-r--r--src/doc/nomicon/safe-unsafe-meaning.md2
-rw-r--r--src/libcollections/str.rs2
-rw-r--r--src/libcore/iter.rs2
-rw-r--r--src/libstd/process.rs4
4 files changed, 5 insertions, 5 deletions
diff --git a/src/doc/nomicon/safe-unsafe-meaning.md b/src/doc/nomicon/safe-unsafe-meaning.md
index 827ea255053..5fd61eb51dd 100644
--- a/src/doc/nomicon/safe-unsafe-meaning.md
+++ b/src/doc/nomicon/safe-unsafe-meaning.md
@@ -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.
diff --git a/src/libcollections/str.rs b/src/libcollections/str.rs
index 5f1ace19f6d..023edf29341 100644
--- a/src/libcollections/str.rs
+++ b/src/libcollections/str.rs
@@ -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)]
diff --git a/src/libcore/iter.rs b/src/libcore/iter.rs
index 93d9f04197f..c5827326a86 100644
--- a/src/libcore/iter.rs
+++ b/src/libcore/iter.rs
@@ -3248,7 +3248,7 @@ impl<T> Default for Empty<T> {
 
 /// Creates an iterator that yields nothing.
 ///
-/// # Exampes
+/// # Examples
 ///
 /// Basic usage:
 ///
diff --git a/src/libstd/process.rs b/src/libstd/process.rs
index 4e80fb2ceb0..6e3c5eaf217 100644
--- a/src/libstd/process.rs
+++ b/src/libstd/process.rs
@@ -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
@@ -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