1.5.0

feat: Add enums exercises

Creates an exhaustive list of enum exercises. This goes through the basics of different ways to derive enums with mixed data type variants, as well as the use of the all important `match` operator.

CHANGELOG.md

@@ -1,3 +1,28 @@
+<a name="1.5.0"></a>
+## 1.5.0 (2019-11-09)
+
+#### Bug Fixes
+
+* **test1:** Rewrite logic ([79a56942](https://github.com/rust-lang/rustlings/commit/79a569422c8309cfc9e4aed25bf4ab3b3859996b))
+* **installation:**  Fix rustlings installation check ([7a252c47](https://github.com/rust-lang/rustlings/commit/7a252c475551486efb52f949b8af55803b700bc6))
+* **iterators:**  Rename iterator3.rs ([433d2115](https://github.com/rust-lang/rustlings/commit/433d2115bc1c04b6d34a335a18c9a8f3e2672bc6))
+* **iterators2:**  Remove syntax resulting in misleading error message ([4cde8664](https://github.com/rust-lang/rustlings/commit/4cde86643e12db162a66e62f23b78962986046ac))
+* **option1:**
+  *  Fix arguments passed to assert! macro (#222) ([4c2cf6da](https://github.com/rust-lang/rustlings/commit/4c2cf6da755efe02725e05ecc3a303304c10a6da))
+  *  Fix arguments passed to assert! macro ([ead4f7af](https://github.com/rust-lang/rustlings/commit/ead4f7af9e10e53418efdde5c359159347282afd))
+  *  Add test for prematurely passing exercise ([a750e4a1](https://github.com/rust-lang/rustlings/commit/a750e4a1a3006227292bb17d57d78ce84da6bfc6))
+* **primitive_types4:**  Fail on a slice covering the wrong area ([5b1e673c](https://github.com/rust-lang/rustlings/commit/5b1e673cec1658afc4ebbbc800213847804facf5))
+* **readme:**  http to https ([70946b85](https://github.com/rust-lang/rustlings/commit/70946b85e536e80e70ed9505cb650ca0a3a1fbb5))
+* **test1:**
+  *  Swap assertion parameter order ([4086d463](https://github.com/rust-lang/rustlings/commit/4086d463a981e81d97781851d17db2ced290f446))
+  *  renamed function name to snake case closes #180 ([89d5186c](https://github.com/rust-lang/rustlings/commit/89d5186c0dae8135ecabf90ee8bb35949bc2d29b))
+
+#### Features
+
+*   Add enums exercises ([dc150321](https://github.com/rust-lang/rustlings/commit/dc15032112fc485226a573a18139e5ce928b1755))
+*   Added exercise for struct update syntax ([1c4c8764](https://github.com/rust-lang/rustlings/commit/1c4c8764ed118740cd4cee73272ddc6cceb9d959))
+* **iterators2:**  adds iterators2 exercise including config ([9288fccf](https://github.com/rust-lang/rustlings/commit/9288fccf07a2c5043b76d0fd6491e4cf72d76031))
+
 <a name="1.4.1"></a>
 ### 1.4.1 (2019-08-13)
 

Cargo.lock

@@ -600,7 +600,7 @@ dependencies = [
 
 [[package]]
 name = "rustlings"
-version = "1.4.0"
+version = "1.4.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,7 +1,7 @@
 [package]
 name = "rustlings"
-version = "1.4.1"
-authors = ["Marisa <marisa@mokou.zone>", "Carol (Nichols || Goulding) <carol.nichols@gmail.com"]
+version = "1.5.0"
+authors = ["Marisa <mokou@posteo.de>", "Carol (Nichols || Goulding) <carol.nichols@gmail.com"]
 edition = "2018"
 
 [dependencies]

README.md

@@ -1,4 +1,4 @@
-![crab pet](https://i.imgur.com/LbZJgmm.gif) 
+![crab pet](https://i.imgur.com/LbZJgmm.gif)
 
 # rustlings 🦀❤️
 
@@ -31,6 +31,16 @@ curl -L https://git.io/rustlings | bash -s mypath/
 
 This will install Rustlings and give you access to the `rustlings` command. Run it to get started!
 
+## Windows
+
+You can run:
+
+```ps
+Invoke-WebRequest https://git.io/rustlings-win | Select-Object -ExpandProperty Content | Out-File $env:TMP/install_rustlings.ps1; Unblock-File $env:TMP/install_rustlings.ps1; Invoke-Expression $env:TMP/install_rustlings.ps1
+```
+
+To install Rustlings. Same as on MacOS/Linux, you will have access to the `rustlings` command after it.
+
 ## Manually
 
 Basically: Clone the repository, checkout to the latest tag, run `cargo install`.
@@ -38,17 +48,22 @@ 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.0.0 # or whatever the latest version is (find out at https://github.com/rust-lang/rustlings/releases/latest)
+git checkout tags/1.5.0 # or whatever the latest version is (find out at https://github.com/rust-lang/rustlings/releases/latest)
 cargo install --force --path .
 ```
 
-Same as above, run `rustlings` to get started.
+If there are installation errors, ensure that your toolchain is up to date. For the latest, run:
+```bash
+rustup update
+```
+
+Then, same as above, run `rustlings` to get started.
 
 ## Doing exercises
 
-The exercises are sorted by topic and can be found in the subdirectory `rustlings/exercises/<topic>`. For every topic there is an additional README file with some resources to get you started on the topic. We really recommend that you have a look at them before you start. 
+The exercises are sorted by topic and can be found in the subdirectory `rustlings/exercises/<topic>`. For every topic there is an additional README file with some resources to get you started on the topic. We really recommend that you have a look at them before you start.
 
-The task is simple. Most exercises contain an error that keep it from compiling, and it's up to you to fix it! Some exercises are also ran as tests, but rustlings handles them all the same. To run the exercises in the recommended order, execute:
+The task is simple. Most exercises contain an error that keep it from compiling, and it's up to you to fix it! Some exercises are also run as tests, but rustlings handles them all the same. To run the exercises in the recommended order, execute:
 
 ```bash
 rustlings watch

exercises/enums/README.md

@@ -0,0 +1,7 @@
+### Enums
+
+Rust allows you to define a type called `enums` which allow you to enumerate possible values. In combination with enums, we have the concept of `pattern matching` in Rust, which makes it easy to run different code for different values of an enumeration. Enums, while available in many languages, Rust's enums are most similar to `algebraic data types` in functional languages, such as F#, OCaml, and Haskell.
+
+#### Book Sections
+
+- [Enums](https://doc.rust-lang.org/book/ch06-00-enums.html)

exercises/enums/enums1.rs

@@ -0,0 +1,42 @@
+// enums1.rs
+// Make me compile! Scroll down for hints!
+
+#[derive(Debug)]
+enum Message {
+    // TODO: define a few types of messages as used below
+}
+
+fn main() {
+    println!("{:?}", Message::Quit);
+    println!("{:?}", Message::Echo);
+    println!("{:?}", Message::Move);
+    println!("{:?}", Message::ChangeColor);
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+// Hint: The declaration of the enumeration type has not been defined yet.

exercises/enums/enums2.rs

@@ -0,0 +1,61 @@
+// enums2.rs
+// Make me compile! Scroll down for hints
+
+#[derive(Debug)]
+enum Message {
+    // TODO: define the different variants used below
+}
+
+impl Message {
+    fn call(&self) {
+        println!("{:?}", &self);
+    }
+}
+
+fn main() {
+    let messages = [
+        Message::Move{ x: 10, y: 30 },
+        Message::Echo(String::from("hello world")),
+        Message::ChangeColor(200, 255, 255),
+        Message::Quit
+    ];
+
+    for message in &messages {
+        message.call();
+    }
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+// Hint: you can create enumerations that have different variants with different types
+// such as no data, anonymous structs, a single string, tuples, ...etc

exercises/enums/enums3.rs

@@ -0,0 +1,63 @@
+// enums3.rs
+// Address all the TODOs to make the tests pass!
+
+enum Message {
+    // TODO: implement the message variant types based on their usage below
+}
+
+struct Point {
+    x: u8,
+    y: u8
+}
+
+struct State {
+    color: (u8, u8, u8),
+    position: Point,
+    quit: bool
+}
+
+impl State {
+    fn change_color(&mut self, color: (u8, u8, u8)) {
+        self.color = color;
+    }
+
+    fn quit(&mut self) {
+        self.quit = true;
+    }
+
+    fn echo(&self, s: String) {
+        println!("{}", s);
+    }
+
+    fn move_position(&mut self, p: Point) {
+        self.position = p;
+    }
+
+    fn process(&mut self, message: Message) {
+        // TODO: create a match expression to process the different message variants
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_match_message_call() {
+        let mut state = State{
+            quit: false,
+            position: Point{ x: 0, y: 0 },
+            color: (0, 0, 0)
+        };
+        state.process(Message::ChangeColor(255, 0, 255));
+        state.process(Message::Echo(String::from("hello world")));
+        state.process(Message::Move{ x: 10, y: 15 });
+        state.process(Message::Quit);
+
+        assert_eq!(state.color, (255, 0, 255));
+        assert_eq!(state.position.x, 10);
+        assert_eq!(state.position.y, 15);
+        assert_eq!(state.quit, true);
+    }
+
+}

exercises/error_handling/errorsn.rs

@@ -20,7 +20,7 @@ use std::fmt;
 use std::io;
 
 // PositiveNonzeroInteger is a struct defined below the tests.
-fn read_and_validate(b: &mut io::BufRead) -> Result<PositiveNonzeroInteger, ???> {
+fn read_and_validate(b: &mut dyn io::BufRead) -> Result<PositiveNonzeroInteger, ???> {
     let mut line = String::new();
     b.read_line(&mut line);
     let num: i64 = line.trim().parse();
@@ -29,7 +29,7 @@ fn read_and_validate(b: &mut io::BufRead) -> Result<PositiveNonzeroInteger, ???>
 }
 
 // This is a test helper function that turns a &str into a BufReader.
-fn test_with_str(s: &str) -> Result<PositiveNonzeroInteger, Box<error::Error>> {
+fn test_with_str(s: &str) -> Result<PositiveNonzeroInteger, Box<dyn error::Error>> {
     let mut b = io::BufReader::new(s.as_bytes());
     read_and_validate(&mut b)
 }
@@ -98,7 +98,7 @@ enum CreationError {
 
 impl fmt::Display for CreationError {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        f.write_str((self as &error::Error).description())
+        f.write_str((self as &dyn error::Error).description())
     }
 }
 
@@ -190,7 +190,7 @@ impl error::Error for CreationError {
 
 
 // Another hint: under the hood, the `?` operator calls `From::from`
-// on the error value to convert it to a boxed trait object, a Box<error::Error>,
+// on the error value to convert it to a boxed trait object, a Box<dyn error::Error>,
 // which is polymorphic-- that means that lots of different kinds of errors
 // can be returned from the same function because all errors act the same
 // since they all implement the `error::Error` trait.

exercises/error_handling/option1.rs

@@ -24,7 +24,7 @@ mod tests {
 
     #[test]
     fn should_not_panic() {
-        assert!(pop_too_much(), true);
+        assert!(pop_too_much());
     }
 }
 

exercises/primitive_types/README.md

@@ -6,3 +6,4 @@ compiler. In this section, we'll go through the most important ones.
 #### Book Sections
 
 - [Data Types](https://doc.rust-lang.org/stable/book/ch03-02-data-types.html)
+- [The Slice Type](https://doc.rust-lang.org/stable/book/ch04-03-slices.html)

exercises/primitive_types/primitive_types4.rs

@@ -2,16 +2,13 @@
 // Get a slice out of Array a where the ??? is so that the `if` statement
 // returns true. Scroll down for hints!!
 
+#[test]
 fn main() {
     let a = [1, 2, 3, 4, 5];
 
     let nice_slice = ???
 
-    if nice_slice == [2, 3, 4] {
-        println!("Nice slice!");
-    } else {
-        println!("Not quite what I was expecting... I see: {:?}", nice_slice);
-    }
+    assert_eq!([2, 3, 4], nice_slice)
 }
 
 
@@ -33,6 +30,28 @@ fn main() {
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 
 

exercises/structs/structs2.rs

@@ -0,0 +1,45 @@
+// structs2.rs
+// Address all the TODOs to make the tests pass!
+// No hints, just do it!
+
+#[derive(Debug)]
+struct Order {
+    name: String,
+    year: u32,
+    made_by_phone: bool,
+    made_by_mobile: bool,
+    made_by_email: bool,
+    item_number: u32,
+    count: u32,
+}
+
+fn create_order_template() -> Order {
+    Order {
+        name: String::from("Bob"),
+        year: 2019,
+        made_by_phone: false,
+        made_by_mobile: false,
+        made_by_email: true,
+        item_number: 123,
+        count: 0,
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn your_order() {
+        let order_template = create_order_template();
+        // TODO: Create your own order using the update syntax and template above!
+        // let your_order =
+        assert_eq!(your_order.name, "Hacker in Rust");
+        assert_eq!(your_order.year, order_template.year);
+        assert_eq!(your_order.made_by_phone, order_template.made_by_phone);
+        assert_eq!(your_order.made_by_mobile, order_template.made_by_mobile);
+        assert_eq!(your_order.made_by_email, order_template.made_by_email);
+        assert_eq!(your_order.item_number, order_template.item_number);
+        assert_eq!(your_order.count, 1);
+    }
+}

exercises/test1.rs

@@ -13,9 +13,9 @@
 // Don't modify this function!
 #[test]
 fn verify_test() {
-    let price1 = calculate_price(55);
-    let price2 = calculate_price(40);
+    let price1 = calculate_apple_price(35);
+    let price2 = calculate_apple_price(65);
 
-    assert_eq!(55, price1);
-    assert_eq!(80, price2);
+    assert_eq!(70, price1);
+    assert_eq!(65, price2);
 }

info.toml

@@ -66,7 +66,7 @@ mode = "compile"
 
 [[exercises]]
 path = "exercises/primitive_types/primitive_types4.rs"
-mode = "compile"
+mode = "test"
 
 [[exercises]]
 path = "exercises/primitive_types/primitive_types5.rs"
@@ -82,6 +82,24 @@ mode = "compile"
 path = "exercises/structs/structs1.rs"
 mode = "test"
 
+[[exercises]]
+path = "exercises/structs/structs2.rs"
+mode = "test"
+
+# ENUMS
+
+[[exercises]]
+path = "exercises/enums/enums1.rs"
+mode = "compile"
+
+[[exercises]]
+path = "exercises/enums/enums2.rs"
+mode = "compile"
+
+[[exercises]]
+path = "exercises/enums/enums3.rs"
+mode = "test"
+
 # TESTS
 
 [[exercises]]

install.ps1

@@ -0,0 +1,85 @@
+#!/usr/bin/env pwsh
+
+#Requires -Version 5
+param($path = "$pwd/rustlings")
+
+Write-Host "Let's get you set up with Rustlings!"
+
+Write-Host "Checking requirements..."
+if (Get-Command git -ErrorAction SilentlyContinue) {
+    Write-Host "SUCCESS: Git is installed"
+} else {
+    Write-Host "WARNING: Git does not seem to be installed."
+    Write-Host "Please download Git using your package manager or over https://git-scm.com/!"
+    exit 1
+}
+
+if (Get-Command rustc -ErrorAction SilentlyContinue) {
+    Write-Host "SUCCESS:  Rust is installed"
+} else {
+    Write-Host "WARNING: Rust does not seem to be installed."
+    Write-Host "Please download Rust using https://rustup.rs!"
+    exit 1
+}
+
+if (Get-Command cargo -ErrorAction SilentlyContinue) {
+    Write-Host "SUCCESS: Cargo is installed"
+} else {
+    Write-Host "WARNING: Cargo does not seem to be installed."
+    Write-Host "Please download Rust and Cargo using https://rustup.rs!"
+    exit 1
+}
+
+# Function that compares two versions strings v1 and v2 given in arguments (e.g 1.31 and 1.33.0).
+# Returns 1 if v1 > v2, 0 if v1 == v2, 2 if v1 < v2.
+function vercomp($v1, $v2) {
+    if ($v1 -eq $v2) {
+       return 0
+    } 
+
+    $v1 = $v1.Replace(".", "0")
+    $v2 = $v2.Replace(".", "0")
+    if ($v1.Length -gt $v2.Length) {
+        $v2 = $v2.PadRight($v1.Length, "0")
+    } else {
+        $v1 = $v1.PadRight($v2.Length, "0")
+    }
+
+    if ($v1 -gt $v2) {
+        return 1
+    } else {
+        return 2
+    }
+}
+
+$rustVersion = $(rustc --version).Split(" ")[1]
+$minRustVersion = "1.31"
+if ((vercomp $rustVersion $minRustVersion) -eq 2) {
+    Write-Host "WARNING: Rust version is too old: $rustVersion - needs at least $minRustVersion"
+    Write-Host "Please update Rust with 'rustup update'"
+    exit 1
+} else {
+    Write-Host "SUCCESS: Rust is up to date"
+}
+
+Write-Host "Cloning Rustlings at $path"
+git clone -q https://github.com/rust-lang/rustlings $path
+if (!($LASTEXITCODE -eq 0)) {
+    exit 1
+}
+
+# UseBasicParsing is deprecated, pwsh 6 or above will automatically use it,
+# but anyone running pwsh 5 will have to pass the argument.
+$version = Invoke-WebRequest -UseBasicParsing https://api.github.com/repos/rust-lang/rustlings/releases/latest `
+    | ConvertFrom-Json | Select-Object -ExpandProperty tag_name
+Write-Host "Checking out version $version..."
+Set-Location $path
+git checkout -q tags/$version
+
+Write-Host "Installing the 'rustlings' executable..."
+cargo install --force --path .
+if (!(Get-Command rustlings -ErrorAction SilentlyContinue)) {
+    Write-Host "WARNING: Please check that you have '~/.cargo/bin' in your PATH environment variable!"
+}
+
+Write-Host "All done! Run 'rustlings' to get started."

src/main.rs

@@ -80,6 +80,9 @@ 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();
     }
 

src/verify.rs

@@ -19,11 +19,7 @@ fn compile_only(exercise: &Exercise) -> Result<(), ()> {
     let compile_output = exercise.compile();
     progress_bar.finish_and_clear();
     if compile_output.status.success() {
-        let formatstr = format!(
-            "{} Successfully compiled {}!",
-            Emoji("✅", "✓"),
-            exercise
-        );
+        let formatstr = format!("{} Successfully compiled {}!", Emoji("✅", "✓"), exercise);
         println!("{}", style(formatstr).green());
         exercise.clean();
         Ok(())