Upgrade to rustc 0.13.0-nightly (7e11b2271 2014-12-24 20:47:12 +0000)

Author: SimonSapin

src/ast.rs

@@ -152,7 +152,7 @@ impl<'a> SkipWhitespaceIterable<'a> for &'a [ComponentValue] {
 
 #[deriving(Clone)]
 pub struct SkipWhitespaceIterator<'a> {
-    pub iter_with_whitespace: slice::Items<'a, ComponentValue>,
+    pub iter_with_whitespace: slice::Iter<'a, ComponentValue>,
 }
 
 impl<'a> Iterator<&'a ComponentValue> for SkipWhitespaceIterator<'a> {
@@ -176,7 +176,7 @@ impl MoveSkipWhitespaceIterable for Vec<ComponentValue> {
 }
 
 pub struct MoveSkipWhitespaceIterator {
-    iter_with_whitespace: vec::MoveItems<ComponentValue>,
+    iter_with_whitespace: vec::IntoIter<ComponentValue>,
 }
 
 impl Iterator<ComponentValue> for MoveSkipWhitespaceIterator {

src/nth.rs

@@ -111,7 +111,7 @@ fn parse_n_dash_digits(string: &str) -> Option<i32> {
     && string.starts_with("n-")
     && string.slice_from(2).chars().all(|c| match c { '0'...'9' => true, _ => false })
     {
-        let result = from_str(string.slice_from(1));  // Include the minus sign
+        let result = string.slice_from(1).parse();  // Include the minus sign
         assert!(result.is_some());
         result
     }

src/tokenizer.rs

@@ -469,14 +469,14 @@ fn consume_numeric(tokenizer: &mut Tokenizer) -> ComponentValue {
     }
     let (value, int_value) = {
         // TODO: handle overflow
-        // Remove any + sign as int::from_str() does not parse them.
+        // Remove any + sign as int::parse() does not parse them.
         let repr = if representation.starts_with("+") {
             representation.slice_from(1)
         } else {
             representation.as_slice()
         };
-        (from_str::<f64>(repr).unwrap(), if is_integer {
-            Some(from_str::<i64>(repr).unwrap())
+        (repr.parse::<f64>().unwrap(), if is_integer {
+            Some(repr.parse::<i64>().unwrap())
         } else {
             None
         })