Bump version to 0.0.62

Cargo.lock

@@ -1907,7 +1907,7 @@ dependencies = [
 
 [[package]]
 name = "ruff"
-version = "0.0.61"
+version = "0.0.62"
 dependencies = [
  "anyhow",
  "bincode",
@@ -1935,6 +1935,8 @@ dependencies = [
  "rustpython-parser",
  "serde",
  "serde_json",
+ "strum",
+ "strum_macros",
  "toml",
  "update-informer",
  "walkdir",
@@ -2252,6 +2254,28 @@ version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
 
+[[package]]
+name = "strum"
+version = "0.24.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "063e6045c0e62079840579a7e47a355ae92f60eb74daaf156fb1e84ba164e63f"
+dependencies = [
+ "strum_macros",
+]
+
+[[package]]
+name = "strum_macros"
+version = "0.24.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e385be0d24f186b4ce2f9982191e7101bb737312ad61c1f2f984f34bcf85d59"
+dependencies = [
+ "heck",
+ "proc-macro2",
+ "quote",
+ "rustversion",
+ "syn",
+]
+
 [[package]]
 name = "syn"
 version = "1.0.101"

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "ruff"
-version = "0.0.61"
+version = "0.0.62"
 edition = "2021"
 
 [lib]
@@ -35,6 +35,8 @@ serde_json = { version = "1.0.83" }
 toml = { version = "0.5.9" }
 update-informer = { version = "0.5.0", default_features = false, features = ["pypi"], optional = true }
 walkdir = { version = "2.3.2" }
+strum = { version = "0.24.1", features = ["strum_macros"] }
+strum_macros = "0.24.3"
 
 [dev-dependencies]
 insta = { version = "1.19.1", features = ["yaml"] }

README.md

@@ -294,9 +294,10 @@ The 🛠 emoji indicates that a rule is automatically fixable by the `--fix` com
 | U003 | TypeOfPrimitive | Use `str` instead of `type(...)` |  | 🛠 |
 | U004 | UselessObjectInheritance | Class `...` inherits from object |  | 🛠 |
 | U005 | NoAssertEquals | `assertEquals` is deprecated, use `assertEqual` instead |  | 🛠 |
+| U006 | UsePEP585Annotation | Use `list` instead of `List` for type annotations |  | 🛠 |
+| U007 | UsePEP604Annotation | Use `X | Y` for type annotations |  | 🛠 |
 | M001 | UnusedNOQA | Unused `noqa` directive |  | 🛠 |
 
-
 ## Integrations
 
 ### PyCharm

examples/generate_rules_table.rs

@@ -1,13 +1,12 @@
 /// Generate a Markdown-compatible table of supported lint rules.
-use ruff::checks::{CheckCode, ALL_CHECK_CODES, DEFAULT_CHECK_CODES};
+use strum::IntoEnumIterator;
+
+use ruff::checks::{CheckCode, DEFAULT_CHECK_CODES};
 
 fn main() {
-    let mut check_codes: Vec<CheckCode> = ALL_CHECK_CODES.to_vec();
-    check_codes.sort();
-
     println!("| Code | Name | Message |     |     |");
     println!("| ---- | ---- | ------- | --- | --- |");
-    for check_code in check_codes {
+    for check_code in CheckCode::iter() {
         let check_kind = check_code.kind();
         let default_token = if DEFAULT_CHECK_CODES.contains(&check_code) {
             "✅"
@@ -17,8 +16,8 @@ fn main() {
         let fix_token = if check_kind.fixable() { "🛠" } else { "" };
         println!(
             "| {} | {} | {} | {} | {} |",
-            check_kind.code().as_str(),
-            check_kind.name(),
+            check_kind.code().as_ref(),
+            check_kind.as_ref(),
             check_kind.body(),
             default_token,
             fix_token

resources/test/fixtures/U006.py

@@ -0,0 +1,12 @@
+from typing import List
+
+
+def f(x: List[str]) -> None:
+    ...
+
+
+import typing
+
+
+def f(x: typing.List[str]) -> None:
+    ...

resources/test/fixtures/U007.py

@@ -0,0 +1,40 @@
+from typing import Optional
+
+
+def f(x: Optional[str]) -> None:
+    ...
+
+
+import typing
+
+
+def f(x: typing.Optional[str]) -> None:
+    ...
+
+
+from typing import Union
+
+
+def f(x: Union[str, int, Union[float, bytes]]) -> None:
+    ...
+
+
+import typing
+
+
+def f(x: typing.Union[str, int]) -> None:
+    ...
+
+
+from typing import Union
+
+
+def f(x: "Union[str, int, Union[float, bytes]]") -> None:
+    ...
+
+
+import typing
+
+
+def f(x: "typing.Union[str, int]") -> None:
+    ...

src/ast.rs

@@ -1,4 +1,5 @@
 pub mod checks;
+pub mod helpers;
 pub mod operations;
 pub mod relocate;
 pub mod types;

src/ast/helpers.rs

@@ -0,0 +1,9 @@
+use rustpython_ast::{Expr, ExprKind};
+
+pub fn match_name_or_attr(expr: &Expr, target: &str) -> bool {
+    match &expr.node {
+        ExprKind::Attribute { attr, .. } => target == attr,
+        ExprKind::Name { id, .. } => target == id,
+        _ => false,
+    }
+}

src/check_ast.rs

@@ -5,12 +5,14 @@ use std::path::Path;
 use log::error;
 use once_cell::sync::Lazy;
 use regex::Regex;
+use rustpython_ast::Location;
 use rustpython_parser::ast::{
     Arg, Arguments, Constant, Excepthandler, ExcepthandlerKind, Expr, ExprContext, ExprKind,
     KeywordData, Operator, Stmt, StmtKind, Suite,
 };
 use rustpython_parser::parser;
 
+use crate::ast::helpers::match_name_or_attr;
 use crate::ast::operations::{extract_all_names, SourceCodeLocator};
 use crate::ast::relocate::relocate_expr;
 use crate::ast::types::{
@@ -100,14 +102,6 @@ impl<'a> Checker<'a> {
     }
 }
 
-fn match_name_or_attr(expr: &Expr, target: &str) -> bool {
-    match &expr.node {
-        ExprKind::Attribute { attr, .. } => target == attr,
-        ExprKind::Name { id, .. } => target == id,
-        _ => false,
-    }
-}
-
 enum SubscriptKind {
     AnnotatedSubscript,
     PEP593AnnotatedSubscript,
@@ -709,7 +703,14 @@ where
 
         // Pre-visit.
         match &expr.node {
-            ExprKind::Subscript { value, .. } => {
+            ExprKind::Subscript { value, slice, .. } => {
+                // Ex) typing.List[...]
+                if self.settings.enabled.contains(&CheckCode::U007)
+                    && self.settings.target_version >= PythonVersion::Py39
+                {
+                    plugins::use_pep604_annotation(self, expr, value, slice);
+                }
+
                 if match_name_or_attr(value, "Literal") {
                     self.in_literal = true;
                 }
@@ -731,7 +732,16 @@ where
                 }
             }
             ExprKind::Name { id, ctx } => match ctx {
-                ExprContext::Load => self.handle_node_load(expr),
+                ExprContext::Load => {
+                    // Ex) List[...]
+                    if self.settings.enabled.contains(&CheckCode::U006)
+                        && self.settings.target_version >= PythonVersion::Py39
+                    {
+                        plugins::use_pep585_annotation(self, expr, id);
+                    }
+
+                    self.handle_node_load(expr);
+                }
                 ExprContext::Store => {
                     if self.settings.enabled.contains(&CheckCode::E741) {
                         if let Some(check) = checks::check_ambiguous_variable_name(
@@ -748,6 +758,18 @@ where
                 }
                 ExprContext::Del => self.handle_node_delete(expr),
             },
+            ExprKind::Attribute { value, attr, .. } => {
+                // Ex) typing.List[...]
+                if self.settings.enabled.contains(&CheckCode::U006)
+                    && self.settings.target_version >= PythonVersion::Py39
+                {
+                    if let ExprKind::Name { id, .. } = &value.node {
+                        if id == "typing" {
+                            plugins::use_pep585_annotation(self, expr, attr);
+                        }
+                    }
+                }
+            }
             ExprKind::Call {
                 func,
                 args,
@@ -1584,14 +1606,37 @@ impl<'a> Checker<'a> {
     where
         'b: 'a,
     {
-        while let Some((location, expression)) = self.deferred_string_annotations.pop() {
+        while let Some((range, expression)) = self.deferred_string_annotations.pop() {
+            // HACK(charlie): We need to modify `range` such that it represents the range of the
+            // expression _within_ the string annotation (as opposed to the range of the string
+            // annotation itself). RustPython seems to return an off-by-one start column for every
+            // string value, so we check for double quotes (which are really triple quotes).
+            let contents = self.locator.slice_source_code_at(&range.location);
+            let range = if contents.starts_with("\"\"") || contents.starts_with("\'\'") {
+                Range {
+                    location: Location::new(range.location.row(), range.location.column() + 2),
+                    end_location: Location::new(
+                        range.end_location.row(),
+                        range.end_location.column() - 2,
+                    ),
+                }
+            } else {
+                Range {
+                    location: Location::new(range.location.row(), range.location.column()),
+                    end_location: Location::new(
+                        range.end_location.row(),
+                        range.end_location.column() - 1,
+                    ),
+                }
+            };
+
             if let Ok(mut expr) = parser::parse_expression(expression, "<filename>") {
-                relocate_expr(&mut expr, location);
+                relocate_expr(&mut expr, range);
                 allocator.push(expr);
             } else if self.settings.enabled.contains(&CheckCode::F722) {
                 self.checks.push(Check::new(
                     CheckKind::ForwardAnnotationSyntaxError(expression.to_string()),
-                    self.locate_check(location),
+                    self.locate_check(range),
                 ));
             }
         }

src/check_lines.rs

@@ -66,12 +66,12 @@ pub fn check_lines(
 
                 match noqa {
                     (Directive::All(_, _), matches) => {
-                        matches.push(check.kind.code().as_str());
+                        matches.push(check.kind.code().as_ref());
                         ignored.push(index)
                     }
                     (Directive::Codes(_, _, codes), matches) => {
-                        if codes.contains(&check.kind.code().as_str()) {
-                            matches.push(check.kind.code().as_str());
+                        if codes.contains(&check.kind.code().as_ref()) {
+                            matches.push(check.kind.code().as_ref());
                             ignored.push(index);
                         }
                     }
@@ -98,11 +98,11 @@ pub fn check_lines(
 
                 match noqa {
                     (Directive::All(_, _), matches) => {
-                        matches.push(check.kind.code().as_str());
+                        matches.push(check.kind.code().as_ref());
                     }
                     (Directive::Codes(_, _, codes), matches) => {
-                        if codes.contains(&check.kind.code().as_str()) {
-                            matches.push(check.kind.code().as_str());
+                        if codes.contains(&check.kind.code().as_ref()) {
+                            matches.push(check.kind.code().as_ref());
                         } else {
                             line_checks.push(check);
                         }
@@ -138,11 +138,11 @@ pub fn check_lines(
 
             match noqa {
                 (Directive::All(_, _), matches) => {
-                    matches.push(check.kind.code().as_str());
+                    matches.push(check.kind.code().as_ref());
                 }
                 (Directive::Codes(_, _, codes), matches) => {
-                    if codes.contains(&check.kind.code().as_str()) {
-                        matches.push(check.kind.code().as_str());
+                    if codes.contains(&check.kind.code().as_ref()) {
+                        matches.push(check.kind.code().as_ref());
                     } else {
                         line_checks.push(check);
                     }

src/checks.rs

@@ -1,11 +1,9 @@
-use std::str::FromStr;
-
-use crate::ast::checks::Primitive;
-use anyhow::Result;
 use itertools::Itertools;
 use rustpython_parser::ast::Location;
 use serde::{Deserialize, Serialize};
+use strum_macros::{AsRefStr, EnumIter, EnumString};
 
+use crate::ast::checks::Primitive;
 use crate::ast::types::Range;
 
 pub const DEFAULT_CHECK_CODES: [CheckCode; 43] = [
@@ -57,82 +55,20 @@ pub const DEFAULT_CHECK_CODES: [CheckCode; 43] = [
     CheckCode::F901,
 ];
 
-pub const ALL_CHECK_CODES: [CheckCode; 63] = [
-    // pycodestyle errors
-    CheckCode::E402,
-    CheckCode::E501,
-    CheckCode::E711,
-    CheckCode::E712,
-    CheckCode::E713,
-    CheckCode::E714,
-    CheckCode::E721,
-    CheckCode::E722,
-    CheckCode::E731,
-    CheckCode::E741,
-    CheckCode::E742,
-    CheckCode::E743,
-    CheckCode::E902,
-    CheckCode::E999,
-    // pycodestyle warnings
-    CheckCode::W292,
-    // pyflakes
-    CheckCode::F401,
-    CheckCode::F402,
-    CheckCode::F403,
-    CheckCode::F404,
-    CheckCode::F405,
-    CheckCode::F406,
-    CheckCode::F407,
-    CheckCode::F541,
-    CheckCode::F601,
-    CheckCode::F602,
-    CheckCode::F621,
-    CheckCode::F622,
-    CheckCode::F631,
-    CheckCode::F632,
-    CheckCode::F633,
-    CheckCode::F634,
-    CheckCode::F701,
-    CheckCode::F702,
-    CheckCode::F704,
-    CheckCode::F706,
-    CheckCode::F707,
-    CheckCode::F722,
-    CheckCode::F821,
-    CheckCode::F822,
-    CheckCode::F823,
-    CheckCode::F831,
-    CheckCode::F841,
-    CheckCode::F901,
-    // flake8-builtins
-    CheckCode::A001,
-    CheckCode::A002,
-    CheckCode::A003,
-    // flake8-comprehensions
-    CheckCode::C400,
-    CheckCode::C401,
-    CheckCode::C402,
-    CheckCode::C403,
-    CheckCode::C404,
-    CheckCode::C405,
-    CheckCode::C406,
-    CheckCode::C408,
-    // flake8-super
-    CheckCode::SPR001,
-    // flake8-print
-    CheckCode::T201,
-    CheckCode::T203,
-    // pyupgrade
-    CheckCode::U001,
-    CheckCode::U002,
-    CheckCode::U003,
-    CheckCode::U004,
-    CheckCode::U005,
-    // Meta
-    CheckCode::M001,
-];
-
-#[derive(Debug, PartialEq, Eq, Clone, Serialize, Deserialize, Hash, PartialOrd, Ord)]
+#[derive(
+    AsRefStr,
+    EnumIter,
+    EnumString,
+    Debug,
+    PartialEq,
+    Eq,
+    Clone,
+    Serialize,
+    Deserialize,
+    Hash,
+    PartialOrd,
+    Ord,
+)]
 pub enum CheckCode {
     // pycodestyle errors
     E402,
@@ -204,170 +140,103 @@ pub enum CheckCode {
     U003,
     U004,
     U005,
+    U006,
+    U007,
     // Meta
     M001,
 }
 
-impl FromStr for CheckCode {
-    type Err = anyhow::Error;
+#[allow(clippy::upper_case_acronyms)]
+pub enum LintSource {
+    AST,
+    Lines,
+    FileSystem,
+}
 
-    fn from_str(s: &str) -> Result<Self> {
-        match s {
-            // pycodestyle errors
-            "E402" => Ok(CheckCode::E402),
-            "E501" => Ok(CheckCode::E501),
-            "E711" => Ok(CheckCode::E711),
-            "E712" => Ok(CheckCode::E712),
-            "E713" => Ok(CheckCode::E713),
-            "E714" => Ok(CheckCode::E714),
-            "E721" => Ok(CheckCode::E721),
-            "E722" => Ok(CheckCode::E722),
-            "E731" => Ok(CheckCode::E731),
-            "E741" => Ok(CheckCode::E741),
-            "E742" => Ok(CheckCode::E742),
-            "E743" => Ok(CheckCode::E743),
-            "E902" => Ok(CheckCode::E902),
-            "E999" => Ok(CheckCode::E999),
-            // pycodestyle warnings
-            "W292" => Ok(CheckCode::W292),
-            // pyflakes
-            "F401" => Ok(CheckCode::F401),
-            "F402" => Ok(CheckCode::F402),
-            "F403" => Ok(CheckCode::F403),
-            "F404" => Ok(CheckCode::F404),
-            "F405" => Ok(CheckCode::F405),
-            "F406" => Ok(CheckCode::F406),
-            "F407" => Ok(CheckCode::F407),
-            "F541" => Ok(CheckCode::F541),
-            "F601" => Ok(CheckCode::F601),
-            "F602" => Ok(CheckCode::F602),
-            "F621" => Ok(CheckCode::F621),
-            "F622" => Ok(CheckCode::F622),
-            "F631" => Ok(CheckCode::F631),
-            "F632" => Ok(CheckCode::F632),
-            "F633" => Ok(CheckCode::F633),
-            "F634" => Ok(CheckCode::F634),
-            "F701" => Ok(CheckCode::F701),
-            "F702" => Ok(CheckCode::F702),
-            "F704" => Ok(CheckCode::F704),
-            "F706" => Ok(CheckCode::F706),
-            "F707" => Ok(CheckCode::F707),
-            "F722" => Ok(CheckCode::F722),
-            "F821" => Ok(CheckCode::F821),
-            "F822" => Ok(CheckCode::F822),
-            "F823" => Ok(CheckCode::F823),
-            "F831" => Ok(CheckCode::F831),
-            "F841" => Ok(CheckCode::F841),
-            "F901" => Ok(CheckCode::F901),
-            // flake8-builtins
-            "A001" => Ok(CheckCode::A001),
-            "A002" => Ok(CheckCode::A002),
-            "A003" => Ok(CheckCode::A003),
-            // flake8-comprehensions
-            "C400" => Ok(CheckCode::C400),
-            "C401" => Ok(CheckCode::C401),
-            "C402" => Ok(CheckCode::C402),
-            "C403" => Ok(CheckCode::C403),
-            "C404" => Ok(CheckCode::C404),
-            "C405" => Ok(CheckCode::C405),
-            "C406" => Ok(CheckCode::C406),
-            "C408" => Ok(CheckCode::C408),
-            // flake8-super
-            "SPR001" => Ok(CheckCode::SPR001),
-            // flake8-print
-            "T201" => Ok(CheckCode::T201),
-            "T203" => Ok(CheckCode::T203),
-            // pyupgrade
-            "U001" => Ok(CheckCode::U001),
-            "U002" => Ok(CheckCode::U002),
-            "U003" => Ok(CheckCode::U003),
-            "U004" => Ok(CheckCode::U004),
-            "U005" => Ok(CheckCode::U005),
-            // Meta
-            "M001" => Ok(CheckCode::M001),
-            _ => Err(anyhow::anyhow!("Unknown check code: {s}")),
-        }
-    }
+#[derive(Debug, PartialEq, Eq, Serialize, Deserialize)]
+pub enum RejectedCmpop {
+    Eq,
+    NotEq,
+}
+
+#[derive(AsRefStr, Debug, PartialEq, Eq, Serialize, Deserialize)]
+pub enum CheckKind {
+    // pycodestyle errors
+    AmbiguousClassName(String),
+    AmbiguousFunctionName(String),
+    AmbiguousVariableName(String),
+    AssertTuple,
+    BreakOutsideLoop,
+    ContinueOutsideLoop,
+    DefaultExceptNotLast,
+    DoNotAssignLambda,
+    DoNotUseBareExcept,
+    DuplicateArgumentName,
+    ExpressionsInStarAssignment,
+    FStringMissingPlaceholders,
+    ForwardAnnotationSyntaxError(String),
+    FutureFeatureNotDefined(String),
+    IOError(String),
+    IfTuple,
+    ImportShadowedByLoopVar(String, usize),
+    ImportStarNotPermitted(String),
+    ImportStarUsage(String, Vec<String>),
+    ImportStarUsed(String),
+    InvalidPrintSyntax,
+    IsLiteral,
+    LateFutureImport,
+    LineTooLong(usize, usize),
+    ModuleImportNotAtTopOfFile,
+    MultiValueRepeatedKeyLiteral,
+    MultiValueRepeatedKeyVariable(String),
+    NoneComparison(RejectedCmpop),
+    NotInTest,
+    NotIsTest,
+    RaiseNotImplemented,
+    ReturnOutsideFunction,
+    SyntaxError(String),
+    TrueFalseComparison(bool, RejectedCmpop),
+    TwoStarredExpressions,
+    TypeComparison,
+    UndefinedExport(String),
+    UndefinedLocal(String),
+    UndefinedName(String),
+    UnusedImport(Vec<String>),
+    UnusedVariable(String),
+    YieldOutsideFunction,
+    // pycodestyle warnings
+    NoNewLineAtEndOfFile,
+    // flake8-builtin
+    BuiltinVariableShadowing(String),
+    BuiltinArgumentShadowing(String),
+    BuiltinAttributeShadowing(String),
+    // flakes8-comprehensions
+    UnnecessaryGeneratorList,
+    UnnecessaryGeneratorSet,
+    UnnecessaryGeneratorDict,
+    UnnecessaryListComprehensionSet,
+    UnnecessaryListComprehensionDict,
+    UnnecessaryLiteralSet(String),
+    UnnecessaryLiteralDict(String),
+    UnnecessaryCollectionCall(String),
+    // flake8-super
+    SuperCallWithParameters,
+    // flake8-print
+    PrintFound,
+    PPrintFound,
+    // pyupgrade
+    TypeOfPrimitive(Primitive),
+    UnnecessaryAbspath,
+    UselessMetaclassType,
+    NoAssertEquals,
+    UselessObjectInheritance(String),
+    UsePEP585Annotation(String),
+    UsePEP604Annotation,
+    // Meta
+    UnusedNOQA(Option<String>),
 }
 
 impl CheckCode {
-    pub fn as_str(&self) -> &str {
-        match self {
-            // pycodestyle errors
-            CheckCode::E402 => "E402",
-            CheckCode::E501 => "E501",
-            CheckCode::E711 => "E711",
-            CheckCode::E712 => "E712",
-            CheckCode::E713 => "E713",
-            CheckCode::E714 => "E714",
-            CheckCode::E721 => "E721",
-            CheckCode::E722 => "E722",
-            CheckCode::E731 => "E731",
-            CheckCode::E741 => "E741",
-            CheckCode::E742 => "E742",
-            CheckCode::E743 => "E743",
-            CheckCode::E902 => "E902",
-            CheckCode::E999 => "E999",
-            // pycodestyle warnings
-            CheckCode::W292 => "W292",
-            // pyflakes
-            CheckCode::F401 => "F401",
-            CheckCode::F402 => "F402",
-            CheckCode::F403 => "F403",
-            CheckCode::F404 => "F404",
-            CheckCode::F405 => "F405",
-            CheckCode::F406 => "F406",
-            CheckCode::F407 => "F407",
-            CheckCode::F541 => "F541",
-            CheckCode::F601 => "F601",
-            CheckCode::F602 => "F602",
-            CheckCode::F621 => "F621",
-            CheckCode::F622 => "F622",
-            CheckCode::F631 => "F631",
-            CheckCode::F632 => "F632",
-            CheckCode::F633 => "F633",
-            CheckCode::F634 => "F634",
-            CheckCode::F701 => "F701",
-            CheckCode::F702 => "F702",
-            CheckCode::F704 => "F704",
-            CheckCode::F706 => "F706",
-            CheckCode::F707 => "F707",
-            CheckCode::F722 => "F722",
-            CheckCode::F821 => "F821",
-            CheckCode::F822 => "F822",
-            CheckCode::F823 => "F823",
-            CheckCode::F831 => "F831",
-            CheckCode::F841 => "F841",
-            CheckCode::F901 => "F901",
-            // flake8-builtins
-            CheckCode::A001 => "A001",
-            CheckCode::A002 => "A002",
-            CheckCode::A003 => "A003",
-            // flake8-comprehensions
-            CheckCode::C400 => "C400",
-            CheckCode::C401 => "C401",
-            CheckCode::C402 => "C402",
-            CheckCode::C403 => "C403",
-            CheckCode::C404 => "C404",
-            CheckCode::C405 => "C405",
-            CheckCode::C406 => "C406",
-            CheckCode::C408 => "C408",
-            // flake8-super
-            CheckCode::SPR001 => "SPR001",
-            // flake8-print
-            CheckCode::T201 => "T201",
-            CheckCode::T203 => "T203",
-            // pyupgrade
-            CheckCode::U001 => "U001",
-            CheckCode::U002 => "U002",
-            CheckCode::U003 => "U003",
-            CheckCode::U004 => "U004",
-            CheckCode::U005 => "U005",
-            // Meta
-            CheckCode::M001 => "M001",
-        }
-    }
-
     /// The source for the check (either the AST, the filesystem, or the physical lines).
     pub fn lint_source(&self) -> &'static LintSource {
         match self {
@@ -454,179 +323,19 @@ impl CheckCode {
             CheckCode::U003 => CheckKind::TypeOfPrimitive(Primitive::Str),
             CheckCode::U004 => CheckKind::UselessObjectInheritance("...".to_string()),
             CheckCode::U005 => CheckKind::NoAssertEquals,
+            CheckCode::U006 => CheckKind::UsePEP585Annotation("List".to_string()),
+            CheckCode::U007 => CheckKind::UsePEP604Annotation,
             // Meta
             CheckCode::M001 => CheckKind::UnusedNOQA(None),
         }
     }
 }
 
-#[allow(clippy::upper_case_acronyms)]
-pub enum LintSource {
-    AST,
-    Lines,
-    FileSystem,
-}
-
-#[derive(Debug, PartialEq, Eq, Serialize, Deserialize)]
-pub enum RejectedCmpop {
-    Eq,
-    NotEq,
-}
-
-#[derive(Debug, PartialEq, Eq, Serialize, Deserialize)]
-pub enum CheckKind {
-    AmbiguousClassName(String),
-    AmbiguousFunctionName(String),
-    AmbiguousVariableName(String),
-    AssertTuple,
-    BreakOutsideLoop,
-    ContinueOutsideLoop,
-    DefaultExceptNotLast,
-    DoNotAssignLambda,
-    DoNotUseBareExcept,
-    DuplicateArgumentName,
-    ExpressionsInStarAssignment,
-    FStringMissingPlaceholders,
-    ForwardAnnotationSyntaxError(String),
-    FutureFeatureNotDefined(String),
-    IOError(String),
-    IfTuple,
-    ImportShadowedByLoopVar(String, usize),
-    ImportStarNotPermitted(String),
-    ImportStarUsage(String, Vec<String>),
-    ImportStarUsed(String),
-    InvalidPrintSyntax,
-    IsLiteral,
-    LateFutureImport,
-    LineTooLong(usize, usize),
-    ModuleImportNotAtTopOfFile,
-    MultiValueRepeatedKeyLiteral,
-    MultiValueRepeatedKeyVariable(String),
-    NoneComparison(RejectedCmpop),
-    NotInTest,
-    NotIsTest,
-    RaiseNotImplemented,
-    ReturnOutsideFunction,
-    SyntaxError(String),
-    TrueFalseComparison(bool, RejectedCmpop),
-    TwoStarredExpressions,
-    TypeComparison,
-    UndefinedExport(String),
-    UndefinedLocal(String),
-    UndefinedName(String),
-    UnusedImport(Vec<String>),
-    UnusedVariable(String),
-    YieldOutsideFunction,
-    // More style
-    NoNewLineAtEndOfFile,
-    // flake8-builtin
-    BuiltinVariableShadowing(String),
-    BuiltinArgumentShadowing(String),
-    BuiltinAttributeShadowing(String),
-    // flakes8-comprehensions
-    UnnecessaryGeneratorList,
-    UnnecessaryGeneratorSet,
-    UnnecessaryGeneratorDict,
-    UnnecessaryListComprehensionSet,
-    UnnecessaryListComprehensionDict,
-    UnnecessaryLiteralSet(String),
-    UnnecessaryLiteralDict(String),
-    UnnecessaryCollectionCall(String),
-    // flake8-super
-    SuperCallWithParameters,
-    // flake8-print
-    PrintFound,
-    PPrintFound,
-    // pyupgrade
-    TypeOfPrimitive(Primitive),
-    UnnecessaryAbspath,
-    UselessMetaclassType,
-    NoAssertEquals,
-    UselessObjectInheritance(String),
-    // Meta
-    UnusedNOQA(Option<String>),
-}
-
 impl CheckKind {
-    /// The name of the check.
-    pub fn name(&self) -> &'static str {
-        match self {
-            CheckKind::AmbiguousClassName(_) => "AmbiguousClassName",
-            CheckKind::AmbiguousFunctionName(_) => "AmbiguousFunctionName",
-            CheckKind::AmbiguousVariableName(_) => "AmbiguousVariableName",
-            CheckKind::AssertTuple => "AssertTuple",
-            CheckKind::BreakOutsideLoop => "BreakOutsideLoop",
-            CheckKind::ContinueOutsideLoop => "ContinueOutsideLoop",
-            CheckKind::DefaultExceptNotLast => "DefaultExceptNotLast",
-            CheckKind::DoNotAssignLambda => "DoNotAssignLambda",
-            CheckKind::DoNotUseBareExcept => "DoNotUseBareExcept",
-            CheckKind::DuplicateArgumentName => "DuplicateArgumentName",
-            CheckKind::ExpressionsInStarAssignment => "ExpressionsInStarAssignment",
-            CheckKind::FStringMissingPlaceholders => "FStringMissingPlaceholders",
-            CheckKind::ForwardAnnotationSyntaxError(_) => "ForwardAnnotationSyntaxError",
-            CheckKind::FutureFeatureNotDefined(_) => "FutureFeatureNotDefined",
-            CheckKind::IOError(_) => "IOError",
-            CheckKind::IfTuple => "IfTuple",
-            CheckKind::ImportShadowedByLoopVar(_, _) => "ImportShadowedByLoopVar",
-            CheckKind::ImportStarNotPermitted(_) => "ImportStarNotPermitted",
-            CheckKind::ImportStarUsage(_, _) => "ImportStarUsage",
-            CheckKind::ImportStarUsed(_) => "ImportStarUsed",
-            CheckKind::InvalidPrintSyntax => "InvalidPrintSyntax",
-            CheckKind::IsLiteral => "IsLiteral",
-            CheckKind::LateFutureImport => "LateFutureImport",
-            CheckKind::LineTooLong(_, _) => "LineTooLong",
-            CheckKind::ModuleImportNotAtTopOfFile => "ModuleImportNotAtTopOfFile",
-            CheckKind::MultiValueRepeatedKeyLiteral => "MultiValueRepeatedKeyLiteral",
-            CheckKind::MultiValueRepeatedKeyVariable(_) => "MultiValueRepeatedKeyVariable",
-            CheckKind::NoneComparison(_) => "NoneComparison",
-            CheckKind::NotInTest => "NotInTest",
-            CheckKind::NotIsTest => "NotIsTest",
-            CheckKind::RaiseNotImplemented => "RaiseNotImplemented",
-            CheckKind::ReturnOutsideFunction => "ReturnOutsideFunction",
-            CheckKind::SyntaxError(_) => "SyntaxError",
-            CheckKind::TrueFalseComparison(_, _) => "TrueFalseComparison",
-            CheckKind::TwoStarredExpressions => "TwoStarredExpressions",
-            CheckKind::TypeComparison => "TypeComparison",
-            CheckKind::UndefinedExport(_) => "UndefinedExport",
-            CheckKind::UndefinedLocal(_) => "UndefinedLocal",
-            CheckKind::UndefinedName(_) => "UndefinedName",
-            CheckKind::UnusedImport(_) => "UnusedImport",
-            CheckKind::UnusedVariable(_) => "UnusedVariable",
-            CheckKind::YieldOutsideFunction => "YieldOutsideFunction",
-            // More style
-            CheckKind::NoNewLineAtEndOfFile => "NoNewLineAtEndOfFile",
-            // flake8-builtins
-            CheckKind::BuiltinVariableShadowing(_) => "BuiltinVariableShadowing",
-            CheckKind::BuiltinArgumentShadowing(_) => "BuiltinArgumentShadowing",
-            CheckKind::BuiltinAttributeShadowing(_) => "BuiltinAttributeShadowing",
-            // flake8-comprehensions
-            CheckKind::UnnecessaryGeneratorList => "UnnecessaryGeneratorList",
-            CheckKind::UnnecessaryGeneratorSet => "UnnecessaryGeneratorSet",
-            CheckKind::UnnecessaryGeneratorDict => "UnnecessaryGeneratorDict",
-            CheckKind::UnnecessaryListComprehensionSet => "UnnecessaryListComprehensionSet",
-            CheckKind::UnnecessaryListComprehensionDict => "UnnecessaryListComprehensionDict",
-            CheckKind::UnnecessaryLiteralSet(_) => "UnnecessaryLiteralSet",
-            CheckKind::UnnecessaryLiteralDict(_) => "UnnecessaryLiteralDict",
-            CheckKind::UnnecessaryCollectionCall(_) => "UnnecessaryCollectionCall",
-            // flake8-super
-            CheckKind::SuperCallWithParameters => "SuperCallWithParameters",
-            // flake8-print
-            CheckKind::PrintFound => "PrintFound",
-            CheckKind::PPrintFound => "PPrintFound",
-            // pyupgrade
-            CheckKind::TypeOfPrimitive(_) => "TypeOfPrimitive",
-            CheckKind::UnnecessaryAbspath => "UnnecessaryAbspath",
-            CheckKind::UselessMetaclassType => "UselessMetaclassType",
-            CheckKind::NoAssertEquals => "NoAssertEquals",
-            CheckKind::UselessObjectInheritance(_) => "UselessObjectInheritance",
-            // Meta
-            CheckKind::UnusedNOQA(_) => "UnusedNOQA",
-        }
-    }
-
     /// A four-letter shorthand code for the check.
     pub fn code(&self) -> &'static CheckCode {
         match self {
+            // pycodestyle errors
             CheckKind::AmbiguousClassName(_) => &CheckCode::E742,
             CheckKind::AmbiguousFunctionName(_) => &CheckCode::E743,
             CheckKind::AmbiguousVariableName(_) => &CheckCode::E741,
@@ -669,7 +378,7 @@ impl CheckKind {
             CheckKind::UnusedImport(_) => &CheckCode::F401,
             CheckKind::UnusedVariable(_) => &CheckCode::F841,
             CheckKind::YieldOutsideFunction => &CheckCode::F704,
-            // More style
+            // pycodestyle warnings
             CheckKind::NoNewLineAtEndOfFile => &CheckCode::W292,
             // flake8-builtins
             CheckKind::BuiltinVariableShadowing(_) => &CheckCode::A001,
@@ -694,6 +403,8 @@ impl CheckKind {
             CheckKind::UnnecessaryAbspath => &CheckCode::U002,
             CheckKind::UselessMetaclassType => &CheckCode::U001,
             CheckKind::NoAssertEquals => &CheckCode::U005,
+            CheckKind::UsePEP585Annotation(_) => &CheckCode::U006,
+            CheckKind::UsePEP604Annotation => &CheckCode::U007,
             CheckKind::UselessObjectInheritance(_) => &CheckCode::U004,
             // Meta
             CheckKind::UnusedNOQA(_) => &CheckCode::M001,
@@ -703,6 +414,7 @@ impl CheckKind {
     /// The body text for the check.
     pub fn body(&self) -> String {
         match self {
+            // pycodestyle errors
             CheckKind::AmbiguousClassName(name) => {
                 format!("Ambiguous class name: `{}`", name)
             }
@@ -830,7 +542,7 @@ impl CheckKind {
             CheckKind::YieldOutsideFunction => {
                 "`yield` or `yield from` statement outside of a function/method".to_string()
             }
-            // More style
+            // pycodestyle warnings
             CheckKind::NoNewLineAtEndOfFile => "No newline at end of file".to_string(),
             // flake8-builtins
             CheckKind::BuiltinVariableShadowing(name) => {
@@ -888,6 +600,14 @@ impl CheckKind {
             CheckKind::UselessObjectInheritance(name) => {
                 format!("Class `{name}` inherits from object")
             }
+            CheckKind::UsePEP585Annotation(name) => {
+                format!(
+                    "Use `{}` instead of `{}` for type annotations",
+                    name.to_lowercase(),
+                    name,
+                )
+            }
+            CheckKind::UsePEP604Annotation => "Use `X | Y` for type annotations".to_string(),
             // Meta
             CheckKind::UnusedNOQA(code) => match code {
                 None => "Unused `noqa` directive".to_string(),
@@ -910,6 +630,8 @@ impl CheckKind {
                 | CheckKind::UnusedNOQA(_)
                 | CheckKind::UselessMetaclassType
                 | CheckKind::UselessObjectInheritance(_)
+                | CheckKind::UsePEP585Annotation(_)
+                | CheckKind::UsePEP604Annotation
         )
     }
 }
@@ -944,3 +666,25 @@ impl Check {
         self.fix = Some(fix);
     }
 }
+
+#[cfg(test)]
+mod tests {
+    use std::str::FromStr;
+
+    use anyhow::Result;
+    use strum::IntoEnumIterator;
+
+    use crate::checks::CheckCode;
+
+    #[test]
+    fn check_code_serialization() -> Result<()> {
+        for check_code in CheckCode::iter() {
+            assert!(
+                CheckCode::from_str(check_code.as_ref()).is_ok(),
+                "{:?} could not be round-trip serialized.",
+                check_code
+            );
+        }
+        Ok(())
+    }
+}

src/code_gen.rs

@@ -547,7 +547,7 @@ impl SourceGenerator {
         Ok(())
     }
 
-    fn unparse_expr<U>(&mut self, ast: &Expr<U>, level: u8) -> fmt::Result {
+    pub fn unparse_expr<U>(&mut self, ast: &Expr<U>, level: u8) -> fmt::Result {
         macro_rules! opprec {
             ($opty:ident, $x:expr, $enu:path, $($var:ident($op:literal, $prec:ident)),*$(,)?) => {
                 match $x {

src/linter.rs

@@ -989,4 +989,28 @@ mod tests {
         insta::assert_yaml_snapshot!(checks);
         Ok(())
     }
+
+    #[test]
+    fn u006() -> Result<()> {
+        let mut checks = check_path(
+            Path::new("./resources/test/fixtures/U006.py"),
+            &settings::Settings::for_rule(CheckCode::U006),
+            &fixer::Mode::Generate,
+        )?;
+        checks.sort_by_key(|check| check.location);
+        insta::assert_yaml_snapshot!(checks);
+        Ok(())
+    }
+
+    #[test]
+    fn u007() -> Result<()> {
+        let mut checks = check_path(
+            Path::new("./resources/test/fixtures/U007.py"),
+            &settings::Settings::for_rule(CheckCode::U007),
+            &fixer::Mode::Generate,
+        )?;
+        checks.sort_by_key(|check| check.location);
+        insta::assert_yaml_snapshot!(checks);
+        Ok(())
+    }
 }

src/message.rs

@@ -45,7 +45,7 @@ impl fmt::Display for Message {
             ":".cyan(),
             self.location.column(),
             ":".cyan(),
-            self.kind.code().as_str().red().bold(),
+            self.kind.code().as_ref().red().bold(),
             self.kind.body()
         )
     }

src/noqa.rs

@@ -125,7 +125,7 @@ fn add_noqa_inner(
                     Directive::All(start, _) => output.push_str(&line[..start]),
                     Directive::Codes(start, _, _) => output.push_str(&line[..start]),
                 };
-                let codes: Vec<&str> = codes.iter().map(|code| code.as_str()).collect();
+                let codes: Vec<&str> = codes.iter().map(|code| code.as_ref()).collect();
                 output.push_str("  # noqa: ");
                 output.push_str(&codes.join(", "));
                 output.push('\n');

src/plugins.rs

@@ -6,6 +6,8 @@ mod print_call;
 mod super_call_with_parameters;
 mod type_of_primitive;
 mod unnecessary_abspath;
+mod use_pep585_annotation;
+mod use_pep604_annotation;
 mod useless_metaclass_type;
 mod useless_object_inheritance;
 
@@ -17,5 +19,7 @@ pub use print_call::print_call;
 pub use super_call_with_parameters::super_call_with_parameters;
 pub use type_of_primitive::type_of_primitive;
 pub use unnecessary_abspath::unnecessary_abspath;
+pub use use_pep585_annotation::use_pep585_annotation;
+pub use use_pep604_annotation::use_pep604_annotation;
 pub use useless_metaclass_type::useless_metaclass_type;
 pub use useless_object_inheritance::useless_object_inheritance;

src/plugins/use_pep585_annotation.rs

@@ -0,0 +1,26 @@
+use rustpython_ast::Expr;
+
+use crate::ast::types::Range;
+use crate::autofix::fixer;
+use crate::check_ast::Checker;
+use crate::checks::{Check, CheckKind, Fix};
+use crate::python::typing;
+
+pub fn use_pep585_annotation(checker: &mut Checker, expr: &Expr, id: &str) {
+    // TODO(charlie): Verify that the builtin is imported from the `typing` module.
+    if typing::is_pep585_builtin(id) {
+        let mut check = Check::new(
+            CheckKind::UsePEP585Annotation(id.to_string()),
+            Range::from_located(expr),
+        );
+        if matches!(checker.autofix, fixer::Mode::Generate | fixer::Mode::Apply) {
+            check.amend(Fix {
+                content: id.to_lowercase(),
+                location: expr.location,
+                end_location: expr.end_location,
+                applied: false,
+            })
+        }
+        checker.add_check(check);
+    }
+}

src/plugins/use_pep604_annotation.rs

@@ -0,0 +1,77 @@
+use anyhow::{anyhow, Result};
+use rustpython_ast::{Expr, ExprKind};
+
+use crate::ast::helpers::match_name_or_attr;
+use crate::ast::types::Range;
+use crate::autofix::fixer;
+use crate::check_ast::Checker;
+use crate::checks::{Check, CheckKind, Fix};
+use crate::code_gen::SourceGenerator;
+
+pub fn use_pep604_annotation(checker: &mut Checker, expr: &Expr, value: &Expr, slice: &Expr) {
+    if match_name_or_attr(value, "Optional") {
+        let mut check = Check::new(CheckKind::UsePEP604Annotation, Range::from_located(expr));
+        if matches!(checker.autofix, fixer::Mode::Generate | fixer::Mode::Apply) {
+            let mut generator = SourceGenerator::new();
+            if let Ok(()) = generator.unparse_expr(slice, 0) {
+                if let Ok(content) = generator.generate() {
+                    check.amend(Fix {
+                        content: format!("{} | None", content),
+                        location: expr.location,
+                        end_location: expr.end_location,
+                        applied: false,
+                    })
+                }
+            }
+        }
+        checker.add_check(check);
+    } else if match_name_or_attr(value, "Union") {
+        let mut check = Check::new(CheckKind::UsePEP604Annotation, Range::from_located(expr));
+        if matches!(checker.autofix, fixer::Mode::Generate | fixer::Mode::Apply) {
+            match &slice.node {
+                ExprKind::Slice { .. } => {
+                    // Invalid type annotation.
+                }
+                ExprKind::Tuple { elts, .. } => {
+                    // Multiple arguments.
+                    let parts: Result<Vec<String>> = elts
+                        .iter()
+                        .map(|expr| {
+                            let mut generator = SourceGenerator::new();
+                            generator
+                                .unparse_expr(expr, 0)
+                                .map_err(|_| anyhow!("Failed to parse."))?;
+                            generator
+                                .generate()
+                                .map_err(|_| anyhow!("Failed to generate."))
+                        })
+                        .collect();
+                    if let Ok(parts) = parts {
+                        let content = parts.join(" | ");
+                        check.amend(Fix {
+                            content,
+                            location: expr.location,
+                            end_location: expr.end_location,
+                            applied: false,
+                        })
+                    }
+                }
+                _ => {
+                    // Single argument.
+                    let mut generator = SourceGenerator::new();
+                    if let Ok(()) = generator.unparse_expr(slice, 0) {
+                        if let Ok(content) = generator.generate() {
+                            check.amend(Fix {
+                                content,
+                                location: expr.location,
+                                end_location: expr.end_location,
+                                applied: false,
+                            });
+                        }
+                    }
+                }
+            }
+        }
+        checker.add_check(check);
+    }
+}

src/python/typing.rs

@@ -92,3 +92,10 @@ pub fn is_annotated_subscript(name: &str) -> bool {
 pub fn is_pep593_annotated_subscript(name: &str) -> bool {
     name == "Annotated"
 }
+
+static PEP_585_BUILTINS: Lazy<BTreeSet<&'static str>> =
+    Lazy::new(|| BTreeSet::from(["Dict", "FrozenSet", "List", "Set", "Tuple", "Type"]));
+
+pub fn is_pep585_builtin(name: &str) -> bool {
+    PEP_585_BUILTINS.contains(name)
+}

src/snapshots/ruff__linter__tests__f722.snap

@@ -9,6 +9,6 @@ expression: checks
     column: 13
   end_location:
     row: 9
-    column: 17
+    column: 16
   fix: ~
 

src/snapshots/ruff__linter__tests__f821.snap

@@ -45,7 +45,7 @@ expression: checks
     column: 5
   end_location:
     row: 58
-    column: 9
+    column: 8
   fix: ~
 - kind:
     UndefinedName: TOMATO
@@ -81,7 +81,7 @@ expression: checks
     column: 10
   end_location:
     row: 114
-    column: 24
+    column: 23
   fix: ~
 - kind:
     UndefinedName: foo
@@ -90,7 +90,7 @@ expression: checks
     column: 15
   end_location:
     row: 122
-    column: 19
+    column: 18
   fix: ~
 - kind:
     UndefinedName: bar
@@ -99,6 +99,6 @@ expression: checks
     column: 22
   end_location:
     row: 122
-    column: 26
+    column: 25
   fix: ~
 

src/snapshots/ruff__linter__tests__u006.snap

@@ -0,0 +1,39 @@
+---
+source: src/linter.rs
+expression: checks
+---
+- kind:
+    UsePEP585Annotation: List
+  location:
+    row: 4
+    column: 10
+  end_location:
+    row: 4
+    column: 14
+  fix:
+    content: list
+    location:
+      row: 4
+      column: 10
+    end_location:
+      row: 4
+      column: 14
+    applied: false
+- kind:
+    UsePEP585Annotation: List
+  location:
+    row: 11
+    column: 10
+  end_location:
+    row: 11
+    column: 21
+  fix:
+    content: list
+    location:
+      row: 11
+      column: 10
+    end_location:
+      row: 11
+      column: 21
+    applied: false
+

src/snapshots/ruff__linter__tests__u007.snap

@@ -0,0 +1,133 @@
+---
+source: src/linter.rs
+expression: checks
+---
+- kind: UsePEP604Annotation
+  location:
+    row: 4
+    column: 10
+  end_location:
+    row: 4
+    column: 23
+  fix:
+    content: str | None
+    location:
+      row: 4
+      column: 10
+    end_location:
+      row: 4
+      column: 23
+    applied: false
+- kind: UsePEP604Annotation
+  location:
+    row: 11
+    column: 10
+  end_location:
+    row: 11
+    column: 30
+  fix:
+    content: str | None
+    location:
+      row: 11
+      column: 10
+    end_location:
+      row: 11
+      column: 30
+    applied: false
+- kind: UsePEP604Annotation
+  location:
+    row: 18
+    column: 10
+  end_location:
+    row: 18
+    column: 46
+  fix:
+    content: "str | int | Union[float, bytes]"
+    location:
+      row: 18
+      column: 10
+    end_location:
+      row: 18
+      column: 46
+    applied: false
+- kind: UsePEP604Annotation
+  location:
+    row: 18
+    column: 26
+  end_location:
+    row: 18
+    column: 45
+  fix:
+    content: float | bytes
+    location:
+      row: 18
+      column: 26
+    end_location:
+      row: 18
+      column: 45
+    applied: false
+- kind: UsePEP604Annotation
+  location:
+    row: 25
+    column: 10
+  end_location:
+    row: 25
+    column: 32
+  fix:
+    content: str | int
+    location:
+      row: 25
+      column: 10
+    end_location:
+      row: 25
+      column: 32
+    applied: false
+- kind: UsePEP604Annotation
+  location:
+    row: 32
+    column: 11
+  end_location:
+    row: 32
+    column: 47
+  fix:
+    content: "str | int | Union[float, bytes]"
+    location:
+      row: 32
+      column: 11
+    end_location:
+      row: 32
+      column: 47
+    applied: false
+- kind: UsePEP604Annotation
+  location:
+    row: 32
+    column: 11
+  end_location:
+    row: 32
+    column: 47
+  fix:
+    content: float | bytes
+    location:
+      row: 32
+      column: 11
+    end_location:
+      row: 32
+      column: 47
+    applied: false
+- kind: UsePEP604Annotation
+  location:
+    row: 39
+    column: 11
+  end_location:
+    row: 39
+    column: 33
+  fix:
+    content: str | int
+    location:
+      row: 39
+      column: 11
+    end_location:
+      row: 39
+      column: 33
+    applied: false
+