Merge pull request #6 from stefandisch/master

[rust-101.git] / workspace / src / part00.rs

diff --git a/workspace/src/part00.rs b/workspace/src/part00.rs
index 2998b20ddfd6ef822c19d77ea37e3953008967b5..9144eaedbc3860c3af73893e9e87b31a05bd8629 100644 (file)
--- a/workspace/src/part00.rs
+++ b/workspace/src/part00.rs
@@ -1,5 +1,3 @@
-// ***Remember to enable/add this part in `main.rs`!***
-

 // Rust-101, Part 00: Algebraic datatypes
 // ======================================
 
 // Rust-101, Part 00: Algebraic datatypes
 // ======================================
 


@@ -17,10 +15,9 @@ enum NumberOrNothing {
 fn vec_min(vec: Vec<i32>) -> NumberOrNothing {
     let mut min = NumberOrNothing::Nothing;
 
 fn vec_min(vec: Vec<i32>) -> NumberOrNothing {
     let mut min = NumberOrNothing::Nothing;
 

-    // Now we want to *iterate* over the list. Rust has some nice syntax for
-    // iterators:
+    // Now we want to *iterate* over the list. Rust has some nice syntax for iterators:

     for el in vec {
     for el in vec {

-        // So `el` is al element of the list. We need to update `min` accordingly, but how do we get the current
+        // So `el` is an element of the list. We need to update `min` accordingly, but how do we get the current

         // number in there? This is what pattern matching can do:
         match min {
             // In this case (*arm*) of the `match`, `min` is currently nothing, so let's just make it the number `el`.
         // number in there? This is what pattern matching can do:
         match min {
             // In this case (*arm*) of the `match`, `min` is currently nothing, so let's just make it the number `el`.


@@ -51,7 +48,7 @@ fn min_i32(a: i32, b: i32) -> i32 {
 
 // Indeed, we can: The following line tells Rust to take
 // the constructors of `NumberOrNothing` into the local namespace.
 
 // Indeed, we can: The following line tells Rust to take
 // the constructors of `NumberOrNothing` into the local namespace.

-// Try moving that above the function, and removing all the occurrences `NumberOrNothing::`.
+// Try moving that above the function, and removing all the occurrences of `NumberOrNothing::`.

 use self::NumberOrNothing::{Number,Nothing};
 
 // To call this function, we now just need a list. Of course, ultimately we want to ask the user for
 use self::NumberOrNothing::{Number,Nothing};
 
 // To call this function, we now just need a list. Of course, ultimately we want to ask the user for


@@ -61,10 +58,7 @@ fn read_vec() -> Vec<i32> {
     unimplemented!()
 }
 
     unimplemented!()
 }
 

-// Finally, let's call our functions and run the code!
-// But, wait, we would like to actually see something, so we need to print the result.
-// Of course Rust can print numbers, but after calling `vec_min`, we have a `NumberOrNothing`.
-// So let's write a small helper function that prints such values.
+// Of course, we would also like to actually see the result of the computation, so we need to print the result.

 
 fn print_number_or_nothing(n: NumberOrNothing) {
     unimplemented!()
 
 fn print_number_or_nothing(n: NumberOrNothing) {
     unimplemented!()


@@ -77,7 +71,6 @@ pub fn main() {
     print_number_or_nothing(min);
 }
 
     print_number_or_nothing(min);
 }
 

-// You can now use `cargo build` to compile your code. If all goes well, try `cargo run` on the
-// console to run it.
+// Finally, try `cargo run` on the console to run it.