*sigh* go back to pycco... for now...

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

diff --git a/src/part01.rs b/src/part01.rs
index 36e15d0245941e07de68de0332ec12b823b5ae37..927a61782451c8f6cd5d73cdd552c0efc5cd9ed4 100644 (file)
--- a/src/part01.rs
+++ b/src/part01.rs
@@ -1,4 +1,4 @@
-// Rust-101, Part 00: Expressions, Inherent methods
+// Rust-101, Part 01: Expressions, Inherent methods

 // ================================================
 
 use std;
 // ================================================
 
 use std;


@@ -42,10 +42,11 @@ fn number_or_default(n: NumberOrNothing, default: i32) -> i32 {
 fn vec_min(v: &Vec<i32>) -> NumberOrNothing {
     let mut min = Nothing;
     for e in v {
 fn vec_min(v: &Vec<i32>) -> NumberOrNothing {
     let mut min = Nothing;
     for e in v {

+        // Now that `v` is just a reference, the same goes for `e`, so we have to dereference the pointer.

         let e = *e;
         // Notice that all we do here is compute a new value for `min`, and that it will always end
         // up being a `Number` rather than `Nothing`. In Rust, the structure of the code
         let e = *e;
         // Notice that all we do here is compute a new value for `min`, and that it will always end
         // up being a `Number` rather than `Nothing`. In Rust, the structure of the code

-        // can express this uniformity as follows:
+        // can express this uniformity.

         min = Number(match min {
             Nothing => e,
             Number(n) => std::cmp::min(n, e)
         min = Number(match min {
             Nothing => e,
             Number(n) => std::cmp::min(n, e)


@@ -63,7 +64,7 @@ fn vec_min(v: &Vec<i32>) -> NumberOrNothing {
 // 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

-// by providing an *inherent implementation* as follows:
+// by providing an *inherent implementation*.

 impl NumberOrNothing {
     fn print(self) {
         match self {
 impl NumberOrNothing {
     fn print(self) {
         match self {


@@ -77,7 +78,7 @@ impl NumberOrNothing {
 // is independent of the definition of the type. `self` is like `this` in other
 // languages, and its type is always implicit. So `print` is now a method that
 // takes as first argument a `NumberOrNothing`, just like `print_number_or_nothing`.
 // is independent of the definition of the type. `self` is like `this` in other
 // languages, and its type is always implicit. So `print` is now a method that
 // takes as first argument a `NumberOrNothing`, just like `print_number_or_nothing`.

-//
+// 

 // Try making `number_or_default` from above an inherent method as well!
 
 // With our refactored functions and methods, `main` now looks as follows:
 // Try making `number_or_default` from above an inherent method as well!
 
 // With our refactored functions and methods, `main` now looks as follows:


@@ -92,4 +93,8 @@ 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>`.
+// 
+// *Hint*: `vec.len()` returns the length of a vector `vec`.
+

 // [index](main.html) | [previous](part00.html) | [next](part02.html)
 // [index](main.html) | [previous](part00.html) | [next](part02.html)