Deprecate Lexer::token with Lexer::next_token

Author: weirdsmiley

src/lexer.rs

@@ -389,17 +389,17 @@ impl Lexer {
         Ok(self.token)
     }
 
+    #[deprecated(
+        since = "0.1.0",
+        note = "This function returns the next token, not the current token. Use `next_token` instead of this."
+    )]
     /// Get the current token.
     pub(crate) fn token(&mut self) -> Result<Option<Token>> {
-        // TODO: This shouldn't be used, next_token should be used instead.
-        // This gives a wrong meaning to what is happening. next_token is more
-        // verbose.
         Ok(self.next_token()?)
     }
 
     /// Consumes last set token and moves onto the next token in buffer.
     pub(crate) fn consume(&mut self, token: Token) -> Result<()> {
-        // TODO: use Lexer::is_token?
         if let Some(last_token) = &self.token {
             assert_eq!(
                 token, *last_token,

src/parser.rs

@@ -716,9 +716,6 @@ impl Parser {
         );
         let mut imports = Vec::new();
 
-        // TODO: Move this entirely in parse_module, parse_module should return
-        // a Qast and it can recursively call itself when `module` is seen
-        // inside the file.
         self.lexer.next_token()?;
         loop {
             if self.lexer.token.is_none() {
@@ -816,7 +813,6 @@ impl Parser {
                         // Here and in the cyclic import case as well.
                         let err: QccError = QccErrorKind::UnknownImport.into();
                         err.report(&function);
-                        // err.report(format!("{} {}", function, self.lexer.location).as_str());
                         Err(QccErrorKind::ParseError)?
                     }
                 }