Merge pull request #11 from deepaksirone/fix_typo

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

diff --git a/workspace/src/part08.rs b/workspace/src/part08.rs
index 1fac1508d7326e5cbbbaadefcf74b04bd5ffe4ee..5ddcb3344cf8652ada5e6a3f0f5f4fe4e4cc5892 100644 (file)
--- a/workspace/src/part08.rs
+++ b/workspace/src/part08.rs
@@ -7,7 +7,7 @@ use part05::BigInt;
 
 // So, let us write a function to "add with carry", and give it the appropriate type. Notice Rust's native support for pairs.
 fn overflowing_add(a: u64, b: u64, carry: bool) -> (u64, bool) {
 
 // So, let us write a function to "add with carry", and give it the appropriate type. Notice Rust's native support for pairs.
 fn overflowing_add(a: u64, b: u64, carry: bool) -> (u64, bool) {

-    let sum = u64::wrapping_add(a, b);
+    let sum = a.wrapping_add(b);

     // If an overflow happened, then the sum will be smaller than *both* summands. Without an overflow, of course, it will be
     // at least as large as both of them. So, let's just pick one and check.
     if sum >= a {
     // If an overflow happened, then the sum will be smaller than *both* summands. Without an overflow, of course, it will be
     // at least as large as both of them. So, let's just pick one and check.
     if sum >= a {


@@ -56,11 +56,11 @@ impl ops::Add<BigInt> for BigInt {
     }
 }
 
     }
 }
 

-// ## Traits and borrowed types
+// ## Traits and reference types

 
 // Writing this out becomes a bit tedious, because trait implementations (unlike functions) require full explicit annotation
 // of lifetimes. Make sure you understand exactly what the following definition says. Notice that we can implement a trait for
 
 // Writing this out becomes a bit tedious, because trait implementations (unlike functions) require full explicit annotation
 // of lifetimes. Make sure you understand exactly what the following definition says. Notice that we can implement a trait for

-// a borrowed type!
+// a reference type!

 impl<'a, 'b> ops::Add<&'a BigInt> for &'b BigInt {
     type Output = BigInt;
     fn add(self, rhs: &'a BigInt) -> Self::Output {
 impl<'a, 'b> ops::Add<&'a BigInt> for &'b BigInt {
     type Output = BigInt;
     fn add(self, rhs: &'a BigInt) -> Self::Output {