Merge pull request servo#7 from kmcallister/rust-upgrade

SimonSapin · SimonSapin · commit 3e2179942cb6 · 2013-08-14T15:26:31.000-07:00
Update to latest Rust
diff --git a/ast.rs b/ast.rs
@@ -129,11 +129,11 @@ impl ToStr for SyntaxError {
 
 
 pub trait SkipWhitespaceIterable<'self> {
-    pub fn skip_whitespace(self) -> SkipWhitespaceIterator<'self>;
+    fn skip_whitespace(self) -> SkipWhitespaceIterator<'self>;
 }
 
 impl<'self> SkipWhitespaceIterable<'self> for &'self [ComponentValue] {
-    pub fn skip_whitespace(self) -> SkipWhitespaceIterator<'self> {
+    fn skip_whitespace(self) -> SkipWhitespaceIterator<'self> {
         SkipWhitespaceIterator{ iter_with_whitespace: self.iter() }
     }
 }
@@ -153,11 +153,11 @@ impl<'self> Iterator<&'self ComponentValue> for SkipWhitespaceIterator<'self> {
 
 
 pub trait MoveSkipWhitespaceIterable {
-    pub fn move_skip_whitespace(self) -> MoveSkipWhitespaceIterator;
+    fn move_skip_whitespace(self) -> MoveSkipWhitespaceIterator;
 }
 
 impl MoveSkipWhitespaceIterable for ~[ComponentValue] {
-    pub fn move_skip_whitespace(self) -> MoveSkipWhitespaceIterator {
+    fn move_skip_whitespace(self) -> MoveSkipWhitespaceIterator {
         MoveSkipWhitespaceIterator{ iter_with_whitespace: self.move_iter() }
     }
 }
diff --git a/tokenizer.rs b/tokenizer.rs
@@ -24,7 +24,7 @@ pub fn tokenize(input: &str) -> Tokenizer {
 
 impl Iterator<Node> for Tokenizer {
     #[inline]
-    pub fn next(&mut self) -> Option<Node> { next_component_value(self) }
+    fn next(&mut self) -> Option<Node> { next_component_value(self) }
 }
 
 

Original file line number	Diff line number	Diff line change
`@@ -129,11 +129,11 @@ impl ToStr for SyntaxError {`
`129`	`129`
`130`	`130`
`131`	`131`	`pub trait SkipWhitespaceIterable<'self> {`
`132`		`- pub fn skip_whitespace(self) -> SkipWhitespaceIterator<'self>;`
	`132`	`+ fn skip_whitespace(self) -> SkipWhitespaceIterator<'self>;`
`133`	`133`	`}`
`134`	`134`
`135`	`135`	`impl<'self> SkipWhitespaceIterable<'self> for &'self [ComponentValue] {`
`136`		`- pub fn skip_whitespace(self) -> SkipWhitespaceIterator<'self> {`
	`136`	`+ fn skip_whitespace(self) -> SkipWhitespaceIterator<'self> {`
`137`	`137`	`SkipWhitespaceIterator{ iter_with_whitespace: self.iter() }`
`138`	`138`	`}`
`139`	`139`	`}`
`@@ -153,11 +153,11 @@ impl<'self> Iterator<&'self ComponentValue> for SkipWhitespaceIterator<'self> {`
`153`	`153`
`154`	`154`
`155`	`155`	`pub trait MoveSkipWhitespaceIterable {`
`156`		`- pub fn move_skip_whitespace(self) -> MoveSkipWhitespaceIterator;`
	`156`	`+ fn move_skip_whitespace(self) -> MoveSkipWhitespaceIterator;`
`157`	`157`	`}`
`158`	`158`
`159`	`159`	`impl MoveSkipWhitespaceIterable for ~[ComponentValue] {`
`160`		`- pub fn move_skip_whitespace(self) -> MoveSkipWhitespaceIterator {`
	`160`	`+ fn move_skip_whitespace(self) -> MoveSkipWhitespaceIterator {`
`161`	`161`	`MoveSkipWhitespaceIterator{ iter_with_whitespace: self.move_iter() }`
`162`	`162`	`}`
`163`	`163`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ pub fn tokenize(input: &str) -> Tokenizer {`
`24`	`24`
`25`	`25`	`impl Iterator<Node> for Tokenizer {`
`26`	`26`	`#[inline]`
`27`		`- pub fn next(&mut self) -> Option<Node> { next_component_value(self) }`
	`27`	`+ fn next(&mut self) -> Option<Node> { next_component_value(self) }`
`28`	`28`	`}`
`29`	`29`
`30`	`30`