diff options
author | Patrick Walton <pcwalton@mimiga.net> | 2012-09-20 15:04:00 -0700 |
---|---|---|
committer | Patrick Walton <pcwalton@mimiga.net> | 2012-09-20 15:04:00 -0700 |
commit | ff6cefb798246cd82d603b7bce89280812affe3c (patch) | |
tree | 434554e74fa510033457ba82cef3118553aaf7ca /src/servo/html | |
parent | f3a8253bc8728e67f88334ef0c7d4b0590557d28 (diff) | |
download | servo-ff6cefb798246cd82d603b7bce89280812affe3c.tar.gz servo-ff6cefb798246cd82d603b7bce89280812affe3c.zip |
Update for language changes
Diffstat (limited to 'src/servo/html')
-rw-r--r-- | src/servo/html/hubbub_html_parser.rs | 2 | ||||
-rw-r--r-- | src/servo/html/lexer_util.rs | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/servo/html/hubbub_html_parser.rs b/src/servo/html/hubbub_html_parser.rs index 0846540b622..8c366e94109 100644 --- a/src/servo/html/hubbub_html_parser.rs +++ b/src/servo/html/hubbub_html_parser.rs @@ -14,7 +14,7 @@ use JSMessage = html::dom_builder::js_message; use comm::{Chan, Port}; use str::from_slice; -use unsafe::reinterpret_cast; +use cast::reinterpret_cast; use std::net::url::Url; type JSResult = ~[~[u8]]; diff --git a/src/servo/html/lexer_util.rs b/src/servo/html/lexer_util.rs index 4f99f5b6441..0e54d0836fd 100644 --- a/src/servo/html/lexer_util.rs +++ b/src/servo/html/lexer_util.rs @@ -12,14 +12,14 @@ enum CharOrEof { } impl CharOrEof: cmp::Eq { - pure fn eq(&&other: CharOrEof) -> bool { - match (self, other) { + pure fn eq(other: &CharOrEof) -> bool { + match (self, *other) { (CoeChar(a), CoeChar(b)) => a == b, (CoeChar(*), _) | (_, CoeChar(*)) => false, (CoeEof, CoeEof) => true, } } - pure fn ne(&&other: CharOrEof) -> bool { + pure fn ne(other: &CharOrEof) -> bool { return !self.eq(other); } } |