Discard changes to crates/ruff_formatter/src/macros.rs

crates/ruff/Cargo.toml

@@ -25,7 +25,7 @@ ruff_python_index = { path = "../ruff_python_index" }
 ruff_python_literal = { path = "../ruff_python_literal" }
 ruff_python_semantic = { path = "../ruff_python_semantic" }
 ruff_python_stdlib = { path = "../ruff_python_stdlib" }
-ruff_python_trivia = { path = "../ruff_python_trivia", features = ["schemars"] }
+ruff_python_trivia = { path = "../ruff_python_trivia" }
 ruff_python_parser = { path = "../ruff_python_parser" }
 ruff_source_file = { path = "../ruff_source_file", features = ["serde"] }
 ruff_text_size = { path = "../ruff_text_size" }

crates/ruff_formatter/src/format_element/document.rs

@@ -216,13 +216,13 @@ impl FormatOptions for IrFormatOptions {
     }
 
     fn line_width(&self) -> LineWidth {
-        LineWidth(80)
+        LineWidth::try_from(80).unwrap()
     }
 
     fn as_print_options(&self) -> PrinterOptions {
         PrinterOptions {
             tab_width: 2,
-            print_width: self.line_width().into(),
+            line_width: self.line_width().into(),
             line_ending: LineEnding::LineFeed,
             indent_style: IndentStyle::Space(2),
         }

crates/ruff_formatter/src/lib.rs

@@ -141,6 +141,12 @@ impl From<LineWidth> for u16 {
     }
 }
 
