Skip to content

Commit

Permalink
Rollup merge of rust-lang#38994 - BenWiederhake:master, r=sanxiyn
Browse files Browse the repository at this point in the history
Fix some typos in Nomicon

I waited a bit before creating this PR in case I find more typos – I didn't.

I've read `CONTRIBUTING.md` but didn't `make check`, and `make doc` takes incredibly long. (Among other things, `make doc` builds llvm from scratch.  Not sure if that's intentional.)
  • Loading branch information
GuillaumeGomez authored Jan 13, 2017
2 parents 629caf5 + 09df83b commit 6d2fb12
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion src/doc/nomicon/dropck.md
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ is that some Drop implementations will not access borrowed data even
though their type gives them the capability for such access.

For example, this variant of the above `Inspector` example will never
accessed borrowed data:
access borrowed data:

```rust,ignore
struct Inspector<'a>(&'a u8, &'static str);
Expand Down
2 changes: 1 addition & 1 deletion src/doc/nomicon/unbounded-lifetimes.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ lifetime can be regarded as `'static`.

Almost no reference is `'static`, so this is probably wrong. `transmute` and
`transmute_copy` are the two other primary offenders. One should endeavor to
bound an unbounded lifetime as quick as possible, especially across function
bound an unbounded lifetime as quickly as possible, especially across function
boundaries.

Given a function, any output lifetimes that don't derive from inputs are
Expand Down

0 comments on commit 6d2fb12

Please sign in to comment.