diff options
| author | Ms2ger <ms2ger@gmail.com> | 2015-01-02 12:45:28 +0100 |
|---|---|---|
| committer | Josh Matthews <josh@joshmatthews.net> | 2015-01-08 09:58:46 -0500 |
| commit | 16c7060bc8ff91527ae97f8a3feee5706747b9c5 (patch) | |
| tree | 0cc29f2cc50c729d3a8f9521a22991fad67b9afd /components/layout/table_wrapper.rs | |
| parent | cf616b90a236f88058dbad74b568b4d4379d2829 (diff) | |
| download | servo-16c7060bc8ff91527ae97f8a3feee5706747b9c5.tar.gz servo-16c7060bc8ff91527ae97f8a3feee5706747b9c5.zip | |
Update rustc to revision 2cfb5acb5a2751c759627377e602bac4f88f2d19.
Diffstat (limited to 'components/layout/table_wrapper.rs')
| -rw-r--r-- | components/layout/table_wrapper.rs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/components/layout/table_wrapper.rs b/components/layout/table_wrapper.rs index 1c68b7fa924..5a856db7334 100644 --- a/components/layout/table_wrapper.rs +++ b/components/layout/table_wrapper.rs @@ -29,9 +29,9 @@ use std::cmp::{max, min}; use std::fmt; use style::{ComputedValues, CSSFloat}; use style::computed_values::table_layout; -use sync::Arc; +use std::sync::Arc; -#[deriving(Encodable, Show)] +#[deriving(Copy, Encodable, Show)] pub enum TableLayout { Fixed, Auto @@ -55,7 +55,7 @@ impl TableWrapperFlow { -> TableWrapperFlow { let mut block_flow = BlockFlow::from_node_and_fragment(node, fragment); let table_layout = if block_flow.fragment().style().get_table().table_layout == - table_layout::fixed { + table_layout::T::fixed { TableLayout::Fixed } else { TableLayout::Auto @@ -72,7 +72,7 @@ impl TableWrapperFlow { -> TableWrapperFlow { let mut block_flow = BlockFlow::from_node(constructor, node); let table_layout = if block_flow.fragment().style().get_table().table_layout == - table_layout::fixed { + table_layout::T::fixed { TableLayout::Fixed } else { TableLayout::Auto @@ -90,7 +90,7 @@ impl TableWrapperFlow { -> TableWrapperFlow { let mut block_flow = BlockFlow::float_from_node_and_fragment(node, fragment, float_kind); let table_layout = if block_flow.fragment().style().get_table().table_layout == - table_layout::fixed { + table_layout::T::fixed { TableLayout::Fixed } else { TableLayout::Auto @@ -487,7 +487,7 @@ impl Add<AutoLayoutCandidateGuess,AutoLayoutCandidateGuess> for AutoLayoutCandid /// The `CSSFloat` member specifies the weight of the smaller of the two guesses, on a scale from /// 0.0 to 1.0. -#[deriving(PartialEq, Show)] +#[deriving(Copy, PartialEq, Show)] enum SelectedAutoLayoutCandidateGuess { UseMinimumGuess, InterpolateBetweenMinimumGuessAndMinimumPercentageGuess(CSSFloat), |