Add assertion that this is not a flex item

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,

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
-	}
-}
+    if mid < lo {
+        lo
+    } else if mid > hi {
+        hi
+    } else {
+        mid
+    }
+}