From 3dd3ad728e56d5eb9ce222778be26c488ee7f493 Mon Sep 17 00:00:00 2001 From: Ms2ger Date: Thu, 2 Apr 2015 14:46:19 +0200 Subject: [PATCH] Use u32 for TableColumnFragmentInfo::span. --- components/layout/fragment.rs | 4 ++-- components/layout/table_colgroup.rs | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/components/layout/fragment.rs b/components/layout/fragment.rs index 0458c2bb738..37cec720b1b 100644 --- a/components/layout/fragment.rs +++ b/components/layout/fragment.rs @@ -672,7 +672,7 @@ impl UnscannedTextFragmentInfo { #[derive(Copy, Clone)] pub struct TableColumnFragmentInfo { /// the number of columns a element should span - pub span: int, + pub span: u32, } impl TableColumnFragmentInfo { @@ -681,7 +681,7 @@ impl TableColumnFragmentInfo { let span = { let element = node.as_element(); element.get_attr(&ns!(""), &atom!("span")).and_then(|string| { - let n: Option = FromStr::from_str(string).ok(); + let n: Option = FromStr::from_str(string).ok(); n }).unwrap_or(0) }; diff --git a/components/layout/table_colgroup.rs b/components/layout/table_colgroup.rs index edb6d64bd0f..d112be8ce0b 100644 --- a/components/layout/table_colgroup.rs +++ b/components/layout/table_colgroup.rs @@ -69,7 +69,7 @@ impl Flow for TableColGroupFlow { for fragment in self.cols.iter() { // Retrieve the specified value from the appropriate CSS property. let inline_size = fragment.style().content_inline_size(); - let span: int = match fragment.specific { + let span = match fragment.specific { SpecificFragmentInfo::TableColumn(col_fragment) => max(col_fragment.span, 1), _ => panic!("non-table-column fragment inside table column?!"), };