Skip to content

Commit 55e49cd

Browse files
committed
Update to rustc 0.8-pre (ecfc9a8 2013-08-12 04:29:11 -0700)
1 parent 9fa603e commit 55e49cd

File tree

4 files changed

+14
-14
lines changed

4 files changed

+14
-14
lines changed

Makefile.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ RUST_SRC=$(shell find $(VPATH)/. -type f -name '*.rs') $(COLOR_DATA_RS)
1414
all: libcssparser.dummy
1515

1616
libcssparser.dummy: cssparser.rc $(RUST_SRC)
17-
$(RUSTC) $(RUSTFLAGS) $< -o $@
17+
$(RUSTC) $(RUSTFLAGS) $<
1818
touch $@
1919

2020
cssparser-test: cssparser.rc $(RUST_SRC)

ast.rs

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -152,23 +152,23 @@ impl<'self> Iterator<&'self ComponentValue> for SkipWhitespaceIterator<'self> {
152152
}
153153

154154

155-
pub trait ConsumeSkipWhitespaceIterable {
156-
pub fn consume_skip_whitespace(self) -> ConsumeSkipWhitespaceIterator;
155+
pub trait MoveSkipWhitespaceIterable {
156+
pub fn move_skip_whitespace(self) -> MoveSkipWhitespaceIterator;
157157
}
158158

159-
impl ConsumeSkipWhitespaceIterable for ~[ComponentValue] {
160-
pub fn consume_skip_whitespace(self) -> ConsumeSkipWhitespaceIterator {
161-
ConsumeSkipWhitespaceIterator{ iter: self.consume_iter() }
159+
impl MoveSkipWhitespaceIterable for ~[ComponentValue] {
160+
pub fn move_skip_whitespace(self) -> MoveSkipWhitespaceIterator {
161+
MoveSkipWhitespaceIterator{ iter_with_whitespace: self.move_iter() }
162162
}
163163
}
164164

165-
pub struct ConsumeSkipWhitespaceIterator {
166-
iter: vec::ConsumeIterator<ComponentValue>,
165+
pub struct MoveSkipWhitespaceIterator {
166+
iter_with_whitespace: vec::MoveIterator<ComponentValue>,
167167
}
168168

169-
impl Iterator<ComponentValue> for ConsumeSkipWhitespaceIterator {
169+
impl Iterator<ComponentValue> for MoveSkipWhitespaceIterator {
170170
fn next(&mut self) -> Option<ComponentValue> {
171-
for component_value in self.iter {
171+
for component_value in self.iter_with_whitespace {
172172
if component_value != WhiteSpace { return Some(component_value) }
173173
}
174174
None

tests.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ fn run_json_tests<T: ToJson>(json_data: &str, parse: &fn (input: ~str) -> T) {
5959
};
6060
assert!(items.len() % 2 == 0);
6161
let mut input: Option<~str> = None;
62-
for item in items.consume_iter() {
62+
for item in items.move_iter() {
6363
match (&input, item) {
6464
(&None, json::String(string)) => input = Some(string),
6565
(&Some(_), expected) => {
@@ -76,7 +76,7 @@ fn run_json_tests<T: ToJson>(json_data: &str, parse: &fn (input: ~str) -> T) {
7676
#[test]
7777
fn component_value_list() {
7878
do run_json_tests(include_str!("css-parsing-tests/component_value_list.json")) |input| {
79-
tokenize(input).transform(|(c, _)| c).to_owned_vec()
79+
tokenize(input).map(|(c, _)| c).to_owned_vec()
8080
}
8181
}
8282
@@ -167,7 +167,7 @@ fn color3_keywords() {
167167
#[test]
168168
fn nth() {
169169
do run_json_tests(include_str!("css-parsing-tests/An+B.json")) |input| {
170-
parse_nth(tokenize(input).transform(|(c, _)| c).to_owned_vec())
170+
parse_nth(tokenize(input).map(|(c, _)| c).to_owned_vec())
171171
}
172172
}
173173

tokenizer.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ fn next_component_value(tokenizer: &mut Tokenizer) -> Option<Node> {
101101
consume_comments(tokenizer);
102102
if tokenizer.is_eof() {
103103
if cfg!(test) {
104-
assert!(tokenizer.line == tokenizer.input.split_iter('\n').len_(),
104+
assert!(tokenizer.line == tokenizer.input.split_iter('\n').len(),
105105
"The tokenizer is missing a tokenizer.new_line() call somewhere.")
106106
}
107107
return None

0 commit comments

Comments
 (0)