diff options
| -rw-r--r-- | components/layout/block.rs | 4 | ||||
| -rw-r--r-- | components/util/lib.rs | 16 |
2 files changed, 11 insertions, 9 deletions
diff --git a/components/layout/block.rs b/components/layout/block.rs index afc1f9e7180..e8eb66cb9ac 100644 --- a/components/layout/block.rs +++ b/components/layout/block.rs @@ -1485,11 +1485,13 @@ impl BlockFlow { // * Flex items cannot also be floats. // Therefore, a flex item cannot be impacted by a float. // See also: https://www.w3.org/TR/css-flexbox-1/#flex-containers - // This line is not just an optimization. It's also needed for correctness. if !self.base.might_have_floats_in() { return } + // If you remove the might_have_floats_in conditional, this will go off. + debug_assert!(!self.is_flex()); + // Compute the available space for us, based on the actual floats. let rect = self.base.floats.available_rect( self.base.position.start.b, diff --git a/components/util/lib.rs b/components/util/lib.rs index edc4a27da42..11b6afbbc8e 100644 --- a/components/util/lib.rs +++ b/components/util/lib.rs @@ -46,11 +46,11 @@ pub fn servo_version() -> String { } pub fn clamp<T: Ord>(lo: T, mid: T, hi: T) -> T { - if mid < lo { - lo - } else if mid > hi { - hi - } else { - mid - } -}
\ No newline at end of file + if mid < lo { + lo + } else if mid > hi { + hi + } else { + mid + } +} |