Separate LineWidth and LineLength implementation

crates/ruff/src/message/text.rs

@@ -14,7 +14,7 @@ use crate::fs::relativize_path;
 use crate::message::diff::Diff;
 use crate::message::{Emitter, EmitterContext, Message};
 use crate::registry::AsRule;
-use crate::settings::line_width::{TabSize, Width};
+use crate::settings::line_width::{LineWidth, TabSize};
 
 bitflags! {
     #[derive(Default)]
@@ -243,15 +243,16 @@ fn replace_whitespace(source: &str, annotation_range: TextRange) -> SourceCode {
     let mut result = String::new();
     let mut last_end = 0;
     let mut range = annotation_range;
-    let mut line_width = Width::new(TAB_SIZE);
+    let mut line_width = LineWidth::new(TAB_SIZE);
 
     for (index, c) in source.char_indices() {
-        let old_width = line_width.width();
+        let old_width = line_width.get();
         line_width = line_width.add_char(c);
 
         if matches!(c, '\t') {
+            // SAFETY: The difference is a value in the range [1..TAB_SIZE] which is guaranteed to be less than `u32`.
             #[allow(clippy::cast_possible_truncation)]
-            let tab_width = (line_width.width() - old_width) as u32;
+            let tab_width = (line_width.get() - old_width) as u32;
 
             if index < usize::from(annotation_range.start()) {
                 range += TextSize::new(tab_width - 1);

crates/ruff/src/rules/flake8_simplify/rules/ast_if.rs

@@ -15,7 +15,7 @@ use ruff_python_semantic::model::SemanticModel;
 use crate::checkers::ast::Checker;
 use crate::registry::AsRule;
 use crate::rules::flake8_simplify::rules::fix_if;
-use crate::settings::line_width::Width;
+use crate::settings::line_width::LineWidth;
 
 fn compare_expr(expr1: &ComparableExpr, expr2: &ComparableExpr) -> bool {
     expr1.eq(expr2)
@@ -289,7 +289,7 @@ pub(crate) fn nested_if_statements(
                     .unwrap_or_default()
                     .universal_newlines()
                     .all(|line| {
-                        Width::new(checker.settings.tab_size).add_str(&line)
+                        LineWidth::new(checker.settings.tab_size).add_str(&line)
                             <= checker.settings.line_length
                     })
                 {
@@ -511,7 +511,7 @@ pub(crate) fn use_ternary_operator(checker: &mut Checker, stmt: &Stmt, parent: O
 
     // Don't flag if the resulting expression would exceed the maximum line length.
     let line_start = checker.locator.line_start(stmt.start());
-    if Width::new(checker.settings.tab_size)
+    if LineWidth::new(checker.settings.tab_size)
         .add_str(&checker.locator.contents()[TextRange::new(line_start, stmt.start())])
         .add_str(&contents)
         > checker.settings.line_length
@@ -867,7 +867,7 @@ pub(crate) fn use_dict_get_with_default(
 
     // Don't flag if the resulting expression would exceed the maximum line length.
     let line_start = checker.locator.line_start(stmt.start());
-    if Width::new(checker.settings.tab_size)
+    if LineWidth::new(checker.settings.tab_size)
         .add_str(&checker.locator.contents()[TextRange::new(line_start, stmt.start())])
         .add_str(&contents)
         > checker.settings.line_length

crates/ruff/src/rules/flake8_simplify/rules/ast_with.rs

@@ -10,7 +10,7 @@ use ruff_python_ast::newlines::StrExt;
 
 use crate::checkers::ast::Checker;
 use crate::registry::AsRule;
-use crate::settings::line_width::Width;
+use crate::settings::line_width::LineWidth;
 
 use super::fix_with;
 
@@ -112,7 +112,7 @@ pub(crate) fn multiple_with_statements(
                         .unwrap_or_default()
                         .universal_newlines()
                         .all(|line| {
-                            Width::new(checker.settings.tab_size).add_str(&line)
+                            LineWidth::new(checker.settings.tab_size).add_str(&line)
                                 <= checker.settings.line_length
                         })
                     {

crates/ruff/src/rules/flake8_simplify/rules/reimplemented_builtin.rs

@@ -9,7 +9,7 @@ use ruff_python_ast::source_code::Generator;
 
 use crate::checkers::ast::Checker;
 use crate::registry::{AsRule, Rule};
-use crate::settings::line_width::Width;
+use crate::settings::line_width::LineWidth;
 
 #[violation]
 pub struct ReimplementedBuiltin {
@@ -224,7 +224,7 @@ pub(crate) fn convert_for_loop_to_any_all(
 
                 // Don't flag if the resulting expression would exceed the maximum line length.
                 let line_start = checker.locator.line_start(stmt.start());
-                if Width::new(checker.settings.tab_size)
+                if LineWidth::new(checker.settings.tab_size)
                     .add_str(&checker.locator.contents()[TextRange::new(line_start, stmt.start())])
                     .add_str(&contents)
                     > checker.settings.line_length
@@ -317,7 +317,7 @@ pub(crate) fn convert_for_loop_to_any_all(
 
                 // Don't flag if the resulting expression would exceed the maximum line length.
                 let line_start = checker.locator.line_start(stmt.start());
-                if Width::new(checker.settings.tab_size)
+                if LineWidth::new(checker.settings.tab_size)
                     .add_str(&checker.locator.contents()[TextRange::new(line_start, stmt.start())])
                     .add_str(&contents)
                     > checker.settings.line_length

crates/ruff/src/rules/isort/format.rs

@@ -1,6 +1,6 @@
 use ruff_python_ast::source_code::Stylist;
 
-use crate::settings::line_width::{LineLength, Width};
+use crate::settings::line_width::{LineLength, LineWidth};
 
 use super::types::{AliasData, CommentSet, ImportFromData, Importable};
 
@@ -46,7 +46,7 @@ pub(crate) fn format_import_from(
     comments: &CommentSet,
     aliases: &[(AliasData, CommentSet)],
     line_length: LineLength,
-    indentation_width: Width,
+    indentation_width: LineWidth,
     stylist: &Stylist,
     force_wrap_aliases: bool,
     is_first: bool,
@@ -103,8 +103,8 @@ fn format_single_line(
     aliases: &[(AliasData, CommentSet)],
     is_first: bool,
     stylist: &Stylist,
-    indentation_width: Width,
-) -> (String, Width) {
+    indentation_width: LineWidth,
+) -> (String, LineWidth) {
     let mut output = String::with_capacity(CAPACITY);
     let mut line_width = indentation_width;
 

crates/ruff/src/rules/isort/mod.rs

@@ -19,7 +19,7 @@ use types::{AliasData, EitherImport, TrailingComma};
 
 use crate::rules::isort::categorize::KnownModules;
 use crate::rules::isort::types::ImportBlock;
-use crate::settings::line_width::{LineLength, Width};
+use crate::settings::line_width::{LineLength, LineWidth};
 use crate::settings::types::PythonVersion;
 
 mod annotate;
@@ -67,7 +67,7 @@ pub(crate) fn format_imports(
     comments: Vec<Comment>,
     locator: &Locator,
     line_length: LineLength,
-    indentation_width: Width,
+    indentation_width: LineWidth,
     stylist: &Stylist,
     src: &[PathBuf],
     package: Option<&Path>,
@@ -166,7 +166,7 @@ pub(crate) fn format_imports(
 fn format_import_block(
     block: ImportBlock,
     line_length: LineLength,
-    indentation_width: Width,
+    indentation_width: LineWidth,
     stylist: &Stylist,
     src: &[PathBuf],
     package: Option<&Path>,

crates/ruff/src/rules/isort/rules/organize_imports.rs

@@ -14,7 +14,7 @@ use ruff_python_ast::source_code::{Indexer, Locator, Stylist};
 use ruff_python_ast::whitespace::leading_space;
 
 use crate::registry::AsRule;
-use crate::settings::line_width::Width;
+use crate::settings::line_width::LineWidth;
 use crate::settings::Settings;
 
 use super::super::block::Block;
@@ -118,7 +118,7 @@ pub(crate) fn organize_imports(
         comments,
         locator,
         settings.line_length,
-        Width::new(settings.tab_size).add_str(indentation),
+        LineWidth::new(settings.tab_size).add_str(indentation),
         stylist,
         &settings.src,
         package,

crates/ruff/src/rules/pycodestyle/helpers.rs

@@ -5,7 +5,7 @@ use unicode_width::UnicodeWidthStr;
 use ruff_python_ast::newlines::Line;
 use ruff_python_ast::source_code::Generator;
 
-use crate::settings::line_width::{LineLength, TabSize, Width};
+use crate::settings::line_width::{LineLength, LineWidth, TabSize};
 
 pub(crate) fn is_ambiguous_name(name: &str) -> bool {
     name == "l" || name == "I" || name == "O"
@@ -34,7 +34,7 @@ pub(super) fn is_overlong(
     tab_size: TabSize,
 ) -> Option<Overlong> {
     let mut start_offset = line.start();
-    let mut width = Width::new(tab_size);
+    let mut width = LineWidth::new(tab_size);
 
     for c in line.chars() {
         if width < limit {
@@ -66,14 +66,14 @@ pub(super) fn is_overlong(
     // begins before the limit.
     let last_chunk = chunks.last().unwrap_or(second_chunk);
     if last_chunk.contains("://") {
-        if width.width() - last_chunk.width() <= limit.width() {
+        if width.get() - last_chunk.width() <= limit.get() {
             return None;
         }
     }
 
     Some(Overlong {
         range: TextRange::new(start_offset, line.end()),
-        width: width.width(),
+        width: width.get(),
     })
 }
 

crates/ruff/src/rules/pycodestyle/rules/doc_line_too_long.rs

@@ -52,7 +52,7 @@ pub(crate) fn doc_line_too_long(line: &Line, settings: &Settings) -> Option<Diag
     )
     .map(|overlong| {
         Diagnostic::new(
-            DocLineTooLong(overlong.width(), limit.width()),
+            DocLineTooLong(overlong.width(), limit.get()),
             overlong.range(),
         )
     })

crates/ruff/src/rules/pycodestyle/rules/line_too_long.rs

@@ -45,10 +45,5 @@ pub(crate) fn line_too_long(line: &Line, settings: &Settings) -> Option<Diagnost
         &settings.task_tags,
         settings.tab_size,
     )
-    .map(|overlong| {
-        Diagnostic::new(
-            LineTooLong(overlong.width(), limit.width()),
-            overlong.range(),
-        )
-    })
+    .map(|overlong| Diagnostic::new(LineTooLong(overlong.width(), limit.get()), overlong.range()))
 }