Merge pull request servo#51 from mozilla-servo/rustup_20140618

Update to latest Rust

Author: SimonSapin

ast.rs

@@ -7,15 +7,15 @@ use std::slice;
 use std::vec;
 
 
-#[deriving(Eq)]
+#[deriving(PartialEq)]
 pub struct NumericValue {
     pub representation: String,
     pub value: f64,
     pub int_value: Option<i64>,
 }
 
 
-#[deriving(Eq)]
+#[deriving(PartialEq)]
 pub struct SourceLocation {
     pub line: uint,  // First line is 1
     pub column: uint,  // First character of a line is at column 1
@@ -25,7 +25,7 @@ pub struct SourceLocation {
 pub type Node = (ComponentValue, SourceLocation);  // TODO this is not a good name
 
 
-#[deriving(Eq)]
+#[deriving(PartialEq)]
 pub enum ComponentValue {
     // Preserved tokens.
     Ident(String),
@@ -69,49 +69,49 @@ pub enum ComponentValue {
 }
 
 
-#[deriving(Eq)]
+#[deriving(PartialEq)]
 pub struct Declaration {
     pub location: SourceLocation,
     pub name: String,
     pub value: Vec<ComponentValue>,
     pub important: bool,
 }
 
-#[deriving(Eq)]
+#[deriving(PartialEq)]
 pub struct QualifiedRule {
     pub location: SourceLocation,
     pub prelude: Vec<ComponentValue>,
     pub block: Vec<Node>,
 }
 
-#[deriving(Eq)]
+#[deriving(PartialEq)]
 pub struct AtRule {
     pub location: SourceLocation,
     pub name: String,
     pub prelude: Vec<ComponentValue>,
     pub block: Option<Vec<Node>>,
 }
 
-#[deriving(Eq)]
+#[deriving(PartialEq)]
 pub enum DeclarationListItem {
     Declaration(Declaration),
     // A better idea for a name that means "at-rule" but is not "AtRule"?
     DeclAtRule(AtRule),
 }
 
-#[deriving(Eq)]
+#[deriving(PartialEq)]
 pub enum Rule {
     QualifiedRule(QualifiedRule),
     AtRule(AtRule),
 }
 
-#[deriving(Eq)]
+#[deriving(PartialEq)]
 pub struct SyntaxError {
     pub location: SourceLocation,
     pub reason: ErrorReason,
 }
 
-#[deriving(Eq)]
+#[deriving(PartialEq)]
 pub enum ErrorReason {
     ErrEmptyInput,  // Parsing a single "thing", found only whitespace.
     ErrExtraInput,  // Found more non-whitespace after parsing a single "thing".

color.rs

@@ -7,7 +7,7 @@ use std::ascii::StrAsciiExt;
 use ast::*;
 
 
-#[deriving(Clone, Eq)]
+#[deriving(Clone, PartialEq)]
 pub struct RGBA {
     // All in 0..1
     // Use f32 to try and match rust-azure’s AzFloat
@@ -17,7 +17,7 @@ pub struct RGBA {
     pub alpha: f32,
 }
 
-#[deriving(Clone, Eq)]
+#[deriving(Clone, PartialEq)]
 pub enum Color {
     CurrentColor,
     RGBA(RGBA),

tokenizer.rs

@@ -101,7 +101,7 @@ fn next_component_value(tokenizer: &mut Tokenizer) -> Option<Node> {
     consume_comments(tokenizer);
     if tokenizer.is_eof() {
         if cfg!(test) {
-            assert!(tokenizer.line == tokenizer.input.as_slice().split('\n').len(),
+            assert!(tokenizer.line == tokenizer.input.as_slice().split('\n').count(),
                     "The tokenizer is missing a tokenizer.new_line() call somewhere.")
         }
         return None