diff --git a/PROGRESS b/PROGRESS index 31036db..bd4bfb7 100644 --- a/PROGRESS +++ b/PROGRESS @@ -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] diff --git a/exercises/01_lifetimes_needed/README.md b/exercises/01_lifetimes_needed/README.md index 4081184..1a57153 100644 --- a/exercises/01_lifetimes_needed/README.md +++ b/exercises/01_lifetimes_needed/README.md @@ -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 diff --git a/exercises/04_mutable_references_and_containers/README.md b/exercises/04_mutable_references_and_containers/README.md index 9d83946..04a307e 100644 --- a/exercises/04_mutable_references_and_containers/README.md +++ b/exercises/04_mutable_references_and_containers/README.md @@ -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) { diff --git a/exercises/07_special_lifetimes/README.md b/exercises/07_special_lifetimes/README.md index 28710c7..e639d61 100644 --- a/exercises/07_special_lifetimes/README.md +++ b/exercises/07_special_lifetimes/README.md @@ -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.