Bump version to 0.0.63

Cargo.lock

@@ -1907,7 +1907,7 @@ dependencies = [
 
 [[package]]
 name = "ruff"
-version = "0.0.62"
+version = "0.0.63"
 dependencies = [
  "anyhow",
  "bincode",
@@ -1957,7 +1957,7 @@ dependencies = [
 [[package]]
 name = "rustpython-ast"
 version = "0.1.0"
-source = "git+https://github.com/charliermarsh/RustPython.git?rev=4f457893efc381ad5c432576b24bcc7e4a08c641#4f457893efc381ad5c432576b24bcc7e4a08c641"
+source = "git+https://github.com/charliermarsh/RustPython.git?rev=778ae2aeb521d0438d2a91bd11238bb5c2bf9d4f#778ae2aeb521d0438d2a91bd11238bb5c2bf9d4f"
 dependencies = [
  "num-bigint",
  "rustpython-common",
@@ -1967,7 +1967,7 @@ dependencies = [
 [[package]]
 name = "rustpython-common"
 version = "0.0.0"
-source = "git+https://github.com/charliermarsh/RustPython.git?rev=4f457893efc381ad5c432576b24bcc7e4a08c641#4f457893efc381ad5c432576b24bcc7e4a08c641"
+source = "git+https://github.com/charliermarsh/RustPython.git?rev=778ae2aeb521d0438d2a91bd11238bb5c2bf9d4f#778ae2aeb521d0438d2a91bd11238bb5c2bf9d4f"
 dependencies = [
  "ascii",
  "cfg-if 1.0.0",
@@ -1990,7 +1990,7 @@ dependencies = [
 [[package]]
 name = "rustpython-compiler-core"
 version = "0.1.2"
-source = "git+https://github.com/charliermarsh/RustPython.git?rev=4f457893efc381ad5c432576b24bcc7e4a08c641#4f457893efc381ad5c432576b24bcc7e4a08c641"
+source = "git+https://github.com/charliermarsh/RustPython.git?rev=778ae2aeb521d0438d2a91bd11238bb5c2bf9d4f#778ae2aeb521d0438d2a91bd11238bb5c2bf9d4f"
 dependencies = [
  "bincode",
  "bitflags",
@@ -2007,7 +2007,7 @@ dependencies = [
 [[package]]
 name = "rustpython-parser"
 version = "0.1.2"
-source = "git+https://github.com/charliermarsh/RustPython.git?rev=4f457893efc381ad5c432576b24bcc7e4a08c641#4f457893efc381ad5c432576b24bcc7e4a08c641"
+source = "git+https://github.com/charliermarsh/RustPython.git?rev=778ae2aeb521d0438d2a91bd11238bb5c2bf9d4f#778ae2aeb521d0438d2a91bd11238bb5c2bf9d4f"
 dependencies = [
  "ahash",
  "anyhow",

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "ruff"
-version = "0.0.62"
+version = "0.0.63"
 edition = "2021"
 
 [lib]
@@ -27,9 +27,9 @@ once_cell = { version = "1.13.1" }
 path-absolutize = { version = "3.0.13", features = ["once_cell_cache"] }
 rayon = { version = "1.5.3" }
 regex = { version = "1.6.0" }
-rustpython-ast = { features = ["unparse"], git = "https://github.com/charliermarsh/RustPython.git", rev = "4f457893efc381ad5c432576b24bcc7e4a08c641" }
-rustpython-parser = { features = ["lalrpop"], git = "https://github.com/charliermarsh/RustPython.git", rev = "4f457893efc381ad5c432576b24bcc7e4a08c641" }
-rustpython-common = { git = "https://github.com/charliermarsh/RustPython.git", rev = "4f457893efc381ad5c432576b24bcc7e4a08c641" }
+rustpython-ast = { features = ["unparse"], git = "https://github.com/charliermarsh/RustPython.git", rev = "778ae2aeb521d0438d2a91bd11238bb5c2bf9d4f" }
+rustpython-parser = { features = ["lalrpop"], git = "https://github.com/charliermarsh/RustPython.git", rev = "778ae2aeb521d0438d2a91bd11238bb5c2bf9d4f" }
+rustpython-common = { git = "https://github.com/charliermarsh/RustPython.git", rev = "778ae2aeb521d0438d2a91bd11238bb5c2bf9d4f" }
 serde = { version = "1.0.143", features = ["derive"] }
 serde_json = { version = "1.0.83" }
 toml = { version = "0.5.9" }

src/ast/helpers.rs

@@ -1,4 +1,69 @@
-use rustpython_ast::{Expr, ExprKind};
+use once_cell::sync::Lazy;
+use regex::Regex;
+use rustpython_ast::{Expr, ExprKind, StmtKind};
+
+use crate::python::typing;
+
+static DUNDER_REGEX: Lazy<Regex> = Lazy::new(|| Regex::new(r"__[^\s]+__").unwrap());
+
+pub enum SubscriptKind {
+    AnnotatedSubscript,
+    PEP593AnnotatedSubscript,
+}
+
+pub fn match_annotated_subscript(expr: &Expr) -> Option<SubscriptKind> {
+    match &expr.node {
+        ExprKind::Attribute { attr, .. } => {
+            if typing::is_annotated_subscript(attr) {
+                Some(SubscriptKind::AnnotatedSubscript)
+            } else if typing::is_pep593_annotated_subscript(attr) {
+                Some(SubscriptKind::PEP593AnnotatedSubscript)
+            } else {
+                None
+            }
+        }
+        ExprKind::Name { id, .. } => {
+            if typing::is_annotated_subscript(id) {
+                Some(SubscriptKind::AnnotatedSubscript)
+            } else if typing::is_pep593_annotated_subscript(id) {
+                Some(SubscriptKind::PEP593AnnotatedSubscript)
+            } else {
+                None
+            }
+        }
+        _ => None,
+    }
+}
+
+pub fn is_assignment_to_a_dunder(node: &StmtKind) -> bool {
+    // Check whether it's an assignment to a dunder, with or without a type annotation.
+    // This is what pycodestyle (as of 2.9.1) does.
+    match node {
+        StmtKind::Assign {
+            targets,
+            value: _,
+            type_comment: _,
+        } => {
+            if targets.len() != 1 {
+                return false;
+            }
+            match &targets[0].node {
+                ExprKind::Name { id, ctx: _ } => DUNDER_REGEX.is_match(id),
+                _ => false,
+            }
+        }
+        StmtKind::AnnAssign {
+            target,
+            annotation: _,
+            value: _,
+            simple: _,
+        } => match &target.node {
+            ExprKind::Name { id, ctx: _ } => DUNDER_REGEX.is_match(id),
+            _ => false,
+        },
+        _ => false,
+    }
+}
 
 pub fn match_name_or_attr(expr: &Expr, target: &str) -> bool {
     match &expr.node {

src/check_ast.rs

@@ -3,8 +3,6 @@ use std::ops::Deref;
 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,
@@ -12,7 +10,7 @@ use rustpython_parser::ast::{
 };
 use rustpython_parser::parser;
 
-use crate::ast::helpers::match_name_or_attr;
+use crate::ast::helpers::{match_name_or_attr, SubscriptKind};
 use crate::ast::operations::{extract_all_names, SourceCodeLocator};
 use crate::ast::relocate::relocate_expr;
 use crate::ast::types::{
@@ -20,19 +18,16 @@ use crate::ast::types::{
     ScopeKind,
 };
 use crate::ast::visitor::{walk_excepthandler, Visitor};
-use crate::ast::{checks, operations, visitor};
+use crate::ast::{checks, helpers, operations, visitor};
 use crate::autofix::{fixer, fixes};
 use crate::checks::{Check, CheckCode, CheckKind};
 use crate::plugins;
 use crate::python::builtins::{BUILTINS, MAGIC_GLOBALS};
 use crate::python::future::ALL_FEATURE_NAMES;
-use crate::python::typing;
 use crate::settings::{PythonVersion, Settings};
 
 pub const GLOBAL_SCOPE_INDEX: usize = 0;
 
-static DUNDER_REGEX: Lazy<Regex> = Lazy::new(|| Regex::new(r"__[^\s]+__").unwrap());
-
 pub struct Checker<'a> {
     // Input data.
     path: &'a Path,
@@ -102,65 +97,6 @@ impl<'a> Checker<'a> {
     }
 }
 
-enum SubscriptKind {
-    AnnotatedSubscript,
-    PEP593AnnotatedSubscript,
-}
-
-fn match_annotated_subscript(expr: &Expr) -> Option<SubscriptKind> {
-    match &expr.node {
-        ExprKind::Attribute { attr, .. } => {
-            if typing::is_annotated_subscript(attr) {
-                Some(SubscriptKind::AnnotatedSubscript)
-            } else if typing::is_pep593_annotated_subscript(attr) {
-                Some(SubscriptKind::PEP593AnnotatedSubscript)
-            } else {
-                None
-            }
-        }
-        ExprKind::Name { id, .. } => {
-            if typing::is_annotated_subscript(id) {
-                Some(SubscriptKind::AnnotatedSubscript)
-            } else if typing::is_pep593_annotated_subscript(id) {
-                Some(SubscriptKind::PEP593AnnotatedSubscript)
-            } else {
-                None
-            }
-        }
-        _ => None,
-    }
-}
-
-fn is_assignment_to_a_dunder(node: &StmtKind) -> bool {
-    // Check whether it's an assignment to a dunder, with or without a type annotation.
-    // This is what pycodestyle (as of 2.9.1) does.
-    match node {
-        StmtKind::Assign {
-            targets,
-            value: _,
-            type_comment: _,
-        } => {
-            if targets.len() != 1 {
-                return false;
-            }
-            match &targets[0].node {
-                ExprKind::Name { id, ctx: _ } => DUNDER_REGEX.is_match(id),
-                _ => false,
-            }
-        }
-        StmtKind::AnnAssign {
-            target,
-            annotation: _,
-            value: _,
-            simple: _,
-        } => match &target.node {
-            ExprKind::Name { id, ctx: _ } => DUNDER_REGEX.is_match(id),
-            _ => false,
-        },
-        _ => false,
-    }
-}
-
 impl<'a, 'b> Visitor<'b> for Checker<'a>
 where
     'b: 'a,
@@ -221,7 +157,7 @@ where
                 self.futures_allowed = false;
 
                 if !self.seen_non_import
-                    && !is_assignment_to_a_dunder(node)
+                    && !helpers::is_assignment_to_a_dunder(node)
                     && !operations::in_nested_block(&self.parent_stack, &self.parents)
                 {
                     self.seen_non_import = true;
@@ -1131,7 +1067,7 @@ where
                 }
             }
             ExprKind::Subscript { value, slice, ctx } => {
-                match match_annotated_subscript(value) {
+                match helpers::match_annotated_subscript(value) {
                     Some(subscript) => match subscript {
                         // Ex) Optional[int]
                         SubscriptKind::AnnotatedSubscript => {

src/check_lines.rs

@@ -1,8 +1,8 @@
 use std::collections::BTreeMap;
 
-use crate::ast::types::Range;
 use rustpython_parser::ast::Location;
 
+use crate::ast::types::Range;
 use crate::autofix::fixer;
 use crate::checks::{Check, CheckCode, CheckKind, Fix};
 use crate::noqa;

src/noqa.rs

@@ -150,12 +150,12 @@ pub fn add_noqa(
 
 #[cfg(test)]
 mod tests {
-    use crate::ast::types::Range;
     use anyhow::Result;
     use rustpython_parser::ast::Location;
     use rustpython_parser::lexer;
     use rustpython_parser::lexer::LexResult;
 
+    use crate::ast::types::Range;
     use crate::checks::{Check, CheckKind};
     use crate::noqa::{add_noqa_inner, extract_noqa_line_for};
 

src/plugins.rs

@@ -1,16 +1,3 @@
-mod assert_equals;
-mod assert_tuple;
-mod if_tuple;
-mod invalid_print_syntax;
-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;
-
 pub use assert_equals::assert_equals;
 pub use assert_tuple::assert_tuple;
 pub use if_tuple::if_tuple;
@@ -23,3 +10,16 @@ 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;
+
+mod assert_equals;
+mod assert_tuple;
+mod if_tuple;
+mod invalid_print_syntax;
+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;

src/plugins/use_pep604_annotation.rs

@@ -1,5 +1,4 @@
-use anyhow::{anyhow, Result};
-use rustpython_ast::{Expr, ExprKind};
+use rustpython_ast::{Constant, Expr, ExprKind, Operator};
 
 use crate::ast::helpers::match_name_or_attr;
 use crate::ast::types::Range;
@@ -8,15 +7,50 @@ use crate::check_ast::Checker;
 use crate::checks::{Check, CheckKind, Fix};
 use crate::code_gen::SourceGenerator;
 
+fn optional(expr: &Expr) -> Expr {
+    Expr::new(
+        Default::default(),
+        Default::default(),
+        ExprKind::BinOp {
+            left: Box::new(expr.clone()),
+            op: Operator::BitOr,
+            right: Box::new(Expr::new(
+                Default::default(),
+                Default::default(),
+                ExprKind::Constant {
+                    value: Constant::None,
+                    kind: None,
+                },
+            )),
+        },
+    )
+}
+
+fn union(elts: &[Expr]) -> Expr {
+    if elts.len() == 1 {
+        elts[0].clone()
+    } else {
+        Expr::new(
+            Default::default(),
+            Default::default(),
+            ExprKind::BinOp {
+                left: Box::new(union(&elts[..elts.len() - 1])),
+                op: Operator::BitOr,
+                right: Box::new(elts[elts.len() - 1].clone()),
+            },
+        )
+    }
+}
+
 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(()) = generator.unparse_expr(&optional(slice), 0) {
                 if let Ok(content) = generator.generate() {
                     check.amend(Fix {
-                        content: format!("{} | None", content),
+                        content,
                         location: expr.location,
                         end_location: expr.end_location,
                         applied: false,
@@ -33,27 +67,16 @@ pub fn use_pep604_annotation(checker: &mut Checker, expr: &Expr, value: &Expr, s
                     // 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,
-                        })
+                    let mut generator = SourceGenerator::new();
+                    if let Ok(()) = generator.unparse_expr(&union(elts), 0) {
+                        if let Ok(content) = generator.generate() {
+                            check.amend(Fix {
+                                content,
+                                location: expr.location,
+                                end_location: expr.end_location,
+                                applied: false,
+                            })
+                        }
                     }
                 }
                 _ => {

src/pyproject.rs

@@ -154,12 +154,13 @@ mod tests {
 
     use anyhow::Result;
 
-    use super::StrCheckCodePair;
     use crate::checks::CheckCode;
     use crate::pyproject::{
         find_project_root, find_pyproject_toml, parse_pyproject_toml, Config, PyProject, Tools,
     };
 
+    use super::StrCheckCodePair;
+
     #[test]
     fn deserialize() -> Result<()> {
         let pyproject: PyProject = toml::from_str(r#""#)?;