CharPos: usize -> u32, as BytePos is u32

Author: klensy

compiler/rustc_ast/src/util/comments.rs

@@ -225,7 +225,8 @@ pub fn gather_comments(sm: &SourceMap, path: FileName, src: String) -> Vec<Comme
                     let pos_in_file = start_bpos + BytePos(pos as u32);
                     let line_begin_in_file = source_file.line_begin_pos(pos_in_file);
                     let line_begin_pos = (line_begin_in_file - start_bpos).to_usize();
-                    let col = CharPos(text[line_begin_pos..pos].chars().count());
+                    // FIXME: maybe simpler way?
+                    let col = CharPos::from_usize(text[line_begin_pos..pos].chars().count());
 
                     let lines = split_block_comment_into_lines(token_text, col);
                     comments.push(Comment { style, lines, pos: pos_in_file })

compiler/rustc_errors/src/emitter.rs

@@ -1499,7 +1499,7 @@ impl EmitterWriter {
                             "{}:{}:{}",
                             sm.filename_for_diagnostics(&loc.file.name),
                             sm.doctest_offset_line(&loc.file.name, loc.line.to_usize()),
-                            loc.col.0 + 1,
+                            loc.col.to_usize() + 1,
                         ),
                         Style::LineAndColumn,
                     );
@@ -1513,7 +1513,7 @@ impl EmitterWriter {
                             "{}:{}:{}: ",
                             sm.filename_for_diagnostics(&loc.file.name),
                             sm.doctest_offset_line(&loc.file.name, loc.line.to_usize()),
-                            loc.col.0 + 1,
+                            loc.col.to_usize() + 1,
                         ),
                         Style::LineAndColumn,
                     );
@@ -1796,7 +1796,7 @@ impl EmitterWriter {
                             "{}:{}:{}",
                             sm.filename_for_diagnostics(&loc.file.name),
                             sm.doctest_offset_line(&loc.file.name, loc.line.to_usize()),
-                            loc.col.0 + 1,
+                            loc.col.to_usize() + 1,
                         ),
                         Style::LineAndColumn,
                     );

compiler/rustc_errors/src/json.rs

@@ -455,8 +455,8 @@ impl DiagnosticSpan {
             byte_end: start.file.original_relative_byte_pos(span.hi()).0,
             line_start: start.line.to_usize(),
             line_end: end.line.to_usize(),
-            column_start: start.col.0 + 1,
-            column_end: end.col.0 + 1,
+            column_start: start.col.to_usize() + 1,
+            column_end: end.col.to_usize() + 1,
             is_primary,
             text: DiagnosticSpanLine::from_span(span, je),
             suggested_replacement: suggestion.map(|x| x.0.clone()),
@@ -535,8 +535,8 @@ impl DiagnosticSpanLine {
                         DiagnosticSpanLine::line_from_source_file(
                             sf,
                             line.line_index,
-                            line.start_col.0 + 1,
-                            line.end_col.0 + 1,
+                            line.start_col.to_usize() + 1,
+                            line.end_col.to_usize() + 1,
                         )
                     })
                     .collect()

compiler/rustc_errors/src/lib.rs

@@ -312,16 +312,17 @@ impl CodeSuggestion {
                         })
                         .sum();
                     line_highlight.push(SubstitutionHighlight {
-                        start: (cur_lo.col.0 as isize + acc) as usize,
-                        end: (cur_lo.col.0 as isize + acc + len) as usize,
+                        start: (cur_lo.col.to_usize() as isize + acc) as usize,
+                        end: (cur_lo.col.to_usize() as isize + acc + len) as usize,
                     });
                     buf.push_str(&part.snippet);
                     let cur_hi = sm.lookup_char_pos(part.span.hi());
                     if prev_hi.line == cur_lo.line && cur_hi.line == cur_lo.line {
                         // Account for the difference between the width of the current code and the
                         // snippet being suggested, so that the *later* suggestions are correctly
                         // aligned on the screen.
-                        acc += len as isize - (cur_hi.col.0 - cur_lo.col.0) as isize;
+                        acc +=
+                            len as isize - (cur_hi.col.to_usize() - cur_lo.col.to_usize()) as isize;
                     }
                     prev_hi = cur_hi;
                     prev_line = sf.get_line(prev_hi.line.to_usize() - 1);

compiler/rustc_mir_transform/src/coverage/mod.rs

