Merge pull request #17 from mmeyerho/fix_layout

Fix borrowck errors and erros in layout positioning

1 files changed, 3 insertions, 2 deletions

diff --git a/src/servo/parser/css_builder.rs b/src/servo/parser/css_builder.rs
index 01dd83fe951..b1c2e1d9273 100644
--- a/src/servo/parser/css_builder.rs
+++ b/src/servo/parser/css_builder.rs
@@ -9,19 +9,20 @@ import parser::lexer::css::{token, to_start_desc, to_end_desc,
                             to_comma, to_elmt, to_attr, to_desc,
                             to_eof};
 import comm::recv;
+import option::is_none;
 
 type token_reader = {stream : port<token>, mut lookahead : option<token>};
 
 impl methods for token_reader {
     fn get() -> token {
-        alt self.lookahead {
+        alt copy self.lookahead {
           some(tok)  { self.lookahead = none; tok }
           none       { recv(self.stream) }
         }
     }
 
     fn unget(tok : token) {
-        assert self.lookahead.is_none();
+        assert is_none(self.lookahead);
         self.lookahead = some(tok);
     }
 }