Skip to content

Commit 2f2d8df

Browse files
committed
Rollup merge of #29169 - apasel422:spell, r=steveklabnik
r? @steveklabnik
2 parents ea3bf79 + 9431f3c commit 2f2d8df

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

src/doc/nomicon/safe-unsafe-meaning.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ Some examples of unsafe functions:
4242
* `slice::get_unchecked` will perform unchecked indexing, allowing memory
4343
safety to be freely violated.
4444
* every raw pointer to sized type has intrinsic `offset` method that invokes
45-
Undefined Behaviour if it is not "in bounds" as defined by LLVM.
45+
Undefined Behavior if it is not "in bounds" as defined by LLVM.
4646
* `mem::transmute` reinterprets some value as having the given type,
4747
bypassing type safety in arbitrary ways. (see [conversions] for details)
4848
* All FFI functions are `unsafe` because they can do arbitrary things.

src/libcollections/str.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ impl<S: Borrow<str>> SliceConcatExt<str> for [S] {
102102
}
103103
}
104104

105-
/// External iterator for a string's UTF16 codeunits.
105+
/// External iterator for a string's UTF-16 code units.
106106
///
107107
/// For use with the `std::iter` module.
108108
#[derive(Clone)]

src/libcore/iter.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -3248,7 +3248,7 @@ impl<T> Default for Empty<T> {
32483248

32493249
/// Creates an iterator that yields nothing.
32503250
///
3251-
/// # Exampes
3251+
/// # Examples
32523252
///
32533253
/// Basic usage:
32543254
///

src/libstd/process.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ impl IntoInner<AnonPipe> for ChildStdin {
100100
fn into_inner(self) -> AnonPipe { self.inner }
101101
}
102102

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

124-
/// A handle to a child procesess's stderr
124+
/// A handle to a child process's stderr
125125
#[stable(feature = "process", since = "1.0.0")]
126126
pub struct ChildStderr {
127127
inner: AnonPipe

0 commit comments

Comments
 (0)