1.5.1

Closes #205.

CHANGELOG.md

@@ -1,3 +1,15 @@
+<a name="1.5.1"></a>
+### 1.5.1 (2019-11-11)
+
+#### Bug Fixes
+
+* **errors3:**  Update hint ([dcfb427b](https://github.com/rust-lang/rustlings/commit/dcfb427b09585f0193f0a294443fdf99f11c64cb), closes [#185](https://github.com/rust-lang/rustlings/issues/185))
+* **if1:**  Remove `return` reference ([ad03d180](https://github.com/rust-lang/rustlings/commit/ad03d180c9311c0093e56a3531eec1a9a70cdb45))
+* **strings:**  Move Strings before Structs ([6dcecb38](https://github.com/rust-lang/rustlings/commit/6dcecb38a4435593beb87c8e12d6314143631482), closes [#204](https://github.com/rust-lang/rustlings/issues/204))
+* **structs1:**  Remove misleading comment ([f72e5a8f](https://github.com/rust-lang/rustlings/commit/f72e5a8f05568dde04eaeac10b9a69872f21cb37))
+* **threads:**  Move Threads behind SLT ([fbe91a67](https://github.com/rust-lang/rustlings/commit/fbe91a67a482bfe64cbcdd58d06ba830a0f39da3), closes [#205](https://github.com/rust-lang/rustlings/issues/205))
+* **watch:** clear screen before each `verify()`  ([3aff590](https://github.com/rust-lang/rustlings/commit/3aff59085586c24196a547c2693adbdcf4432648))
+
 <a name="1.5.0"></a>
 ## 1.5.0 (2019-11-09)
 

Cargo.lock

@@ -600,7 +600,7 @@ dependencies = [
 
 [[package]]
 name = "rustlings"
-version = "1.4.1"
+version = "1.5.1"
 dependencies = [
  "assert_cmd 0.11.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)",

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "rustlings"
-version = "1.5.0"
+version = "1.5.1"
 authors = ["Marisa <mokou@posteo.de>", "Carol (Nichols || Goulding) <carol.nichols@gmail.com"]
 edition = "2018"
 

README.md

@@ -48,7 +48,7 @@ Basically: Clone the repository, checkout to the latest tag, run `cargo install`
 ```bash
 git clone https://github.com/rust-lang/rustlings
 cd rustlings
-git checkout tags/1.5.0 # or whatever the latest version is (find out at https://github.com/rust-lang/rustlings/releases/latest)
+git checkout tags/1.5.1 # or whatever the latest version is (find out at https://github.com/rust-lang/rustlings/releases/latest)
 cargo install --force --path .
 ```
 

exercises/error_handling/errors3.rs

@@ -1,8 +1,7 @@
 // errors3.rs
 // This is a program that is trying to use a completed version of the
-// `total_cost` function from the previous exercise. It's not working though--
-// we can't use the `?` operator in the `main()` function! Why not?
-// What should we do instead? Scroll for hints!
+// `total_cost` function from the previous exercise. It's not working though!
+// Why not? What should we do to fix it? Scroll for hints!
 
 use std::num::ParseIntError;
 
@@ -45,18 +44,4 @@ pub fn total_cost(item_quantity: &str) -> Result<i32, ParseIntError> {
 
 
 
-// Since the `?` operator returns an `Err` early if the thing it's trying to
-// do fails, you can only use the `?` operator in functions that have a
-// `Result` as their return type.
-
-// Hence the error that you get if you run this code is:
-
-// ```
-// error[E0277]: the `?` operator can only be used in a function that returns `Result` (or another type that implements `std::ops::Try`)
-// ```
-
-// So we have to use another way of handling a `Result` within `main`.
-
-// Decide what we should do if `pretend_user_input` has a string value that does
-// not parse to an integer, and implement that instead of using the `?`
-// operator.
+// If other functions can return a `Result`, why shouldn't `main`?

exercises/if/if1.rs

@@ -3,7 +3,6 @@
 pub fn bigger(a: i32, b: i32) -> i32 {
     // Complete this function to return the bigger number!
     // Do not use:
-    // - return
     // - another function call
     // - additional variables
     // Scroll down for hints.

exercises/structs/structs1.rs

@@ -26,7 +26,6 @@ mod tests {
     #[test]
     fn tuple_structs() {
         // TODO: Instantiate a tuple struct!
-        // For more fun, use the field initialization shorthand.
         // let green =
 
         assert_eq!(green.0, "green");

exercises/test2.rs

@@ -1,27 +1,28 @@
 // test2.rs
 // This is a test for the following sections:
-// - Tests
+// - Strings
 
-// This test isn't testing our function -- make it do that in such a way that
-// the test passes. Then write a second test that tests that we get the result
-// we expect to get when we call `times_two` with a negative number.
-// No hints, you can do this :)
+// Ok, here are a bunch of values-- some are `Strings`, some are `&strs`. Your
+// task is to call one of these two functions on each value depending on what
+// you think each value is. That is, add either `string_slice` or `string`
+// before the parentheses on each line. If you're right, it will compile!
 
-pub fn times_two(num: i32) -> i32 {
-    num * 2
+fn string_slice(arg: &str) {
+    println!("{}", arg);
+}
+fn string(arg: String) {
+    println!("{}", arg);
 }
 
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn returns_twice_of_positive_numbers() {
-        assert_eq!(times_two(4), ???);
-    }
-
-    #[test]
-    fn returns_twice_of_negative_numbers() {
-        // TODO write an assert for `times_two(-4)`
-    }
+fn main() {
+    ("blue");
+    ("red".to_string());
+    (String::from("hi"));
+    ("rust is fun!".to_owned());
+    ("nice weather".into());
+    (format!("Interpolation {}", "Station"));
+    (&String::from("abc")[0..1]);
+    ("  hello there ".trim());
+    ("Happy Monday!".to_string().replace("Mon", "Tues"));
+    ("mY sHiFt KeY iS sTiCkY".to_lowercase());
 }

exercises/test3.rs

@@ -1,28 +1,27 @@
-// strings3.rs
+// test3.rs
 // This is a test for the following sections:
-// - Strings
+// - Tests
 
-// Ok, here are a bunch of values-- some are `Strings`, some are `&strs`. Your
-// task is to call one of these two functions on each value depending on what
-// you think each value is. That is, add either `string_slice` or `string`
-// before the parentheses on each line. If you're right, it will compile!
+// This test isn't testing our function -- make it do that in such a way that
+// the test passes. Then write a second test that tests that we get the result
+// we expect to get when we call `times_two` with a negative number.
+// No hints, you can do this :)
 
-fn string_slice(arg: &str) {
-    println!("{}", arg);
-}
-fn string(arg: String) {
-    println!("{}", arg);
+pub fn times_two(num: i32) -> i32 {
+    num * 2
 }
 
-fn main() {
-    ("blue");
-    ("red".to_string());
-    (String::from("hi"));
-    ("rust is fun!".to_owned());
-    ("nice weather".into());
-    (format!("Interpolation {}", "Station"));
-    (&String::from("abc")[0..1]);
-    ("  hello there ".trim());
-    ("Happy Monday!".to_string().replace("Mon", "Tues"));
-    ("mY sHiFt KeY iS sTiCkY".to_lowercase());
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn returns_twice_of_positive_numbers() {
+        assert_eq!(times_two(4), ???);
+    }
+
+    #[test]
+    fn returns_twice_of_negative_numbers() {
+        // TODO write an assert for `times_two(-4)`
+    }
 }

info.toml

@@ -86,6 +86,22 @@ mode = "test"
 path = "exercises/structs/structs2.rs"
 mode = "test"
 
+# STRINGS
+
+[[exercises]]
+path = "exercises/strings/strings1.rs"
+mode = "compile"
+
+[[exercises]]
+path = "exercises/strings/strings2.rs"
+mode = "compile"
+
+# TEST 2
+
+[[exercises]]
+path = "exercises/test2.rs"
+mode = "compile"
+
 # ENUMS
 
 [[exercises]]
@@ -114,27 +130,11 @@ mode = "test"
 path = "exercises/tests/tests3.rs"
 mode = "test"
 
-# TEST 2
-
-[[exercises]]
-path = "exercises/test2.rs"
-mode = "test"
-
-# STRINGS
-
-[[exercises]]
-path = "exercises/strings/strings1.rs"
-mode = "compile"
-
-[[exercises]]
-path = "exercises/strings/strings2.rs"
-mode = "compile"
-
 # TEST 3
 
 [[exercises]]
 path = "exercises/test3.rs"
-mode = "compile"
+mode = "test"
 
 # MODULES
 
@@ -216,12 +216,6 @@ mode = "test"
 path = "exercises/error_handling/result1.rs"
 mode = "test"
 
-# THREADS
-
-[[exercises]]
-path = "exercises/threads/threads1.rs"
-mode = "compile"
-
 # STANDARD LIBRARY TYPES
 
 [[exercises]]
@@ -239,3 +233,9 @@ mode = "test"
 [[exercises]]
 path = "exercises/standard_library_types/iterators4.rs"
 mode = "test"
+
+# THREADS
+
+[[exercises]]
+path = "exercises/threads/threads1.rs"
+mode = "compile"

src/main.rs

@@ -80,9 +80,6 @@ fn main() {
     }
 
     if matches.subcommand_matches("watch").is_some() {
-        /* Clears the terminal with an ANSI escape code.
-           Works in UNIX and newer Windows terminals. */
-        println!("\x1Bc");
         watch(&exercises).unwrap();
     }
 
@@ -93,11 +90,18 @@ fn main() {
 }
 
 fn watch(exercises: &[Exercise]) -> notify::Result<()> {
+    /* Clears the terminal with an ANSI escape code.
+    Works in UNIX and newer Windows terminals. */
+    fn clear_screen() {
+        println!("\x1Bc");
+    }
+
     let (tx, rx) = channel();
 
     let mut watcher: RecommendedWatcher = Watcher::new(tx, Duration::from_secs(2))?;
     watcher.watch(Path::new("./exercises"), RecursiveMode::Recursive)?;
 
+    clear_screen();
     let _ignored = verify(exercises.iter());
 
     loop {
@@ -105,11 +109,11 @@ fn watch(exercises: &[Exercise]) -> notify::Result<()> {
             Ok(event) => match event {
                 DebouncedEvent::Create(b) | DebouncedEvent::Chmod(b) | DebouncedEvent::Write(b) => {
                     if b.extension() == Some(OsStr::new("rs")) && b.exists() {
-                        println!("----------**********----------\n");
                         let filepath = b.as_path().canonicalize().unwrap();
                         let exercise = exercises
                             .iter()
                             .skip_while(|e| !filepath.ends_with(&e.path));
+                        clear_screen();
                         let _ignored = verify(exercise);
                     }
                 }