Merge branch 'master' of git://ralfj.de/rust-101

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

diff --git a/workspace/src/part05.rs b/workspace/src/part05.rs
index 1eb02d893a1c82ceb992013f039fac48f009ce44..28c4030aef6f4200c77b983551c05a0ac0ef52ec 100644 (file)
--- a/workspace/src/part05.rs
+++ b/workspace/src/part05.rs
@@ -1,19 +1,17 @@
-// ***Remember to enable/add this part in `main.rs`!***
-

 // Rust-101, Part 05: Clone
 // ========================
 
 // ## Big Numbers
 
 pub struct BigInt {
 // Rust-101, Part 05: Clone
 // ========================
 
 // ## Big Numbers
 
 pub struct BigInt {

-    pub data: Vec<u64>,
+    pub data: Vec<u64>, // least significant digit first, no trailing zeros

 }
 
 // Now that we fixed the data representation, we can start implementing methods on it.
 impl BigInt {
     pub fn new(x: u64) -> Self {
         if x == 0 {
 }
 
 // Now that we fixed the data representation, we can start implementing methods on it.
 impl BigInt {
     pub fn new(x: u64) -> Self {
         if x == 0 {

-            BigInt { data: vec![] }
+            unimplemented!()

         } else {
             unimplemented!()
         }
         } else {
             unimplemented!()
         }


@@ -28,12 +26,14 @@ impl BigInt {
     }
 
     // We can convert any vector of digits into a number, by removing trailing zeros. The `mut`
     }
 
     // We can convert any vector of digits into a number, by removing trailing zeros. The `mut`

-    // declaration for `v` here is just like the one in `let mut ...`, it says that we will locally
-    // change the vector `v`.
+    // declaration for `v` here is just like the one in `let mut ...`: We completely own `v`, but Rust
+    // still asks us to make our intention of modifying it explicit. This `mut` is *not* part of the
+    // type of `from_vec` - the caller has to give up ownership of `v` anyway, so they don't care anymore
+    // what you do to it.

     // 
     // **Exercise 05.1**: Implement this function.
     // 
     // 
     // **Exercise 05.1**: Implement this function.
     // 

-    // *Hint*: You can use `pop()` to remove the last element of a vector.
+    // *Hint*: You can use `pop` to remove the last element of a vector.

     pub fn from_vec(mut v: Vec<u64>) -> Self {
         unimplemented!()
     }
     pub fn from_vec(mut v: Vec<u64>) -> Self {
         unimplemented!()
     }


@@ -61,7 +61,7 @@ impl<T: Clone> Clone for SomethingOrNothing<T> {
 }
 
 // **Exercise 05.2**: Write some more functions on `BigInt`. What about a function that returns the number of
 }
 
 // **Exercise 05.2**: Write some more functions on `BigInt`. What about a function that returns the number of

-// digits? The number of non-zero digits? The smallest/largest digit?
+// digits? The number of non-zero digits? The smallest/largest digit? Of course, these should all take `self` as a shared reference (i.e., in borrowed form).

 
 // ## Mutation + aliasing considered harmful (part 2)
 enum Variant {
 
 // ## Mutation + aliasing considered harmful (part 2)
 enum Variant {


@@ -74,7 +74,7 @@ fn work_on_variant(mut var: Variant, text: String) {
         Variant::Number(ref mut n) => ptr = n,
         Variant::Text(_) => return,
     }
         Variant::Number(ref mut n) => ptr = n,
         Variant::Text(_) => return,
     }

-    /* var = Variant::Text(text); */
+    /* var = Variant::Text(text); */                                /* BAD! */

     *ptr = 1337;
 }
 
     *ptr = 1337;
 }