add trim() to reading from stdin, so that it also works on Windows

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

diff --git a/src/part08.rs b/src/part08.rs
index 558bd628d55a68479e456424e4ebffc38937ce46..90c35f65a526d0b5f702a84ccf7e43f2fe017ff2 100644 (file)
--- a/src/part08.rs
+++ b/src/part08.rs
@@ -1,63 +1,18 @@
+// Rust-101, Part 08: Associated Types, Modules (WIP)
+// ==================================================
+

 use std::cmp;
 use std::ops;
 use std::fmt;
 use part05::BigInt;
 
 use std::cmp;
 use std::ops;
 use std::fmt;
 use part05::BigInt;
 

-impl PartialEq for BigInt {
-    fn eq(&self, other: &BigInt) -> bool {
-        debug_assert!(self.test_invariant() && other.test_invariant());
-        self.data == other.data
-    }
-}
-
-fn call_eq() {
-    let b1 = BigInt::new(13);
-    let b2 = BigInt::new(37);
-    println!("b1 == b1: {} ; b1 == b2: {}; b1 != b2: {}", b1 == b1, b1 == b2, b1 != b2);
-}
-
-
-impl fmt::Debug for BigInt {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        self.data.fmt(f)
-    }
-}
-
-
-
-impl BigInt {
-    pub fn inc(&mut self, mut by: u64) {
-        panic!("Not yet implemented.");
-    }
-}
-
-
-#[test]
-fn test_inc() {
-    let mut b = BigInt::new(1337);
-    b.inc(1337);
-    assert!(b == BigInt::new(1337 + 1337));
-
-    b = BigInt::new(0);
-    assert_eq!(b, BigInt::from_vec(vec![0]));
-    b.inc(1 << 63);
-    assert_eq!(b, BigInt::from_vec(vec![1 << 63]));
-    b.inc(1 << 63);
-    assert_eq!(b, BigInt::from_vec(vec![0, 1]));
-    b.inc(1 << 63);
-    assert_eq!(b, BigInt::from_vec(vec![1 << 63, 1]));
-    b.inc(1 << 63);
-    assert_eq!(b, BigInt::from_vec(vec![0, 2]));
-}
-
-

 // Add with carry, returning the sum and the carry
 fn overflowing_add(a: u64, b: u64, carry: bool) -> (u64, bool) {
     let sum = u64::wrapping_add(a, b);
 // Add with carry, returning the sum and the carry
 fn overflowing_add(a: u64, b: u64, carry: bool) -> (u64, bool) {
     let sum = u64::wrapping_add(a, b);

-    if sum >= a {
-        panic!("First addition did not overflow. Not implemented.");
-    } else {
-        panic!("First addition *did* overflow. Not implemented.");
+    if sum >= a { // first addition did not overflow
+        unimplemented!()
+    } else { // first addition *did* overflow
+        unimplemented!()

     }
 }
 
     }
 }
 


@@ -74,6 +29,8 @@ impl ops::Add for BigInt {
     type Output = BigInt;
     fn add(self, rhs: BigInt) -> Self::Output {
         let mut result_vec:Vec<u64> = Vec::with_capacity(cmp::max(self.data.len(), rhs.data.len()));
     type Output = BigInt;
     fn add(self, rhs: BigInt) -> Self::Output {
         let mut result_vec:Vec<u64> = Vec::with_capacity(cmp::max(self.data.len(), rhs.data.len()));

-        panic!("Not yet implemented.");
+        unimplemented!()

     }
 }
     }
 }

+
+// [index](main.html) | [previous](part07.html) | [next](main.html)