Updated lexer for rust 0.7