chore: use Cursor::with_position (#11627)

Author: DaniPopes

crates/chisel/src/dispatcher.rs

@@ -528,15 +528,11 @@ impl ChiselDispatcher {
 /// Preprocesses addresses to ensure they are correctly checksummed and returns whether the input
 /// only contained trivia (comments, whitespace).
 fn preprocess(input: &str) -> (bool, Cow<'_, str>) {
-    let mut current_pos = 0;
     let mut only_trivia = true;
     let mut new_input = Cow::Borrowed(input);
-    for token in solar::parse::Cursor::new(input) {
+    for (pos, token) in solar::parse::Cursor::new(input).with_position() {
         use RawTokenKind::*;
 
-        let pos = current_pos as usize;
-        current_pos += token.len;
-
         if matches!(token.kind, Whitespace | LineComment { .. } | BlockComment { .. }) {
             continue;
         }

crates/common/src/comments/mod.rs

@@ -70,7 +70,6 @@ fn line_begin_pos(sf: &SourceFile, pos: BytePos) -> BytePos {
 fn gather_comments(sf: &SourceFile) -> Vec<Comment> {
     let text = sf.src.as_str();
     let start_bpos = sf.start_pos;
-    let mut pos = 0;
     let mut comments: Vec<Comment> = Vec::new();
     let mut code_to_the_left = false;
 
@@ -89,7 +88,7 @@ fn gather_comments(sf: &SourceFile) -> Vec<Comment> {
     }
     */
 
-    for token in solar::parse::Cursor::new(&text[pos..]) {
+    for (pos, token) in solar::parse::Cursor::new(text).with_position() {
         let token_range = pos..pos + token.len as usize;
         let span = make_span(token_range.clone());
         let token_text = &text[token_range];
@@ -148,7 +147,6 @@ fn gather_comments(sf: &SourceFile) -> Vec<Comment> {
                 code_to_the_left = true;
             }
         }
-        pos += token.len as usize;
     }
 
     comments