Update for language changes

Author: pcwalton

color.rs

@@ -2,16 +2,12 @@ use float::round;
 use libc::types::os::arch::c95::c_double;
 use cmp::Eq;
 
-pub struct Color { red : u8, green : u8, blue : u8, alpha : float}
-
-impl Color : Eq {
-    pure fn eq(&self, other: &Color) -> bool {
-        return self.red == other.red && self.green == other.green && self.blue == other.blue &&
-               self.alpha == other.alpha;
-    }
-    pure fn ne(&self, other: &Color) -> bool {
-        !self.eq(other)
-    }
+#[deriving_eq]
+pub struct Color {
+    red: u8,
+    green: u8,
+    blue: u8,
+    alpha: float,
 }
 
 pub fn rgba(r : u8, g : u8, b : u8, a : float) -> Color {

complete.rs

@@ -12,13 +12,13 @@ pub struct CompleteSelectResults {
 pub impl CompleteSelectResults {
     static fn new_root(root: SelectResults) -> CompleteSelectResults {
         CompleteSelectResults {
-            inner: move root
+            inner: root
         }
     }
 
     static fn new_from_parent(parent: &CompleteSelectResults,
                               child: SelectResults) -> CompleteSelectResults {
-        let mut child = move child;
+        let mut child = child;
 
         // New lifetime
         {
@@ -39,7 +39,7 @@ pub impl CompleteSelectResults {
                                 new_value *= n::u::css_fixed_to_float(child_em);
                                 let unit = parent_unit.modify(n::u::float_to_css_fixed(
                                     new_value));
-                                CssHintLength(move unit)
+                                CssHintLength(unit)
                             }
                             _ => n::h::CssHintLength(n::t::CssUnitEm(child_em)),
                         }
@@ -58,7 +58,7 @@ pub impl CompleteSelectResults {
         }
 
         CompleteSelectResults {
-            inner: move child
+            inner: child
         }
     }
 
@@ -204,9 +204,9 @@ impl CompleteStyle {
 }
 
 fn strip<T>(value: CSSValue<T>) -> T {
-    match move value {
+    match value {
         Inherit => fail!(~"unexpected 'inherit' value in complete style"),
-        Specified(move v) => move v
+        Specified(v) => v
     }
 }
 

computed.rs

@@ -255,8 +255,8 @@ fn convert_net_font_size_value(value: n::v::CssFontSizeValue) -> CSSValue<CSSFon
         n::v::CssFontSizeSmaller => Specified(CSSFontSizeRelativeSize(Smaller)),
         n::v::CssFontSizeDimension(size) => {
             match convert_net_unit_to_length_or_percent(size) {
-                Left(move val) => Specified(CSSFontSizeLength(move val)),
-                Right(move val) => Specified(CSSFontSizePercentage(move val))
+                Left(val) => Specified(CSSFontSizeLength(val)),
+                Right(val) => Specified(CSSFontSizePercentage(val))
             }
         }
     }
@@ -321,7 +321,7 @@ fn convert_net_line_height_value(value: n::v::CssLineHeightValue) -> CSSValue<CS
 
 fn convert_net_unit_to_length(unit: n::t::CssUnit) -> Length {
     match convert_net_unit_to_length_or_percent(unit) {
-        Left(move v) => v,
+        Left(v) => v,
         Right(*) => fail!(~"unexpected percentage unit")
     }
 }

parser.rs

@@ -38,14 +38,14 @@ pub fn parse_stylesheet(url: Url, input: DataStream) -> CssStylesheet {
 
     loop {
         match input() {
-            Some(move data) => {
+            Some(data) => {
                 sheet.append_data(data);
             }
             None => break
         }
     }
     sheet.data_done();
-    return move sheet;
+    return sheet;
 }
 
 fn resolve_url(_base: &str, _rel: &LwcString) -> CssResult<LwcString> {

select.rs

@@ -38,11 +38,11 @@ impl SelectCtx {
     during future selector matching
     */
     fn append_sheet(&mut self, sheet: Stylesheet, origin: StylesheetOrigin) {
-        let sheet = match move sheet {
-            Stylesheet { inner: move inner } => move inner
+        let sheet = match sheet {
+            Stylesheet { inner: inner } => inner
         };
 
-        self.inner.append_sheet(move sheet, origin.to_net(), n::ll::t::CSS_MEDIA_SCREEN)
+        self.inner.append_sheet(sheet, origin.to_net(), n::ll::t::CSS_MEDIA_SCREEN)
     }
 
     /**
@@ -101,7 +101,7 @@ priv impl<N, H: SelectHandler<N>> SelectHandlerWrapper<N, H> {
     }
 }
 
-impl<N, H: SelectHandler<N>> SelectHandlerWrapper<N, H>: n::s::CssSelectHandler<N> {
+impl<N, H: SelectHandler<N>> n::s::CssSelectHandler<N> for SelectHandlerWrapper<N, H> {
     fn node_name(node: &N) -> n::t::CssQName {
         do self.inner_ref().with_node_name(node) |name| {
             rust_str_to_net_qname(name)

stylesheet.rs

@@ -14,7 +14,7 @@ pub struct Stylesheet {
 pub impl Stylesheet {
     static fn new(url: Url, input: DataStream) -> Stylesheet {
         Stylesheet {
-            inner: parse_stylesheet(move url, input)
+            inner: parse_stylesheet(url, input)
         }
     }
 }

test.rs

@@ -18,10 +18,12 @@ fn test_url() -> Url {
 
 fn style_stream(style: &str) -> DataStream {
     let style = Cell(style.to_str());
-    let d: DataStream = |move style| if !style.is_empty() {
-        Some(str::to_bytes(style.take()))
-    } else {
-        None
+    let d: DataStream = || {
+        if !style.is_empty() {
+            Some(str::to_bytes(style.take()))
+        } else {
+            None
+        }
     };
     return d;
 }
@@ -35,7 +37,7 @@ struct NodeData {
     mut parent: Option<TestNode>
 }
 
-impl TestNode: VoidPtrLike {
+impl VoidPtrLike for TestNode {
     static fn from_void_ptr(node: *libc::c_void) -> TestNode {
         assert node.is_not_null();
         TestNode(unsafe {
@@ -62,7 +64,7 @@ impl TestHandler {
     }
 }
 
-impl TestHandler: SelectHandler<TestNode> {
+impl SelectHandler<TestNode> for TestHandler {
     fn with_node_name<R>(node: &TestNode, f: &fn(&str) -> R) -> R {
         f((*node).name)
     }
@@ -92,7 +94,7 @@ fn single_div_test(style: &str, f: &fn(&ComputedStyle)) {
     let sheet = Stylesheet::new(test_url(), style_stream(style));
     let mut select_ctx = SelectCtx::new();
     let handler = &TestHandler::new();
-    select_ctx.append_sheet(move sheet, OriginAuthor);
+    select_ctx.append_sheet(sheet, OriginAuthor);
     let dom = &TestNode(@NodeData {
         name: ~"div",
         id: ~"id1",
@@ -359,7 +361,7 @@ fn child_test(style: &str, f: &fn(&ComputedStyle)) {
     let sheet = Stylesheet::new(test_url(), style_stream(style));
     let mut select_ctx = SelectCtx::new();
     let handler = &TestHandler::new();
-    select_ctx.append_sheet(move sheet, OriginAuthor);
+    select_ctx.append_sheet(sheet, OriginAuthor);
     let child = TestNode(@NodeData {
         name: ~"span",
         id: ~"id1",
@@ -417,7 +419,7 @@ fn test_compose() {
     let sheet = Stylesheet::new(test_url(), style_stream(style));
     let mut select_ctx = SelectCtx::new();
     let handler = &TestHandler::new();
-    select_ctx.append_sheet(move sheet, OriginAuthor);
+    select_ctx.append_sheet(sheet, OriginAuthor);
     let child = TestNode(@NodeData {
         name: ~"span",
         id: ~"id1",
@@ -434,8 +436,9 @@ fn test_compose() {
     let parent_results = select_ctx.select_style(&parent, handler);
     let child_results = select_ctx.select_style(&child, handler);
 
-    let complete_parent_results = CompleteSelectResults::new_root(move parent_results);
-    let complete_child_results = CompleteSelectResults::new_from_parent(&complete_parent_results, move child_results);
+    let complete_parent_results = CompleteSelectResults::new_root(parent_results);
+    let complete_child_results = CompleteSelectResults::new_from_parent(&complete_parent_results,
+                                                                        child_results);
 
     let computed = complete_child_results.computed_style();
 

units.rs

@@ -2,6 +2,7 @@
 Units used by CSS
 */
 
+#[deriving_eq]
 pub enum Length {
     Em(float), // normalized to 'em'
     Px(float), // normalized to 'px'
@@ -23,12 +24,14 @@ impl Length {
     }
 }
 
+#[deriving_eq]
 pub enum BoxSizing { // used by width, height, top, left, etc
     BoxLength(Length),
     BoxPercent(float),
     BoxAuto
 }
 
+#[deriving_eq]
 pub enum AbsoluteSize {
     XXSmall,
     XSmall,
@@ -39,6 +42,7 @@ pub enum AbsoluteSize {
     XXLarge
 }
 
+#[deriving_eq]
 pub enum RelativeSize {
     Larger,
     Smaller