tune and tweak: part 05-07

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

diff --git a/src/part01.rs b/src/part01.rs
index d046a1b70330f7769276a94abe9e488591a7be80..dc97d8dbc1d957e29c5009207809523c0ea3d793 100644 (file)
--- a/src/part01.rs
+++ b/src/part01.rs
@@ -9,6 +9,7 @@ use std;
 // terms you write down are not just *statements* (executing code), but *expressions*
 // (returning a value). This applies even to the body of entire functions!
 
 // terms you write down are not just *statements* (executing code), but *expressions*
 // (returning a value). This applies even to the body of entire functions!
 

+// ## Expression-based programming

 // For example, consider `sqr`:
 fn sqr(i: i32) -> i32 { i * i }
 // Between the curly braces, we are giving the *expression* that computes the return value.
 // For example, consider `sqr`:
 fn sqr(i: i32) -> i32 { i * i }
 // Between the curly braces, we are giving the *expression* that computes the return value.


@@ -55,6 +56,7 @@ fn vec_min(v: Vec<i32>) -> NumberOrNothing {
 // Now that's already much shorter! Make sure you can go over the code above and actually understand
 // every step of what's going on.
 
 // Now that's already much shorter! Make sure you can go over the code above and actually understand
 // every step of what's going on.
 

+// ## Inherent implementations

 // So much for `vec_min`. Let us now reconsider `print_number_or_nothing`. That function
 // really belongs pretty close to the type `NumberOrNothing`. In C++ or Java, you would
 // probably make it a method of the type. In Rust, we can achieve something very similar
 // So much for `vec_min`. Let us now reconsider `print_number_or_nothing`. That function
 // really belongs pretty close to the type `NumberOrNothing`. In C++ or Java, you would
 // probably make it a method of the type. In Rust, we can achieve something very similar


@@ -79,7 +81,7 @@ impl NumberOrNothing {
 fn read_vec() -> Vec<i32> {
     vec![18,5,7,2,9,27]
 }
 fn read_vec() -> Vec<i32> {
     vec![18,5,7,2,9,27]
 }

-pub fn part_main() {
+pub fn main() {

     let vec = read_vec();
     let min = vec_min(vec);
     min.print();
     let vec = read_vec();
     let min = vec_min(vec);
     min.print();


@@ -87,7 +89,7 @@ pub fn part_main() {
 // You will have to replace `part00` by `part01` in the `main` function in
 // `main.rs` to run this code.
 
 // You will have to replace `part00` by `part01` in the `main` function in
 // `main.rs` to run this code.
 

-// **Exercise**: Write a funtion `vec_avg` that computes the average value of a `Vec<i32>`.
+// **Exercise 01.1**: Write a funtion `vec_avg` that computes the average value of a `Vec<i32>`.

 // 
 // *Hint*: `vec.len()` returns the length of a vector `vec`.
 
 // 
 // *Hint*: `vec.len()` returns the length of a vector `vec`.