unify PyVersion enums

Author: ntBre

crates/ruff_python_formatter/src/lib.rs

@@ -15,7 +15,7 @@ use crate::comments::{
 pub use crate::context::PyFormatContext;
 pub use crate::options::{
     DocstringCode, DocstringCodeLineWidth, MagicTrailingComma, PreviewMode, PyFormatOptions,
-    PythonVersion, QuoteStyle,
+    QuoteStyle,
 };
 use crate::range::is_logical_line;
 pub use crate::shared_traits::{AsFormat, FormattedIter, FormattedIterExt, IntoFormat};

crates/ruff_python_formatter/src/options.rs

@@ -6,6 +6,7 @@ use ruff_formatter::printer::{LineEnding, PrinterOptions, SourceMapGeneration};
 use ruff_formatter::{FormatOptions, IndentStyle, IndentWidth, LineWidth};
 use ruff_macros::CacheKey;
 use ruff_python_ast::PySourceType;
+use ruff_python_parser::python_version::PyVersion;
 
 /// Resolved options for formatting one individual file. The difference to `FormatterSettings`
 /// is that `FormatterSettings` stores the settings for multiple files (the entire project, a subdirectory, ..)
@@ -21,7 +22,7 @@ pub struct PyFormatOptions {
 
     /// The (minimum) Python version used to run the formatted code. This is used
     /// to determine the supported Python syntax.
-    target_version: PythonVersion,
+    target_version: PyVersion,
 
     /// Specifies the indent style:
     /// * Either a tab
@@ -80,7 +81,7 @@ impl Default for PyFormatOptions {
     fn default() -> Self {
         Self {
             source_type: PySourceType::default(),
-            target_version: PythonVersion::default(),
+            target_version: PyVersion::default(),
             indent_style: default_indent_style(),
             line_width: default_line_width(),
             indent_width: default_indent_width(),
@@ -108,7 +109,7 @@ impl PyFormatOptions {
         }
     }
 
-    pub const fn target_version(&self) -> PythonVersion {
+    pub const fn target_version(&self) -> PyVersion {
         self.target_version
     }
 
@@ -145,7 +146,7 @@ impl PyFormatOptions {
     }
 
     #[must_use]
-    pub fn with_target_version(mut self, target_version: PythonVersion) -> Self {
+    pub fn with_target_version(mut self, target_version: PyVersion) -> Self {
         self.target_version = target_version;
         self
     }
@@ -468,52 +469,3 @@ where
         )),
     }
 }
-
-#[derive(CacheKey, Clone, Copy, Debug, PartialOrd, Ord, PartialEq, Eq, Default)]
-#[cfg_attr(
-    feature = "serde",
-    derive(serde::Serialize, serde::Deserialize),
-    serde(rename_all = "lowercase")
-)]
-#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
-pub enum PythonVersion {
-    Py37,
-    Py38,
-    // Make sure to also change the default for `ruff_linter::settings::types::PythonVersion`
-    // when changing the default here.
-    #[default]
-    Py39,
-    Py310,
-    Py311,
-    Py312,
-    Py313,
-}
-
-impl PythonVersion {
-    /// Return `true` if the current version supports [PEP 701].
-    ///
-    /// [PEP 701]: https://peps.python.org/pep-0701/
-    pub fn supports_pep_701(self) -> bool {
-        self >= Self::Py312
-    }
-
-    pub fn as_tuple(self) -> (u8, u8) {
-        match self {
-            Self::Py37 => (3, 7),
-            Self::Py38 => (3, 8),
-            Self::Py39 => (3, 9),
-            Self::Py310 => (3, 10),
-            Self::Py311 => (3, 11),
-            Self::Py312 => (3, 12),
-            Self::Py313 => (3, 13),
-        }
-    }
-
-    pub fn latest() -> Self {
-        Self::Py313
-    }
-
-    pub fn minimal_supported() -> Self {
-        Self::Py37
-    }
-}

crates/ruff_python_formatter/src/statement/stmt_with.rs

@@ -1,5 +1,6 @@
 use ruff_formatter::{format_args, write, FormatContext, FormatError};
 use ruff_python_ast::{StmtWith, WithItem};
+use ruff_python_parser::python_version::PyVersion;
 use ruff_python_trivia::{SimpleTokenKind, SimpleTokenizer};
 use ruff_text_size::{Ranged, TextRange};
 
@@ -14,7 +15,6 @@ use crate::other::with_item::WithItemLayout;
 use crate::prelude::*;
 use crate::statement::clause::{clause_body, clause_header, ClauseHeader};
 use crate::statement::suite::SuiteKind;
-use crate::PythonVersion;
 
 #[derive(Default)]
 pub struct FormatStmtWith;
@@ -302,7 +302,7 @@ impl<'a> WithItemsLayout<'a> {
             }
         }
 