@@ -512,11 +512,10 @@ fn make_code_region(
     let (end_line, end_col) = if span.hi() == span.lo() {
         let (end_line, mut end_col) = (start_line, start_col);
         // Extend an empty span by one character so the region will be counted.
-        let CharPos(char_pos) = start_col;
         if span.hi() == body_span.hi() {
-            start_col = CharPos(char_pos - 1);
+            start_col = start_col - CharPos::from_u32(1);
         } else {
-            end_col = CharPos(char_pos + 1);
+            end_col = start_col + CharPos::from_u32(1);
         }
         (end_line, end_col)
     } else {

compiler/rustc_save_analysis/src/lib.rs

@@ -85,8 +85,8 @@ impl<'tcx> SaveContext<'tcx> {
             byte_end: span.hi().0,
             line_start: Row::new_one_indexed(start.line.to_u32()),
             line_end: Row::new_one_indexed(end.line.to_u32()),
-            column_start: Column::new_one_indexed(start.col.0 as u32 + 1),
-            column_end: Column::new_one_indexed(end.col.0 as u32 + 1),
+            column_start: Column::new_one_indexed(start.col.to_u32() + 1),
+            column_end: Column::new_one_indexed(end.col.to_u32() + 1),
         }
     }
 

compiler/rustc_span/src/lib.rs

@@ -1687,7 +1687,7 @@ impl SourceFile {
         }
 
         assert!(self.start_pos.to_u32() + total_extra_bytes <= bpos.to_u32());
-        CharPos(bpos.to_usize() - self.start_pos.to_usize() - total_extra_bytes as usize)
+        CharPos(bpos.to_u32() - self.start_pos.to_u32() - total_extra_bytes)
     }
 
     /// Looks up the file's (1-based) line number and (0-based `CharPos`) column offset, for a
@@ -1712,7 +1712,7 @@ impl SourceFile {
 
     /// Looks up the file's (1-based) line number, (0-based `CharPos`) column offset, and (0-based)
     /// column offset when displayed, for a given `BytePos`.
-    pub fn lookup_file_pos_with_col_display(&self, pos: BytePos) -> (LineNum, CharPos, usize) {
+    pub fn lookup_file_pos_with_col_display(&self, pos: BytePos) -> (LineNum, CharPos, u32) {
         let (line, col_or_chpos) = self.lookup_file_pos(pos);
         if line.to_usize() > 0 {
             let col = col_or_chpos;
@@ -1731,7 +1731,8 @@ impl SourceFile {
                     .iter()
                     .map(|x| x.width())
                     .sum();
-                col.0 - special_chars + non_narrow
+                col.to_u32() - u32::try_from(special_chars).unwrap()
+                    + u32::try_from(non_narrow).unwrap()
             };
             (line, col, col_display)
         } else {
@@ -1743,7 +1744,8 @@ impl SourceFile {
                     .unwrap_or_else(|x| x);
                 let non_narrow: usize =
                     self.non_narrow_chars[0..end_width_idx].iter().map(|x| x.width()).sum();
-                chpos.0 - end_width_idx + non_narrow
+                chpos.to_u32() - u32::try_from(end_width_idx).unwrap()
+                    + u32::try_from(non_narrow).unwrap()
             };
             (LineNum(0), chpos, col_display)
         }
@@ -1911,7 +1913,7 @@ impl_pos! {
     /// is not equivalent to a character offset. The [`SourceMap`] will convert [`BytePos`]
     /// values to `CharPos` values as necessary.
     #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Debug)]
-    pub struct CharPos(pub usize);
+    pub struct CharPos(u32);
 
     /// A Line number
     ///

compiler/rustc_span/src/source_map.rs

@@ -428,7 +428,7 @@ impl SourceMap {
     pub fn lookup_char_pos(&self, pos: BytePos) -> Loc {
         let sf = self.lookup_source_file(pos);
         let (line, col, col_display) = sf.lookup_file_pos_with_col_display(pos);
-        Loc { file: sf, line, col, col_display }
+        Loc { file: sf, line, col, col_display: col_display as usize }
     }
 
     // If the corresponding `SourceFile` is empty, does not return a line number.

src/tools/clippy/clippy_lints/src/formatting.rs

@@ -5,7 +5,7 @@ use rustc_ast::ast::{BinOpKind, Block, Expr, ExprKind, StmtKind, UnOp};
 use rustc_lint::{EarlyContext, EarlyLintPass, LintContext};
 use rustc_middle::lint::in_external_macro;
 use rustc_session::{declare_lint_pass, declare_tool_lint};
-use rustc_span::source_map::Span;
+use rustc_span::source_map::{Pos, Span};
 
 declare_clippy_lint! {
     /// ### What it does
@@ -264,7 +264,7 @@ fn has_unary_equivalent(bin_op: BinOpKind) -> bool {
 }
 
 fn indentation(cx: &EarlyContext<'_>, span: Span) -> usize {
-    cx.sess().source_map().lookup_char_pos(span.lo()).col.0
+    cx.sess().source_map().lookup_char_pos(span.lo()).col.to_usize()
 }
 
 /// Implementation of the `POSSIBLE_MISSING_COMMA` lint for array

src/tools/clippy/clippy_utils/src/sugg.rs

@@ -661,7 +661,7 @@ fn indentation<T: LintContext>(cx: &T, span: Span) -> Option<String> {
         .and_then(|line| {
             if let Some((pos, _)) = line.char_indices().find(|&(_, c)| c != ' ' && c != '\t') {
                 // We can mix char and byte positions here because we only consider `[ \t]`.
-                if lo.col == CharPos(pos) {
+                if lo.col == CharPos::from_usize(pos) {
                     Some(line[..pos].into())
                 } else {
                     None