projects
/
rust-101.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
complete part 10
[rust-101.git]
/
src
/
part08.rs
diff --git
a/src/part08.rs
b/src/part08.rs
index 7a9c093d8aec4308f0c4463b5adf83e6821133c0..d6b6782e5fb5d2f42e11d073a3182894acd9b96c 100644
(file)
--- a/
src/part08.rs
+++ b/
src/part08.rs
@@
-26,7
+26,9
@@
fn overflowing_add(a: u64, b: u64, carry: bool) -> (u64, bool) {
if sum >= a {
// The addition did not overflow. <br/>
// **Exercise 08.1**: Write the code to handle adding the carry in this case.
if sum >= a {
// The addition did not overflow. <br/>
// **Exercise 08.1**: Write the code to handle adding the carry in this case.
- unimplemented!()
+ let sum_total = u64::wrapping_add(sum, if carry { 1 } else { 0 }); /*@@*/
+ let had_overflow = sum_total < sum; /*@@*/
+ (sum_total, had_overflow) /*@@*/
} else {
// Otherwise, the addition *did* overflow. It is impossible for the addition of the carry
// to overflow again, as we are just adding 0 or 1.
} else {
// Otherwise, the addition *did* overflow. It is impossible for the addition of the carry
// to overflow again, as we are just adding 0 or 1.
@@
-82,7
+84,10
@@
impl ops::Add<BigInt> for BigInt {
carry = new_carry; /*@*/
}
// **Exercise 08.2**: Handle the final `carry`, and return the sum.
carry = new_carry; /*@*/
}
// **Exercise 08.2**: Handle the final `carry`, and return the sum.
- unimplemented!()
+ if carry { /*@@*/
+ result_vec.push(1); /*@@*/
+ } /*@@*/
+ BigInt { data: result_vec } /*@@*/
}
}
}
}