-        let can_parenthesize = context.options().target_version() >= PythonVersion::Py39
+        let can_parenthesize = context.options().target_version() >= PyVersion::Py39
             || are_with_items_parenthesized(with, context)?;
 
         // If the target version doesn't support parenthesized context managers and they aren't

crates/ruff_python_formatter/src/string/implicit.rs

@@ -164,7 +164,7 @@ impl<'a> FormatImplicitConcatenatedStringFlat<'a> {
                 }
 
                 if let StringLikePart::FString(fstring) = part {
-                    if context.options().target_version().supports_pep_701() {
+                    if context.options().target_version().supports_pep701() {
                         if is_fstring_with_quoted_format_spec_and_debug(fstring, context) {
                             if preserve_quotes_requirement
                                 .is_some_and(|quote| quote != part.flags().quote_style())

crates/ruff_python_formatter/src/string/normalize.rs

@@ -45,7 +45,7 @@ impl<'a, 'src> StringNormalizer<'a, 'src> {
         let preferred_quote_style = self
             .preferred_quote_style
             .unwrap_or(self.context.options().quote_style());
-        let supports_pep_701 = self.context.options().target_version().supports_pep_701();
+        let supports_pep_701 = self.context.options().target_version().supports_pep701();
 
         // For f-strings prefer alternating the quotes unless The outer string is triple quoted and the inner isn't.
         if let FStringState::InsideExpressionElement(parent_context) = self.context.f_string_state()

crates/ruff_python_parser/src/python_version.rs

@@ -21,8 +21,6 @@ mod pyversion {
     pub enum PyVersion {
         Py37,
         Py38,
-        // Make sure to also change the default for `ruff_python_formatter::PyVersion`
-        // when changing the default here.
         #[default]
         Py39,
         Py310,

crates/ruff_workspace/src/configuration.rs

@@ -178,15 +178,7 @@ impl Configuration {
             exclude: FilePatternSet::try_from_iter(format.exclude.unwrap_or_default())?,
             extension: self.extension.clone().unwrap_or_default(),
             preview: format_preview,
-            target_version: match target_version {
-                PyVersion::Py37 => ruff_python_formatter::PythonVersion::Py37,
-                PyVersion::Py38 => ruff_python_formatter::PythonVersion::Py38,
-                PyVersion::Py39 => ruff_python_formatter::PythonVersion::Py39,
-                PyVersion::Py310 => ruff_python_formatter::PythonVersion::Py310,
-                PyVersion::Py311 => ruff_python_formatter::PythonVersion::Py311,
-                PyVersion::Py312 => ruff_python_formatter::PythonVersion::Py312,
-                PyVersion::Py313 => ruff_python_formatter::PythonVersion::Py313,
-            },
+            target_version,
             line_width: self
                 .line_length
                 .map_or(format_defaults.line_width, |length| {

crates/ruff_workspace/src/options.rs

@@ -3848,8 +3848,6 @@ mod tests {
     use crate::options::Flake8SelfOptions;
     use ruff_linter::rules::flake8_self;
     use ruff_python_ast::name::Name;
-    use ruff_python_formatter::PythonVersion as FormatterPythonVersion;
-    use ruff_python_parser::python_version::PyVersion as LinterPythonVersion;
 
     #[test]
     fn flake8_self_options() {
@@ -3897,28 +3895,4 @@ mod tests {
             vec![Name::new_static("_foo"), Name::new_static("_bar")]
         );
     }
-
-    #[test]
-    fn formatter_and_linter_target_version_have_same_default() {
-        assert_eq!(
-            FormatterPythonVersion::default().as_tuple(),
-            LinterPythonVersion::default().as_tuple()
-        );
-    }
-
-    #[test]
-    fn formatter_and_linter_target_version_have_same_latest() {
-        assert_eq!(
-            FormatterPythonVersion::latest().as_tuple(),
-            LinterPythonVersion::latest().as_tuple()
-        );
-    }
-
-    #[test]
-    fn formatter_and_linter_target_version_have_same_minimal_supported() {
-        assert_eq!(
-            FormatterPythonVersion::minimal_supported().as_tuple(),
-            LinterPythonVersion::minimal_supported().as_tuple()
-        );
-    }
 }

crates/ruff_workspace/src/settings.rs

@@ -13,6 +13,7 @@ use ruff_python_formatter::{
     DocstringCode, DocstringCodeLineWidth, MagicTrailingComma, PreviewMode, PyFormatOptions,
     QuoteStyle,
 };
+use ruff_python_parser::python_version::PyVersion;
 use ruff_source_file::find_newline;
 use std::fmt;
 use std::path::{Path, PathBuf};
@@ -164,7 +165,7 @@ pub struct FormatterSettings {
     pub exclude: FilePatternSet,
     pub extension: ExtensionMapping,
     pub preview: PreviewMode,
-    pub target_version: ruff_python_formatter::PythonVersion,
+    pub target_version: PyVersion,
 
     pub line_width: LineWidth,