This is no longer work-in-progress

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

diff --git a/src/part00.rs b/src/part00.rs
index 2bc40d99b29c230222088ade013669c968ec747f..6469907e91203f62f856a8a8e25c229c9b7a41c1 100644 (file)
--- a/src/part00.rs
+++ b/src/part00.rs
@@ -35,8 +35,7 @@ fn vec_min(vec: Vec<i32>) -> NumberOrNothing {
     //@ immutable per default, and you need to tell Rust if you want
     //@ to change a variable later.
 
     //@ immutable per default, and you need to tell Rust if you want
     //@ to change a variable later.
 

-    // 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 {
         // So `el` is al 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:
     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
         // number in there? This is what pattern matching can do:


@@ -45,8 +44,8 @@ fn vec_min(vec: Vec<i32>) -> NumberOrNothing {
             NumberOrNothing::Nothing => {
                 min = NumberOrNothing::Number(el);                  /*@*/
             },
             NumberOrNothing::Nothing => {
                 min = NumberOrNothing::Number(el);                  /*@*/
             },

-            // In this arm, `min` is currently the number `n`, so let's compute the new minimum and store it. We will write
-            // the function `min_i32` just after we completed this one.
+            // In this arm, `min` is currently the number `n`, so let's compute the new minimum and store it.
+            //@ We will write the function `min_i32` just after we completed this one.

             NumberOrNothing::Number(n) => {
                 let new_min = min_i32(n, el);                       /*@*/
                 min = NumberOrNothing::Number(new_min);             /*@*/
             NumberOrNothing::Number(n) => {
                 let new_min = min_i32(n, el);                       /*@*/
                 min = NumberOrNothing::Number(new_min);             /*@*/


@@ -77,25 +76,24 @@ 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
 // a list of numbers, but for now, let's just hard-code something.
 
 // To call this function, we now just need a list. Of course, ultimately we want to ask the user for
 // a list of numbers, but for now, let's just hard-code something.
 

-// `vec!` is a *macro* (as you can tell from the `!`) that constructs a constant `Vec<_>` with the given
-// elements.
+//@ `vec!` is a *macro* (as you can tell from the `!`) that constructs a constant `Vec<_>` with the given
+//@ elements.

 fn read_vec() -> Vec<i32> {
 fn read_vec() -> Vec<i32> {

-    vec![18,5,7,1,9,27]
+    vec![18,5,7,1,9,27]                                             /*@*/

 }
 
 }
 

-// 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.
+//@ 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.

 
 //@ `println!` is again a macro, where the first argument is a *format string*. For
 //@ now, you just need to know that `{}` is the placeholder for a value, and that Rust
 //@ will check at compile-time that you supplied the right number of arguments.
 fn print_number_or_nothing(n: NumberOrNothing) {
 
 //@ `println!` is again a macro, where the first argument is a *format string*. For
 //@ now, you just need to know that `{}` is the placeholder for a value, and that Rust
 //@ will check at compile-time that you supplied the right number of arguments.
 fn print_number_or_nothing(n: NumberOrNothing) {

-    match n {
-        Nothing => println!("The number is: <nothing>"),
-        Number(n) => println!("The number is: {}", n),
-    };
+    match n {                                                       /*@*/
+        Nothing => println!("The number is: <nothing>"),            /*@*/
+        Number(n) => println!("The number is: {}", n),              /*@*/
+    };                                                              /*@*/

 }
 
 // Putting it all together:
 }
 
 // Putting it all together:


@@ -105,10 +103,12 @@ pub fn main() {
     print_number_or_nothing(min);
 }
 
     print_number_or_nothing(min);
 }
 

-// Now try `cargo run` on the console to run above code.
+//@ You can now use `cargo build` to compile your *crate*. That's Rust's name for a *compilation unit*, which in
+//@ the case of Rust means an application or a library. <br/>
+// Finally, try `cargo run` on the console to run it.

 
 //@ Yay, it said "1"! That's actually the right answer. Okay, we could have
 //@ computed that ourselves, but that's besides the point. More importantly:
 //@ You completed the first part of the course.
 
 
 //@ Yay, it said "1"! That's actually the right answer. Okay, we could have
 //@ computed that ourselves, but that's besides the point. More importantly:
 //@ You completed the first part of the course.
 

-// [index](main.html) | previous | [next](part01.html)
+//@ [index](main.html) | previous | [next](part01.html)