u

Author: shulaoda

src/format_report_formatter.rs

@@ -106,7 +106,7 @@ fn annotation(error: &FormattingError) -> Option<Annotation<'_>> {
 
 fn error_kind_to_snippet_annotation_level(error_kind: &ErrorKind) -> Level {
     match error_kind {
-        ErrorKind::LineOverflow(..)
+        ErrorKind::LineOverflow { .. }
         | ErrorKind::TrailingWhitespace
         | ErrorKind::IoError(_)
         | ErrorKind::ModuleResolutionError(_)

src/formatting.rs

@@ -333,7 +333,7 @@ impl FormattingError {
 
     pub(crate) fn is_internal(&self) -> bool {
         match self.kind {
-            ErrorKind::LineOverflow(..)
+            ErrorKind::LineOverflow { .. }
             | ErrorKind::TrailingWhitespace
             | ErrorKind::IoError(_)
             | ErrorKind::ParseError
@@ -354,9 +354,13 @@ impl FormattingError {
     // (space, target)
     pub(crate) fn format_len(&self) -> (usize, usize) {
         match self.kind {
-            ErrorKind::LineOverflow(_, _, byte_start) => {
-                (byte_start, self.line_buffer.len() - byte_start)
-            }
+            ErrorKind::LineOverflow {
+                overflow_start_byte,
+                ..
+            } => (
+                overflow_start_byte,
+                self.line_buffer.len() - overflow_start_byte,
+            ),
             ErrorKind::TrailingWhitespace
             | ErrorKind::DeprecatedAttr
             | ErrorKind::BadAttr
@@ -566,10 +570,13 @@ impl<'a> FormatLines<'a> {
             }
 
             // Check for any line width errors we couldn't correct.
-            let max = self.config.max_width();
-            let error_kind =
-                ErrorKind::LineOverflow(self.line_len, max, self.byte_offset_at_col(max));
-            if self.line_len > max
+            let max_width = self.config.max_width();
+            let error_kind = ErrorKind::LineOverflow {
+                total_line_width: self.line_len,
+                max_width,
+                overflow_start_byte: self.byte_offset_at_col(max_width),
+            };
+            if self.line_len > max_width
                 && !self.is_skipped_line()
                 && self.should_report_error(kind, &error_kind)
             {
@@ -641,7 +648,7 @@ impl<'a> FormatLines<'a> {
         };
 
         match error_kind {
-            ErrorKind::LineOverflow(..) => {
+            ErrorKind::LineOverflow { .. } => {
                 self.config.error_on_line_overflow() && allow_error_report
             }
             ErrorKind::TrailingWhitespace | ErrorKind::LostComment => allow_error_report,

src/lib.rs

@@ -106,17 +106,16 @@ pub(crate) mod visitor;
 /// these can currently be propagated to clients.
 #[derive(Error, Debug)]
 pub enum ErrorKind {
-    /// Line has exceeded character limit (found, maximum, byte offset within
-    /// the line where the overflow region begins).
+    /// A line exceeded the configured maximum width.
     #[error(
         "line formatted, but exceeded maximum width \
-         (maximum: {1} (see `max_width` option), found: {0})"
+         (maximum: {max_width} (see `max_width` option), found: {total_line_width})"
     )]
-LineOverflow {
-    total_line_width: usize,
-    max_width: usize,
-    overflow_start_byte: usize
-}
+    LineOverflow {
+        total_line_width: usize,
+        max_width: usize,
+        overflow_start_byte: usize,
+    },
     /// Line ends in whitespace.
     #[error("left behind trailing whitespace")]
     TrailingWhitespace,
@@ -230,7 +229,7 @@ impl FormatReport {
         }
         for err in new_errors {
             match err.kind {
-                ErrorKind::LineOverflow(..) => {
+                ErrorKind::LineOverflow { .. } => {
                     errs.has_operational_errors = true;
                 }
                 ErrorKind::TrailingWhitespace => {