Bump version to 0.0.36

.pre-commit-config.yaml

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

Cargo.lock

@@ -1744,7 +1744,7 @@ dependencies = [
 
 [[package]]
 name = "ruff"
-version = "0.0.34"
+version = "0.0.36"
 dependencies = [
  "anyhow",
  "bincode",

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "ruff"
-version = "0.0.34"
+version = "0.0.36"
 edition = "2021"
 
 [lib]

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.34
+  rev: v0.0.36
   hooks:
     - id: lint
 ```
@@ -86,7 +86,7 @@ ruff path/to/code/ --select F401 F403
 See `ruff --help` for more:
 
 ```shell
-ruff (v0.0.34)
+ruff (v0.0.36)
 An extremely fast Python linter.
 
 USAGE:
@@ -124,13 +124,12 @@ 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 31 rules. (Note that these 31 rules likely cover a disproportionate share of errors:
+implements 36 rules. (Note that these 36 rules likely cover a disproportionate share of errors:
 unused imports, undefined variables, etc.)
 
 Of the unimplemented rules, ruff is missing:
 
 - 15 rules related to string `.format` calls.
-- 6 rules related to misplaced `yield`, `break`, and `return` statements.
 - 3 rules related to syntax errors in doctests and annotations.
 - 2 rules related to redefining unused names.
 
@@ -147,13 +146,16 @@ Beyond rule-set parity, ruff suffers from the following limitations vis-à-vis F
 | Code | Name | Message |
 | ---- | ----- | ------- |
 | E402 | ModuleImportNotAtTopOfFile | Module level import not at top of file |
-| E501 | LineTooLong | Line too long |
+| E501 | LineTooLong | Line too long (89 > 88 characters) |
 | E711 | NoneComparison | Comparison to `None` should be `cond is None` |
 | E712 | TrueFalseComparison | Comparison to `True` should be `cond is True` |
 | E713 | NotInTest | Test for membership should be `not in` |
 | E714 | NotIsTest | Test for object identity should be `is not` |
+| E722 | DoNotUseBareExcept | Do not use bare `except` |
 | E731 | DoNotAssignLambda | Do not assign a lambda expression, use a def |
 | E741 | AmbiguousVariableName | ambiguous variable name '...' |
+| E742 | AmbiguousClassName | ambiguous class name '...' |
+| E743 | AmbiguousFunctionName | ambiguous function name '...' |
 | E902 | IOError | No such file or directory: `...` |
 | F401 | UnusedImport | `...` imported but unused |
 | F403 | ImportStarUsage | Unable to detect undefined names |
@@ -166,6 +168,8 @@ Beyond rule-set parity, ruff suffers from the following limitations vis-à-vis F
 | 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` |
+| F701 | BreakOutsideLoop | `break` outside loop |
+| F702 | ContinueOutsideLoop | `continue` not properly in loop |
 | F704 | YieldOutsideFunction | a `yield` or `yield from` statement outside of a function/method |
 | F706 | ReturnOutsideFunction | a `return` statement outside of a function/method |
 | F707 | DefaultExceptNotLast | an `except:` block as not the last exception handler |

examples/generate_rules_table.rs

@@ -3,10 +3,15 @@ use ruff::checks::{CheckKind, RejectedCmpop};
 
 fn main() {
     let mut check_kinds: Vec<CheckKind> = vec![
+        CheckKind::AmbiguousClassName("...".to_string()),
+        CheckKind::AmbiguousFunctionName("...".to_string()),
         CheckKind::AmbiguousVariableName("...".to_string()),
         CheckKind::AssertTuple,
+        CheckKind::BreakOutsideLoop,
+        CheckKind::ContinueOutsideLoop,
         CheckKind::DefaultExceptNotLast,
         CheckKind::DoNotAssignLambda,
+        CheckKind::DoNotUseBareExcept,
         CheckKind::DuplicateArgumentName,
         CheckKind::FStringMissingPlaceholders,
         CheckKind::FutureFeatureNotDefined("...".to_string()),
@@ -14,7 +19,7 @@ fn main() {
         CheckKind::IfTuple,
         CheckKind::ImportStarUsage,
         CheckKind::LateFutureImport,
-        CheckKind::LineTooLong,
+        CheckKind::LineTooLong(89, 88),
         CheckKind::ModuleImportNotAtTopOfFile,
         CheckKind::MultiValueRepeatedKeyLiteral,
         CheckKind::MultiValueRepeatedKeyVariable("...".to_string()),

resources/test/fixtures/E722.py

@@ -0,0 +1,9 @@
+try:
+    pass
+except:
+    pass
+
+try:
+    pass
+except Exception:
+    pass

resources/test/fixtures/E741.py

@@ -70,3 +70,6 @@ try:
     pass
 except ValueError as l:
     pass
+
+if (l := 5) > 0:
+    pass

resources/test/fixtures/E742.py

@@ -0,0 +1,14 @@
+class l:
+    pass
+
+
+class I:
+    pass
+
+
+class O:
+    pass
+
+
+class X:
+    pass

resources/test/fixtures/E743.py

@@ -0,0 +1,15 @@
+def l():
+    pass
+
+
+def I():
+    pass
+
+
+class X:
+    def O(self):
+        pass
+
+
+def x():
+    pass

resources/test/fixtures/F701.py

@@ -0,0 +1,23 @@
+for i in range(10):
+    break
+else:
+    break
+
+i = 0
+while i < 10:
+    i += 1
+    break
+
+
+def f():
+    for i in range(10):
+        break
+
+    break
+
+
+class Foo:
+    break
+
+
+break

resources/test/fixtures/F702.py

@@ -0,0 +1,23 @@
+for i in range(10):
+    continue
+else:
+    continue
+
+i = 0
+while i < 10:
+    i += 1
+    continue
+
+
+def f():
+    for i in range(10):
+        continue
+
+    continue
+
+
+class Foo:
+    continue
+
+
+continue

resources/test/fixtures/F841.py

@@ -14,3 +14,11 @@ def f():
     x = 1
     y = 2
     z = x + y
+
+
+def g():
+    foo = (1, 2)
+    (a, b) = (1, 2)
+
+    bar = (1, 2)
+    (c, d) = bar

resources/test/fixtures/pyproject.toml

@@ -8,8 +8,11 @@ select = [
     "E712",
     "E713",
     "E714",
+    "E722",
     "E731",
     "E741",
+    "E742",
+    "E743",
     "E902",
     "F401",
     "F403",
@@ -22,6 +25,8 @@ select = [
     "F622",
     "F631",
     "F634",
+    "F701",
+    "F702",
     "F704",
     "F706",
     "F707",

src/ast/checks.rs

@@ -3,7 +3,7 @@ use std::collections::BTreeSet;
 use itertools::izip;
 use rustpython_parser::ast::{
     Arg, Arguments, Cmpop, Constant, Excepthandler, ExcepthandlerKind, Expr, ExprKind, Keyword,
-    Location, Stmt, Unaryop,
+    Location, Stmt, StmtKind, Unaryop,
 };
 
 use crate::ast::operations::SourceCodeLocator;
@@ -109,6 +109,30 @@ pub fn check_ambiguous_variable_name(name: &str, location: Location) -> Option<C
     }
 }
 
+/// Check AmbiguousClassName compliance.
+pub fn check_ambiguous_class_name(name: &str, location: Location) -> Option<Check> {
+    if is_ambiguous_name(name) {
+        Some(Check::new(
+            CheckKind::AmbiguousClassName(name.to_string()),
+            location,
+        ))
+    } else {
+        None
+    }
+}
+
+/// Check AmbiguousFunctionName compliance.
+pub fn check_ambiguous_function_name(name: &str, location: Location) -> Option<Check> {
+    if is_ambiguous_name(name) {
+        Some(Check::new(
+            CheckKind::AmbiguousFunctionName(name.to_string()),
+            location,
+        ))
+    } else {
+        None
+    }
+}
+
 /// Check UselessObjectInheritance compliance.
 pub fn check_useless_object_inheritance(
     stmt: &Stmt,
@@ -444,3 +468,77 @@ pub fn check_starred_expressions(
 
     None
 }
+
+/// Check BreakOutsideLoop compliance.
+pub fn check_break_outside_loop(
+    stmt: &Stmt,
+    parents: &[&Stmt],
+    parent_stack: &[usize],
+) -> Option<Check> {
+    let mut allowed: bool = false;
+    let mut parent = stmt;
+    for index in parent_stack.iter().rev() {
+        let child = parent;
+        parent = parents[*index];
+        match &parent.node {
+            StmtKind::For { orelse, .. }
+            | StmtKind::AsyncFor { orelse, .. }
+            | StmtKind::While { orelse, .. } => {
+                if !orelse.contains(child) {
+                    allowed = true;
+                    break;
+                }
+            }
+
+            StmtKind::FunctionDef { .. }
+            | StmtKind::AsyncFunctionDef { .. }
+            | StmtKind::ClassDef { .. } => {
+                break;
+            }
+            _ => {}
+        }
+    }
+
+    if !allowed {
+        Some(Check::new(CheckKind::BreakOutsideLoop, stmt.location))
+    } else {
+        None
+    }
+}
+
+/// Check ContinueOutsideLoop compliance.
+pub fn check_continue_outside_loop(
+    stmt: &Stmt,
+    parents: &[&Stmt],
+    parent_stack: &[usize],
+) -> Option<Check> {
+    let mut allowed: bool = false;
+    let mut parent = stmt;
+    for index in parent_stack.iter().rev() {
+        let child = parent;
+        parent = parents[*index];
+        match &parent.node {
+            StmtKind::For { orelse, .. }
+            | StmtKind::AsyncFor { orelse, .. }
+            | StmtKind::While { orelse, .. } => {
+                if !orelse.contains(child) {
+                    allowed = true;
+                    break;
+                }
+            }
+
+            StmtKind::FunctionDef { .. }
+            | StmtKind::AsyncFunctionDef { .. }
+            | StmtKind::ClassDef { .. } => {
+                break;
+            }
+            _ => {}
+        }
+    }
+
+    if !allowed {
+        Some(Check::new(CheckKind::ContinueOutsideLoop, stmt.location))
+    } else {
+        None
+    }
+}

src/ast/operations.rs

@@ -100,6 +100,24 @@ pub fn in_nested_block(parent_stack: &[usize], parents: &[&Stmt]) -> bool {
     false
 }
 
+/// Check if a node represents an unpacking assignment.
+pub fn is_unpacking_assignment(stmt: &Stmt) -> bool {
+    if let StmtKind::Assign { targets, value, .. } = &stmt.node {
+        for child in targets {
+            match &child.node {
+                ExprKind::Set { .. } | ExprKind::List { .. } | ExprKind::Tuple { .. } => {}
+                _ => return false,
+            }
+        }
+        match &value.node {
+            ExprKind::Set { .. } | ExprKind::List { .. } | ExprKind::Tuple { .. } => return false,
+            _ => {}
+        }
+        return true;
+    }
+    false
+}
+
 /// Struct used to efficiently slice source code at (row, column) Locations.
 pub struct SourceCodeLocator<'a> {
     content: &'a str,

src/ast/types.rs

@@ -35,8 +35,10 @@ impl Scope {
 
 #[derive(Clone, Debug)]
 pub enum BindingKind {
+    Annotation,
     Argument,
     Assignment,
+    Binding,
     Builtin,
     ClassDefinition,
     Definition,

src/check_ast.rs

@@ -194,6 +194,24 @@ where
                     }));
                 }
             }
+            StmtKind::Break => {
+                if self.settings.select.contains(&CheckCode::F701) {
+                    if let Some(check) =
+                        checks::check_break_outside_loop(stmt, &self.parents, &self.parent_stack)
+                    {
+                        self.checks.push(check);
+                    }
+                }
+            }
+            StmtKind::Continue => {
+                if self.settings.select.contains(&CheckCode::F702) {
+                    if let Some(check) =
+                        checks::check_continue_outside_loop(stmt, &self.parents, &self.parent_stack)
+                    {
+                        self.checks.push(check);
+                    }
+                }
+            }
             StmtKind::FunctionDef {
                 name,
                 decorator_list,
@@ -208,6 +226,12 @@ where
                 args,
                 ..
             } => {
+                if self.settings.select.contains(&CheckCode::E743) {
+                    if let Some(check) = checks::check_ambiguous_function_name(name, stmt.location)
+                    {
+                        self.checks.push(check);
+                    }
+                }
                 for expr in decorator_list {
                     self.visit_expr(expr);
                 }
@@ -296,6 +320,12 @@ where
                     }
                 }
 
+                if self.settings.select.contains(&CheckCode::E742) {
+                    if let Some(check) = checks::check_ambiguous_class_name(name, stmt.location) {
+                        self.checks.push(check);
+                    }
+                }
+
                 for expr in bases {
                     self.visit_expr(expr)
                 }
@@ -541,7 +571,7 @@ where
                     self.in_literal = true;
                 }
             }
-            ExprKind::Tuple { elts, ctx } => {
+            ExprKind::Tuple { elts, ctx } | ExprKind::List { elts, ctx } => {
                 if matches!(ctx, ExprContext::Store) {
                     let check_too_many_expressions =
                         self.settings.select.contains(&CheckCode::F621);
@@ -569,7 +599,7 @@ where
                     }
                     let parent =
                         self.parents[*(self.parent_stack.last().expect("No parent found."))];
-                    self.handle_node_store(expr, Some(parent));
+                    self.handle_node_store(expr, parent);
                 }
                 ExprContext::Del => self.handle_node_delete(expr),
             },
@@ -801,20 +831,45 @@ where
 
     fn visit_excepthandler(&mut self, excepthandler: &'b Excepthandler) {
         match &excepthandler.node {
-            ExcepthandlerKind::ExceptHandler { name, .. } => match name {
-                Some(name) => {
-                    if self.settings.select.contains(&CheckCode::E741) {
-                        if let Some(check) =
-                            checks::check_ambiguous_variable_name(name, excepthandler.location)
-                        {
-                            self.checks.push(check);
+            ExcepthandlerKind::ExceptHandler { type_, name, .. } => {
+                if self.settings.select.contains(&CheckCode::E722) && type_.is_none() {
+                    self.checks.push(Check::new(
+                        CheckKind::DoNotUseBareExcept,
+                        excepthandler.location,
+                    ));
+                }
+                match name {
+                    Some(name) => {
+                        if self.settings.select.contains(&CheckCode::E741) {
+                            if let Some(check) =
+                                checks::check_ambiguous_variable_name(name, excepthandler.location)
+                            {
+                                self.checks.push(check);
+                            }
                         }
-                    }
-                    let scope =
-                        &self.scopes[*(self.scope_stack.last().expect("No current scope found."))];
-                    if scope.values.contains_key(name) {
+                        let scope = &self.scopes
+                            [*(self.scope_stack.last().expect("No current scope found."))];
+                        if scope.values.contains_key(name) {
+                            let parent = self.parents
+                                [*(self.parent_stack.last().expect("No parent found."))];
+                            self.handle_node_store(
+                                &Expr::new(
+                                    excepthandler.location,
+                                    ExprKind::Name {
+                                        id: name.to_string(),
+                                        ctx: ExprContext::Store,
+                                    },
+                                ),
+                                parent,
+                            );
+                            self.parents.push(parent);
+                        }
+
                         let parent =
                             self.parents[*(self.parent_stack.last().expect("No parent found."))];
+                        let scope = &self.scopes
+                            [*(self.scope_stack.last().expect("No current scope found."))];
+                        let definition = scope.values.get(name).cloned();
                         self.handle_node_store(
                             &Expr::new(
                                 excepthandler.location,
@@ -823,48 +878,32 @@ where
                                     ctx: ExprContext::Store,
                                 },
                             ),
-                            Some(parent),
+                            parent,
                         );
                         self.parents.push(parent);
-                    }
 
-                    let parent =
-                        self.parents[*(self.parent_stack.last().expect("No parent found."))];
-                    let scope =
-                        &self.scopes[*(self.scope_stack.last().expect("No current scope found."))];
-                    let definition = scope.values.get(name).cloned();
-                    self.handle_node_store(
-                        &Expr::new(
-                            excepthandler.location,
-                            ExprKind::Name {
-                                id: name.to_string(),
-                                ctx: ExprContext::Store,
-                            },
-                        ),
-                        Some(parent),
-                    );
-                    self.parents.push(parent);
+                        walk_excepthandler(self, excepthandler);
 
-                    walk_excepthandler(self, excepthandler);
+                        let scope = &mut self.scopes
+                            [*(self.scope_stack.last().expect("No current scope found."))];
+                        if let Some(binding) = &scope.values.remove(name) {
+                            if self.settings.select.contains(&CheckCode::F841)
+                                && binding.used.is_none()
+                            {
+                                self.checks.push(Check::new(
+                                    CheckKind::UnusedVariable(name.to_string()),
+                                    excepthandler.location,
+                                ));
+                            }
+                        }
 
-                    let scope = &mut self.scopes
-                        [*(self.scope_stack.last().expect("No current scope found."))];
-                    if let Some(binding) = &scope.values.remove(name) {
-                        if self.settings.select.contains(&CheckCode::F841) && binding.used.is_none()
-                        {
-                            self.checks.push(Check::new(
-                                CheckKind::UnusedVariable(name.to_string()),
-                                excepthandler.location,
-                            ));
+                        if let Some(binding) = definition {
+                            scope.values.insert(name.to_string(), binding);
                         }
                     }
-
-                    if let Some(binding) = definition {
-                        scope.values.insert(name.to_string(), binding);
-                    }
+                    None => walk_excepthandler(self, excepthandler),
                 }
-                None => walk_excepthandler(self, excepthandler),
-            },
+            }
         }
     }
 
@@ -1011,7 +1050,7 @@ impl<'a> Checker<'a> {
         }
     }
 
-    fn handle_node_store(&mut self, expr: &Expr, parent: Option<&Stmt>) {
+    fn handle_node_store(&mut self, expr: &Expr, parent: &Stmt) {
         if let ExprKind::Name { id, .. } = &expr.node {
             let current =
                 &self.scopes[*(self.scope_stack.last().expect("No current scope found."))];
@@ -1041,35 +1080,59 @@ impl<'a> Checker<'a> {
                 }
             }
 
-            // TODO(charlie): Handle alternate binding types (like `Annotation`).
-            if id == "__all__"
-                && matches!(current.kind, ScopeKind::Module)
-                && parent
-                    .map(|stmt| {
-                        matches!(stmt.node, StmtKind::Assign { .. })
-                            || matches!(stmt.node, StmtKind::AugAssign { .. })
-                            || matches!(stmt.node, StmtKind::AnnAssign { .. })
-                    })
-                    .unwrap_or_default()
+            if matches!(parent.node, StmtKind::AnnAssign { value: None, .. }) {
+                self.add_binding(
+                    id.to_string(),
+                    Binding {
+                        kind: BindingKind::Annotation,
+                        used: None,
+                        location: expr.location,
+                    },
+                );
+                return;
+            }
+
+            // TODO(charlie): Include comprehensions here.
+            if matches!(parent.node, StmtKind::For { .. })
+                || matches!(parent.node, StmtKind::AsyncFor { .. })
+                || operations::is_unpacking_assignment(parent)
             {
                 self.add_binding(
                     id.to_string(),
                     Binding {
-                        kind: BindingKind::Export(extract_all_names(parent.unwrap(), current)),
+                        kind: BindingKind::Binding,
                         used: None,
                         location: expr.location,
                     },
                 );
-            } else {
+                return;
+            }
+
+            if id == "__all__"
+                && matches!(current.kind, ScopeKind::Module)
+                && (matches!(parent.node, StmtKind::Assign { .. })
+                    || matches!(parent.node, StmtKind::AugAssign { .. })
+                    || matches!(parent.node, StmtKind::AnnAssign { .. }))
+            {
                 self.add_binding(
                     id.to_string(),
                     Binding {
-                        kind: BindingKind::Assignment,
+                        kind: BindingKind::Export(extract_all_names(parent, current)),
                         used: None,
                         location: expr.location,
                     },
                 );
+                return;
             }
+
+            self.add_binding(
+                id.to_string(),
+                Binding {
+                    kind: BindingKind::Assignment,
+                    used: None,
+                    location: expr.location,
+                },
+            );
         }
     }
 

src/check_lines.rs

@@ -1,11 +1,11 @@
 use rustpython_parser::ast::Location;
 
-use crate::checks::{Check, CheckKind};
+use crate::checks::{Check, CheckCode, CheckKind};
 use crate::settings::Settings;
 
 /// Whether the given line is too long and should be reported.
-fn should_enforce_line_length(line: &str, limit: usize) -> bool {
-    if line.len() > limit {
+fn should_enforce_line_length(line: &str, length: usize, limit: usize) -> bool {
+    if length > limit {
         let mut chunks = line.split_whitespace();
         if let (Some(first), Some(_)) = (chunks.next(), chunks.next()) {
             // Do not enforce the line length for commented lines with a single word
@@ -20,7 +20,7 @@ fn should_enforce_line_length(line: &str, limit: usize) -> bool {
 }
 
 pub fn check_lines(checks: &mut Vec<Check>, contents: &str, settings: &Settings) {
-    let enforce_line_too_long = settings.select.contains(CheckKind::LineTooLong.code());
+    let enforce_line_too_long = settings.select.contains(&CheckCode::E501);
 
     let mut line_checks = vec![];
     let mut ignored = vec![];
@@ -34,13 +34,16 @@ pub fn check_lines(checks: &mut Vec<Check>, contents: &str, settings: &Settings)
         }
 
         // Enforce line length.
-        if enforce_line_too_long && should_enforce_line_length(line, settings.line_length) {
-            let check = Check::new(
-                CheckKind::LineTooLong,
-                Location::new(row + 1, settings.line_length + 1),
-            );
-            if !check.is_inline_ignored(line) {
-                line_checks.push(check);
+        if enforce_line_too_long {
+            let line_length = line.len();
+            if should_enforce_line_length(line, line_length, settings.line_length) {
+                let check = Check::new(
+                    CheckKind::LineTooLong(line_length, settings.line_length),
+                    Location::new(row + 1, settings.line_length + 1),
+                );
+                if !check.is_inline_ignored(line) {
+                    line_checks.push(check);
+                }
             }
         }
     }

src/checks.rs

@@ -14,8 +14,11 @@ pub enum CheckCode {
     E712,
     E713,
     E714,
+    E722,
     E731,
     E741,
+    E742,
+    E743,
     E902,
     F401,
     F403,
@@ -28,6 +31,8 @@ pub enum CheckCode {
     F622,
     F631,
     F634,
+    F701,
+    F702,
     F704,
     F706,
     F707,
@@ -51,9 +56,12 @@ impl FromStr for CheckCode {
             "E711" => Ok(CheckCode::E711),
             "E712" => Ok(CheckCode::E712),
             "E713" => Ok(CheckCode::E713),
+            "E722" => Ok(CheckCode::E722),
             "E714" => Ok(CheckCode::E714),
             "E731" => Ok(CheckCode::E731),
             "E741" => Ok(CheckCode::E741),
+            "E742" => Ok(CheckCode::E742),
+            "E743" => Ok(CheckCode::E743),
             "E902" => Ok(CheckCode::E902),
             "F401" => Ok(CheckCode::F401),
             "F403" => Ok(CheckCode::F403),
@@ -66,6 +74,8 @@ impl FromStr for CheckCode {
             "F622" => Ok(CheckCode::F622),
             "F631" => Ok(CheckCode::F631),
             "F634" => Ok(CheckCode::F634),
+            "F701" => Ok(CheckCode::F701),
+            "F702" => Ok(CheckCode::F702),
             "F704" => Ok(CheckCode::F704),
             "F706" => Ok(CheckCode::F706),
             "F707" => Ok(CheckCode::F707),
@@ -91,8 +101,11 @@ impl CheckCode {
             CheckCode::E712 => "E712",
             CheckCode::E713 => "E713",
             CheckCode::E714 => "E714",
+            CheckCode::E722 => "E722",
             CheckCode::E731 => "E731",
             CheckCode::E741 => "E741",
+            CheckCode::E742 => "E742",
+            CheckCode::E743 => "E743",
             CheckCode::E902 => "E902",
             CheckCode::F401 => "F401",
             CheckCode::F403 => "F403",
@@ -105,6 +118,8 @@ impl CheckCode {
             CheckCode::F622 => "F622",
             CheckCode::F631 => "F631",
             CheckCode::F634 => "F634",
+            CheckCode::F701 => "F701",
+            CheckCode::F702 => "F702",
             CheckCode::F704 => "F704",
             CheckCode::F706 => "F706",
             CheckCode::F707 => "F707",
@@ -128,8 +143,11 @@ impl CheckCode {
             CheckCode::E712 => &LintSource::AST,
             CheckCode::E713 => &LintSource::AST,
             CheckCode::E714 => &LintSource::AST,
+            CheckCode::E722 => &LintSource::AST,
             CheckCode::E731 => &LintSource::AST,
             CheckCode::E741 => &LintSource::AST,
+            CheckCode::E742 => &LintSource::AST,
+            CheckCode::E743 => &LintSource::AST,
             CheckCode::E902 => &LintSource::FileSystem,
             CheckCode::F401 => &LintSource::AST,
             CheckCode::F403 => &LintSource::AST,
@@ -142,6 +160,8 @@ impl CheckCode {
             CheckCode::F622 => &LintSource::AST,
             CheckCode::F631 => &LintSource::AST,
             CheckCode::F634 => &LintSource::AST,
+            CheckCode::F701 => &LintSource::AST,
+            CheckCode::F702 => &LintSource::AST,
             CheckCode::F704 => &LintSource::AST,
             CheckCode::F706 => &LintSource::AST,
             CheckCode::F707 => &LintSource::AST,
@@ -172,10 +192,15 @@ pub enum RejectedCmpop {
 
 #[derive(Debug, PartialEq, Eq, Serialize, Deserialize)]
 pub enum CheckKind {
-    AssertTuple,
+    AmbiguousClassName(String),
+    AmbiguousFunctionName(String),
     AmbiguousVariableName(String),
+    AssertTuple,
+    BreakOutsideLoop,
+    ContinueOutsideLoop,
     DefaultExceptNotLast,
     DoNotAssignLambda,
+    DoNotUseBareExcept,
     DuplicateArgumentName,
     FStringMissingPlaceholders,
     FutureFeatureNotDefined(String),
@@ -183,7 +208,7 @@ pub enum CheckKind {
     IfTuple,
     ImportStarUsage,
     LateFutureImport,
-    LineTooLong,
+    LineTooLong(usize, usize),
     ModuleImportNotAtTopOfFile,
     MultiValueRepeatedKeyLiteral,
     MultiValueRepeatedKeyVariable(String),
@@ -209,9 +234,15 @@ impl CheckKind {
     /// The name of the check.
     pub fn name(&self) -> &'static str {
         match self {
-            CheckKind::AssertTuple => "AssertTuple",
+            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::FStringMissingPlaceholders => "FStringMissingPlaceholders",
             CheckKind::FutureFeatureNotDefined(_) => "FutureFeatureNotDefined",
@@ -219,8 +250,7 @@ impl CheckKind {
             CheckKind::IfTuple => "IfTuple",
             CheckKind::ImportStarUsage => "ImportStarUsage",
             CheckKind::LateFutureImport => "LateFutureImport",
-            CheckKind::LineTooLong => "LineTooLong",
-            CheckKind::DoNotAssignLambda => "DoNotAssignLambda",
+            CheckKind::LineTooLong(_, _) => "LineTooLong",
             CheckKind::ModuleImportNotAtTopOfFile => "ModuleImportNotAtTopOfFile",
             CheckKind::MultiValueRepeatedKeyLiteral => "MultiValueRepeatedKeyLiteral",
             CheckKind::MultiValueRepeatedKeyVariable(_) => "MultiValueRepeatedKeyVariable",
@@ -248,8 +278,15 @@ impl CheckKind {
     /// A four-letter shorthand code for the check.
     pub fn code(&self) -> &'static CheckCode {
         match self {
+            CheckKind::AmbiguousClassName(_) => &CheckCode::E742,
+            CheckKind::AmbiguousFunctionName(_) => &CheckCode::E743,
+            CheckKind::AmbiguousVariableName(_) => &CheckCode::E741,
             CheckKind::AssertTuple => &CheckCode::F631,
+            CheckKind::BreakOutsideLoop => &CheckCode::F701,
+            CheckKind::ContinueOutsideLoop => &CheckCode::F702,
             CheckKind::DefaultExceptNotLast => &CheckCode::F707,
+            CheckKind::DoNotAssignLambda => &CheckCode::E731,
+            CheckKind::DoNotUseBareExcept => &CheckCode::E722,
             CheckKind::DuplicateArgumentName => &CheckCode::F831,
             CheckKind::FStringMissingPlaceholders => &CheckCode::F541,
             CheckKind::FutureFeatureNotDefined(_) => &CheckCode::F407,
@@ -257,9 +294,7 @@ impl CheckKind {
             CheckKind::IfTuple => &CheckCode::F634,
             CheckKind::ImportStarUsage => &CheckCode::F403,
             CheckKind::LateFutureImport => &CheckCode::F404,
-            CheckKind::LineTooLong => &CheckCode::E501,
-            CheckKind::DoNotAssignLambda => &CheckCode::E731,
-            CheckKind::AmbiguousVariableName(_) => &CheckCode::E741,
+            CheckKind::LineTooLong(_, _) => &CheckCode::E501,
             CheckKind::ModuleImportNotAtTopOfFile => &CheckCode::E402,
             CheckKind::MultiValueRepeatedKeyLiteral => &CheckCode::F601,
             CheckKind::MultiValueRepeatedKeyVariable(_) => &CheckCode::F602,
@@ -285,12 +320,27 @@ impl CheckKind {
     /// The body text for the check.
     pub fn body(&self) -> String {
         match self {
+            CheckKind::AmbiguousClassName(name) => {
+                format!("ambiguous class name '{}'", name)
+            }
+            CheckKind::AmbiguousFunctionName(name) => {
+                format!("ambiguous function name '{}'", name)
+            }
+            CheckKind::AmbiguousVariableName(name) => {
+                format!("ambiguous variable name '{}'", name)
+            }
             CheckKind::AssertTuple => {
                 "Assert test is a non-empty tuple, which is always `True`".to_string()
             }
+            CheckKind::BreakOutsideLoop => "`break` outside loop".to_string(),
+            CheckKind::ContinueOutsideLoop => "`continue` not properly in loop".to_string(),
             CheckKind::DefaultExceptNotLast => {
                 "an `except:` block as not the last exception handler".to_string()
             }
+            CheckKind::DoNotAssignLambda => {
+                "Do not assign a lambda expression, use a def".to_string()
+            }
+            CheckKind::DoNotUseBareExcept => "Do not use bare `except`".to_string(),
             CheckKind::DuplicateArgumentName => {
                 "Duplicate argument name in function definition".to_string()
             }
@@ -308,12 +358,8 @@ impl CheckKind {
             CheckKind::LateFutureImport => {
                 "from __future__ imports must occur at the beginning of the file".to_string()
             }
-            CheckKind::LineTooLong => "Line too long".to_string(),
-            CheckKind::DoNotAssignLambda => {
-                "Do not assign a lambda expression, use a def".to_string()
-            }
-            CheckKind::AmbiguousVariableName(name) => {
-                format!("ambiguous variable name '{}'", name)
+            CheckKind::LineTooLong(length, limit) => {
+                format!("Line too long ({length} > {limit} characters)")
             }
             CheckKind::ModuleImportNotAtTopOfFile => {
                 "Module level import not at top of file".to_string()
@@ -366,12 +412,12 @@ impl CheckKind {
             CheckKind::UndefinedExport(name) => {
                 format!("Undefined name `{name}` in `__all__`")
             }
-            CheckKind::UndefinedName(name) => {
-                format!("Undefined name `{name}`")
-            }
             CheckKind::UndefinedLocal(name) => {
                 format!("Local variable `{name}` referenced before assignment")
             }
+            CheckKind::UndefinedName(name) => {
+                format!("Undefined name `{name}`")
+            }
             CheckKind::UnusedImport(name) => format!("`{name}` imported but unused"),
             CheckKind::UnusedVariable(name) => {
                 format!("Local variable `{name}` is assigned to but never used")
@@ -387,39 +433,10 @@ impl CheckKind {
 
     /// Whether the check kind is (potentially) fixable.
     pub fn fixable(&self) -> bool {
-        match self {
-            CheckKind::AmbiguousVariableName(_) => false,
-            CheckKind::AssertTuple => false,
-            CheckKind::DefaultExceptNotLast => false,
-            CheckKind::DoNotAssignLambda => false,
-            CheckKind::DuplicateArgumentName => false,
-            CheckKind::FStringMissingPlaceholders => false,
-            CheckKind::FutureFeatureNotDefined(_) => false,
-            CheckKind::IOError(_) => false,
-            CheckKind::IfTuple => false,
-            CheckKind::ImportStarUsage => false,
-            CheckKind::LateFutureImport => false,
-            CheckKind::LineTooLong => false,
-            CheckKind::ModuleImportNotAtTopOfFile => false,
-            CheckKind::MultiValueRepeatedKeyLiteral => false,
-            CheckKind::MultiValueRepeatedKeyVariable(_) => false,
-            CheckKind::NoAssertEquals => true,
-            CheckKind::NoneComparison(_) => false,
-            CheckKind::NotInTest => false,
-            CheckKind::NotIsTest => 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,
-            CheckKind::UnusedImport(_) => false,
-            CheckKind::UnusedVariable(_) => false,
-            CheckKind::UselessObjectInheritance(_) => true,
-            CheckKind::YieldOutsideFunction => false,
-        }
+        matches!(
+            self,
+            CheckKind::NoAssertEquals | CheckKind::UselessObjectInheritance(_)
+        )
     }
 }
 

src/linter.rs

@@ -128,7 +128,7 @@ mod tests {
         )?;
         actual.sort_by_key(|check| check.location);
         let expected = vec![Check {
-            kind: CheckKind::LineTooLong,
+            kind: CheckKind::LineTooLong(123, 88),
             location: Location::new(5, 89),
             fix: None,
         }];
@@ -240,6 +240,31 @@ mod tests {
         Ok(())
     }
 
+    #[test]
+    fn e722() -> Result<()> {
+        let mut actual = check_path(
+            Path::new("./resources/test/fixtures/E722.py"),
+            &settings::Settings {
+                line_length: 88,
+                exclude: vec![],
+                select: BTreeSet::from([CheckCode::E722]),
+            },
+            &fixer::Mode::Generate,
+        )?;
+        actual.sort_by_key(|check| check.location);
+        let expected = vec![Check {
+            kind: CheckKind::DoNotUseBareExcept,
+            location: Location::new(3, 1),
+            fix: None,
+        }];
+        assert_eq!(actual.len(), expected.len());
+        for i in 0..actual.len() {
+            assert_eq!(actual[i], expected[i]);
+        }
+
+        Ok(())
+    }
+
     #[test]
     fn e714() -> Result<()> {
         let mut actual = check_path(
@@ -431,6 +456,87 @@ mod tests {
                 location: Location::new(71, 1),
                 fix: None,
             },
+            Check {
+                kind: CheckKind::AmbiguousVariableName("l".to_string()),
+                location: Location::new(74, 5),
+                fix: None,
+            },
+        ];
+
+        assert_eq!(actual.len(), expected.len());
+        for i in 0..actual.len() {
+            assert_eq!(actual[i], expected[i]);
+        }
+
+        Ok(())
+    }
+
+    #[test]
+    fn e742() -> Result<()> {
+        let mut actual = check_path(
+            Path::new("./resources/test/fixtures/E742.py"),
+            &settings::Settings {
+                line_length: 88,
+                exclude: vec![],
+                select: BTreeSet::from([CheckCode::E742]),
+            },
+            &fixer::Mode::Generate,
+        )?;
+        actual.sort_by_key(|check| check.location);
+        let expected = vec![
+            Check {
+                kind: CheckKind::AmbiguousClassName("l".to_string()),
+                location: Location::new(1, 1),
+                fix: None,
+            },
+            Check {
+                kind: CheckKind::AmbiguousClassName("I".to_string()),
+                location: Location::new(5, 1),
+                fix: None,
+            },
+            Check {
+                kind: CheckKind::AmbiguousClassName("O".to_string()),
+                location: Location::new(9, 1),
+                fix: None,
+            },
+        ];
+
+        assert_eq!(actual.len(), expected.len());
+        for i in 0..actual.len() {
+            assert_eq!(actual[i], expected[i]);
+        }
+
+        Ok(())
+    }
+
+    #[test]
+    fn e743() -> Result<()> {
+        let mut actual = check_path(
+            Path::new("./resources/test/fixtures/E743.py"),
+            &settings::Settings {
+                line_length: 88,
+                exclude: vec![],
+                select: BTreeSet::from([CheckCode::E743]),
+            },
+            &fixer::Mode::Generate,
+        )?;
+        actual.sort_by_key(|check| check.location);
+        let expected = vec![
+            Check {
+                kind: CheckKind::AmbiguousFunctionName("l".to_string()),
+                location: Location::new(1, 1),
+                fix: None,
+            },
+            Check {
+                kind: CheckKind::AmbiguousFunctionName("I".to_string()),
+                location: Location::new(5, 1),
+                fix: None,
+            },
+            Check {
+                kind: CheckKind::AmbiguousFunctionName("O".to_string()),
+                location: Location::new(10, 5),
+                fix: None,
+            },
         ];
 
         assert_eq!(actual.len(), expected.len());
@@ -745,6 +851,90 @@ mod tests {
         Ok(())
     }
 
+    #[test]
+    fn f701() -> Result<()> {
+        let mut actual = check_path(
+            Path::new("./resources/test/fixtures/F701.py"),
+            &settings::Settings {
+                line_length: 88,
+                exclude: vec![],
+                select: BTreeSet::from([CheckCode::F701]),
+            },
+            &fixer::Mode::Generate,
+        )?;
+        actual.sort_by_key(|check| check.location);
+        let expected = vec![
+            Check {
+                kind: CheckKind::BreakOutsideLoop,
+                location: Location::new(4, 5),
+                fix: None,
+            },
+            Check {
+                kind: CheckKind::BreakOutsideLoop,
+                location: Location::new(16, 5),
+                fix: None,
+            },
+            Check {
+                kind: CheckKind::BreakOutsideLoop,
+                location: Location::new(20, 5),
+                fix: None,
+            },
+            Check {
+                kind: CheckKind::BreakOutsideLoop,
+                location: Location::new(23, 1),
+                fix: None,
+            },
+        ];
+        assert_eq!(actual.len(), expected.len());
+        for i in 0..actual.len() {
+            assert_eq!(actual[i], expected[i]);
+        }
+
+        Ok(())
+    }
+
+    #[test]
+    fn f702() -> Result<()> {
+        let mut actual = check_path(
+            Path::new("./resources/test/fixtures/F702.py"),
+            &settings::Settings {
+                line_length: 88,
+                exclude: vec![],
+                select: BTreeSet::from([CheckCode::F702]),
+            },
+            &fixer::Mode::Generate,
+        )?;
+        actual.sort_by_key(|check| check.location);
+        let expected = vec![
+            Check {
+                kind: CheckKind::ContinueOutsideLoop,
+                location: Location::new(4, 5),
+                fix: None,
+            },
+            Check {
+                kind: CheckKind::ContinueOutsideLoop,
+                location: Location::new(16, 5),
+                fix: None,
+            },
+            Check {
+                kind: CheckKind::ContinueOutsideLoop,
+                location: Location::new(20, 5),
+                fix: None,
+            },
+            Check {
+                kind: CheckKind::ContinueOutsideLoop,
+                location: Location::new(23, 1),
+                fix: None,
+            },
+        ];
+        assert_eq!(actual.len(), expected.len());
+        for i in 0..actual.len() {
+            assert_eq!(actual[i], expected[i]);
+        }
+
+        Ok(())
+    }
+
     #[test]
     fn f704() -> Result<()> {
         let mut actual = check_path(
@@ -1008,6 +1198,21 @@ mod tests {
                 location: Location::new(16, 5),
                 fix: None,
             },
+            Check {
+                kind: CheckKind::UnusedVariable("foo".to_string()),
+                location: Location::new(20, 5),
+                fix: None,
+            },
+            Check {
+                kind: CheckKind::UnusedVariable("a".to_string()),
+                location: Location::new(21, 6),
+                fix: None,
+            },
+            Check {
+                kind: CheckKind::UnusedVariable("b".to_string()),
+                location: Location::new(21, 9),
+                fix: None,
+            },
         ];
         assert_eq!(actual.len(), expected.len());
         for i in 0..actual.len() {

src/pyproject.rs

@@ -265,8 +265,11 @@ other-attribute = 1
                     CheckCode::E712,
                     CheckCode::E713,
                     CheckCode::E714,
+                    CheckCode::E722,
                     CheckCode::E731,
                     CheckCode::E741,
+                    CheckCode::E742,
+                    CheckCode::E743,
                     CheckCode::E902,
                     CheckCode::F401,
                     CheckCode::F403,
@@ -279,6 +282,8 @@ other-attribute = 1
                     CheckCode::F622,
                     CheckCode::F631,
                     CheckCode::F634,
+                    CheckCode::F701,
+                    CheckCode::F702,
                     CheckCode::F704,
                     CheckCode::F706,
                     CheckCode::F707,

src/settings.rs

@@ -50,8 +50,11 @@ impl Settings {
                     CheckCode::E712,
                     CheckCode::E713,
                     CheckCode::E714,
+                    CheckCode::E722,
                     CheckCode::E731,
                     CheckCode::E741,
+                    CheckCode::E742,
+                    CheckCode::E743,
                     CheckCode::E902,
                     CheckCode::F401,
                     CheckCode::F403,
@@ -63,6 +66,8 @@ impl Settings {
                     CheckCode::F622,
                     CheckCode::F631,
                     CheckCode::F634,
+                    CheckCode::F701,
+                    CheckCode::F702,
                     CheckCode::F704,
                     CheckCode::F706,
                     CheckCode::F707,