Auto merge of #230 - jrvidal:master, r=fmoko

bors · bors · commit 88ec6f6b1645 · 2019-11-11T15:59:35.000Z
Changes the execution mode for `watch`, asking for user input We've [observed](https://hackmd.io/-cK6aPhnTwiCiI7u6k0xug?both) that learners can get confused when they do get everything right, but they _still_ get errors... which come from the next exercise, no the one they just edited. This PR changes it so they have to confirm they want to move forward by removing the `I AM NOT DONE` comment. ![Screenshot at 2019-11-11 15:13:39](https://user-images.githubusercontent.com/1636604/68593566-0abd3900-0496-11ea-9e9d-6c43b91bf21d.png) * [ ] The particular string is of course subject to bikeshed. ### Alternatives/doubts * The coolest solution I could imagine would involve a proc-macro attribute `#![ready(false)]` that they could edit once they're done, but it's a bit complicated to set up. * For now I've put `I AM NOT DONE` everywhere, I think it's what make more sense.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -10,6 +10,7 @@ indicatif = "0.9.0"
 console = "0.6.2"
 notify = "4.0.0"
 toml = "0.4.10"
+regex = "1.1.6"
 serde = {version = "1.0.10", features = ["derive"]}
 
 [[bin]]
@@ -18,3 +19,4 @@ path = "src/main.rs"
 
 [dev-dependencies]
 assert_cmd = "0.11.0"
+glob = "0.3.0"
diff --git a/exercises/enums/enums1.rs b/exercises/enums/enums1.rs
@@ -1,6 +1,8 @@
 // enums1.rs
 // Make me compile! Scroll down for hints!
 
