Bump version to 0.0.32

.pre-commit-config.yaml

@@ -1,5 +1,5 @@
 repos:
   - repo: https://github.com/charliermarsh/ruff
-    rev: v0.0.31
+    rev: v0.0.32
     hooks:
       - id: lint

Cargo.lock

@@ -1744,7 +1744,7 @@ dependencies = [
 
 [[package]]
 name = "ruff"
-version = "0.0.31"
+version = "0.0.32"
 dependencies = [
  "anyhow",
  "bincode",
@@ -1759,6 +1759,7 @@ dependencies = [
  "filetime",
  "glob",
  "itertools",
+ "lazy_static",
  "log",
  "notify",
  "once_cell",

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "ruff"
-version = "0.0.31"
+version = "0.0.32"
 edition = "2021"
 
 [lib]
@@ -20,6 +20,7 @@ fern = { version = "0.6.1" }
 filetime = { version = "0.2.17" }
 glob = { version = "0.3.0" }
 itertools = "0.10.3"
+lazy_static = "1.4.0"
 log = { version = "0.4.17" }
 notify = { version = "4.0.17" }
 once_cell = { version = "1.13.1" }

README.md

@@ -57,7 +57,7 @@ ruff also works with [Pre-Commit](https://pre-commit.com) (requires Cargo on sys
 ```yaml
 repos:
 - repo: https://github.com/charliermarsh/ruff
-  rev: v0.0.31
+  rev: v0.0.32
   hooks:
     - id: lint
 ```
@@ -86,7 +86,7 @@ ruff path/to/code/ --select F401 F403
 See `ruff --help` for more:
 
 ```shell
-ruff (v0.0.31)
+ruff (v0.0.32)
 An extremely fast Python linter.
 
 USAGE:
@@ -123,7 +123,7 @@ ruff's goal is to achieve feature-parity with Flake8 when used (1) without any p
 stylistic checks; limiting to Python 3 obviates the need for certain compatibility checks.)
 
 Under those conditions, Flake8 implements about 58 rules, give or take. At time of writing, ruff
-implements 24 rules. (Note that these 24 rules likely cover a disproportionate share of errors:
+implements 28 rules. (Note that these 28 rules likely cover a disproportionate share of errors:
 unused imports, undefined variables, etc.)
 
 Of the unimplemented rules, ruff is missing:
@@ -158,6 +158,8 @@ Beyond rule-set parity, ruff suffers from the following limitations vis-à-vis F
 | F541 | FStringMissingPlaceholders | f-string without any placeholders |
 | F601 | MultiValueRepeatedKeyLiteral | Dictionary key literal repeated |
 | F602 | MultiValueRepeatedKeyVariable | Dictionary key `...` repeated |
+| F621 | TooManyExpressionsInStarredAssignment | too many expressions in star-unpacking assignment |
+| F622 | TwoStarredExpressions | two starred expressions in assignment |
 | F631 | AssertTuple | Assert test is a non-empty tuple, which is always `True` |
 | F634 | IfTuple | If test is a tuple, which is always `True` |
 | F704 | YieldOutsideFunction | a `yield` or `yield from` statement outside of a function/method |

examples/generate_rules_table.rs

@@ -21,7 +21,9 @@ fn main() {
         CheckKind::NotIsTest,
         CheckKind::RaiseNotImplemented,
         CheckKind::ReturnOutsideFunction,
+        CheckKind::TooManyExpressionsInStarredAssignment,
         CheckKind::TrueFalseComparison(true, RejectedCmpop::Eq),
+        CheckKind::TwoStarredExpressions,
         CheckKind::UndefinedExport("...".to_string()),
         CheckKind::UndefinedLocal("...".to_string()),
         CheckKind::UndefinedName("...".to_string()),

resources/test/fixtures/F401.py

@@ -11,10 +11,13 @@ import multiprocessing.pool
 import multiprocessing.process
 import logging.config
 import logging.handlers
-from typing import NamedTuple, Dict, Type, TypeVar, List, Set
+from typing import TYPING_CHECK, NamedTuple, Dict, Type, TypeVar, List, Set, Union, cast
 
 from blah import ClassA, ClassB, ClassC
 
+if TYPING_CHECK:
+    from models import Fruit, Nut, Vegetable
+
 
 class X:
     datetime: datetime
@@ -32,3 +35,7 @@ __all__ += ["ClassC"]
 X = TypeVar("X")
 Y = TypeVar("Y", bound="Dict")
 Z = TypeVar("Z", "List", "Set")
+
+a = list["Fruit"]
+b = Union["Nut", None]
+c = cast("Vegetable", b)

resources/test/fixtures/F622.py

@@ -0,0 +1,3 @@
+*a, *b, c = (1, 2, 3)
+*a, b, c = (1, 2, 3)
+a, b, *c = (1, 2, 3)

resources/test/fixtures/F821.py

@@ -64,4 +64,16 @@ from typing import List, TypedDict
 
 
 class Item(TypedDict):
-    nodes: List[TypedDict("Node", {"id": str})]
+    nodes: List[TypedDict("Node", {"name": str})]
+
+
+from enum import Enum
+
+
+class Ticket:
+    class Status(Enum):
+        OPEN = "OPEN"
+        CLOSED = "CLOSED"
+
+    def set_status(self, status: Status):
+        self.status = status

resources/test/fixtures/pyproject.toml

@@ -15,6 +15,8 @@ select = [
     "F541",
     "F601",
     "F602",
+    "F621",
+    "F622",
     "F631",
     "F634",
     "F704",

src/ast/checks.rs

@@ -395,3 +395,36 @@ pub fn check_literal_comparisons(
 
     checks
 }
+
+/// Check TwoStarredExpressions and TooManyExpressionsInStarredAssignment compliance.
+pub fn check_starred_expressions(
+    elts: &[Expr],
+    location: Location,
+    check_too_many_expressions: bool,
+    check_two_starred_expressions: bool,
+) -> Option<Check> {
+    let mut has_starred: bool = false;
+    let mut starred_index: Option<usize> = None;
+    for (index, elt) in elts.iter().enumerate() {
+        if matches!(elt.node, ExprKind::Starred { .. }) {
+            if has_starred && check_two_starred_expressions {
+                return Some(Check::new(CheckKind::TwoStarredExpressions, location));
+            }
+            has_starred = true;
+            starred_index = Some(index);
+        }
+    }
+
+    if check_too_many_expressions {
+        if let Some(starred_index) = starred_index {
+            if starred_index >= 1 << 8 || elts.len() - starred_index > 1 << 24 {
+                return Some(Check::new(
+                    CheckKind::TooManyExpressionsInStarredAssignment,
+                    location,
+                ));
+            }
+        }
+    }
+
+    None
+}

src/check_ast.rs

@@ -12,8 +12,9 @@ use crate::ast::types::{Binding, BindingKind, Scope, ScopeKind};
 use crate::ast::visitor::{walk_excepthandler, Visitor};
 use crate::ast::{checks, visitor};
 use crate::autofix::fixer;
-use crate::builtins::{BUILTINS, MAGIC_GLOBALS};
 use crate::checks::{Check, CheckCode, CheckKind};
+use crate::python::builtins::{BUILTINS, MAGIC_GLOBALS};
+use crate::python::typing;
 use crate::settings::Settings;
 
 pub const GLOBAL_SCOPE_INDEX: usize = 0;
@@ -82,6 +83,14 @@ fn match_name_or_attr(expr: &Expr, target: &str) -> bool {
     }
 }
 
+fn is_annotated_subscript(expr: &Expr) -> bool {
+    match &expr.node {
+        ExprKind::Attribute { attr, .. } => typing::is_annotated_subscript(attr),
+        ExprKind::Name { id, .. } => typing::is_annotated_subscript(id),
+        _ => false,
+    }
+}
+
 impl<'a, 'b> Visitor<'b> for Checker<'a>
 where
     'b: 'a,
@@ -117,20 +126,53 @@ where
                 name,
                 decorator_list,
                 returns,
+                args,
                 ..
             }
             | StmtKind::AsyncFunctionDef {
                 name,
                 decorator_list,
                 returns,
+                args,
                 ..
             } => {
                 for expr in decorator_list {
                     self.visit_expr(expr);
                 }
+                for arg in &args.posonlyargs {
+                    if let Some(expr) = &arg.node.annotation {
+                        self.visit_annotation(expr);
+                    }
+                }
+                for arg in &args.args {
+                    if let Some(expr) = &arg.node.annotation {
+                        self.visit_annotation(expr);
+                    }
+                }
+                if let Some(arg) = &args.vararg {
+                    if let Some(expr) = &arg.node.annotation {
+                        self.visit_annotation(expr);
+                    }
+                }
+                for arg in &args.kwonlyargs {
+                    if let Some(expr) = &arg.node.annotation {
+                        self.visit_annotation(expr);
+                    }
+                }
+                if let Some(arg) = &args.kwarg {
+                    if let Some(expr) = &arg.node.annotation {
+                        self.visit_annotation(expr);
+                    }
+                }
                 for expr in returns {
                     self.visit_annotation(expr);
                 }
+                for expr in &args.kw_defaults {
+                    self.visit_expr(expr);
+                }
+                for expr in &args.defaults {
+                    self.visit_expr(expr);
+                }
                 self.add_binding(
                     name.to_string(),
                     Binding {
@@ -422,6 +464,7 @@ where
     fn visit_expr(&mut self, expr: &'b Expr) {
         let prev_in_f_string = self.in_f_string;
         let prev_in_literal = self.in_literal;
+        let prev_in_annotation = self.in_annotation;
 
         // Pre-visit.
         match &expr.node {
@@ -430,6 +473,22 @@ where
                     self.in_literal = true;
                 }
             }
+            ExprKind::Tuple { elts, ctx } => {
+                if matches!(ctx, ExprContext::Store) {
+                    let check_too_many_expressions =
+                        self.settings.select.contains(&CheckCode::F621);
+                    let check_two_starred_expressions =
+                        self.settings.select.contains(&CheckCode::F622);
+                    if let Some(check) = checks::check_starred_expressions(
+                        elts,
+                        expr.location,
+                        check_too_many_expressions,
+                        check_two_starred_expressions,
+                    ) {
+                        self.checks.push(check);
+                    }
+                }
+            }
             ExprKind::Name { ctx, .. } => match ctx {
                 ExprContext::Load => self.handle_node_load(expr),
                 ExprContext::Store => {
@@ -544,7 +603,25 @@ where
                 args,
                 keywords,
             } => {
-                if match_name_or_attr(func, "TypeVar") {
+                if match_name_or_attr(func, "ForwardRef") {
+                    self.visit_expr(func);
+                    for expr in args {
+                        self.visit_annotation(expr);
+                    }
+                } else if match_name_or_attr(func, "cast") {
+                    self.visit_expr(func);
+                    if !args.is_empty() {
+                        self.visit_annotation(&args[0]);
+                    }
+                    for expr in args.iter().skip(1) {
+                        self.visit_expr(expr);
+                    }
+                } else if match_name_or_attr(func, "NewType") {
+                    self.visit_expr(func);
+                    for expr in args.iter().skip(1) {
+                        self.visit_annotation(expr);
+                    }
+                } else if match_name_or_attr(func, "TypeVar") {
                     self.visit_expr(func);
                     for expr in args.iter().skip(1) {
                         self.visit_annotation(expr);
@@ -555,16 +632,54 @@ where
                             if id == "bound" {
                                 self.visit_annotation(value);
                             } else {
+                                self.in_annotation = false;
                                 self.visit_expr(value);
+                                self.in_annotation = prev_in_annotation;
                             }
                         }
                     }
+                } else if match_name_or_attr(func, "NamedTuple") {
+                    self.visit_expr(func);
+
+                    // NamedTuple("a", [("a", int)])
+                    if args.len() > 1 {
+                        match &args[1].node {
+                            ExprKind::List { elts, .. } | ExprKind::Tuple { elts, .. } => {
+                                for elt in elts {
+                                    match &elt.node {
+                                        ExprKind::List { elts, .. }
+                                        | ExprKind::Tuple { elts, .. } => {
+                                            if elts.len() == 2 {
+                                                self.in_annotation = false;
+                                                self.visit_expr(&elts[0]);
+                                                self.in_annotation = prev_in_annotation;
+
+                                                self.visit_annotation(&elts[1]);
+                                            }
+                                        }
+                                        _ => {}
+                                    }
+                                }
+                            }
+                            _ => {}
+                        }
+                    }
+
+                    // NamedTuple("a", a=int)
+                    for keyword in keywords {
+                        let KeywordData { value, .. } = &keyword.node;
+                        self.visit_annotation(value);
+                    }
                 } else if match_name_or_attr(func, "TypedDict") {
+                    self.visit_expr(func);
+
                     // TypedDict("a", {"a": int})
                     if args.len() > 1 {
                         if let ExprKind::Dict { keys, values } = &args[1].node {
                             for key in keys {
+                                self.in_annotation = false;
                                 self.visit_expr(key);
+                                self.in_annotation = prev_in_annotation;
                             }
                             for value in values {
                                 self.visit_annotation(value);
@@ -582,7 +697,7 @@ where
                 }
             }
             ExprKind::Subscript { value, slice, ctx } => {
-                if match_name_or_attr(value, "Type") {
+                if is_annotated_subscript(value) {
                     self.visit_expr(value);
                     self.visit_annotation(slice);
                     self.visit_expr_context(ctx);
@@ -603,6 +718,8 @@ where
             }
             _ => {}
         };
+
+        self.in_annotation = prev_in_annotation;
         self.in_literal = prev_in_literal;
         self.in_f_string = prev_in_f_string;
     }
@@ -674,10 +791,27 @@ where
             self.checks
                 .extend(checks::check_duplicate_arguments(arguments));
         }
-        visitor::walk_arguments(self, arguments);
+
+        // Bind, but intentionally avoid walking default expressions, as we handle them upstream.
+        for arg in &arguments.posonlyargs {
+            self.visit_arg(arg);
+        }
+        for arg in &arguments.args {
+            self.visit_arg(arg);
+        }
+        if let Some(arg) = &arguments.vararg {
+            self.visit_arg(arg);
+        }
+        for arg in &arguments.kwonlyargs {
+            self.visit_arg(arg);
+        }
+        if let Some(arg) = &arguments.kwarg {
+            self.visit_arg(arg);
+        }
     }
 
     fn visit_arg(&mut self, arg: &'b Arg) {
+        // Bind, but intentionally avoid walking the annotation, as we handle it upstream.
         self.add_binding(
             arg.node.arg.to_string(),
             Binding {
@@ -686,7 +820,6 @@ where
                 location: arg.location,
             },
         );
-        visitor::walk_arg(self, arg);
     }
 }
 
@@ -900,8 +1033,9 @@ impl<'a> Checker<'a> {
                 _ => {}
             }
 
-            let scope = &self.scopes[*(self.scope_stack.last().expect("No current scope found."))];
             if self.settings.select.contains(&CheckCode::F841) {
+                let scope =
+                    &self.scopes[*(self.scope_stack.last().expect("No current scope found."))];
                 self.checks.extend(checks::check_unused_variables(scope));
             }
 
@@ -922,8 +1056,9 @@ impl<'a> Checker<'a> {
                 self.visit_expr(body);
             }
 
-            let scope = &self.scopes[*(self.scope_stack.last().expect("No current scope found."))];
             if self.settings.select.contains(&CheckCode::F841) {
+                let scope =
+                    &self.scopes[*(self.scope_stack.last().expect("No current scope found."))];
                 self.checks.extend(checks::check_unused_variables(scope));
             }
 

src/checks.rs

@@ -21,6 +21,8 @@ pub enum CheckCode {
     F541,
     F601,
     F602,
+    F621,
+    F622,
     F631,
     F634,
     F704,
@@ -54,6 +56,8 @@ impl FromStr for CheckCode {
             "F541" => Ok(CheckCode::F541),
             "F601" => Ok(CheckCode::F601),
             "F602" => Ok(CheckCode::F602),
+            "F621" => Ok(CheckCode::F621),
+            "F622" => Ok(CheckCode::F622),
             "F631" => Ok(CheckCode::F631),
             "F634" => Ok(CheckCode::F634),
             "F704" => Ok(CheckCode::F704),
@@ -88,6 +92,8 @@ impl CheckCode {
             CheckCode::F541 => "F541",
             CheckCode::F601 => "F601",
             CheckCode::F602 => "F602",
+            CheckCode::F621 => "F621",
+            CheckCode::F622 => "F622",
             CheckCode::F631 => "F631",
             CheckCode::F634 => "F634",
             CheckCode::F704 => "F704",
@@ -120,6 +126,8 @@ impl CheckCode {
             CheckCode::F541 => &LintSource::AST,
             CheckCode::F601 => &LintSource::AST,
             CheckCode::F602 => &LintSource::AST,
+            CheckCode::F621 => &LintSource::AST,
+            CheckCode::F622 => &LintSource::AST,
             CheckCode::F631 => &LintSource::AST,
             CheckCode::F634 => &LintSource::AST,
             CheckCode::F704 => &LintSource::AST,
@@ -170,7 +178,9 @@ pub enum CheckKind {
     NotIsTest,
     RaiseNotImplemented,
     ReturnOutsideFunction,
+    TooManyExpressionsInStarredAssignment,
     TrueFalseComparison(bool, RejectedCmpop),
+    TwoStarredExpressions,
     UndefinedExport(String),
     UndefinedLocal(String),
     UndefinedName(String),
@@ -202,7 +212,11 @@ impl CheckKind {
             CheckKind::NotIsTest => "NotIsTest",
             CheckKind::RaiseNotImplemented => "RaiseNotImplemented",
             CheckKind::ReturnOutsideFunction => "ReturnOutsideFunction",
+            CheckKind::TooManyExpressionsInStarredAssignment => {
+                "TooManyExpressionsInStarredAssignment"
+            }
             CheckKind::TrueFalseComparison(_, _) => "TrueFalseComparison",
+            CheckKind::TwoStarredExpressions => "TwoStarredExpressions",
             CheckKind::UndefinedExport(_) => "UndefinedExport",
             CheckKind::UndefinedLocal(_) => "UndefinedLocal",
             CheckKind::UndefinedName(_) => "UndefinedName",
@@ -234,7 +248,9 @@ impl CheckKind {
             CheckKind::NotIsTest => &CheckCode::E714,
             CheckKind::RaiseNotImplemented => &CheckCode::F901,
             CheckKind::ReturnOutsideFunction => &CheckCode::F706,
+            CheckKind::TooManyExpressionsInStarredAssignment => &CheckCode::F621,
             CheckKind::TrueFalseComparison(_, _) => &CheckCode::E712,
+            CheckKind::TwoStarredExpressions => &CheckCode::F622,
             CheckKind::UndefinedExport(_) => &CheckCode::F822,
             CheckKind::UndefinedLocal(_) => &CheckCode::F823,
             CheckKind::UndefinedName(_) => &CheckCode::F821,
@@ -295,6 +311,9 @@ impl CheckKind {
             CheckKind::ReturnOutsideFunction => {
                 "a `return` statement outside of a function/method".to_string()
             }
+            CheckKind::TooManyExpressionsInStarredAssignment => {
+                "too many expressions in star-unpacking assignment".to_string()
+            }
             CheckKind::TrueFalseComparison(value, op) => match *value {
                 true => match op {
                     RejectedCmpop::Eq => {
@@ -313,6 +332,7 @@ impl CheckKind {
                     }
                 },
             },
+            CheckKind::TwoStarredExpressions => "two starred expressions in assignment".to_string(),
             CheckKind::UndefinedExport(name) => {
                 format!("Undefined name `{name}` in `__all__`")
             }
@@ -356,7 +376,9 @@ impl CheckKind {
             CheckKind::NoneComparison(_) => false,
             CheckKind::RaiseNotImplemented => false,
             CheckKind::ReturnOutsideFunction => false,
+            CheckKind::TooManyExpressionsInStarredAssignment => false,
             CheckKind::TrueFalseComparison(_, _) => false,
+            CheckKind::TwoStarredExpressions => false,
             CheckKind::UndefinedExport(_) => false,
             CheckKind::UndefinedLocal(_) => false,
             CheckKind::UndefinedName(_) => false,

src/lib.rs

@@ -2,7 +2,6 @@ extern crate core;
 
 mod ast;
 mod autofix;
-mod builtins;
 mod cache;
 pub mod check_ast;
 mod check_lines;
@@ -12,4 +11,5 @@ pub mod linter;
 pub mod logging;
 pub mod message;
 mod pyproject;
+mod python;
 pub mod settings;

src/linter.rs

@@ -463,6 +463,30 @@ mod tests {
         Ok(())
     }
 
+    #[test]
+    fn f622() -> Result<()> {
+        let actual = check_path(
+            Path::new("./resources/test/fixtures/F622.py"),
+            &settings::Settings {
+                line_length: 88,
+                exclude: vec![],
+                select: BTreeSet::from([CheckCode::F622]),
+            },
+            &fixer::Mode::Generate,
+        )?;
+        let expected = vec![Check {
+            kind: CheckKind::TwoStarredExpressions,
+            location: Location::new(1, 1),
+            fix: None,
+        }];
+        assert_eq!(actual.len(), expected.len());
+        for i in 0..actual.len() {
+            assert_eq!(actual[i], expected[i]);
+        }
+
+        Ok(())
+    }
+
     #[test]
     fn f631() -> Result<()> {
         let mut actual = check_path(

src/pyproject.rs

@@ -272,6 +272,8 @@ other-attribute = 1
                     CheckCode::F541,
                     CheckCode::F601,
                     CheckCode::F602,
+                    CheckCode::F621,
+                    CheckCode::F622,
                     CheckCode::F631,
                     CheckCode::F634,
                     CheckCode::F704,

src/python.rs

@@ -0,0 +1,2 @@
+pub mod builtins;
+pub mod typing;

src/python/builtins.rs

@@ -156,8 +156,8 @@ pub const BUILTINS: &[&str] = &[
 // Globally defined names which are not attributes of the builtins module, or are only present on
 // some platforms.
 pub const MAGIC_GLOBALS: &[&str] = &[
-    "__file__",
-    "__builtins__",
-    "__annotations__",
     "WindowsError",
+    "__annotations__",
+    "__builtins__",
+    "__file__",
 ];

src/python/typing.rs

@@ -0,0 +1,88 @@
+use lazy_static::lazy_static;
+use std::collections::BTreeSet;
+
+lazy_static! {
+    static ref ANNOTATED_SUBSCRIPTS: BTreeSet<&'static str> = BTreeSet::from([
+        "AbstractAsyncContextManager",
+        "AbstractContextManager",
+        "AbstractSet",
+        "AsyncContextManager",
+        "AsyncGenerator",
+        "AsyncIterable",
+        "AsyncIterator",
+        "Awaitable",
+        "BinaryIO",
+        "BsdDbShelf",
+        "ByteString",
+        "Callable",
+        "ChainMap",
+        "ClassVar",
+        "Collection",
+        "Concatenate",
+        "Container",
+        "ContextManager",
+        "Coroutine",
+        "Counter",
+        "Counter",
+        "DbfilenameShelf",
+        "DefaultDict",
+        "Deque",
+        "Dict",
+        "Field",
+        "Final",
+        "FrozenSet",
+        "Generator",
+        "Iterator",
+        "Generic",
+        "IO",
+        "ItemsView",
+        "Iterable",
+        "Iterator",
+        "KeysView",
+        "LifoQueue",
+        "List",
+        "Mapping",
+        "MappingProxyType",
+        "MappingView",
+        "Match",
+        "MutableMapping",
+        "MutableSequence",
+        "MutableSet",
+        "Optional",
+        "OrderedDict",
+        "PathLike",
+        "Pattern",
+        "PriorityQueue",
+        "Protocol",
+        "Queue",
+        "Reversible",
+        "Sequence",
+        "Set",
+        "Shelf",
+        "SimpleQueue",
+        "TextIO",
+        "Tuple",
+        "Type",
+        "TypeGuard",
+        "Union",
+        "ValuesView",
+        "WeakKeyDictionary",
+        "WeakMethod",
+        "WeakSet",
+        "WeakValueDictionary",
+        "cached_property",
+        "defaultdict",
+        "deque",
+        "dict",
+        "frozenset",
+        "list",
+        "partialmethod",
+        "set",
+        "tuple",
+        "type",
+    ]);
+}
+
+pub fn is_annotated_subscript(name: &str) -> bool {
+    ANNOTATED_SUBSCRIPTS.contains(name)
+}

src/settings.rs

@@ -57,6 +57,8 @@ impl Settings {
                     CheckCode::F541,
                     CheckCode::F601,
                     CheckCode::F602,
+                    CheckCode::F621,
+                    CheckCode::F622,
                     CheckCode::F631,
                     CheckCode::F634,
                     CheckCode::F704,