File tree Expand file tree Collapse file tree 3 files changed +3
-3
lines changed Expand file tree Collapse file tree 3 files changed +3
-3
lines changed Original file line number Diff line number Diff line change 1
1
---
2
- refs/heads/master: 0275b1c4047c9213a3f55b36ab690ebedff3a4d5
2
+ refs/heads/master: 835960a3331bdabc7f6251a66c284fe0a3b98d10
3
3
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
4
4
refs/heads/snap-stage3: 6c08cc2db4f98e9f07ae7d50338396c4123c2f0a
5
5
refs/heads/try: 70152ff55722878cde684ee6462c14c65f2c4729
Original file line number Diff line number Diff line change @@ -423,7 +423,7 @@ do_some_work();
423
423
While it isn't possible for a task to recover from failure, tasks may notify
424
424
each other of failure. The simplest way of handling task failure is with the
425
425
` try ` function, which is similar to ` spawn ` , but immediately blocks waiting
426
- for the child task to finish. ` try ` returns a value of type `Result<T ,
426
+ for the child task to finish. ` try ` returns a value of type `Result<int ,
427
427
()>` . ` Result` is an ` enum` type with two variants: ` Ok` and ` Err`. In this
428
428
case, because the type arguments to ` Result ` are ` int ` and ` () ` , callers can
429
429
pattern-match on a result to check whether it's an ` Ok ` result with an ` int `
Original file line number Diff line number Diff line change @@ -737,7 +737,7 @@ fn area(sh: Shape) -> float {
737
737
match sh {
738
738
Circle { radius: radius, _ } => float::consts::pi * square(radius),
739
739
Rectangle { top_left: top_left, bottom_right: bottom_right } => {
740
- (bottom_right.x - top_left.x) * (bottom_right .y - top_left .y)
740
+ (bottom_right.x - top_left.x) * (top_left .y - bottom_right .y)
741
741
}
742
742
}
743
743
}
You can’t perform that action at this time.
0 commit comments