+// I AM NOT DONE
+
 #[derive(Debug)]
 enum Message {
     // TODO: define a few types of messages as used below
diff --git a/exercises/enums/enums2.rs b/exercises/enums/enums2.rs
@@ -1,6 +1,8 @@
 // enums2.rs
 // Make me compile! Scroll down for hints
 
+// I AM NOT DONE
+
 #[derive(Debug)]
 enum Message {
     // TODO: define the different variants used below
diff --git a/exercises/enums/enums3.rs b/exercises/enums/enums3.rs
@@ -1,6 +1,8 @@
 // enums3.rs
 // Address all the TODOs to make the tests pass!
 
+// I AM NOT DONE
+
 enum Message {
     // TODO: implement the message variant types based on their usage below
 }
diff --git a/exercises/error_handling/errors1.rs b/exercises/error_handling/errors1.rs
@@ -6,6 +6,8 @@
 // this function to have.
 // Scroll down for hints!!!
 
+// I AM NOT DONE
+
 pub fn generate_nametag_text(name: String) -> Option<String> {
     if name.len() > 0 {
         Some(format!("Hi! My name is {}", name))
diff --git a/exercises/error_handling/errors2.rs b/exercises/error_handling/errors2.rs
@@ -16,6 +16,8 @@
 // There are at least two ways to implement this that are both correct-- but
 // one is a lot shorter! Scroll down for hints to both ways.
 
+// I AM NOT DONE
+
 use std::num::ParseIntError;
 
 pub fn total_cost(item_quantity: &str) -> Result<i32, ParseIntError> {
diff --git a/exercises/error_handling/errors3.rs b/exercises/error_handling/errors3.rs
@@ -3,6 +3,8 @@
 // `total_cost` function from the previous exercise. It's not working though!
 // Why not? What should we do to fix it? Scroll for hints!
 
+// I AM NOT DONE
+
 use std::num::ParseIntError;
 
 fn main() {
diff --git a/exercises/error_handling/errorsn.rs b/exercises/error_handling/errorsn.rs
@@ -15,6 +15,8 @@
 //
 // Scroll down for hints :)
 
+// I AM NOT DONE
+
 use std::error;
 use std::fmt;
 use std::io;
diff --git a/exercises/error_handling/option1.rs b/exercises/error_handling/option1.rs
@@ -4,6 +4,8 @@
 // on `None`. Handle this in a more graceful way than calling `unwrap`!
 // Scroll down for hints :)
 
+// I AM NOT DONE
+
 pub fn pop_too_much() -> bool {
     let mut list = vec![3];
 
diff --git a/exercises/error_handling/result1.rs b/exercises/error_handling/result1.rs
@@ -1,6 +1,8 @@
 // result1.rs
 // Make this test pass! Scroll down for hints :)
 
+// I AM NOT DONE
+
 #[derive(PartialEq, Debug)]
 struct PositiveNonzeroInteger(u64);
 
diff --git a/exercises/functions/functions1.rs b/exercises/functions/functions1.rs
@@ -1,6 +1,8 @@
 // functions1.rs
 // Make me compile! Scroll down for hints :)
 
+// I AM NOT DONE
+
 fn main() {
     call_me();
 }
diff --git a/exercises/functions/functions2.rs b/exercises/functions/functions2.rs
@@ -1,6 +1,8 @@
 // functions2.rs
 // Make me compile! Scroll down for hints :)
 
+// I AM NOT DONE
+
 fn main() {
     call_me(3);
 }
diff --git a/exercises/functions/functions3.rs b/exercises/functions/functions3.rs
@@ -1,6 +1,8 @@
 // functions3.rs
 // Make me compile! Scroll down for hints :)
 
+// I AM NOT DONE
+
 fn main() {
     call_me();
 }
diff --git a/exercises/functions/functions4.rs b/exercises/functions/functions4.rs
@@ -4,6 +4,8 @@
 // This store is having a sale where if the price is an even number, you get
 // 10 (money unit) off, but if it's an odd number, it's 3 (money unit) less.
 
+// I AM NOT DONE
+
 fn main() {
     let original_price = 51;
     println!("Your sale price is {}", sale_price(original_price));
diff --git a/exercises/functions/functions5.rs b/exercises/functions/functions5.rs
@@ -1,6 +1,8 @@
 // functions5.rs
 // Make me compile! Scroll down for hints :)
 
+// I AM NOT DONE
+
 fn main() {
     let answer = square(3);
     println!("The answer is {}", answer);
diff --git a/exercises/if/if1.rs b/exercises/if/if1.rs
@@ -1,5 +1,7 @@
 // if1.rs
 
+// I AM NOT DONE
+
 pub fn bigger(a: i32, b: i32) -> i32 {
     // Complete this function to return the bigger number!
     // Do not use:
diff --git a/exercises/macros/macros1.rs b/exercises/macros/macros1.rs
@@ -1,6 +1,8 @@
 // macros1.rs
 // Make me compile! Scroll down for hints :)
 
+// I AM NOT DONE
+
 macro_rules! my_macro {
     () => {
         println!("Check out my macro!");
diff --git a/exercises/macros/macros2.rs b/exercises/macros/macros2.rs
@@ -1,6 +1,8 @@
 // macros2.rs
 // Make me compile! Scroll down for hints :)
 
+// I AM NOT DONE
+
 fn main() {
     my_macro!();
 }
diff --git a/exercises/macros/macros3.rs b/exercises/macros/macros3.rs
@@ -1,6 +1,8 @@
 // macros3.rs
 // Make me compile, without taking the macro out of the module! Scroll down for hints :)
 
+// I AM NOT DONE
+
 mod macros {
     macro_rules! my_macro {
         () => {
diff --git a/exercises/macros/macros4.rs b/exercises/macros/macros4.rs
@@ -1,6 +1,8 @@
 // macros4.rs
 // Make me compile! Scroll down for hints :)
 
+// I AM NOT DONE
+
 macro_rules! my_macro {
     () => {
         println!("Check out my macro!");
diff --git a/exercises/modules/modules1.rs b/exercises/modules/modules1.rs
@@ -1,6 +1,8 @@
 // modules1.rs
 // Make me compile! Scroll down for hints :)
 
+// I AM NOT DONE
+
 mod sausage_factory {
     fn make_sausage() {
         println!("sausage!");
diff --git a/exercises/modules/modules2.rs b/exercises/modules/modules2.rs
@@ -1,6 +1,8 @@
 // modules2.rs
 // Make me compile! Scroll down for hints :)
 
+// I AM NOT DONE
+
 mod delicious_snacks {
     use self::fruits::PEAR as fruit;
     use self::veggies::CUCUMBER as veggie;
diff --git a/exercises/move_semantics/move_semantics1.rs b/exercises/move_semantics/move_semantics1.rs
@@ -1,6 +1,8 @@
 // move_semantics1.rs
 // Make me compile! Scroll down for hints :)
 
+// I AM NOT DONE
+
 fn main() {
     let vec0 = Vec::new();
 
diff --git a/exercises/move_semantics/move_semantics2.rs b/exercises/move_semantics/move_semantics2.rs
@@ -1,6 +1,8 @@
 // move_semantics2.rs
 // Make me compile without changing line 10! Scroll down for hints :)
 
+// I AM NOT DONE
+
 fn main() {
     let vec0 = Vec::new();
 
diff --git a/exercises/move_semantics/move_semantics3.rs b/exercises/move_semantics/move_semantics3.rs
@@ -3,6 +3,8 @@
 // (no lines with multiple semicolons necessary!)
 // Scroll down for hints :)
 
+// I AM NOT DONE
+
 fn main() {
     let vec0 = Vec::new();
 
diff --git a/exercises/move_semantics/move_semantics4.rs b/exercises/move_semantics/move_semantics4.rs
@@ -3,6 +3,8 @@
 // in `fn main`, we instead create it within `fn fill_vec` and transfer the
 // freshly created vector from fill_vec to its caller. Scroll for hints!
 
+// I AM NOT DONE
+
 fn main() {
     let vec0 = Vec::new();
 
diff --git a/exercises/primitive_types/primitive_types1.rs b/exercises/primitive_types/primitive_types1.rs
@@ -2,6 +2,8 @@
 // Fill in the rest of the line that has code missing!
 // No hints, there's no tricks, just get used to typing these :)
 
+// I AM NOT DONE
+
 fn main() {
     // Booleans (`bool`)
 
diff --git a/exercises/primitive_types/primitive_types2.rs b/exercises/primitive_types/primitive_types2.rs
@@ -2,6 +2,8 @@
 // Fill in the rest of the line that has code missing!
 // No hints, there's no tricks, just get used to typing these :)
 
+// I AM NOT DONE
+
 fn main() {
     // Characters (`char`)
 
diff --git a/exercises/primitive_types/primitive_types3.rs b/exercises/primitive_types/primitive_types3.rs
@@ -2,6 +2,8 @@
 // Create an array with at least 100 elements in it where the ??? is. 
 // Scroll down for hints!
 
+// I AM NOT DONE
+
 fn main() {
     let a = ???
 
diff --git a/exercises/primitive_types/primitive_types4.rs b/exercises/primitive_types/primitive_types4.rs
@@ -2,6 +2,8 @@
 // Get a slice out of Array a where the ??? is so that the `if` statement
 // returns true. Scroll down for hints!!
 
+// I AM NOT DONE
+
 #[test]
 fn main() {
     let a = [1, 2, 3, 4, 5];
diff --git a/exercises/primitive_types/primitive_types5.rs b/exercises/primitive_types/primitive_types5.rs
@@ -2,6 +2,8 @@
 // Destructure the `cat` tuple so that the println will work.
 // Scroll down for hints!
 
+// I AM NOT DONE
+
 fn main() {
     let cat = ("Furry McFurson", 3.5);
     let /* your pattern here */ = cat;
diff --git a/exercises/primitive_types/primitive_types6.rs b/exercises/primitive_types/primitive_types6.rs
@@ -3,6 +3,8 @@
 // You can put this right into the `println!` where the ??? is.
 // Scroll down for hints!
 
+// I AM NOT DONE
+
 fn main() {
     let numbers = (1, 2, 3);
     println!("The second number is {}", ???);
diff --git a/exercises/standard_library_types/arc1.rs b/exercises/standard_library_types/arc1.rs
@@ -4,6 +4,8 @@
 // somewhere. Try not to create any copies of the `numbers` Vec!
 // Scroll down for hints :)
 
+// I AM NOT DONE
+
 use std::sync::Arc;
 use std::thread;
 
diff --git a/exercises/standard_library_types/iterators2.rs b/exercises/standard_library_types/iterators2.rs
@@ -5,6 +5,8 @@
 // Step 3. Apply the `capitalize_first` function again to a list, but try and ensure it returns a single string
 // As always, there are hints below!
 
+// I AM NOT DONE
+
 pub fn capitalize_first(input: &str) -> String {
     let mut c = input.chars();
     match c.next() {
diff --git a/exercises/standard_library_types/iterators3.rs b/exercises/standard_library_types/iterators3.rs
@@ -8,6 +8,8 @@
 // a major hint.
 // Have fun :-)
 
+// I AM NOT DONE
+
 #[derive(Debug, PartialEq, Eq)]
 pub enum DivisionError {
     NotDivisible(NotDivisibleError),
diff --git a/exercises/standard_library_types/iterators4.rs b/exercises/standard_library_types/iterators4.rs
@@ -1,5 +1,7 @@
 // iterators4.rs
 
+// I AM NOT DONE
+
 pub fn factorial(num: u64) -> u64 {
     // Complete this function to return factorial of num
     // Do not use:
diff --git a/exercises/strings/strings1.rs b/exercises/strings/strings1.rs
@@ -1,6 +1,8 @@
 // strings1.rs
 // Make me compile without changing the function signature! Scroll down for hints :)
 
+// I AM NOT DONE
+
 fn main() {
     let answer = current_favorite_color();
     println!("My current favorite color is {}", answer);
diff --git a/exercises/strings/strings2.rs b/exercises/strings/strings2.rs
@@ -1,6 +1,8 @@
 // strings2.rs
 // Make me compile without changing the function signature! Scroll down for hints :)
 
+// I AM NOT DONE
+
 fn main() {
     let word = String::from("green"); // Try not changing this line :)
     if is_a_color_word(word) {
diff --git a/exercises/structs/structs1.rs b/exercises/structs/structs1.rs
@@ -1,6 +1,8 @@
 // structs1.rs
 // Address all the TODOs to make the tests pass!
 
+// I AM NOT DONE
+
 struct ColorClassicStruct {
     // TODO: Something goes here
 }
diff --git a/exercises/structs/structs2.rs b/exercises/structs/structs2.rs
@@ -2,6 +2,8 @@
 // Address all the TODOs to make the tests pass!
 // No hints, just do it!
 
+// I AM NOT DONE
+
 #[derive(Debug)]
 struct Order {
     name: String,
diff --git a/exercises/test1.rs b/exercises/test1.rs
diff --git a/exercises/test2.rs b/exercises/test2.rs
diff --git a/exercises/test3.rs b/exercises/test3.rs
diff --git a/exercises/test4.rs b/exercises/test4.rs
diff --git a/exercises/tests/tests1.rs b/exercises/tests/tests1.rs
diff --git a/exercises/tests/tests2.rs b/exercises/tests/tests2.rs
diff --git a/exercises/tests/tests3.rs b/exercises/tests/tests3.rs
diff --git a/exercises/threads/threads1.rs b/exercises/threads/threads1.rs
diff --git a/exercises/variables/variables1.rs b/exercises/variables/variables1.rs
diff --git a/exercises/variables/variables2.rs b/exercises/variables/variables2.rs
diff --git a/exercises/variables/variables3.rs b/exercises/variables/variables3.rs
diff --git a/exercises/variables/variables4.rs b/exercises/variables/variables4.rs
diff --git a/src/exercise.rs b/src/exercise.rs
diff --git a/src/main.rs b/src/main.rs
diff --git a/src/run.rs b/src/run.rs
diff --git a/src/verify.rs b/src/verify.rs
diff --git a/tests/fixture/state/finished_exercise.rs b/tests/fixture/state/finished_exercise.rs
diff --git a/tests/fixture/state/pending_exercise.rs b/tests/fixture/state/pending_exercise.rs
diff --git a/tests/integration_tests.rs b/tests/integration_tests.rs

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,8 @@`
`1`	`1`	`// enums3.rs`
`2`	`2`	`// Address all the TODOs to make the tests pass!`
`3`	`3`
	`4`	`+// I AM NOT DONE`
	`5`	`+`
`4`	`6`	`enum Message {`
`5`	`7`	`// TODO: implement the message variant types based on their usage below`
`6`	`8`	`}`