diff options
| author | Jack Moffitt <jack@metajack.im> | 2013-10-14 23:11:35 -0600 |
|---|---|---|
| committer | Jack Moffitt <jack@metajack.im> | 2013-10-21 17:38:34 -0600 |
| commit | 94202661c03500fffcc7ec3e566e2a2a168c7dfc (patch) | |
| tree | 111764fc98e2cfe3995e2c9d20332c29b989f761 /src/components/main/layout/float_context.rs | |
| parent | 8b47221ff8c77281eb55c5c671f23ae455cfe6bd (diff) | |
| download | servo-94202661c03500fffcc7ec3e566e2a2a168c7dfc.tar.gz servo-94202661c03500fffcc7ec3e566e2a2a168c7dfc.zip | |
Update to latest Rust.
Diffstat (limited to 'src/components/main/layout/float_context.rs')
| -rw-r--r-- | src/components/main/layout/float_context.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/components/main/layout/float_context.rs b/src/components/main/layout/float_context.rs index adc083105fe..e9f39586081 100644 --- a/src/components/main/layout/float_context.rs +++ b/src/components/main/layout/float_context.rs @@ -300,7 +300,7 @@ impl FloatContextBase{ f_data.bounds.origin.x + f_data.bounds.size.width > left && f_data.bounds.origin.x < left + width { let new_y = f_data.bounds.origin.y; - max_height = Some(min(max_height.unwrap_or_default(new_y), new_y)); + max_height = Some(min(max_height.unwrap_or(new_y), new_y)); } } } @@ -340,7 +340,7 @@ impl FloatContextBase{ let height = self.max_height_for_bounds(rect.origin.x, rect.origin.y, rect.size.width); - let height = height.unwrap_or_default(Au(max_value)); + let height = height.unwrap_or(Au(max_value)); return match info.f_type { FloatLeft => Rect(Point2D(rect.origin.x, float_y), Size2D(rect.size.width, height)), |