Skip to content

Commit 94d5f6d

Browse files
authored
Rollup merge of rust-lang#34626 - sylvestre:master, r=Manishearth
Fix typos
2 parents ec52b11 + 3fcb649 commit 94d5f6d

File tree

5 files changed

+6
-6
lines changed

5 files changed

+6
-6
lines changed

src/doc/book/closures.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -339,7 +339,7 @@ fn call_with_ref<'a, F>(some_closure:F) -> i32
339339
where F: Fn(&'a 32) -> i32 {
340340
```
341341

342-
However this presents a problem with in our case. When you specify the explict
342+
However this presents a problem with in our case. When you specify the explicit
343343
lifetime on a function it binds that lifetime to the *entire* scope of the function
344344
instead of just the invocation scope of our closure. This means that the borrow checker
345345
will see a mutable reference in the same lifetime as our immutable reference and fail
@@ -354,7 +354,7 @@ fn call_with_ref<F>(some_closure:F) -> i32
354354
```
355355

356356
This lets the Rust compiler find the minimum lifetime to invoke our closure and
357-
satisfy the borrow checker's rules. Our function then compiles and excutes as we
357+
satisfy the borrow checker's rules. Our function then compiles and executes as we
358358
expect.
359359

360360
```rust

src/doc/book/testing.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -431,7 +431,7 @@ one.
431431

432432
Cargo will ignore files in subdirectories of the `tests/` directory.
433433
Therefore shared modules in integrations tests are possible.
434-
For example `tests/common/mod.rs` is not seperatly compiled by cargo but can
434+
For example `tests/common/mod.rs` is not separately compiled by cargo but can
435435
be imported in every test with `mod common;`
436436

437437
That's all there is to the `tests` directory. The `tests` module isn't needed

src/librustdoc/html/highlight.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ pub enum Class {
107107
///
108108
/// The classifier will call into the `Writer` implementation as it finds spans
109109
/// of text to highlight. Exactly how that text should be highlighted is up to
110-
/// the implemention.
110+
/// the implementation.
111111
pub trait Writer {
112112
/// Called when we start processing a span of text that should be highlighted.
113113
/// The `Class` argument specifies how it should be highlighted.

src/librustdoc/html/render.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2715,7 +2715,7 @@ impl<'a> fmt::Display for Sidebar<'a> {
27152715
let parentlen = cx.current.len() - if it.is_mod() {1} else {0};
27162716

27172717
// the sidebar is designed to display sibling functions, modules and
2718-
// other miscellaneous informations. since there are lots of sibling
2718+
// other miscellaneous information. since there are lots of sibling
27192719
// items (and that causes quadratic growth in large modules),
27202720
// we refactor common parts into a shared JavaScript file per module.
27212721
// still, we don't move everything into JS because we want to preserve

src/libstd/memchr.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@ mod fallback {
239239
text[..offset].iter().rposition(|elt| *elt == x)
240240
}
241241

242-
// test fallback implementations on all plattforms
242+
// test fallback implementations on all platforms
243243
#[test]
244244
fn matches_one() {
245245
assert_eq!(Some(0), memchr(b'a', b"a"));

0 commit comments

Comments
 (0)