diff options
| author | Steve Klabnik <steve@steveklabnik.com> | 2016-07-06 19:13:07 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-06 19:13:07 -0400 |
| commit | 1b7bebf84d7b0c428dddfdada1789ebde7871509 (patch) | |
| tree | 06c7050de8a3b27b63df6694dddd8826632f2566 /src/doc | |
| parent | 80e5672f7ed4980726e1b917ba5bfdd229b08fc5 (diff) | |
| parent | 3fcb64927750b8c4bccd866ec137500de2e7aea3 (diff) | |
| download | rust-1b7bebf84d7b0c428dddfdada1789ebde7871509.tar.gz rust-1b7bebf84d7b0c428dddfdada1789ebde7871509.zip | |
Rollup merge of #34626 - sylvestre:master, r=Manishearth
Fix typos
Diffstat (limited to 'src/doc')
| -rw-r--r-- | src/doc/book/closures.md | 4 | ||||
| -rw-r--r-- | src/doc/book/testing.md | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/doc/book/closures.md b/src/doc/book/closures.md index a6b4e949218..e8c88b7db06 100644 --- a/src/doc/book/closures.md +++ b/src/doc/book/closures.md @@ -339,7 +339,7 @@ fn call_with_ref<'a, F>(some_closure:F) -> i32 where F: Fn(&'a 32) -> i32 { ``` -However this presents a problem with in our case. When you specify the explict +However this presents a problem with in our case. When you specify the explicit lifetime on a function it binds that lifetime to the *entire* scope of the function instead of just the invocation scope of our closure. This means that the borrow checker 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 ``` This lets the Rust compiler find the minimum lifetime to invoke our closure and -satisfy the borrow checker's rules. Our function then compiles and excutes as we +satisfy the borrow checker's rules. Our function then compiles and executes as we expect. ```rust diff --git a/src/doc/book/testing.md b/src/doc/book/testing.md index 7954085472e..86729147ed0 100644 --- a/src/doc/book/testing.md +++ b/src/doc/book/testing.md @@ -431,7 +431,7 @@ one. Cargo will ignore files in subdirectories of the `tests/` directory. Therefore shared modules in integrations tests are possible. -For example `tests/common/mod.rs` is not seperatly compiled by cargo but can +For example `tests/common/mod.rs` is not separately compiled by cargo but can be imported in every test with `mod common;` That's all there is to the `tests` directory. The `tests` module isn't needed |