Update to rustc 0.8-pre (ecfc9a8 2013-08-12 04:29:11 -0700)

Author: SimonSapin

Makefile.in

@@ -14,7 +14,7 @@ RUST_SRC=$(shell find $(VPATH)/. -type f -name '*.rs') $(COLOR_DATA_RS)
 all:    libcssparser.dummy
 
 libcssparser.dummy: cssparser.rc $(RUST_SRC)
-	$(RUSTC) $(RUSTFLAGS) $< -o $@
+	$(RUSTC) $(RUSTFLAGS) $<
 	touch $@
 
 cssparser-test: cssparser.rc $(RUST_SRC)

ast.rs

@@ -152,23 +152,23 @@ impl<'self> Iterator<&'self ComponentValue> for SkipWhitespaceIterator<'self> {
 }
 
 
-pub trait ConsumeSkipWhitespaceIterable {
-    pub fn consume_skip_whitespace(self) -> ConsumeSkipWhitespaceIterator;
+pub trait MoveSkipWhitespaceIterable {
+    pub fn move_skip_whitespace(self) -> MoveSkipWhitespaceIterator;
 }
 
-impl ConsumeSkipWhitespaceIterable for ~[ComponentValue] {
-    pub fn consume_skip_whitespace(self) -> ConsumeSkipWhitespaceIterator {
-        ConsumeSkipWhitespaceIterator{ iter: self.consume_iter() }
+impl MoveSkipWhitespaceIterable for ~[ComponentValue] {
+    pub fn move_skip_whitespace(self) -> MoveSkipWhitespaceIterator {
+        MoveSkipWhitespaceIterator{ iter_with_whitespace: self.move_iter() }
     }
 }
 
-pub struct ConsumeSkipWhitespaceIterator {
-    iter: vec::ConsumeIterator<ComponentValue>,
+pub struct MoveSkipWhitespaceIterator {
+    iter_with_whitespace: vec::MoveIterator<ComponentValue>,
 }
 
-impl Iterator<ComponentValue> for ConsumeSkipWhitespaceIterator {
+impl Iterator<ComponentValue> for MoveSkipWhitespaceIterator {
     fn next(&mut self) -> Option<ComponentValue> {
-        for component_value in self.iter {
+        for component_value in self.iter_with_whitespace {
             if component_value != WhiteSpace { return Some(component_value) }
         }
         None

tests.rs

@@ -59,7 +59,7 @@ fn run_json_tests<T: ToJson>(json_data: &str, parse: &fn (input: ~str) -> T) {
     };
     assert!(items.len() % 2 == 0);
     let mut input: Option<~str> = None;
-    for item in items.consume_iter() {
+    for item in items.move_iter() {
         match (&input, item) {
             (&None, json::String(string)) => input = Some(string),
             (&Some(_), expected) => {
@@ -76,7 +76,7 @@ fn run_json_tests<T: ToJson>(json_data: &str, parse: &fn (input: ~str) -> T) {
 #[test]
 fn component_value_list() {
     do run_json_tests(include_str!("css-parsing-tests/component_value_list.json")) |input| {
-        tokenize(input).transform(|(c, _)| c).to_owned_vec()
+        tokenize(input).map(|(c, _)| c).to_owned_vec()
     }
 }
 
@@ -167,7 +167,7 @@ fn color3_keywords() {
 #[test]
 fn nth() {
     do run_json_tests(include_str!("css-parsing-tests/An+B.json")) |input| {
-        parse_nth(tokenize(input).transform(|(c, _)| c).to_owned_vec())
+        parse_nth(tokenize(input).map(|(c, _)| c).to_owned_vec())
     }
 }
 

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.split_iter('\n').len_(),
+            assert!(tokenizer.line == tokenizer.input.split_iter('\n').len(),
                     "The tokenizer is missing a tokenizer.new_line() call somewhere.")
         }
         return None