Switch column-count to use predefined integer type

1 files changed, 5 insertions, 2 deletions

diff --git a/components/layout/multicol.rs b/components/layout/multicol.rs
index 9e341d96d01..18cfe6409cb 100644
--- a/components/layout/multicol.rs
+++ b/components/layout/multicol.rs
@@ -106,11 +106,14 @@ impl Flow for MulticolFlow {
             if let Either::First(column_width) = column_style.column_width {
                 column_count =
                     max(1, (content_inline_size + column_gap).0 / (column_width + column_gap).0);
-                if let Some(specified_column_count) = column_style.column_count.0 {
+                if let Either::First(specified_column_count) = column_style.column_count {
                     column_count = min(column_count, specified_column_count as i32);
                 }
             } else {
-                column_count = column_style.column_count.0.unwrap() as i32;
+                column_count = match column_style.column_count {
+                    Either::First(n) => n,
+                    _ => unreachable!(),
+                }
             }
             column_width =
                 max(Au(0), (content_inline_size + column_gap) / column_count - column_gap);