diff options
| author | Steve Klabnik <steve@steveklabnik.com> | 2016-02-09 16:58:59 -0500 |
|---|---|---|
| committer | Steve Klabnik <steve@steveklabnik.com> | 2016-02-09 16:58:59 -0500 |
| commit | 6571ae28a81e899aeb3eae81ee26c3cf31fddd1c (patch) | |
| tree | abd0ca2173c4b034961d3a8e3b13eb2d604def4f /src/libcore | |
| parent | e3bf4a74272c2072ad9567c5201c6514b9aff0fc (diff) | |
| parent | 02aa0aff2f0b42368dd871186510493fa60d785a (diff) | |
| download | rust-6571ae28a81e899aeb3eae81ee26c3cf31fddd1c.tar.gz rust-6571ae28a81e899aeb3eae81ee26c3cf31fddd1c.zip | |
Rollup merge of #31514 - cgar:spelling, r=alexcrichton
Diffstat (limited to 'src/libcore')
| -rw-r--r-- | src/libcore/convert.rs | 2 | ||||
| -rw-r--r-- | src/libcore/str/mod.rs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/libcore/convert.rs b/src/libcore/convert.rs index c207ad16595..b4ac020795c 100644 --- a/src/libcore/convert.rs +++ b/src/libcore/convert.rs @@ -19,7 +19,7 @@ //! //! - Impl the `As*` traits for reference-to-reference conversions //! - Impl the `Into` trait when you want to consume the value in the conversion -//! - The `From` trait is the most flexible, usefull for values _and_ references conversions +//! - The `From` trait is the most flexible, useful for values _and_ references conversions //! //! As a library writer, you should prefer implementing `From<T>` rather than //! `Into<U>`, as `From` provides greater flexibility and offer the equivalent `Into` diff --git a/src/libcore/str/mod.rs b/src/libcore/str/mod.rs index f19970546d7..fa169416a10 100644 --- a/src/libcore/str/mod.rs +++ b/src/libcore/str/mod.rs @@ -1740,7 +1740,7 @@ impl StrExt for str { let mut matcher = pat.into_searcher(self); if let Some((a, b)) = matcher.next_reject() { i = a; - j = b; // Rember earliest known match, correct it below if + j = b; // Remember earliest known match, correct it below if // last match is different } if let Some((_, b)) = matcher.next_reject_back() { |