Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions PROGRESS
Original file line number Diff line number Diff line change
Expand Up @@ -29,31 +29,31 @@ Exercises [ ] gnarly macro required
Copy [X]
Exercises [X]

* Exericse 5: Lifetimes on Types
* Exercise 5: Lifetimes on Types

Copy [X]
Exercises [X] (confirm I like the exercise here)

* Exericse 6: Lifetimes on Impls
* Exercise 6: Lifetimes on Impls

Copy [X]
Exercises [X] (confirm I like the exercise here)

* Exericse 7: Special Lifetimes
* Exercise 7: Special Lifetimes

Copy [X]
exercises [X]

* Exericse 8: Finale
* Exercise 8: Finale

Copy [X]
exercises [X]

* Exericse 9: Further Reading
* Exercise 9: Further Reading

Copy [X]

* Exericse 10: Footnote
* Exercise 10: Footnote

Copy [X]

Expand Down
2 changes: 1 addition & 1 deletion exercises/01_lifetimes_needed/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ It's possible that in simple cases it could. But your compiler might decide that
lifetimes. Or it could succeed in inferring them... after 6 months.

So, the compiler needs more information. That information is provided by lifetime annotations.
Before we discuss them in detail, here is an exercise that will hopefully re-inforce the concepts,
Before we discuss them in detail, here is an exercise that will hopefully re-enforce the concepts,
before we deal with syntax.

## Exercise: Identify which programs work, and which break
Expand Down
2 changes: 1 addition & 1 deletion exercises/04_mutable_references_and_containers/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ This seems strange -- why can't you borrow `my_vec`?

Well, let's walk through what the compiler sees:

`&val` needs to last for as long as `my_vec` exists:
`&val1` needs to last for as long as `my_vec` exists:

``` rust,ignore
# fn insert_value<'one_lifetime>(my_vec: &'one_lifetime mut Vec<&'one_lifetime i32>, value: &'one_lifetime i32) {
Expand Down
2 changes: 1 addition & 1 deletion exercises/07_special_lifetimes/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ To quote the Rust Reference:
You have been given code which contains many uses of the lifetimes `'a` and `'b'`.
All of these lifetimes can be replaced with either `'_` or `'static`.

Your task is to replace every occurance of the lifetimes `'a` and `'b` with either
Your task is to replace every occurrence of the lifetimes `'a` and `'b` with either
`'_` or `'static`, to remove excessive lifetime declarations, and to ensure your
code still compiles.

Expand Down