+impl From<LineWidth> for u32 {
+    fn from(value: LineWidth) -> Self {
+        value.0.get() as u32
+    }
+}
+
 impl From<NonZeroU16> for LineWidth {
     fn from(value: NonZeroU16) -> Self {
         Self(value)
@@ -221,7 +227,7 @@ impl FormatOptions for SimpleFormatOptions {
     fn as_print_options(&self) -> PrinterOptions {
         PrinterOptions::default()
             .with_indent(self.indent_style)
-            .with_print_width(self.line_width.into())
+            .with_line_width(self.line_width.into())
     }
 }
 
@@ -394,7 +400,6 @@ pub type FormatResult<F> = Result<F, FormatError>;
 /// Implementing `Format` for a custom struct
 ///
 /// ```
-///
 /// use ruff_formatter::{format, write, IndentStyle};
 /// use ruff_formatter::prelude::*;
 /// use ruff_text_size::TextSize;

crates/ruff_formatter/src/macros.rs

@@ -153,8 +153,7 @@ macro_rules! format {
 /// ## Examples
 ///
 /// ```
-///
-/// use ruff_formatter::{Formatted, format, format_args, SimpleFormatOptions};
+/// use ruff_formatter::{Formatted, LineWidth, format, format_args, SimpleFormatOptions};
 /// use ruff_formatter::prelude::*;
 ///
 /// # fn main() -> FormatResult<()> {
@@ -242,8 +241,7 @@ macro_rules! format {
 /// ### Enclosing group with `should_expand: true`
 ///
 /// ```
-///
-/// use ruff_formatter::{Formatted, format, format_args, SimpleFormatOptions};
+/// use ruff_formatter::{Formatted, LineWidth, format, format_args, SimpleFormatOptions};
 /// use ruff_formatter::prelude::*;
 ///
 /// # fn main() -> FormatResult<()> {

crates/ruff_formatter/src/printer/mod.rs

@@ -1309,7 +1309,7 @@ impl<'a, 'print> FitsMeasurer<'a, 'print> {
             self.state.line_width += char_width;
         }
 
-        if self.state.line_width > self.options().print_width.into() {
+        if self.state.line_width > self.options().line_width.into() {
             return Fits::No;
         }
 
@@ -1426,9 +1426,11 @@ impl From<BestFittingMode> for MeasureMode {
 #[cfg(test)]
 mod tests {
     use crate::prelude::*;
-    use crate::printer::{LineEnding, PrintWidth, Printer, PrinterOptions};
+    use crate::printer::{LineEnding, Printer, PrinterOptions};
     use crate::source_code::SourceCode;
-    use crate::{format_args, write, Document, FormatState, IndentStyle, Printed, VecBuffer};
+    use crate::{
+        format_args, write, Document, FormatState, IndentStyle, LineWidth, Printed, VecBuffer,
+    };
 
     fn format(root: &dyn Format<SimpleFormatContext>) -> Printed {
         format_with_options(
@@ -1579,7 +1581,7 @@ two lines`,
         let options = PrinterOptions {
             indent_style: IndentStyle::Tab,
             tab_width: 4,
-            print_width: PrintWidth::new(19),
+            line_width: LineWidth::try_from(19).unwrap(),
             ..PrinterOptions::default()
         };
 
@@ -1684,7 +1686,7 @@ two lines`,
 
         let printed = Printer::new(
             SourceCode::default(),
-            PrinterOptions::default().with_print_width(PrintWidth::new(10)),
+            PrinterOptions::default().with_line_width(LineWidth::try_from(10).unwrap()),
         )
         .print(&document)
         .unwrap();

crates/ruff_formatter/src/printer/printer_options/mod.rs

@@ -7,7 +7,7 @@ pub struct PrinterOptions {
     pub tab_width: u8,
 
     /// What's the max width of a line. Defaults to 80
-    pub print_width: PrintWidth,
+    pub line_width: LineWidth,
 
     /// The type of line ending to apply to the printed input
     pub line_ending: LineEnding,
@@ -16,54 +16,21 @@ pub struct PrinterOptions {
     pub indent_style: IndentStyle,
 }
 
-#[derive(Debug, Copy, Clone, Eq, PartialEq)]
-pub struct PrintWidth(u16);
-
-impl PrintWidth {
-    pub fn new(width: u16) -> Self {
-        Self(width)
-    }
-}
-
-impl Default for PrintWidth {
-    fn default() -> Self {
-        LineWidth::default().into()
-    }
-}
-
-impl From<LineWidth> for PrintWidth {
-    fn from(width: LineWidth) -> Self {
-        Self(u16::from(width))
-    }
-}
-
-impl From<PrintWidth> for u32 {
-    fn from(width: PrintWidth) -> Self {
-        u32::from(width.0)
-    }
-}
-
-impl From<PrintWidth> for u16 {
-    fn from(width: PrintWidth) -> Self {
-        width.0
-    }
-}
-
 impl<'a, O> From<&'a O> for PrinterOptions
 where
     O: FormatOptions,
 {
     fn from(options: &'a O) -> Self {
         PrinterOptions::default()
             .with_indent(options.indent_style())
-            .with_print_width(options.line_width().into())
+            .with_line_width(options.line_width().into())
     }
 }
 
 impl PrinterOptions {
     #[must_use]
-    pub fn with_print_width(mut self, width: PrintWidth) -> Self {
-        self.print_width = width;
+    pub fn with_line_width(mut self, width: LineWidth) -> Self {
+        self.line_width = width;
         self
     }
 
@@ -115,7 +82,7 @@ impl Default for PrinterOptions {
     fn default() -> Self {
         PrinterOptions {
             tab_width: 2,
-            print_width: PrintWidth::default(),
+            line_width: LineWidth::default(),
             indent_style: IndentStyle::default(),
             line_ending: LineEnding::LineFeed,
         }

crates/ruff_python_formatter/src/options.rs

@@ -113,7 +113,7 @@ impl FormatOptions for PyFormatOptions {
     fn as_print_options(&self) -> PrinterOptions {
         PrinterOptions {
             tab_width: 4,
-            print_width: self.line_width.into(),
+            line_width: self.line_width.into(),
             line_ending: LineEnding::LineFeed,
             indent_style: self.indent_style,
         }