Bump version to 0.0.185

.pre-commit-config.yaml

@@ -1,6 +1,6 @@
 repos:
   - repo: https://github.com/charliermarsh/ruff-pre-commit
-    rev: v0.0.183
+    rev: v0.0.185
     hooks:
       - id: ruff
 

Cargo.lock

@@ -724,7 +724,7 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80"
 
 [[package]]
 name = "flake8-to-ruff"
-version = "0.0.183-dev.0"
+version = "0.0.185-dev.0"
 dependencies = [
  "anyhow",
  "clap 4.0.29",
@@ -1845,7 +1845,7 @@ dependencies = [
 
 [[package]]
 name = "ruff"
-version = "0.0.183"
+version = "0.0.185"
 dependencies = [
  "annotate-snippets 0.9.1",
  "anyhow",
@@ -1901,7 +1901,7 @@ dependencies = [
 
 [[package]]
 name = "ruff_dev"
-version = "0.0.183"
+version = "0.0.185"
 dependencies = [
  "anyhow",
  "clap 4.0.29",
@@ -1919,7 +1919,7 @@ dependencies = [
 
 [[package]]
 name = "ruff_macros"
-version = "0.0.183"
+version = "0.0.185"
 dependencies = [
  "proc-macro2",
  "quote",

Cargo.toml

@@ -6,7 +6,7 @@ members = [
 
 [package]
 name = "ruff"
-version = "0.0.183"
+version = "0.0.185"
 edition = "2021"
 rust-version = "1.65.0"
 
@@ -43,7 +43,7 @@ quick-junit = { version = "0.3.2" }
 rayon = { version = "1.5.3" }
 regex = { version = "1.6.0" }
 ropey = { version = "1.5.0", features = ["cr_lines", "simd"], default-features = false }
-ruff_macros = { version = "0.0.183", path = "ruff_macros" }
+ruff_macros = { version = "0.0.185", path = "ruff_macros" }
 rustc-hash = { version = "1.1.0" }
 rustpython-ast = { features = ["unparse"], git = "https://github.com/RustPython/RustPython.git", rev = "8d879a53197f9c73062f6160410bdba796a71cbf" }
 rustpython-common = { git = "https://github.com/RustPython/RustPython.git", rev = "8d879a53197f9c73062f6160410bdba796a71cbf" }

README.md

@@ -157,7 +157,7 @@ Ruff also works with [pre-commit](https://pre-commit.com):
 ```yaml
 repos:
   - repo: https://github.com/charliermarsh/ruff-pre-commit
-    rev: v0.0.183
+    rev: v0.0.185
     hooks:
       - id: ruff
 ```
@@ -673,7 +673,7 @@ For more, see [flake8-annotations](https://pypi.org/project/flake8-annotations/2
 | ANN102 | MissingTypeCls | Missing type annotation for `...` in classmethod |  |
 | ANN201 | MissingReturnTypePublicFunction | Missing return type annotation for public function `...` |  |
 | ANN202 | MissingReturnTypePrivateFunction | Missing return type annotation for private function `...` |  |
-| ANN204 | MissingReturnTypeMagicMethod | Missing return type annotation for magic method `...` |  |
+| ANN204 | MissingReturnTypeSpecialMethod | Missing return type annotation for special method `...` | 🛠 |
 | ANN205 | MissingReturnTypeStaticMethod | Missing return type annotation for staticmethod `...` |  |
 | ANN206 | MissingReturnTypeClassMethod | Missing return type annotation for classmethod `...` |  |
 | ANN401 | DynamicallyTypedExpression | Dynamically typed expressions (typing.Any) are disallowed in `...` |  |
@@ -1100,6 +1100,7 @@ natively, including:
 - [`flake8-debugger`](https://pypi.org/project/flake8-debugger/)
 - [`flake8-docstrings`](https://pypi.org/project/flake8-docstrings/)
 - [`flake8-eradicate`](https://pypi.org/project/flake8-eradicate/)
+- [`flake8-errmsg`](https://pypi.org/project/flake8-errmsg/)
 - [`flake8-import-conventions`](https://github.com/joaopalmeiro/flake8-import-conventions)
 - [`flake8-print`](https://pypi.org/project/flake8-print/)
 - [`flake8-quotes`](https://pypi.org/project/flake8-quotes/)
@@ -1153,6 +1154,7 @@ Today, Ruff can be used to replace Flake8 when used with any of the following pl
 - [`flake8-debugger`](https://pypi.org/project/flake8-debugger/)
 - [`flake8-docstrings`](https://pypi.org/project/flake8-docstrings/)
 - [`flake8-eradicate`](https://pypi.org/project/flake8-eradicate/)
+- [`flake8-errmsg`](https://pypi.org/project/flake8-errmsg/)
 - [`flake8-import-conventions`](https://github.com/joaopalmeiro/flake8-import-conventions)
 - [`flake8-print`](https://pypi.org/project/flake8-print/)
 - [`flake8-quotes`](https://pypi.org/project/flake8-quotes/)
@@ -2142,6 +2144,25 @@ ban-relative-imports = "all"
 
 ---
 
+### `flake8-unused-arguments`
+
+#### [`ignore-variadic-names`](#ignore-variadic-names)
+
+Whether to allow unused variadic arguments, like `*args` and `**kwargs`.
+
+**Default value**: `false`
+
+**Type**: `bool`
+
+**Example usage**:
+
+```toml
+[tool.ruff.flake8-unused-arguments]
+ignore-variadic-names = true
+```
+
+---
+
 ### `isort`
 
 #### [`combine-as-imports`](#combine-as-imports)

flake8_to_ruff/Cargo.lock

@@ -771,7 +771,7 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80"
 
 [[package]]
 name = "flake8_to_ruff"
-version = "0.0.183"
+version = "0.0.185"
 dependencies = [
  "anyhow",
  "clap",
@@ -1975,7 +1975,7 @@ dependencies = [
 
 [[package]]
 name = "ruff"
-version = "0.0.183"
+version = "0.0.185"
 dependencies = [
  "anyhow",
  "bincode",

flake8_to_ruff/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "flake8-to-ruff"
-version = "0.0.183-dev.0"
+version = "0.0.185-dev.0"
 edition = "2021"
 
 [lib]

flake8_to_ruff/src/converter.rs

@@ -288,6 +288,7 @@ mod tests {
             flake8_quotes: None,
             flake8_tidy_imports: None,
             flake8_import_conventions: None,
+            flake8_unused_arguments: None,
             isort: None,
             mccabe: None,
             pep8_naming: None,
@@ -336,6 +337,7 @@ mod tests {
             flake8_quotes: None,
             flake8_tidy_imports: None,
             flake8_import_conventions: None,
+            flake8_unused_arguments: None,
             isort: None,
             mccabe: None,
             pep8_naming: None,
@@ -384,6 +386,7 @@ mod tests {
             flake8_quotes: None,
             flake8_tidy_imports: None,
             flake8_import_conventions: None,
+            flake8_unused_arguments: None,
             isort: None,
             mccabe: None,
             pep8_naming: None,
@@ -432,6 +435,7 @@ mod tests {
             flake8_quotes: None,
             flake8_tidy_imports: None,
             flake8_import_conventions: None,
+            flake8_unused_arguments: None,
             isort: None,
             mccabe: None,
             pep8_naming: None,
@@ -485,6 +489,7 @@ mod tests {
             }),
             flake8_tidy_imports: None,
             flake8_import_conventions: None,
+            flake8_unused_arguments: None,
             isort: None,
             mccabe: None,
             pep8_naming: None,
@@ -572,6 +577,7 @@ mod tests {
             flake8_quotes: None,
             flake8_tidy_imports: None,
             flake8_import_conventions: None,
+            flake8_unused_arguments: None,
             isort: None,
             mccabe: None,
             pep8_naming: None,
@@ -626,6 +632,7 @@ mod tests {
             }),
             flake8_tidy_imports: None,
             flake8_import_conventions: None,
+            flake8_unused_arguments: None,
             isort: None,
             mccabe: None,
             pep8_naming: None,

resources/test/fixtures/flake8_errmsg/EM.py

@@ -5,6 +5,10 @@ def f_a():
     raise RuntimeError("This is an example exception")
 
 
+def f_a_short():
+    raise RuntimeError("Error")
+
+
 def f_b():
     example = "example"
     raise RuntimeError(f"This is an {example} exception")

resources/test/fixtures/flake8_unused_arguments/ARG.py

@@ -27,7 +27,7 @@ def f(cls, x):
 lambda x: print("Hello, world!")
 
 
-class X:
+class C:
     ###
     # Unused arguments.
     ###

resources/test/fixtures/flake8_unused_arguments/ignore_variadic_names.py

@@ -0,0 +1,14 @@
+def f(a, b):
+    print("Hello, world!")
+
+
+def f(a, b, *args, **kwargs):
+    print("Hello, world!")
+
+
+class C:
+    def f(self, a, b):
+        print("Hello, world!")
+
+    def f(self, a, b, *args, **kwargs):
+        print("Hello, world!")

resources/test/package/pyproject.toml

@@ -0,0 +1,2 @@
+[tool.ruff]
+src = ["."]

resources/test/package/src/package/app.py

@@ -0,0 +1,4 @@
+from package.core import method
+
+if __name__ == "__main__":
+    method()

ruff_dev/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "ruff_dev"
-version = "0.0.183"
+version = "0.0.185"
 edition = "2021"
 
 [dependencies]

ruff_macros/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "ruff_macros"
-version = "0.0.183"
+version = "0.0.185"
 edition = "2021"
 
 [lib]

src/ast/whitespace.rs

@@ -4,7 +4,7 @@ use std::str::Lines;
 use rustpython_ast::{Located, Location};
 
 use crate::ast::types::Range;
-use crate::check_ast::Checker;
+use crate::checkers::ast::Checker;
 
 /// Extract the leading indentation from a line.
 pub fn indentation<'a, T>(checker: &'a Checker, located: &'a Located<T>) -> Cow<'a, str> {

src/autofix/fixer.rs

@@ -10,7 +10,7 @@ use crate::autofix::Fix;
 use crate::checks::Check;
 use crate::source_code_locator::SourceCodeLocator;
 
-#[derive(Debug, Hash)]
+#[derive(Debug, Copy, Clone, Hash)]
 pub enum Mode {
     Generate,
     Apply,
@@ -27,15 +27,6 @@ impl From<bool> for Mode {
     }
 }
 
-impl From<&Mode> for bool {
-    fn from(value: &Mode) -> Self {
-        match value {
-            Mode::Generate | Mode::Apply => true,
-            Mode::None => false,
-        }
-    }
-}
-
 /// Auto-fix errors in a file, and write the fixed source code to disk.
 pub fn fix_file<'a>(
     checks: &'a [Check],

src/cache.rs

@@ -13,7 +13,7 @@ use serde::{Deserialize, Serialize};
 
 use crate::autofix::fixer;
 use crate::message::Message;
-use crate::settings::Settings;
+use crate::settings::{flags, Settings};
 
 const CARGO_PKG_VERSION: &str = env!("CARGO_PKG_VERSION");
 
@@ -34,43 +34,6 @@ struct CheckResult {
     messages: Vec<Message>,
 }
 
-pub enum Mode {
-    ReadWrite,
-    ReadOnly,
-    WriteOnly,
-    None,
-}
-
-impl Mode {
-    fn allow_read(&self) -> bool {
-        match self {
-            Mode::ReadWrite => true,
-            Mode::ReadOnly => true,
-            Mode::WriteOnly => false,
-            Mode::None => false,
-        }
-    }
-
-    fn allow_write(&self) -> bool {
-        match self {
-            Mode::ReadWrite => true,
-            Mode::ReadOnly => false,
-            Mode::WriteOnly => true,
-            Mode::None => false,
-        }
-    }
-}
-
-impl From<bool> for Mode {
-    fn from(value: bool) -> Self {
-        if value {
-            Mode::ReadWrite
-        } else {
-            Mode::None
-        }
-    }
-}
-
 fn cache_dir() -> &'static str {
     "./.ruff_cache"
 }
@@ -79,10 +42,10 @@ fn content_dir() -> &'static str {
     "content"
 }
 
-fn cache_key(path: &Path, settings: &Settings, autofix: &fixer::Mode) -> u64 {
+fn cache_key<P: AsRef<Path>>(path: P, settings: &Settings, autofix: fixer::Mode) -> u64 {
     let mut hasher = DefaultHasher::new();
     CARGO_PKG_VERSION.hash(&mut hasher);
-    path.absolutize().unwrap().hash(&mut hasher);
+    path.as_ref().absolutize().unwrap().hash(&mut hasher);
     settings.hash(&mut hasher);
     autofix.hash(&mut hasher);
     hasher.finish()
@@ -128,14 +91,14 @@ fn read_sync(key: u64) -> Result<Vec<u8>, std::io::Error> {
 }
 
 /// Get a value from the cache.
-pub fn get(
-    path: &Path,
+pub fn get<P: AsRef<Path>>(
+    path: P,
     metadata: &Metadata,
     settings: &Settings,
-    autofix: &fixer::Mode,
-    mode: &Mode,
+    autofix: fixer::Mode,
+    cache: flags::Cache,
 ) -> Option<Vec<Message>> {
-    if !mode.allow_read() {
+    if matches!(cache, flags::Cache::Disabled) {
         return None;
     };
 
@@ -157,15 +120,15 @@ pub fn get(
 }
 
 /// Set a value in the cache.
-pub fn set(
-    path: &Path,
+pub fn set<P: AsRef<Path>>(
+    path: P,
     metadata: &Metadata,
     settings: &Settings,
-    autofix: &fixer::Mode,
+    autofix: fixer::Mode,
     messages: &[Message],
-    mode: &Mode,
+    cache: flags::Cache,
 ) {
-    if !mode.allow_write() {
+    if matches!(cache, flags::Cache::Disabled) {
         return;
     };
 

src/check_lines.rs

@@ -1,288 +0,0 @@
-//! Lint rules based on checking raw physical lines.
-
-use nohash_hasher::IntMap;
-use once_cell::sync::Lazy;
-use regex::Regex;
-use rustpython_parser::ast::Location;
-
-use crate::ast::types::Range;
-use crate::autofix::Fix;
-use crate::checks::{Check, CheckCode, CheckKind, CODE_REDIRECTS};
-use crate::noqa;
-use crate::noqa::{is_file_exempt, Directive};
-use crate::settings::Settings;
-
-// Regex from PEP263.
-static CODING_COMMENT_REGEX: Lazy<Regex> =
-    Lazy::new(|| Regex::new(r"^[ \t\f]*#.*?coding[:=][ \t]*utf-?8").unwrap());
-
-static URL_REGEX: Lazy<Regex> = Lazy::new(|| Regex::new(r"^https?://\S+$").unwrap());
-
-/// Whether the given line is too long and should be reported.
-fn should_enforce_line_length(line: &str, length: usize, limit: usize) -> bool {
-    if length <= limit {
-        return false;
-    }
-    let mut chunks = line.split_whitespace();
-    let (Some(first), Some(_)) = (chunks.next(), chunks.next()) else {
-        // Single word / no printable chars - no way to make the line shorter
-        return false;
-    };
-
-    // Do not enforce the line length for commented lines that end with a URL
-    // or contain only a single word.
-    !(first == "#" && chunks.last().map_or(true, |c| URL_REGEX.is_match(c)))
-}
-
-pub fn check_lines(
-    checks: &mut Vec<Check>,
-    contents: &str,
-    noqa_line_for: &IntMap<usize, usize>,
-    settings: &Settings,
-    autofix: bool,
-    ignore_noqa: bool,
-) {
-    let enforce_unnecessary_coding_comment = settings.enabled.contains(&CheckCode::UP009);
-    let enforce_line_too_long = settings.enabled.contains(&CheckCode::E501);
-    let enforce_noqa = settings.enabled.contains(&CheckCode::RUF100);
-
-    let mut noqa_directives: IntMap<usize, (Directive, Vec<&str>)> = IntMap::default();
-    let mut line_checks = vec![];
-    let mut ignored = vec![];
-
-    checks.sort_by_key(|check| check.location);
-    let mut checks_iter = checks.iter().enumerate().peekable();
-    if let Some((_index, check)) = checks_iter.peek() {
-        assert!(check.location.row() >= 1);
-    }
-
-    macro_rules! add_if {
-        ($check:expr, $noqa_lineno:expr, $line:expr) => {{
-            match noqa_directives
-                .entry($noqa_lineno)
-                .or_insert_with(|| (noqa::extract_noqa_directive($line), vec![]))
-            {
-                (Directive::All(..), matches) => {
-                    matches.push($check.kind.code().as_ref());
-                    if ignore_noqa {
-                        line_checks.push($check);
-                    }
-                }
-                (Directive::Codes(.., codes), matches) => {
-                    if noqa::includes($check.kind.code(), codes) {
-                        matches.push($check.kind.code().as_ref());
-                        if ignore_noqa {
-                            line_checks.push($check);
-                        }
-                    } else {
-                        line_checks.push($check);
-                    }
-                }
-                (Directive::None, ..) => line_checks.push($check),
-            }
-        }};
-    }
-
-    let lines: Vec<&str> = contents.lines().collect();
-    for (lineno, line) in lines.iter().enumerate() {
-        // If we hit an exemption for the entire file, bail.
-        if is_file_exempt(line) {
-            checks.drain(..);
-            return;
-        }
-
-        // Grab the noqa (logical) line number for the current (physical) line.
-        // If there are newlines at the end of the file, they won't be represented in
-        // `noqa_line_for`, so fallback to the current line.
-        let noqa_lineno = noqa_line_for.get(&(lineno + 1)).unwrap_or(&(lineno + 1)) - 1;
-
-        // Enforce unnecessary coding comments (UP009).
-        if enforce_unnecessary_coding_comment {
-            if lineno < 2 {
-                // PEP3120 makes utf-8 the default encoding.
-                if CODING_COMMENT_REGEX.is_match(line) {
-                    let mut check = Check::new(
-                        CheckKind::PEP3120UnnecessaryCodingComment,
-                        Range {
-                            location: Location::new(lineno + 1, 0),
-                            end_location: Location::new(lineno + 2, 0),
-                        },
-                    );
-                    if autofix && settings.fixable.contains(check.kind.code()) {
-                        check.amend(Fix::deletion(
-                            Location::new(lineno + 1, 0),
-                            Location::new(lineno + 2, 0),
-                        ));
-                    }
-                    add_if!(check, noqa_lineno, lines[noqa_lineno]);
-                }
-            }
-        }
-
-        if enforce_noqa {
-            noqa_directives
-                .entry(noqa_lineno)
-                .or_insert_with(|| (noqa::extract_noqa_directive(lines[noqa_lineno]), vec![]));
-        }
-
-        // Remove any ignored checks.
-        while let Some((index, check)) =
-            checks_iter.next_if(|(_index, check)| check.location.row() == lineno + 1)
-        {
-            let noqa = noqa_directives
-                .entry(noqa_lineno)
-                .or_insert_with(|| (noqa::extract_noqa_directive(lines[noqa_lineno]), vec![]));
-
-            match noqa {
-                (Directive::All(..), matches) => {
-                    matches.push(check.kind.code().as_ref());
-                    ignored.push(index);
-                }
-                (Directive::Codes(.., codes), matches) => {
-                    if noqa::includes(check.kind.code(), codes) {
-                        matches.push(check.kind.code().as_ref());
-                        ignored.push(index);
-                    }
-                }
-                (Directive::None, ..) => {}
-            }
-        }
-
-        // Enforce line length violations (E501).
-        if enforce_line_too_long {
-            let line_length = line.chars().count();
-            if should_enforce_line_length(line, line_length, settings.line_length) {
-                let check = Check::new(
-                    CheckKind::LineTooLong(line_length, settings.line_length),
-                    Range {
-                        location: Location::new(lineno + 1, 0),
-                        end_location: Location::new(lineno + 1, line_length),
-                    },
-                );
-                add_if!(check, noqa_lineno, lines[noqa_lineno]);
-            }
-        }
-    }
-
-    // Enforce newlines at end of files (W292).
-    if settings.enabled.contains(&CheckCode::W292) && !contents.ends_with('\n') {
-        // Note: if `lines.last()` is `None`, then `contents` is empty (and so we don't
-        // want to raise W292 anyway).
-        if let Some(line) = lines.last() {
-            let check = Check::new(
-                CheckKind::NoNewLineAtEndOfFile,
-                Range {
-                    location: Location::new(lines.len(), line.len() + 1),
-                    end_location: Location::new(lines.len(), line.len() + 1),
-                },
-            );
-
-            let lineno = lines.len() - 1;
-            let noqa_lineno = noqa_line_for.get(&(lineno + 1)).unwrap_or(&(lineno + 1)) - 1;
-            add_if!(check, noqa_lineno, lines[noqa_lineno]);
-        }
-    }
-
-    // Enforce that the noqa directive was actually used (RUF100).
-    if enforce_noqa {
-        for (row, (directive, matches)) in noqa_directives {
-            match directive {
-                Directive::All(spaces, start, end) => {
-                    if matches.is_empty() {
-                        let mut check = Check::new(
-                            CheckKind::UnusedNOQA(None),
-                            Range {
-                                location: Location::new(row + 1, start),
-                                end_location: Location::new(row + 1, end),
-                            },
-                        );
-                        if autofix && settings.fixable.contains(check.kind.code()) {
-                            check.amend(Fix::deletion(
-                                Location::new(row + 1, start - spaces),
-                                Location::new(row + 1, lines[row].chars().count()),
-                            ));
-                        }
-                        line_checks.push(check);
-                    }
-                }
-                Directive::Codes(spaces, start, end, codes) => {
-                    let mut invalid_codes = vec![];
-                    let mut valid_codes = vec![];
-                    for code in codes {
-                        let code = CODE_REDIRECTS.get(code).map_or(code, AsRef::as_ref);
-                        if matches.contains(&code) || settings.external.contains(code) {
-                            valid_codes.push(code.to_string());
-                        } else {
-                            invalid_codes.push(code.to_string());
-                        }
-                    }
-
-                    if !invalid_codes.is_empty() {
-                        let mut check = Check::new(
-                            CheckKind::UnusedNOQA(Some(invalid_codes)),
-                            Range {
-                                location: Location::new(row + 1, start),
-                                end_location: Location::new(row + 1, end),
-                            },
-                        );
-                        if autofix && settings.fixable.contains(check.kind.code()) {
-                            if valid_codes.is_empty() {
-                                check.amend(Fix::deletion(
-                                    Location::new(row + 1, start - spaces),
-                                    Location::new(row + 1, lines[row].chars().count()),
-                                ));
-                            } else {
-                                check.amend(Fix::replacement(
-                                    format!("# noqa: {}", valid_codes.join(", ")),
-                                    Location::new(row + 1, start),
-                                    Location::new(row + 1, lines[row].chars().count()),
-                                ));
-                            }
-                        }
-                        line_checks.push(check);
-                    }
-                }
-                Directive::None => {}
-            }
-        }
-    }
-
-    if !ignore_noqa {
-        ignored.sort_unstable();
-        for index in ignored.iter().rev() {
-            checks.swap_remove(*index);
-        }
-    }
-    checks.extend(line_checks);
-}
-
-#[cfg(test)]
-mod tests {
-    use nohash_hasher::IntMap;
-
-    use super::check_lines;
-    use crate::checks::{Check, CheckCode};
-    use crate::settings::Settings;
-
-    #[test]
-    fn e501_non_ascii_char() {
-        let line = "'\u{4e9c}' * 2"; // 7 in UTF-32, 9 in UTF-8.
-        let check_with_max_line_length = |line_length: usize| {
-            let mut checks: Vec<Check> = vec![];
-            check_lines(
-                &mut checks,
-                line,
-                &IntMap::default(),
-                &Settings {
-                    line_length,
-                    ..Settings::for_rule(CheckCode::E501)
-                },
-                true,
-                false,
-            );
-            checks
-        };
-        assert!(!check_with_max_line_length(6).is_empty());
-        assert!(check_with_max_line_length(7).is_empty());
-    }
-}

src/checkers/ast.rs

@@ -31,7 +31,7 @@ use crate::python::future::ALL_FEATURE_NAMES;
 use crate::python::typing;
 use crate::python::typing::SubscriptKind;
 use crate::settings::types::PythonVersion;
-use crate::settings::Settings;
+use crate::settings::{flags, Settings};
 use crate::source_code_locator::SourceCodeLocator;
 use crate::vendored::cformat::{CFormatError, CFormatErrorType};
 use crate::visibility::{module_visibility, transition_scope, Modifier, Visibility, VisibleScope};
@@ -51,8 +51,8 @@ type DeferralContext<'a> = (Vec<usize>, Vec<RefEquality<'a, Stmt>>);
 pub struct Checker<'a> {
     // Input data.
     path: &'a Path,
-    autofix: bool,
-    ignore_noqa: bool,
+    autofix: flags::Autofix,
+    noqa: flags::Noqa,
     pub(crate) settings: &'a Settings,
     pub(crate) noqa_line_for: &'a IntMap<usize, usize>,
     pub(crate) locator: &'a SourceCodeLocator<'a>,
@@ -102,8 +102,8 @@ impl<'a> Checker<'a> {
     pub fn new(
         settings: &'a Settings,
         noqa_line_for: &'a IntMap<usize, usize>,
-        autofix: bool,
-        ignore_noqa: bool,
+        autofix: flags::Autofix,
+        noqa: flags::Noqa,
         path: &'a Path,
         locator: &'a SourceCodeLocator,
     ) -> Checker<'a> {
@@ -111,7 +111,7 @@ impl<'a> Checker<'a> {
             settings,
             noqa_line_for,
             autofix,
-            ignore_noqa,
+            noqa,
             path,
             locator,
             checks: vec![],
@@ -182,7 +182,9 @@ impl<'a> Checker<'a> {
     pub fn patch(&self, code: &CheckCode) -> bool {
         // TODO(charlie): We can't fix errors in f-strings until RustPython adds
         // location data.
-        self.autofix && self.in_f_string.is_none() && self.settings.fixable.contains(code)
+        matches!(self.autofix, flags::Autofix::Enabled)
+            && self.in_f_string.is_none()
+            && self.settings.fixable.contains(code)
     }
 
     /// Return `true` if the `Expr` is a reference to `typing.${target}`.
@@ -216,7 +218,7 @@ impl<'a> Checker<'a> {
         // members from the fix that will eventually be excluded by a `noqa`.
         // Unfortunately, we _do_ want to register a `Check` for each eventually-ignored
         // import, so that our `noqa` counts are accurate.
-        if self.ignore_noqa {
+        if matches!(self.noqa, flags::Noqa::Disabled) {
             return false;
         }
         let noqa_lineno = self.noqa_line_for.get(&lineno).unwrap_or(&lineno);
@@ -3758,11 +3760,11 @@ pub fn check_ast(
     locator: &SourceCodeLocator,
     noqa_line_for: &IntMap<usize, usize>,
     settings: &Settings,
-    autofix: bool,
-    ignore_noqa: bool,
+    autofix: flags::Autofix,
+    noqa: flags::Noqa,
     path: &Path,
 ) -> Vec<Check> {
-    let mut checker = Checker::new(settings, noqa_line_for, autofix, ignore_noqa, path, locator);
+    let mut checker = Checker::new(settings, noqa_line_for, autofix, noqa, path, locator);
     checker.push_scope(Scope::new(ScopeKind::Module));
     checker.bind_builtins();
 

src/checkers/imports.rs

@@ -9,19 +9,22 @@ use crate::checks::Check;
 use crate::directives::IsortDirectives;
 use crate::isort;
 use crate::isort::track::ImportTracker;
-use crate::settings::Settings;
+use crate::settings::{flags, Settings};
 use crate::source_code_locator::SourceCodeLocator;
 
 fn check_import_blocks(
     tracker: ImportTracker,
     locator: &SourceCodeLocator,
     settings: &Settings,
-    autofix: bool,
+    autofix: flags::Autofix,
+    package: Option<&Path>,
 ) -> Vec<Check> {
     let mut checks = vec![];
     for block in tracker.into_iter() {
         if !block.imports.is_empty() {
-            if let Some(check) = isort::plugins::check_imports(&block, locator, settings, autofix) {
+            if let Some(check) =
+                isort::plugins::check_imports(&block, locator, settings, autofix, package)
+            {
                 checks.push(check);
             }
         }
@@ -34,12 +37,13 @@ pub fn check_imports(
     locator: &SourceCodeLocator,
     directives: &IsortDirectives,
     settings: &Settings,
-    autofix: bool,
+    autofix: flags::Autofix,
     path: &Path,
+    package: Option<&Path>,
 ) -> Vec<Check> {
     let mut tracker = ImportTracker::new(locator, directives, path);
     for stmt in python_ast {
         tracker.visit_stmt(stmt);
     }
-    check_import_blocks(tracker, locator, settings, autofix)
+    check_import_blocks(tracker, locator, settings, autofix, package)
 }

src/checkers/lines.rs

@@ -0,0 +1,71 @@
+//! Lint rules based on checking raw physical lines.
+
+use crate::checks::{Check, CheckCode};
+use crate::pycodestyle::checks::{line_too_long, no_newline_at_end_of_file};
+use crate::pyupgrade::checks::unnecessary_coding_comment;
+use crate::settings::{flags, Settings};
+
+pub fn check_lines(contents: &str, settings: &Settings, autofix: flags::Autofix) -> Vec<Check> {
+    let mut checks: Vec<Check> = vec![];
+
+    let enforce_unnecessary_coding_comment = settings.enabled.contains(&CheckCode::UP009);
+    let enforce_line_too_long = settings.enabled.contains(&CheckCode::E501);
+    let enforce_no_newline_at_end_of_file = settings.enabled.contains(&CheckCode::W292);
+
+    for (lineno, line) in contents.lines().enumerate() {
+        // Enforce unnecessary coding comments (UP009).
+        if enforce_unnecessary_coding_comment {
+            if lineno < 2 {
+                if let Some(check) = unnecessary_coding_comment(
+                    lineno,
+                    line,
+                    matches!(autofix, flags::Autofix::Enabled)
+                        && settings.fixable.contains(&CheckCode::UP009),
+                ) {
+                    checks.push(check);
+                }
+            }
+        }
+
+        // Enforce line length violations (E501).
+        if enforce_line_too_long {
+            if let Some(check) = line_too_long(lineno, line, settings.line_length) {
+                checks.push(check);
+            }
+        }
+    }
+
+    // Enforce newlines at end of files (W292).
+    if enforce_no_newline_at_end_of_file {
+        if let Some(check) = no_newline_at_end_of_file(contents) {
+            checks.push(check);
+        }
+    }
+
+    checks
+}
+
+#[cfg(test)]
+mod tests {
+
+    use super::check_lines;
+    use crate::checks::CheckCode;
+    use crate::settings::{flags, Settings};
+
+    #[test]
+    fn e501_non_ascii_char() {
+        let line = "'\u{4e9c}' * 2"; // 7 in UTF-32, 9 in UTF-8.
+        let check_with_max_line_length = |line_length: usize| {
+            check_lines(
+                line,
+                &Settings {
+                    line_length,
+                    ..Settings::for_rule(CheckCode::E501)
+                },
+                flags::Autofix::Enabled,
+            )
+        };
+        assert!(!check_with_max_line_length(6).is_empty());
+        assert!(check_with_max_line_length(7).is_empty());
+    }
+}

src/checkers/mod.rs

@@ -0,0 +1,5 @@
+pub mod ast;
+pub mod imports;
+pub mod lines;
+pub mod noqa;
+pub mod tokens;

src/checkers/noqa.rs

@@ -0,0 +1,148 @@
+//! `NoQA` enforcement and validation.
+
+use nohash_hasher::IntMap;
+use rustpython_parser::ast::Location;
+
+use crate::ast::types::Range;
+use crate::autofix::Fix;
+use crate::checks::{Check, CheckCode, CheckKind, CODE_REDIRECTS};
+use crate::noqa;
+use crate::noqa::{is_file_exempt, Directive};
+use crate::settings::{flags, Settings};
+
+pub fn check_noqa(
+    checks: &mut Vec<Check>,
+    contents: &str,
+    commented_lines: &[usize],
+    noqa_line_for: &IntMap<usize, usize>,
+    settings: &Settings,
+    autofix: flags::Autofix,
+) {
+    let mut noqa_directives: IntMap<usize, (Directive, Vec<&str>)> = IntMap::default();
+    let mut ignored = vec![];
+
+    let enforce_noqa = settings.enabled.contains(&CheckCode::RUF100);
+
+    checks.sort_by_key(|check| check.location);
+    let mut checks_iter = checks.iter().enumerate().peekable();
+    if let Some((_index, check)) = checks_iter.peek() {
+        assert!(check.location.row() >= 1);
+    }
+
+    let lines: Vec<&str> = contents.lines().collect();
+    for lineno in commented_lines {
+        // If we hit an exemption for the entire file, bail.
+        if is_file_exempt(lines[lineno - 1]) {
+            checks.drain(..);
+            return;
+        }
+
+        if enforce_noqa {
+            noqa_directives
+                .entry(lineno - 1)
+                .or_insert_with(|| (noqa::extract_noqa_directive(lines[lineno - 1]), vec![]));
+        }
+
+        // Remove any ignored checks.
+        while let Some((index, check)) =
+            checks_iter.next_if(|(_index, check)| check.location.row() <= *lineno)
+        {
+            // Grab the noqa (logical) line number for the current (physical) line.
+            // If there are newlines at the end of the file, they won't be represented in
+            // `noqa_line_for`, so fallback to the current line.
+            let check_lineno = check.location.row();
+            let noqa_lineno = noqa_line_for.get(&check_lineno).unwrap_or(&check_lineno);
+            if noqa_lineno == lineno {
+                let noqa = noqa_directives.entry(noqa_lineno - 1).or_insert_with(|| {
+                    (noqa::extract_noqa_directive(lines[noqa_lineno - 1]), vec![])
+                });
+                match noqa {
+                    (Directive::All(..), matches) => {
+                        matches.push(check.kind.code().as_ref());
+                        ignored.push(index);
+                    }
+                    (Directive::Codes(.., codes), matches) => {
+                        if noqa::includes(check.kind.code(), codes) {
+                            matches.push(check.kind.code().as_ref());
+                            ignored.push(index);
+                        }
+                    }
+                    (Directive::None, ..) => {}
+                }
+            }
+        }
+    }
+
+    // Enforce that the noqa directive was actually used (RUF100).
+    if enforce_noqa {
+        for (row, (directive, matches)) in noqa_directives {
+            match directive {
+                Directive::All(spaces, start, end) => {
+                    if matches.is_empty() {
+                        let mut check = Check::new(
+                            CheckKind::UnusedNOQA(None),
+                            Range {
+                                location: Location::new(row + 1, start),
+                                end_location: Location::new(row + 1, end),
+                            },
+                        );
+                        if matches!(autofix, flags::Autofix::Enabled)
+                            && settings.fixable.contains(check.kind.code())
+                        {
+                            check.amend(Fix::deletion(
+                                Location::new(row + 1, start - spaces),
+                                Location::new(row + 1, lines[row].chars().count()),
+                            ));
+                        }
+                        checks.push(check);
+                    }
+                }
+                Directive::Codes(spaces, start, end, codes) => {
+                    let mut invalid_codes = vec![];
+                    let mut valid_codes = vec![];
+                    for code in codes {
+                        let code = CODE_REDIRECTS.get(code).map_or(code, AsRef::as_ref);
+                        if matches.contains(&code) || settings.external.contains(code) {
+                            valid_codes.push(code.to_string());
+                        } else {
+                            invalid_codes.push(code.to_string());
+                        }
+                    }
+
+                    if !invalid_codes.is_empty() {
+                        let mut check = Check::new(
+                            CheckKind::UnusedNOQA(Some(invalid_codes)),
+                            Range {
+                                location: Location::new(row + 1, start),
+                                end_location: Location::new(row + 1, end),
+                            },
+                        );
+                        if matches!(autofix, flags::Autofix::Enabled)
+                            && settings.fixable.contains(check.kind.code())
+                        {
+                            if valid_codes.is_empty() {
+                                check.amend(Fix::deletion(
+                                    Location::new(row + 1, start - spaces),
+                                    Location::new(row + 1, lines[row].chars().count()),
+                                ));
+                            } else {
+                                check.amend(Fix::replacement(
+                                    format!("# noqa: {}", valid_codes.join(", ")),
+                                    Location::new(row + 1, start),
+                                    Location::new(row + 1, lines[row].chars().count()),
+                                ));
+                            }
+                        }
+                        checks.push(check);
+                    }
+                }
+                Directive::None => {}
+            }
+        }
+    }
+
+    ignored.sort_unstable();
+    for index in ignored.iter().rev() {
+        checks.swap_remove(*index);
+    }
+}

src/checkers/tokens.rs

@@ -5,6 +5,7 @@ use rustpython_parser::lexer::{LexResult, Tok};
 use crate::checks::{Check, CheckCode};
 use crate::lex::docstring_detection::StateMachine;
 use crate::ruff::checks::Context;
+use crate::settings::flags;
 use crate::source_code_locator::SourceCodeLocator;
 use crate::{eradicate, flake8_quotes, pycodestyle, ruff, Settings};
 
@@ -12,7 +13,7 @@ pub fn check_tokens(
     locator: &SourceCodeLocator,
     tokens: &[LexResult],
     settings: &Settings,
-    autofix: bool,
+    autofix: flags::Autofix,
 ) -> Vec<Check> {
     let mut checks: Vec<Check> = vec![];
 

src/checks.rs

@@ -573,6 +573,7 @@ pub enum LintSource {
     Lines,
     Tokens,
     Imports,
+    NoQA,
 }
 
 #[derive(Debug, PartialEq, Eq, Serialize, Deserialize)]
@@ -772,7 +773,7 @@ pub enum CheckKind {
     MissingTypeCls(String),
     MissingReturnTypePublicFunction(String),
     MissingReturnTypePrivateFunction(String),
-    MissingReturnTypeMagicMethod(String),
+    MissingReturnTypeSpecialMethod(String),
     MissingReturnTypeStaticMethod(String),
     MissingReturnTypeClassMethod(String),
     DynamicallyTypedExpression(String),
@@ -923,9 +924,8 @@ impl CheckCode {
     /// physical lines).
     pub fn lint_source(&self) -> &'static LintSource {
         match self {
-            CheckCode::E501 | CheckCode::W292 | CheckCode::RUF100 | CheckCode::UP009 => {
-                &LintSource::Lines
-            }
+            CheckCode::RUF100 => &LintSource::NoQA,
+            CheckCode::E501 | CheckCode::W292 | CheckCode::UP009 => &LintSource::Lines,
             CheckCode::ERA001
             | CheckCode::Q000
             | CheckCode::Q001
@@ -1126,7 +1126,7 @@ impl CheckCode {
             CheckCode::ANN102 => CheckKind::MissingTypeCls("...".to_string()),
             CheckCode::ANN201 => CheckKind::MissingReturnTypePublicFunction("...".to_string()),
             CheckCode::ANN202 => CheckKind::MissingReturnTypePrivateFunction("...".to_string()),
-            CheckCode::ANN204 => CheckKind::MissingReturnTypeMagicMethod("...".to_string()),
+            CheckCode::ANN204 => CheckKind::MissingReturnTypeSpecialMethod("...".to_string()),
             CheckCode::ANN205 => CheckKind::MissingReturnTypeStaticMethod("...".to_string()),
             CheckCode::ANN206 => CheckKind::MissingReturnTypeClassMethod("...".to_string()),
             CheckCode::ANN401 => CheckKind::DynamicallyTypedExpression("...".to_string()),
@@ -1733,7 +1733,7 @@ impl CheckKind {
             CheckKind::MissingTypeCls(_) => &CheckCode::ANN102,
             CheckKind::MissingReturnTypePublicFunction(_) => &CheckCode::ANN201,
             CheckKind::MissingReturnTypePrivateFunction(_) => &CheckCode::ANN202,
-            CheckKind::MissingReturnTypeMagicMethod(_) => &CheckCode::ANN204,
+            CheckKind::MissingReturnTypeSpecialMethod(_) => &CheckCode::ANN204,
             CheckKind::MissingReturnTypeStaticMethod(_) => &CheckCode::ANN205,
             CheckKind::MissingReturnTypeClassMethod(_) => &CheckCode::ANN206,
             CheckKind::DynamicallyTypedExpression(_) => &CheckCode::ANN401,
@@ -2390,8 +2390,8 @@ impl CheckKind {
             CheckKind::MissingReturnTypePrivateFunction(name) => {
                 format!("Missing return type annotation for private function `{name}`")
             }
-            CheckKind::MissingReturnTypeMagicMethod(name) => {
-                format!("Missing return type annotation for magic method `{name}`")
+            CheckKind::MissingReturnTypeSpecialMethod(name) => {
+                format!("Missing return type annotation for special method `{name}`")
             }
             CheckKind::MissingReturnTypeStaticMethod(name) => {
                 format!("Missing return type annotation for staticmethod `{name}`")
@@ -2817,7 +2817,6 @@ impl CheckKind {
                 | CheckKind::CommentedOutCode
                 | CheckKind::ConvertNamedTupleFunctionalToClass(..)
                 | CheckKind::ConvertTypedDictFunctionalToClass(..)
-                | CheckKind::RemoveSixCompat
                 | CheckKind::DashedUnderlineAfterSection(..)
                 | CheckKind::DeprecatedUnittestAlias(..)
                 | CheckKind::DoNotAssertFalse
@@ -2831,6 +2830,7 @@ impl CheckKind {
                 | CheckKind::IsLiteral
                 | CheckKind::KeyInDict(..)
                 | CheckKind::MisplacedComparisonConstant(..)
+                | CheckKind::MissingReturnTypeSpecialMethod(..)
                 | CheckKind::NewLineAfterLastParagraph
                 | CheckKind::NewLineAfterSectionName(..)
                 | CheckKind::NoBlankLineAfterFunction(..)
@@ -2845,13 +2845,14 @@ impl CheckKind {
                 | CheckKind::NotIsTest
                 | CheckKind::OneBlankLineAfterClass(..)
                 | CheckKind::OneBlankLineBeforeClass(..)
-                | CheckKind::PercentFormatExtraNamedArguments(..)
                 | CheckKind::PEP3120UnnecessaryCodingComment
                 | CheckKind::PPrintFound
+                | CheckKind::PercentFormatExtraNamedArguments(..)
                 | CheckKind::PrintFound
                 | CheckKind::RaiseNotImplemented
                 | CheckKind::RedundantOpenModes
                 | CheckKind::RedundantTupleInExceptionHandler(..)
+                | CheckKind::RemoveSixCompat
                 | CheckKind::SectionNameEndsInColon(..)
                 | CheckKind::SectionNotOverIndented(..)
                 | CheckKind::SectionUnderlineAfterName(..)

src/commands.rs

@@ -17,9 +17,10 @@ use crate::cli::Overrides;
 use crate::iterators::par_iter;
 use crate::linter::{add_noqa_to_path, autoformat_path, lint_path, lint_stdin, Diagnostics};
 use crate::message::Message;
-use crate::resolver;
 use crate::resolver::{FileDiscovery, PyprojectDiscovery};
+use crate::settings::flags;
 use crate::settings::types::SerializationFormat;
+use crate::{packages, resolver};
 
 /// Run the linter over a collection of files.
 pub fn run(
@@ -27,24 +28,37 @@ pub fn run(
     pyproject_strategy: &PyprojectDiscovery,
     file_strategy: &FileDiscovery,
     overrides: &Overrides,
-    cache: bool,
-    autofix: &fixer::Mode,
+    cache: flags::Cache,
+    autofix: fixer::Mode,
 ) -> Result<Diagnostics> {
-    // Collect all the files to check.
+    // Collect all the Python files to check.
     let start = Instant::now();
     let (paths, resolver) =
         resolver::python_files_in_path(files, pyproject_strategy, file_strategy, overrides)?;
     let duration = start.elapsed();
     debug!("Identified files to lint in: {:?}", duration);
 
+    // Discover the package root for each Python file.
+    let package_roots = packages::detect_package_roots(
+        &paths
+            .iter()
+            .flatten()
+            .map(ignore::DirEntry::path)
+            .collect::<Vec<_>>(),
+    );
+
     let start = Instant::now();
     let mut diagnostics: Diagnostics = par_iter(&paths)
         .map(|entry| {
             match entry {
                 Ok(entry) => {
                     let path = entry.path();
+                    let package = path
+                        .parent()
+                        .and_then(|parent| package_roots.get(parent))
+                        .and_then(|package| *package);
                     let settings = resolver.resolve(path, pyproject_strategy);
-                    lint_path(path, settings, &cache.into(), autofix)
+                    lint_path(path, package, settings, cache, autofix)
                         .map_err(|e| (Some(path.to_owned()), e.to_string()))
                 }
                 Err(e) => Err((
@@ -102,7 +116,7 @@ fn read_from_stdin() -> Result<String> {
 pub fn run_stdin(
     strategy: &PyprojectDiscovery,
     filename: &Path,
-    autofix: &fixer::Mode,
+    autofix: fixer::Mode,
 ) -> Result<Diagnostics> {
     let stdin = read_from_stdin()?;
     let settings = match strategy {

src/directives.rs

@@ -37,6 +37,7 @@ pub struct IsortDirectives {
 }
 
 pub struct Directives {
+    pub commented_lines: Vec<usize>,
     pub noqa_line_for: IntMap<usize, usize>,
     pub isort: IsortDirectives,
 }
@@ -47,6 +48,7 @@ pub fn extract_directives(
     flags: Flags,
 ) -> Directives {
     Directives {
+        commented_lines: extract_commented_lines(lxr),
         noqa_line_for: if flags.contains(Flags::NOQA) {
             extract_noqa_line_for(lxr)
         } else {
@@ -60,6 +62,16 @@ pub fn extract_directives(
     }
 }
 
+pub fn extract_commented_lines(lxr: &[LexResult]) -> Vec<usize> {
+    let mut commented_lines = Vec::new();
+    for (start, tok, ..) in lxr.iter().flatten() {
+        if matches!(tok, Tok::Comment) {
+            commented_lines.push(start.row());
+        }
+    }
+    commented_lines
+}
+
 /// Extract a mapping from logical line to noqa line.
 pub fn extract_noqa_line_for(lxr: &[LexResult]) -> IntMap<usize, usize> {
     let mut noqa_line_for: IntMap<usize, usize> = IntMap::default();

src/eradicate/checks.rs

@@ -4,6 +4,7 @@ use crate::ast::types::Range;
 use crate::autofix::Fix;
 use crate::checks::{CheckCode, CheckKind};
 use crate::eradicate::detection::comment_contains_code;
+use crate::settings::flags;
 use crate::{Check, Settings, SourceCodeLocator};
 
 fn is_standalone_comment(line: &str) -> bool {
@@ -23,7 +24,7 @@ pub fn commented_out_code(
     start: Location,
     end: Location,
     settings: &Settings,
-    autofix: bool,
+    autofix: flags::Autofix,
 ) -> Option<Check> {
     let location = Location::new(start.row(), 0);
     let end_location = Location::new(end.row() + 1, 0);
@@ -41,7 +42,9 @@ pub fn commented_out_code(
                 end_location: end,
             },
         );
-        if autofix && settings.fixable.contains(&CheckCode::ERA001) {
+        if matches!(autofix, flags::Autofix::Enabled)
+            && settings.fixable.contains(&CheckCode::ERA001)
+        {
             check.amend(Fix::deletion(location, end_location));
         }
         Some(check)

src/eradicate/mod.rs

@@ -21,7 +21,6 @@ mod tests {
                 .join(path)
                 .as_path(),
             &settings::Settings::for_rule(check_code),
-            true,
         )?;
         checks.sort_by_key(|check| check.location);
         insta::assert_yaml_snapshot!(snapshot, checks);

src/flake8_2020/mod.rs

@@ -29,7 +29,6 @@ mod tests {
                 .join(path)
                 .as_path(),
             &settings::Settings::for_rule(check_code),
-            true,
         )?;
         checks.sort_by_key(|check| check.location);
         insta::assert_yaml_snapshot!(snapshot, checks);

src/flake8_2020/plugins.rs

@@ -3,7 +3,7 @@ use rustpython_ast::{Cmpop, Constant, Expr, ExprKind, Located};
 
 use crate::ast::helpers::match_module_member;
 use crate::ast::types::Range;
-use crate::check_ast::Checker;
+use crate::checkers::ast::Checker;
 use crate::checks::{Check, CheckCode, CheckKind};
 
 fn is_sys(checker: &Checker, expr: &Expr, target: &str) -> bool {

src/flake8_annotations/fixes.rs

@@ -0,0 +1,45 @@
+use anyhow::{bail, Result};
+use rustpython_ast::Stmt;
+use rustpython_parser::lexer;
+use rustpython_parser::lexer::Tok;
+
+use crate::ast::helpers;
+use crate::ast::types::Range;
+use crate::autofix::Fix;
+use crate::source_code_locator::SourceCodeLocator;
+
+/// ANN204
+pub fn add_return_none_annotation(locator: &SourceCodeLocator, stmt: &Stmt) -> Result<Fix> {
+    let range = Range::from_located(stmt);
+    let contents = locator.slice_source_code_range(&range);
+
+    // Find the colon (following the `def` keyword).
+    let mut seen_lpar = false;
+    let mut seen_rpar = false;
+    let mut count: usize = 0;
+    for (start, tok, ..) in lexer::make_tokenizer(&contents).flatten() {
+        if seen_lpar && seen_rpar {
+            if matches!(tok, Tok::Colon) {
+                return Ok(Fix::insertion(
+                    " -> None".to_string(),
+                    helpers::to_absolute(start, range.location),
+                ));
+            }
+        }
+
+        if matches!(tok, Tok::Lpar) {
+            if count == 0 {
+                seen_lpar = true;
+            }
+            count += 1;
+        }
+        if matches!(tok, Tok::Rpar) {
+            count -= 1;
+            if count == 0 {
+                seen_rpar = true;
+            }
+        }
+    }
+
+    bail!("Unable to locate colon in function definition");
+}

src/flake8_annotations/helpers.rs

@@ -1,7 +1,7 @@
 use rustpython_ast::{Arguments, Expr, Stmt, StmtKind};
 
 use crate::ast::cast;
-use crate::check_ast::Checker;
+use crate::checkers::ast::Checker;
 use crate::docstrings::definition::{Definition, DefinitionKind};
 use crate::visibility;
 

src/flake8_annotations/mod.rs

@@ -1,3 +1,4 @@
+mod fixes;
 pub mod helpers;
 pub mod plugins;
 pub mod settings;
@@ -31,7 +32,6 @@ mod tests {
                     CheckCode::ANN401,
                 ])
             },
-            true,
         )?;
         checks.sort_by_key(|check| check.location);
         insta::assert_yaml_snapshot!(checks);
@@ -57,7 +57,6 @@ mod tests {
                     CheckCode::ANN102,
                 ])
             },
-            true,
         )?;
         checks.sort_by_key(|check| check.location);
         insta::assert_yaml_snapshot!(checks);
@@ -83,7 +82,6 @@ mod tests {
                     CheckCode::ANN206,
                 ])
             },
-            true,
         )?;
         checks.sort_by_key(|check| check.location);
         insta::assert_yaml_snapshot!(checks);
@@ -109,7 +107,6 @@ mod tests {
                     CheckCode::ANN206,
                 ])
             },
-            true,
         )?;
         checks.sort_by_key(|check| check.location);
         insta::assert_yaml_snapshot!(checks);
@@ -129,7 +126,6 @@ mod tests {
                 },
                 ..Settings::for_rules(vec![CheckCode::ANN401])
             },
-            true,
         )?;
         checks.sort_by_key(|check| check.location);
         insta::assert_yaml_snapshot!(checks);
@@ -149,7 +145,6 @@ mod tests {
                     CheckCode::ANN206,
                 ])
             },
-            true,
         )?;
         checks.sort_by_key(|check| check.location);
         insta::assert_yaml_snapshot!(checks);

src/flake8_annotations/plugins.rs

@@ -1,11 +1,13 @@
+use log::error;
 use rustpython_ast::{Constant, Expr, ExprKind, Stmt, StmtKind};
 
 use crate::ast::types::Range;
 use crate::ast::visitor::Visitor;
 use crate::ast::{cast, visitor};
-use crate::check_ast::Checker;
+use crate::checkers::ast::Checker;
 use crate::checks::{CheckCode, CheckKind};
 use crate::docstrings::definition::{Definition, DefinitionKind};
+use crate::flake8_annotations::fixes;
 use crate::flake8_annotations::helpers::match_function_def;
 use crate::visibility::Visibility;
 use crate::{visibility, Check};
@@ -295,8 +297,8 @@ pub fn definition(checker: &mut Checker, definition: &Definition, visibility: &V
                     check_dynamically_typed(checker, expr, || name.to_string());
                 }
             } else {
-                // Allow omission of return annotation in `__init__` functions, if the function
-                // only returns `None` (explicitly or implicitly).
+                // Allow omission of return annotation if the function only returns `None`
+                // (explicitly or implicitly).
                 if checker.settings.flake8_annotations.suppress_none_returning
                     && is_none_returning(body)
                 {
@@ -317,13 +319,6 @@ pub fn definition(checker: &mut Checker, definition: &Definition, visibility: &V
                             Range::from_located(stmt),
                         ));
                     }
-                } else if visibility::is_magic(stmt) {
-                    if checker.settings.enabled.contains(&CheckCode::ANN204) {
-                        checker.add_check(Check::new(
-                            CheckKind::MissingReturnTypeMagicMethod(name.to_string()),
-                            Range::from_located(stmt),
-                        ));
-                    }
                 } else if visibility::is_init(stmt) {
                     // Allow omission of return annotation in `__init__` functions, as long as at
                     // least one argument is typed.
@@ -331,12 +326,26 @@ pub fn definition(checker: &mut Checker, definition: &Definition, visibility: &V
                         if !(checker.settings.flake8_annotations.mypy_init_return
                             && has_any_typed_arg)
                         {
-                            checker.add_check(Check::new(
-                                CheckKind::MissingReturnTypeMagicMethod(name.to_string()),
+                            let mut check = Check::new(
+                                CheckKind::MissingReturnTypeSpecialMethod(name.to_string()),
                                 Range::from_located(stmt),
-                            ));
+                            );
+                            if checker.patch(check.kind.code()) {
+                                match fixes::add_return_none_annotation(checker.locator, stmt) {
+                                    Ok(fix) => check.amend(fix),
+                                    Err(e) => error!("Failed to generate fix: {e}"),
+                                }
+                            }
+                            checker.add_check(check);
                         }
                     }
+                } else if visibility::is_magic(stmt) {
+                    if checker.settings.enabled.contains(&CheckCode::ANN204) {
+                        checker.add_check(Check::new(
+                            CheckKind::MissingReturnTypeSpecialMethod(name.to_string()),
+                            Range::from_located(stmt),
+                        ));
+                    }
                 } else {
                     match visibility {
                         Visibility::Public => {

src/flake8_annotations/snapshots/ruff__flake8_annotations__tests__mypy_init_return.snap

@@ -3,23 +3,37 @@ source: src/flake8_annotations/mod.rs
 expression: checks
 ---
 - kind:
-    MissingReturnTypeMagicMethod: __init__
+    MissingReturnTypeSpecialMethod: __init__
   location:
     row: 5
     column: 4
   end_location:
     row: 6
     column: 11
-  fix: ~
+  fix:
+    content: " -> None"
+    location:
+      row: 5
+      column: 22
+    end_location:
+      row: 5
+      column: 22
 - kind:
-    MissingReturnTypeMagicMethod: __init__
+    MissingReturnTypeSpecialMethod: __init__
   location:
     row: 11
     column: 4
   end_location:
     row: 12
     column: 11
-  fix: ~
+  fix:
+    content: " -> None"
+    location:
+      row: 11
+      column: 27
+    end_location:
+      row: 11
+      column: 27
 - kind:
     MissingReturnTypePrivateFunction: __init__
   location:

src/flake8_bandit/mod.rs

@@ -26,7 +26,6 @@ mod tests {
                 .join(path)
                 .as_path(),
             &settings::Settings::for_rule(check_code),
-            true,
         )?;
         checks.sort_by_key(|check| check.location);
         insta::assert_yaml_snapshot!(snapshot, checks);

src/flake8_blind_except/mod.rs

@@ -20,7 +20,6 @@ mod tests {
                 .join(path)
                 .as_path(),
             &settings::Settings::for_rule(check_code),
-            true,
         )?;
         checks.sort_by_key(|check| check.location);
         insta::assert_yaml_snapshot!(snapshot, checks);

src/flake8_blind_except/plugins.rs

@@ -1,7 +1,7 @@
 use rustpython_ast::{Expr, ExprKind, Stmt, StmtKind};
 
 use crate::ast::types::Range;
-use crate::check_ast::Checker;
+use crate::checkers::ast::Checker;
 use crate::checks::{Check, CheckKind};
 
 /// BLE001

src/flake8_boolean_trap/mod.rs

@@ -22,7 +22,6 @@ mod tests {
                 .join(path)
                 .as_path(),
             &settings::Settings::for_rule(check_code),
-            true,
         )?;
         checks.sort_by_key(|check| check.location);
         insta::assert_yaml_snapshot!(snapshot, checks);

src/flake8_boolean_trap/plugins.rs

@@ -2,7 +2,7 @@ use rustpython_ast::{Arguments, ExprKind};
 use rustpython_parser::ast::{Constant, Expr};
 
 use crate::ast::types::Range;
-use crate::check_ast::Checker;
+use crate::checkers::ast::Checker;
 use crate::checks::{Check, CheckKind};
 
 const FUNC_NAME_ALLOWLIST: &[&str] = &["get", "setdefault", "pop", "fromkeys"];

src/flake8_bugbear/mod.rs

@@ -47,7 +47,6 @@ mod tests {
                 .join(path)
                 .as_path(),
             &Settings::for_rule(check_code),
-            true,
         )?;
         checks.sort_by_key(|check| check.location);
         insta::assert_yaml_snapshot!(snapshot, checks);
@@ -68,7 +67,6 @@ mod tests {
                 },
                 ..Settings::for_rules(vec![CheckCode::B008])
             },
-            true,
         )?;
         checks.sort_by_key(|check| check.location);
         insta::assert_yaml_snapshot!(snapshot, checks);

src/flake8_bugbear/plugins/abstract_base_class.rs

@@ -3,7 +3,7 @@ use rustpython_ast::{Constant, Expr, ExprKind, Keyword, Stmt, StmtKind};
 
 use crate::ast::helpers::match_module_member;
 use crate::ast::types::Range;
-use crate::check_ast::Checker;
+use crate::checkers::ast::Checker;
 use crate::checks::{Check, CheckCode, CheckKind};
 
 fn is_abc_class(

src/flake8_bugbear/plugins/assert_false.rs

@@ -2,7 +2,7 @@ use rustpython_ast::{Constant, Expr, ExprContext, ExprKind, Location, Stmt, Stmt
 
 use crate::ast::types::Range;
 use crate::autofix::Fix;
-use crate::check_ast::Checker;
+use crate::checkers::ast::Checker;
 use crate::checks::{Check, CheckKind};
 use crate::code_gen::SourceGenerator;
 

src/flake8_bugbear/plugins/assert_raises_exception.rs

@@ -2,7 +2,7 @@ use rustpython_ast::{ExprKind, Stmt, Withitem};
 
 use crate::ast::helpers::match_module_member;
 use crate::ast::types::Range;
-use crate::check_ast::Checker;
+use crate::checkers::ast::Checker;
 use crate::checks::{Check, CheckKind};
 
 /// B017

src/flake8_bugbear/plugins/assignment_to_os_environ.rs

@@ -1,7 +1,7 @@
 use rustpython_ast::{Expr, ExprKind};
 
 use crate::ast::types::Range;
-use crate::check_ast::Checker;
+use crate::checkers::ast::Checker;
 use crate::checks::{Check, CheckKind};
 
 /// B003

src/flake8_bugbear/plugins/cached_instance_method.rs

@@ -2,7 +2,7 @@ use rustpython_ast::{Expr, ExprKind};
 
 use crate::ast::helpers::{collect_call_paths, dealias_call_path, match_call_path};
 use crate::ast::types::{Range, ScopeKind};
-use crate::check_ast::Checker;
+use crate::checkers::ast::Checker;
 use crate::checks::{Check, CheckKind};
 
 fn is_cache_func(checker: &Checker, expr: &Expr) -> bool {

src/flake8_bugbear/plugins/cannot_raise_literal.rs

@@ -1,7 +1,7 @@
 use rustpython_ast::{Expr, ExprKind};
 
 use crate::ast::types::Range;
-use crate::check_ast::Checker;
+use crate::checkers::ast::Checker;
 use crate::checks::{Check, CheckKind};
 
 /// B016

src/flake8_bugbear/plugins/duplicate_exceptions.rs

@@ -7,7 +7,7 @@ use rustpython_ast::{
 use crate::ast::helpers;
 use crate::ast::types::Range;
 use crate::autofix::Fix;
-use crate::check_ast::Checker;
+use crate::checkers::ast::Checker;
 use crate::checks::{Check, CheckCode, CheckKind};
 use crate::code_gen::SourceGenerator;
 

src/flake8_bugbear/plugins/f_string_docstring.rs

@@ -1,7 +1,7 @@
 use rustpython_ast::{ExprKind, Stmt, StmtKind};
 
 use crate::ast::types::Range;
-use crate::check_ast::Checker;
+use crate::checkers::ast::Checker;
 use crate::checks::{Check, CheckKind};
 
 /// B021

src/flake8_bugbear/plugins/function_call_argument_default.rs

@@ -7,7 +7,7 @@ use crate::ast::helpers::{
 use crate::ast::types::Range;
 use crate::ast::visitor;
 use crate::ast::visitor::Visitor;
-use crate::check_ast::Checker;
+use crate::checkers::ast::Checker;
 use crate::checks::{Check, CheckKind};
 use crate::flake8_bugbear::plugins::mutable_argument_default::is_mutable_func;
 

src/flake8_bugbear/plugins/function_uses_loop_variable.rs

@@ -5,7 +5,7 @@ use crate::ast::helpers::collect_arg_names;
 use crate::ast::types::{Node, Range};
 use crate::ast::visitor;
 use crate::ast::visitor::Visitor;
-use crate::check_ast::Checker;
+use crate::checkers::ast::Checker;
 use crate::checks::{Check, CheckKind};
 
 #[derive(Default)]

src/flake8_bugbear/plugins/getattr_with_constant.rs

@@ -2,7 +2,7 @@ use rustpython_ast::{Constant, Expr, ExprContext, ExprKind, Location};
 
 use crate::ast::types::Range;
 use crate::autofix::Fix;
-use crate::check_ast::Checker;
+use crate::checkers::ast::Checker;
 use crate::checks::{Check, CheckKind};
 use crate::code_gen::SourceGenerator;
 use crate::python::identifiers::IDENTIFIER_REGEX;

src/flake8_bugbear/plugins/jump_statement_in_finally.rs

@@ -1,7 +1,7 @@
 use rustpython_ast::{Stmt, StmtKind};
 
 use crate::ast::types::Range;
-use crate::check_ast::Checker;
+use crate::checkers::ast::Checker;
 use crate::checks::{Check, CheckKind};
 
 fn walk_stmt(checker: &mut Checker, body: &[Stmt], f: fn(&Stmt) -> bool) {

src/flake8_bugbear/plugins/loop_variable_overrides_iterator.rs

@@ -4,7 +4,7 @@ use rustpython_ast::{Expr, ExprKind};
 use crate::ast::types::Range;
 use crate::ast::visitor;
 use crate::ast::visitor::Visitor;
-use crate::check_ast::Checker;
+use crate::checkers::ast::Checker;
 use crate::checks::{Check, CheckKind};
 
 #[derive(Default)]

src/flake8_bugbear/plugins/mutable_argument_default.rs

@@ -3,7 +3,7 @@ use rustpython_ast::{Arguments, Constant, Expr, ExprKind, Operator};
 
 use crate::ast::helpers::{collect_call_paths, dealias_call_path, match_call_path};
 use crate::ast::types::Range;
-use crate::check_ast::Checker;
+use crate::checkers::ast::Checker;
 use crate::checks::{Check, CheckKind};
 
 const MUTABLE_FUNCS: &[(&str, &str)] = &[

src/flake8_bugbear/plugins/raise_without_from_inside_except.rs

@@ -2,7 +2,7 @@ use rustpython_ast::{ExprKind, Stmt, StmtKind};
 
 use crate::ast::types::Range;
 use crate::ast::visitor::Visitor;
-use crate::check_ast::Checker;
+use crate::checkers::ast::Checker;
 use crate::checks::{Check, CheckKind};
 use crate::python::string::is_lower;
 

src/flake8_bugbear/plugins/redundant_tuple_in_exception_handler.rs

@@ -7,7 +7,7 @@ use rustpython_parser::lexer::Tok;
 use crate::ast::helpers;
 use crate::ast::types::Range;
 use crate::autofix::Fix;
-use crate::check_ast::Checker;
+use crate::checkers::ast::Checker;
 use crate::checks::{Check, CheckKind};
 use crate::code_gen::SourceGenerator;
 use crate::SourceCodeLocator;

src/flake8_bugbear/plugins/setattr_with_constant.rs

@@ -4,7 +4,7 @@ use rustpython_ast::{Constant, Expr, ExprContext, ExprKind, Location, Stmt, Stmt
 
 use crate::ast::types::Range;
 use crate::autofix::Fix;
-use crate::check_ast::Checker;
+use crate::checkers::ast::Checker;
 use crate::checks::{Check, CheckKind};
 use crate::code_gen::SourceGenerator;
 use crate::python::identifiers::IDENTIFIER_REGEX;

src/flake8_bugbear/plugins/star_arg_unpacking_after_keyword_arg.rs

@@ -1,7 +1,7 @@
 use rustpython_ast::{Expr, ExprKind, Keyword};
 
 use crate::ast::types::Range;
-use crate::check_ast::Checker;
+use crate::checkers::ast::Checker;
 use crate::checks::{Check, CheckKind};
 
 /// B026

src/flake8_bugbear/plugins/strip_with_multi_characters.rs

@@ -2,7 +2,7 @@ use itertools::Itertools;
 use rustpython_ast::{Constant, Expr, ExprKind};
 
 use crate::ast::types::Range;
-use crate::check_ast::Checker;
+use crate::checkers::ast::Checker;
 use crate::checks::{Check, CheckKind};
 
 /// B005

src/flake8_bugbear/plugins/unary_prefix_increment.rs

@@ -1,7 +1,7 @@
 use rustpython_ast::{Expr, ExprKind, Unaryop};
 
 use crate::ast::types::Range;
-use crate::check_ast::Checker;
+use crate::checkers::ast::Checker;
 use crate::checks::{Check, CheckKind};
 
 /// B002

src/flake8_bugbear/plugins/unreliable_callable_check.rs

@@ -1,7 +1,7 @@
 use rustpython_ast::{Constant, Expr, ExprKind};
 
 use crate::ast::types::Range;
-use crate::check_ast::Checker;
+use crate::checkers::ast::Checker;
 use crate::checks::{Check, CheckKind};
 
 /// B004

src/flake8_bugbear/plugins/unused_loop_control_variable.rs

@@ -5,7 +5,7 @@ use crate::ast::types::Range;
 use crate::ast::visitor;
 use crate::ast::visitor::Visitor;
 use crate::autofix::Fix;
-use crate::check_ast::Checker;
+use crate::checkers::ast::Checker;
 use crate::checks::{Check, CheckKind};
 
 /// Identify all `ExprKind::Name` nodes in an AST.

src/flake8_bugbear/plugins/useless_comparison.rs

@@ -1,7 +1,7 @@
 use rustpython_ast::{Expr, ExprKind};
 
 use crate::ast::types::Range;
-use crate::check_ast::Checker;
+use crate::checkers::ast::Checker;
 use crate::checks::{Check, CheckKind};
 
 pub fn useless_comparison(checker: &mut Checker, expr: &Expr) {

src/flake8_bugbear/plugins/useless_contextlib_suppress.rs

@@ -2,7 +2,7 @@ use rustpython_ast::Expr;
 
 use crate::ast::helpers::{collect_call_paths, match_call_path};
 use crate::ast::types::Range;
-use crate::check_ast::Checker;
+use crate::checkers::ast::Checker;
 use crate::checks::{Check, CheckKind};
 
 /// B005

src/flake8_bugbear/plugins/useless_expression.rs

@@ -1,7 +1,7 @@
 use rustpython_ast::{Constant, ExprKind, Stmt, StmtKind};
 
 use crate::ast::types::Range;
-use crate::check_ast::Checker;
+use crate::checkers::ast::Checker;
 use crate::checks::{Check, CheckKind};
 
 // B018

src/flake8_bugbear/plugins/zip_without_explicit_strict.rs

@@ -1,7 +1,7 @@
 use rustpython_ast::{Expr, ExprKind, Keyword};
 
 use crate::ast::types::Range;
-use crate::check_ast::Checker;
+use crate::checkers::ast::Checker;
 use crate::checks::{Check, CheckKind};
 
 /// B905

src/flake8_builtins/mod.rs

@@ -23,7 +23,6 @@ mod tests {
                 .join(path)
                 .as_path(),
             &settings::Settings::for_rule(check_code),
-            true,
         )?;
         checks.sort_by_key(|check| check.location);
         insta::assert_yaml_snapshot!(snapshot, checks);

src/flake8_comprehensions/mod.rs

@@ -37,7 +37,6 @@ mod tests {
                 .join(path)
                 .as_path(),
             &settings::Settings::for_rule(check_code),
-            true,
         )?;
         checks.sort_by_key(|check| check.location);
         insta::assert_yaml_snapshot!(snapshot, checks);

src/flake8_errmsg/mod.rs

@@ -20,7 +20,6 @@ mod tests {
                 CheckCode::EM102,
                 CheckCode::EM103,
             ]),
-            false,
         )?;
         checks.sort_by_key(|check| check.location);
         insta::assert_yaml_snapshot!("defaults", checks);
@@ -41,7 +40,6 @@ mod tests {
                     CheckCode::EM103,
                 ])
             },
-            false,
         )?;
         checks.sort_by_key(|check| check.location);
         insta::assert_yaml_snapshot!("custom", checks);

src/flake8_errmsg/snapshots/ruff__flake8_errmsg__tests__custom.snap

@@ -12,18 +12,18 @@ expression: checks
   fix: ~
 - kind: FStringInException
   location:
-    row: 10
+    row: 14
     column: 23
   end_location:
-    row: 10
+    row: 14
     column: 56
   fix: ~
 - kind: DotFormatInException
   location:
-    row: 14
+    row: 18
     column: 23
   end_location:
-    row: 14
+    row: 18
     column: 81
   fix: ~
 

src/flake8_errmsg/snapshots/ruff__flake8_errmsg__tests__defaults.snap

@@ -10,20 +10,28 @@ expression: checks
     row: 5
     column: 53
   fix: ~
-- kind: FStringInException
+- kind: RawStringInException
   location:
-    row: 10
+    row: 9
     column: 23
   end_location:
-    row: 10
+    row: 9
+    column: 30
+  fix: ~
+- kind: FStringInException
+  location:
+    row: 14
+    column: 23
+  end_location:
+    row: 14
     column: 56
   fix: ~
 - kind: DotFormatInException
   location:
-    row: 14
+    row: 18
     column: 23
   end_location:
-    row: 14
+    row: 18
     column: 81
   fix: ~
 

src/flake8_import_conventions/mod.rs

@@ -18,7 +18,6 @@ mod tests {
         let mut checks = test_path(
             Path::new("./resources/test/fixtures/flake8_import_conventions/defaults.py"),
             &Settings::for_rule(CheckCode::ICN001),
-            true,
         )?;
         checks.sort_by_key(|check| check.location);
         insta::assert_yaml_snapshot!("defaults", checks);
@@ -42,7 +41,6 @@ mod tests {
                     ),
                 ..Settings::for_rule(CheckCode::ICN001)
             },
-            true,
         )?;
         checks.sort_by_key(|check| check.location);
         insta::assert_yaml_snapshot!("custom", checks);
@@ -68,7 +66,6 @@ mod tests {
                     ),
                 ..Settings::for_rule(CheckCode::ICN001)
             },
-            true,
         )?;
         checks.sort_by_key(|check| check.location);
         insta::assert_yaml_snapshot!("remove_default", checks);
@@ -92,7 +89,6 @@ mod tests {
                     ),
                 ..Settings::for_rule(CheckCode::ICN001)
             },
-            true,
         )?;
         checks.sort_by_key(|check| check.location);
         insta::assert_yaml_snapshot!("override_default", checks);

src/flake8_print/mod.rs

@@ -23,7 +23,6 @@ mod tests {
                 .join(path)
                 .as_path(),
             &settings::Settings::for_rule(check_code),
-            true,
         )?;
         checks.sort_by_key(|check| check.location);
         insta::assert_yaml_snapshot!(snapshot, checks);

src/flake8_print/plugins/print_call.rs

@@ -3,7 +3,7 @@ use rustpython_ast::{Expr, Stmt, StmtKind};
 
 use crate::ast::types::Range;
 use crate::autofix::helpers;
-use crate::check_ast::Checker;
+use crate::checkers::ast::Checker;
 use crate::checks::CheckCode;
 use crate::flake8_print::checks;
 

src/flake8_quotes/mod.rs

@@ -38,7 +38,6 @@ mod tests {
                     CheckCode::Q003,
                 ])
             },
-            true,
         )?;
         checks.sort_by_key(|check| check.location);
         insta::assert_yaml_snapshot!(snapshot, checks);
@@ -70,7 +69,6 @@ mod tests {
                     CheckCode::Q003,
                 ])
             },
-            true,
         )?;
         checks.sort_by_key(|check| check.location);
         insta::assert_yaml_snapshot!(snapshot, checks);
@@ -107,7 +105,6 @@ mod tests {
                     CheckCode::Q003,
                 ])
             },
-            true,
         )?;
         checks.sort_by_key(|check| check.location);
         insta::assert_yaml_snapshot!(snapshot, checks);
@@ -144,7 +141,6 @@ mod tests {
                     CheckCode::Q003,
                 ])
             },
-            true,
         )?;
         checks.sort_by_key(|check| check.location);
         insta::assert_yaml_snapshot!(snapshot, checks);

src/flake8_return/mod.rs

@@ -28,7 +28,6 @@ mod tests {
                 .join(path)
                 .as_path(),
             &Settings::for_rule(check_code),
-            true,
         )?;
         checks.sort_by_key(|check| check.location);
         insta::assert_yaml_snapshot!(snapshot, checks);

src/flake8_return/plugins.rs

@@ -5,7 +5,7 @@ use crate::ast::types::Range;
 use crate::ast::visitor::Visitor;
 use crate::ast::whitespace::indentation;
 use crate::autofix::Fix;
-use crate::check_ast::Checker;
+use crate::checkers::ast::Checker;
 use crate::checks::{Branch, CheckCode, CheckKind};
 use crate::flake8_return::helpers::result_exists;
 use crate::flake8_return::visitor::{ReturnVisitor, Stack};

src/flake8_simplify/mod.rs

@@ -20,7 +20,6 @@ mod tests {
                 .join(path)
                 .as_path(),
             &settings::Settings::for_rule(check_code),
-            true,
         )?;
         checks.sort_by_key(|check| check.location);
         insta::assert_yaml_snapshot!(snapshot, checks);

src/flake8_simplify/plugins/key_in_dict.rs

@@ -2,7 +2,7 @@ use rustpython_ast::{Cmpop, Expr, ExprKind};
 
 use crate::ast::types::Range;
 use crate::autofix::Fix;
-use crate::check_ast::Checker;
+use crate::checkers::ast::Checker;
 use crate::checks::{Check, CheckCode, CheckKind};
 
 /// SIM118

src/flake8_tidy_imports/mod.rs

@@ -22,7 +22,6 @@ mod tests {
                 },
                 ..Settings::for_rules(vec![CheckCode::TID252])
             },
-            true,
         )?;
         checks.sort_by_key(|check| check.location);
         insta::assert_yaml_snapshot!(checks);
@@ -39,7 +38,6 @@ mod tests {
                 },
                 ..Settings::for_rules(vec![CheckCode::TID252])
             },
-            true,
         )?;
         checks.sort_by_key(|check| check.location);
         insta::assert_yaml_snapshot!(checks);

src/flake8_unused_arguments/mod.rs

@@ -1,5 +1,6 @@
 mod helpers;
 pub mod plugins;
+pub mod settings;
 mod types;
 
 #[cfg(test)]
@@ -12,7 +13,7 @@ mod tests {
 
     use crate::checks::CheckCode;
     use crate::linter::test_path;
-    use crate::settings;
+    use crate::{flake8_unused_arguments, settings};
 
     #[test_case(CheckCode::ARG001, Path::new("ARG.py"); "ARG001")]
     #[test_case(CheckCode::ARG002, Path::new("ARG.py"); "ARG002")]
@@ -26,10 +27,53 @@ mod tests {
                 .join(path)
                 .as_path(),
             &settings::Settings::for_rule(check_code),
-            true,
         )?;
         checks.sort_by_key(|check| check.location);
         insta::assert_yaml_snapshot!(snapshot, checks);
         Ok(())
     }
+
+    #[test]
+    fn ignore_variadic_names() -> Result<()> {
+        let mut checks = test_path(
+            Path::new("./resources/test/fixtures/flake8_unused_arguments/ignore_variadic_names.py"),
+            &settings::Settings {
+                flake8_unused_arguments: flake8_unused_arguments::settings::Settings {
+                    ignore_variadic_names: true,
+                },
+                ..settings::Settings::for_rules(vec![
+                    CheckCode::ARG001,
+                    CheckCode::ARG002,
+                    CheckCode::ARG003,
+                    CheckCode::ARG004,
+                    CheckCode::ARG005,
+                ])
+            },
+        )?;
+        checks.sort_by_key(|check| check.location);
+        insta::assert_yaml_snapshot!(checks);
+        Ok(())
+    }
+
+    #[test]
+    fn enforce_variadic_names() -> Result<()> {
+        let mut checks = test_path(
+            Path::new("./resources/test/fixtures/flake8_unused_arguments/ignore_variadic_names.py"),
+            &settings::Settings {
+                flake8_unused_arguments: flake8_unused_arguments::settings::Settings {
+                    ignore_variadic_names: false,
+                },
+                ..settings::Settings::for_rules(vec![
+                    CheckCode::ARG001,
+                    CheckCode::ARG002,
+                    CheckCode::ARG003,
+                    CheckCode::ARG004,
+                    CheckCode::ARG005,
+                ])
+            },
+        )?;
+        checks.sort_by_key(|check| check.location);
+        insta::assert_yaml_snapshot!(checks);
+        Ok(())
+    }
 }

src/flake8_unused_arguments/plugins.rs

@@ -6,9 +6,8 @@ use rustpython_ast::{Arg, Arguments};
 
 use crate::ast::function_type;
 use crate::ast::function_type::FunctionType;
-use crate::ast::helpers::collect_arg_names;
 use crate::ast::types::{Binding, BindingKind, FunctionDef, Lambda, Scope, ScopeKind};
-use crate::check_ast::Checker;
+use crate::checkers::ast::Checker;
 use crate::flake8_unused_arguments::helpers;
 use crate::flake8_unused_arguments::types::Argumentable;
 use crate::{visibility, Check};
@@ -20,16 +19,35 @@ fn function(
     values: &FxHashMap<&str, usize>,
     bindings: &[Binding],
     dummy_variable_rgx: &Regex,
+    ignore_variadic_names: bool,
 ) -> Vec<Check> {
     let mut checks: Vec<Check> = vec![];
-    for arg_name in collect_arg_names(args) {
-        if let Some(binding) = values.get(arg_name).map(|index| &bindings[*index]) {
+    for arg in args
+        .posonlyargs
+        .iter()
+        .chain(args.args.iter())
+        .chain(args.kwonlyargs.iter())
+        .chain(
+            iter::once::<Option<&Arg>>(args.vararg.as_deref())
+                .flatten()
+                .skip(usize::from(ignore_variadic_names)),
+        )
+        .chain(
+            iter::once::<Option<&Arg>>(args.kwarg.as_deref())
+                .flatten()
+                .skip(usize::from(ignore_variadic_names)),
+        )
+    {
+        if let Some(binding) = values
+            .get(&arg.node.arg.as_str())
+            .map(|index| &bindings[*index])
+        {
             if binding.used.is_none()
                 && matches!(binding.kind, BindingKind::Argument)
-                && !dummy_variable_rgx.is_match(arg_name)
+                && !dummy_variable_rgx.is_match(arg.node.arg.as_str())
             {
                 checks.push(Check::new(
-                    argumentable.check_for(arg_name.to_string()),
+                    argumentable.check_for(arg.node.arg.to_string()),
                     binding.range,
                 ));
             }
@@ -45,6 +63,7 @@ fn method(
     values: &FxHashMap<&str, usize>,
     bindings: &[Binding],
     dummy_variable_rgx: &Regex,
+    ignore_variadic_names: bool,
 ) -> Vec<Check> {
     let mut checks: Vec<Check> = vec![];
     for arg in args
@@ -53,8 +72,16 @@ fn method(
         .chain(args.args.iter())
         .skip(1)
         .chain(args.kwonlyargs.iter())
-        .chain(iter::once::<Option<&Arg>>(args.vararg.as_deref()).flatten())
-        .chain(iter::once::<Option<&Arg>>(args.kwarg.as_deref()).flatten())
+        .chain(
+            iter::once::<Option<&Arg>>(args.vararg.as_deref())
+                .flatten()
+                .skip(usize::from(ignore_variadic_names)),
+        )
+        .chain(
+            iter::once::<Option<&Arg>>(args.kwarg.as_deref())
+                .flatten()
+                .skip(usize::from(ignore_variadic_names)),
+        )
     {
         if let Some(binding) = values
             .get(&arg.node.arg.as_str())
@@ -110,6 +137,10 @@ pub fn unused_arguments(
                             &scope.values,
                             bindings,
                             &checker.settings.dummy_variable_rgx,
+                            checker
+                                .settings
+                                .flake8_unused_arguments
+                                .ignore_variadic_names,
                         )
                     } else {
                         vec![]
@@ -130,6 +161,10 @@ pub fn unused_arguments(
                             &scope.values,
                             bindings,
                             &checker.settings.dummy_variable_rgx,
+                            checker
+                                .settings
+                                .flake8_unused_arguments
+                                .ignore_variadic_names,
                         )
                     } else {
                         vec![]
@@ -150,6 +185,10 @@ pub fn unused_arguments(
                             &scope.values,
                             bindings,
                             &checker.settings.dummy_variable_rgx,
+                            checker
+                                .settings
+                                .flake8_unused_arguments
+                                .ignore_variadic_names,
                         )
                     } else {
                         vec![]
@@ -170,6 +209,10 @@ pub fn unused_arguments(
                             &scope.values,
                             bindings,
                             &checker.settings.dummy_variable_rgx,
+                            checker
+                                .settings
+                                .flake8_unused_arguments
+                                .ignore_variadic_names,
                         )
                     } else {
                         vec![]
@@ -189,6 +232,10 @@ pub fn unused_arguments(
                     &scope.values,
                     bindings,
                     &checker.settings.dummy_variable_rgx,
+                    checker
+                        .settings
+                        .flake8_unused_arguments
+                        .ignore_variadic_names,
                 )
             } else {
                 vec![]

src/flake8_unused_arguments/settings.rs

@@ -0,0 +1,32 @@
+//! Settings for the `flake8-unused-arguments` plugin.
+
+use ruff_macros::ConfigurationOptions;
+use serde::{Deserialize, Serialize};
+
+#[derive(Debug, PartialEq, Eq, Serialize, Deserialize, Default, ConfigurationOptions)]
+#[serde(deny_unknown_fields, rename_all = "kebab-case")]
+pub struct Options {
+    #[option(
+        doc = r#"
+            Whether to allow unused variadic arguments, like `*args` and `**kwargs`.
+        "#,
+        default = "false",
+        value_type = "bool",
+        example = "ignore-variadic-names = true"
+    )]
+    pub ignore_variadic_names: Option<bool>,
+}
+
+#[derive(Debug, Hash, Default)]
+pub struct Settings {
+    pub ignore_variadic_names: bool,
+}
+
+impl Settings {
+    #[allow(clippy::needless_pass_by_value)]
+    pub fn from_options(options: Options) -> Self {
+        Self {
+            ignore_variadic_names: options.ignore_variadic_names.unwrap_or_default(),
+        }
+    }
+}

src/flake8_unused_arguments/snapshots/ruff__flake8_unused_arguments__tests__enforce_variadic_names.snap

@@ -0,0 +1,113 @@
+---
+source: src/flake8_unused_arguments/mod.rs
+expression: checks
+---
+- kind:
+    UnusedFunctionArgument: a
+  location:
+    row: 1
+    column: 6
+  end_location:
+    row: 1
+    column: 7
+  fix: ~
+- kind:
+    UnusedFunctionArgument: b
+  location:
+    row: 1
+    column: 9
+  end_location:
+    row: 1
+    column: 10
+  fix: ~
+- kind:
+    UnusedFunctionArgument: a
+  location:
+    row: 5
+    column: 6
+  end_location:
+    row: 5
+    column: 7
+  fix: ~
+- kind:
+    UnusedFunctionArgument: b
+  location:
+    row: 5
+    column: 9
+  end_location:
+    row: 5
+    column: 10
+  fix: ~
+- kind:
+    UnusedFunctionArgument: args
+  location:
+    row: 5
+    column: 13
+  end_location:
+    row: 5
+    column: 17
+  fix: ~
+- kind:
+    UnusedFunctionArgument: kwargs
+  location:
+    row: 5
+    column: 21
+  end_location:
+    row: 5
+    column: 27
+  fix: ~
+- kind:
+    UnusedMethodArgument: a
+  location:
+    row: 10
+    column: 16
+  end_location:
+    row: 10
+    column: 17
+  fix: ~
+- kind:
+    UnusedMethodArgument: b
+  location:
+    row: 10
+    column: 19
+  end_location:
+    row: 10
+    column: 20
+  fix: ~
+- kind:
+    UnusedMethodArgument: a
+  location:
+    row: 13
+    column: 16
+  end_location:
+    row: 13
+    column: 17
+  fix: ~
+- kind:
+    UnusedMethodArgument: b
+  location:
+    row: 13
+    column: 19
+  end_location:
+    row: 13
+    column: 20
+  fix: ~
+- kind:
+    UnusedMethodArgument: args
+  location:
+    row: 13
+    column: 23
+  end_location:
+    row: 13
+    column: 27
+  fix: ~
+- kind:
+    UnusedMethodArgument: kwargs
+  location:
+    row: 13
+    column: 31
+  end_location:
+    row: 13
+    column: 37
+  fix: ~
+

src/flake8_unused_arguments/snapshots/ruff__flake8_unused_arguments__tests__ignore_variadic_names.snap

@@ -0,0 +1,77 @@
+---
+source: src/flake8_unused_arguments/mod.rs
+expression: checks
+---
+- kind:
+    UnusedFunctionArgument: a
+  location:
+    row: 1
+    column: 6
+  end_location:
+    row: 1
+    column: 7
+  fix: ~
+- kind:
+    UnusedFunctionArgument: b
+  location:
+    row: 1
+    column: 9
+  end_location:
+    row: 1
+    column: 10
+  fix: ~
+- kind:
+    UnusedFunctionArgument: a
+  location:
+    row: 5
+    column: 6
+  end_location:
+    row: 5
+    column: 7
+  fix: ~
+- kind:
+    UnusedFunctionArgument: b
+  location:
+    row: 5
+    column: 9
+  end_location:
+    row: 5
+    column: 10
+  fix: ~
+- kind:
+    UnusedMethodArgument: a
+  location:
+    row: 10
+    column: 16
+  end_location:
+    row: 10
+    column: 17
+  fix: ~
+- kind:
+    UnusedMethodArgument: b
+  location:
+    row: 10
+    column: 19
+  end_location:
+    row: 10
+    column: 20
+  fix: ~
+- kind:
+    UnusedMethodArgument: a
+  location:
+    row: 13
+    column: 16
+  end_location:
+    row: 13
+    column: 17
+  fix: ~
+- kind:
+    UnusedMethodArgument: b
+  location:
+    row: 13
+    column: 19
+  end_location:
+    row: 13
+    column: 20
+  fix: ~
+

src/fs.rs

@@ -40,7 +40,8 @@ pub(crate) fn ignores_from_path<'a>(
 
 /// Convert any path to an absolute path (based on the current working
 /// directory).
-pub fn normalize_path(path: &Path) -> PathBuf {
+pub fn normalize_path<P: AsRef<Path>>(path: P) -> PathBuf {
+    let path = path.as_ref();
     if let Ok(path) = path.absolutize() {
         return path.to_path_buf();
     }
@@ -48,8 +49,9 @@ pub fn normalize_path(path: &Path) -> PathBuf {
 }
 
 /// Convert any path to an absolute path (based on the specified project root).
-pub fn normalize_path_to(path: &Path, project_root: &Path) -> PathBuf {
-    if let Ok(path) = path.absolutize_from(project_root) {
+pub fn normalize_path_to<P: AsRef<Path>, R: AsRef<Path>>(path: P, project_root: R) -> PathBuf {
+    let path = path.as_ref();
+    if let Ok(path) = path.absolutize_from(project_root.as_ref()) {
         return path.to_path_buf();
     }
     path.to_path_buf()
@@ -64,7 +66,7 @@ pub fn relativize_path(path: &Path) -> Cow<str> {
 }
 
 /// Read a file's contents from disk.
-pub(crate) fn read_file(path: &Path) -> Result<String> {
+pub(crate) fn read_file<P: AsRef<Path>>(path: P) -> Result<String> {
     let file = File::open(path)?;
     let mut buf_reader = BufReader::new(file);
     let mut contents = String::new();

src/isort/categorize.rs

@@ -1,6 +1,8 @@
 use std::collections::BTreeSet;
 use std::fs;
-use std::path::PathBuf;
+use std::path::{Path, PathBuf};
+
+use log::debug;
 
 use crate::python::sys::KNOWN_STANDARD_LIBRARY;
 
@@ -13,45 +15,72 @@ pub enum ImportType {
     LocalFolder,
 }
 
+#[derive(Debug)]
+enum Reason<'a> {
+    NonZeroLevel,
+    KnownFirstParty,
+    KnownThirdParty,
+    ExtraStandardLibrary,
+    Future,
+    KnownStandardLibrary,
+    SamePackage,
+    SourceMatch(&'a Path),
+    NoMatch,
+}
+
 pub fn categorize(
     module_base: &str,
     level: Option<&usize>,
     src: &[PathBuf],
+    package: Option<&Path>,
     known_first_party: &BTreeSet<String>,
     known_third_party: &BTreeSet<String>,
     extra_standard_library: &BTreeSet<String>,
 ) -> ImportType {
-    if level.map_or(false, |level| *level > 0) {
-        ImportType::LocalFolder
-    } else if known_first_party.contains(module_base) {
-        ImportType::FirstParty
-    } else if known_third_party.contains(module_base) {
-        ImportType::ThirdParty
-    } else if extra_standard_library.contains(module_base) {
-        ImportType::StandardLibrary
-    } else if module_base == "__future__" {
-        ImportType::Future
-    } else if KNOWN_STANDARD_LIBRARY.contains(module_base) {
-        ImportType::StandardLibrary
-    } else if find_local(src, module_base) {
-        ImportType::FirstParty
-    } else {
-        ImportType::ThirdParty
-    }
+    let (import_type, reason) = {
+        if level.map_or(false, |level| *level > 0) {
+            (ImportType::LocalFolder, Reason::NonZeroLevel)
+        } else if known_first_party.contains(module_base) {
+            (ImportType::FirstParty, Reason::KnownFirstParty)
+        } else if known_third_party.contains(module_base) {
+            (ImportType::ThirdParty, Reason::KnownThirdParty)
+        } else if extra_standard_library.contains(module_base) {
+            (ImportType::StandardLibrary, Reason::ExtraStandardLibrary)
+        } else if module_base == "__future__" {
+            (ImportType::Future, Reason::Future)
+        } else if KNOWN_STANDARD_LIBRARY.contains(module_base) {
+            (ImportType::StandardLibrary, Reason::KnownStandardLibrary)
+        } else if same_package(package, module_base) {
+            (ImportType::FirstParty, Reason::SamePackage)
+        } else if let Some(src) = match_sources(src, module_base) {
+            (ImportType::FirstParty, Reason::SourceMatch(src))
+        } else {
+            (ImportType::ThirdParty, Reason::NoMatch)
+        }
+    };
+    debug!(
+        "Categorized '{}' as {:?} ({:?})",
+        module_base, import_type, reason
+    );
+    import_type
 }
 
-fn find_local(paths: &[PathBuf], base: &str) -> bool {
+fn same_package(package: Option<&Path>, module_base: &str) -> bool {
+    package.map_or(false, |package| package.ends_with(module_base))
+}
+
+fn match_sources<'a>(paths: &'a [PathBuf], base: &str) -> Option<&'a Path> {
     for path in paths {
         if let Ok(metadata) = fs::metadata(path.join(base)) {
             if metadata.is_dir() {
-                return true;
+                return Some(path);
             }
         }
         if let Ok(metadata) = fs::metadata(path.join(format!("{base}.py"))) {
             if metadata.is_file() {
-                return true;
+                return Some(path);
             }
         }
     }
-    false
+    None
 }

src/isort/mod.rs

@@ -1,6 +1,6 @@
 use std::cmp::Reverse;
 use std::collections::{BTreeMap, BTreeSet};
-use std::path::PathBuf;
+use std::path::{Path, PathBuf};
 
 use itertools::Itertools;
 use ropey::RopeBuilder;
@@ -294,6 +294,7 @@ fn normalize_imports(imports: Vec<AnnotatedImport>, combine_as_imports: bool) ->
 fn categorize_imports<'a>(
     block: ImportBlock<'a>,
     src: &[PathBuf],
+    package: Option<&Path>,
     known_first_party: &BTreeSet<String>,
     known_third_party: &BTreeSet<String>,
     extra_standard_library: &BTreeSet<String>,
@@ -305,6 +306,7 @@ fn categorize_imports<'a>(
             &alias.module_base(),
             None,
             src,
+            package,
             known_first_party,
             known_third_party,
             extra_standard_library,
@@ -321,6 +323,7 @@ fn categorize_imports<'a>(
             &import_from.module_base(),
             import_from.level,
             src,
+            package,
             known_first_party,
             known_third_party,
             extra_standard_library,
@@ -337,6 +340,7 @@ fn categorize_imports<'a>(
             &import_from.module_base(),
             import_from.level,
             src,
+            package,
             known_first_party,
             known_third_party,
             extra_standard_library,
@@ -353,6 +357,7 @@ fn categorize_imports<'a>(
             &import_from.module_base(),
             import_from.level,
             src,
+            package,
             known_first_party,
             known_third_party,
             extra_standard_library,
@@ -470,6 +475,7 @@ pub fn format_imports(
     comments: Vec<Comment>,
     line_length: usize,
     src: &[PathBuf],
+    package: Option<&Path>,
     known_first_party: &BTreeSet<String>,
     known_third_party: &BTreeSet<String>,
     extra_standard_library: &BTreeSet<String>,
@@ -486,6 +492,7 @@ pub fn format_imports(
     let block_by_type = categorize_imports(
         block,
         src,
+        package,
         known_first_party,
         known_third_party,
         extra_standard_library,
@@ -590,7 +597,6 @@ mod tests {
                 src: vec![Path::new("resources/test/fixtures/isort").to_path_buf()],
                 ..Settings::for_rule(CheckCode::I001)
             },
-            true,
         )?;
         checks.sort_by_key(|check| check.location);
         insta::assert_yaml_snapshot!(snapshot, checks);
@@ -612,7 +618,6 @@ mod tests {
                 src: vec![Path::new("resources/test/fixtures/isort").to_path_buf()],
                 ..Settings::for_rule(CheckCode::I001)
             },
-            true,
         )?;
         checks.sort_by_key(|check| check.location);
         insta::assert_yaml_snapshot!(snapshot, checks);
@@ -635,7 +640,6 @@ mod tests {
                 src: vec![Path::new("resources/test/fixtures/isort").to_path_buf()],
                 ..Settings::for_rule(CheckCode::I001)
             },
-            true,
         )?;
         checks.sort_by_key(|check| check.location);
         insta::assert_yaml_snapshot!(snapshot, checks);

src/isort/plugins.rs

@@ -1,3 +1,5 @@
+use std::path::Path;
+
 use rustpython_ast::{Location, Stmt};
 use textwrap::{dedent, indent};
 
@@ -10,6 +12,7 @@ use crate::autofix::Fix;
 use crate::checks::CheckKind;
 use crate::isort::track::Block;
 use crate::isort::{comments, format_imports};
+use crate::settings::flags;
 use crate::{Check, Settings, SourceCodeLocator};
 
 fn extract_range(body: &[&Stmt]) -> Range {
@@ -34,7 +37,8 @@ pub fn check_imports(
     block: &Block,
     locator: &SourceCodeLocator,
     settings: &Settings,
-    autofix: bool,
+    autofix: flags::Autofix,
+    package: Option<&Path>,
 ) -> Option<Check> {
     let indentation = locator.slice_source_code_range(&extract_indentation_range(&block.imports));
     let indentation = leading_space(&indentation);
@@ -70,6 +74,7 @@ pub fn check_imports(
         comments,
         settings.line_length - indentation.len(),
         &settings.src,
+        package,
         &settings.isort.known_first_party,
         &settings.isort.known_third_party,
         &settings.isort.extra_standard_library,
@@ -87,7 +92,9 @@ pub fn check_imports(
         None
     } else {
         let mut check = Check::new(CheckKind::UnsortedImports, range);
-        if autofix && settings.fixable.contains(check.kind.code()) {
+        if matches!(autofix, flags::Autofix::Enabled)
+            && settings.fixable.contains(check.kind.code())
+        {
             check.amend(Fix::replacement(
                 indent(&expected, indentation),
                 range.location,

src/lib.rs

@@ -23,15 +23,13 @@ use crate::checks::Check;
 use crate::linter::check_path;
 use crate::resolver::Relativity;
 use crate::settings::configuration::Configuration;
+use crate::settings::flags;
 use crate::source_code_locator::SourceCodeLocator;
 
 mod ast;
 pub mod autofix;
 pub mod cache;
-pub mod check_ast;
-mod check_imports;
-mod check_lines;
-mod check_tokens;
+mod checkers;
 pub mod checks;
 pub mod checks_gen;
 pub mod cli;
@@ -67,6 +65,7 @@ pub mod logging;
 pub mod mccabe;
 pub mod message;
 mod noqa;
+mod packages;
 mod pandas_vet;
 pub mod pep8_naming;
 pub mod printer;
@@ -122,13 +121,14 @@ pub fn check(path: &Path, contents: &str, autofix: bool) -> Result<Vec<Check>> {
     // Generate checks.
     let checks = check_path(
         path,
+        packages::detect_package_root(path),
         contents,
         tokens,
         &locator,
         &directives,
         &settings,
-        autofix,
-        false,
+        autofix.into(),
+        flags::Noqa::Enabled,
     )?;
 
     Ok(checks)

src/linter.rs

@@ -7,22 +7,22 @@ use std::path::Path;
 use anyhow::Result;
 #[cfg(not(target_family = "wasm"))]
 use log::debug;
-use nohash_hasher::IntMap;
 use rustpython_parser::lexer::LexResult;
 
 use crate::ast::types::Range;
 use crate::autofix::fixer;
 use crate::autofix::fixer::fix_file;
-use crate::check_ast::check_ast;
-use crate::check_imports::check_imports;
-use crate::check_lines::check_lines;
-use crate::check_tokens::check_tokens;
+use crate::checkers::ast::check_ast;
+use crate::checkers::imports::check_imports;
+use crate::checkers::lines::check_lines;
+use crate::checkers::noqa::check_noqa;
+use crate::checkers::tokens::check_tokens;
 use crate::checks::{Check, CheckCode, CheckKind, LintSource};
 use crate::code_gen::SourceGenerator;
 use crate::directives::Directives;
 use crate::message::{Message, Source};
 use crate::noqa::add_noqa;
-use crate::settings::Settings;
+use crate::settings::{flags, Settings};
 use crate::source_code_locator::SourceCodeLocator;
 use crate::{cache, directives, fs, rustpython_helpers};
 
@@ -50,23 +50,24 @@ impl AddAssign for Diagnostics {
 #[allow(clippy::too_many_arguments)]
 pub(crate) fn check_path(
     path: &Path,
+    package: Option<&Path>,
     contents: &str,
     tokens: Vec<LexResult>,
     locator: &SourceCodeLocator,
     directives: &Directives,
     settings: &Settings,
-    autofix: bool,
-    ignore_noqa: bool,
+    autofix: flags::Autofix,
+    noqa: flags::Noqa,
 ) -> Result<Vec<Check>> {
     // Aggregate all checks.
     let mut checks: Vec<Check> = vec![];
 
     // Run the token-based checks.
-    let use_tokens = settings
+    if settings
         .enabled
         .iter()
-        .any(|check_code| matches!(check_code.lint_source(), LintSource::Tokens));
-    if use_tokens {
+        .any(|check_code| matches!(check_code.lint_source(), LintSource::Tokens))
+    {
         checks.extend(check_tokens(locator, &tokens, settings, autofix));
     }
 
@@ -89,7 +90,7 @@ pub(crate) fn check_path(
                         &directives.noqa_line_for,
                         settings,
                         autofix,
-                        ignore_noqa,
+                        noqa,
                         path,
                     ));
                 }
@@ -101,6 +102,7 @@ pub(crate) fn check_path(
                         settings,
                         autofix,
                         path,
+                        package,
                     ));
                 }
             }
@@ -119,14 +121,30 @@ pub(crate) fn check_path(
     }
 
     // Run the lines-based checks.
-    check_lines(
-        &mut checks,
-        contents,
-        &directives.noqa_line_for,
-        settings,
-        autofix,
-        ignore_noqa,
-    );
+    if settings
+        .enabled
+        .iter()
+        .any(|check_code| matches!(check_code.lint_source(), LintSource::Lines))
+    {
+        checks.extend(check_lines(contents, settings, autofix));
+    }
+
+    // Enforce `noqa` directives.
+    if matches!(noqa, flags::Noqa::Enabled)
+        || settings
+            .enabled
+            .iter()
+            .any(|check_code| matches!(check_code.lint_source(), LintSource::NoQA))
+    {
+        check_noqa(
+            &mut checks,
+            contents,
+            &directives.commented_lines,
+            &directives.noqa_line_for,
+            settings,
+            autofix,
+        );
+    }
 
     // Create path ignores.
     if !checks.is_empty() && !settings.per_file_ignores.is_empty() {
@@ -147,14 +165,15 @@ const MAX_ITERATIONS: usize = 100;
 /// Lint the source code at the given `Path`.
 pub fn lint_path(
     path: &Path,
+    package: Option<&Path>,
     settings: &Settings,
-    mode: &cache::Mode,
-    autofix: &fixer::Mode,
+    cache: flags::Cache,
+    autofix: fixer::Mode,
 ) -> Result<Diagnostics> {
     let metadata = path.metadata()?;
 
     // Check the cache.
-    if let Some(messages) = cache::get(path, &metadata, settings, autofix, mode) {
+    if let Some(messages) = cache::get(path, &metadata, settings, autofix, cache) {
         debug!("Cache hit for: {}", path.to_string_lossy());
         return Ok(Diagnostics::new(messages));
     }
@@ -163,10 +182,10 @@ pub fn lint_path(
     let contents = fs::read_file(path)?;
 
     // Lint the file.
-    let (contents, fixed, messages) = lint(contents, path, settings, autofix)?;
+    let (contents, fixed, messages) = lint(contents, path, package, settings, autofix)?;
 
     // Re-populate the cache.
-    cache::set(path, &metadata, settings, autofix, &messages, mode);
+    cache::set(path, &metadata, settings, autofix, &messages, cache);
 
     // If we applied any fixes, write the contents back to disk.
     if fixed > 0 {
@@ -197,16 +216,14 @@ pub fn add_noqa_to_path(path: &Path, settings: &Settings) -> Result<usize> {
     // Generate checks, ignoring any existing `noqa` directives.
     let checks = check_path(
         path,
+        None,
         &contents,
         tokens,
         &locator,
-        &Directives {
-            noqa_line_for: IntMap::default(),
-            isort: directives.isort,
-        },
+        &directives,
         settings,
-        false,
-        true,
+        flags::Autofix::Disabled,
+        flags::Noqa::Disabled,
     )?;
 
     add_noqa(
@@ -241,13 +258,13 @@ pub fn lint_stdin(
     path: &Path,
     stdin: &str,
     settings: &Settings,
-    autofix: &fixer::Mode,
+    autofix: fixer::Mode,
 ) -> Result<Diagnostics> {
     // Read the file from disk.
     let contents = stdin.to_string();
 
     // Lint the file.
-    let (contents, fixed, messages) = lint(contents, path, settings, autofix)?;
+    let (contents, fixed, messages) = lint(contents, path, None, settings, autofix)?;
 
     // Write the fixed contents to stdout.
     if matches!(autofix, fixer::Mode::Apply) {
@@ -260,8 +277,9 @@ pub fn lint_stdin(
 fn lint(
     mut contents: String,
     path: &Path,
+    package: Option<&Path>,
     settings: &Settings,
-    autofix: &fixer::Mode,
+    autofix: fixer::Mode,
 ) -> Result<(String, usize, Vec<Message>)> {
     // Track the number of fixed errors across iterations.
     let mut fixed = 0;
@@ -287,13 +305,14 @@ fn lint(
         // Generate checks.
         let checks = check_path(
             path,
+            package,
             &contents,
             tokens,
             &locator,
             &directives,
             settings,
             autofix.into(),
-            false,
+            flags::Noqa::Enabled,
         )?;
 
         // Apply autofix.
@@ -332,7 +351,7 @@ fn lint(
 }
 
 #[cfg(test)]
-pub fn test_path(path: &Path, settings: &Settings, autofix: bool) -> Result<Vec<Check>> {
+pub fn test_path(path: &Path, settings: &Settings) -> Result<Vec<Check>> {
     let contents = fs::read_file(path)?;
     let tokens: Vec<LexResult> = rustpython_helpers::tokenize(&contents);
     let locator = SourceCodeLocator::new(&contents);
@@ -343,12 +362,13 @@ pub fn test_path(path: &Path, settings: &Settings, autofix: bool) -> Result<Vec<
     );
     check_path(
         path,
+        None,
         &contents,
         tokens,
         &locator,
         &directives,
         settings,
-        autofix,
-        false,
+        flags::Autofix::Enabled,
+        flags::Noqa::Enabled,
     )
 }

src/main.rs

@@ -17,10 +17,10 @@ use std::process::ExitCode;
 use std::sync::mpsc::channel;
 
 use ::ruff::autofix::fixer;
-use ::ruff::cli::{extract_log_level, Cli};
+use ::ruff::cli::{extract_log_level, Cli, Overrides};
 use ::ruff::logging::{set_up_logging, LogLevel};
 use ::ruff::printer::Printer;
-use ::ruff::resolver::PyprojectDiscovery;
+use ::ruff::resolver::{resolve_settings, FileDiscovery, PyprojectDiscovery, Relativity};
 use ::ruff::settings::configuration::Configuration;
 use ::ruff::settings::types::SerializationFormat;
 use ::ruff::settings::{pyproject, Settings};
@@ -32,8 +32,6 @@ use clap::{CommandFactory, Parser};
 use colored::Colorize;
 use notify::{recommended_watcher, RecursiveMode, Watcher};
 use path_absolutize::path_dedot;
-use ruff::cli::Overrides;
-use ruff::resolver::{resolve_settings, FileDiscovery, Relativity};
 
 /// Resolve the relevant settings strategy and defaults for the current
 /// invocation.
@@ -153,8 +151,8 @@ fn inner_main() -> Result<ExitCode> {
             &pyproject_strategy,
             &file_strategy,
             &overrides,
-            cache_enabled,
-            &fixer::Mode::None,
+            cache_enabled.into(),
+            fixer::Mode::None,
         )?;
         printer.write_continuously(&messages)?;
 
@@ -183,8 +181,8 @@ fn inner_main() -> Result<ExitCode> {
                             &pyproject_strategy,
                             &file_strategy,
                             &overrides,
-                            cache_enabled,
-                            &fixer::Mode::None,
+                            cache_enabled.into(),
+                            fixer::Mode::None,
                         )?;
                         printer.write_continuously(&messages)?;
                     }
@@ -211,15 +209,15 @@ fn inner_main() -> Result<ExitCode> {
         let diagnostics = if is_stdin {
             let filename = cli.stdin_filename.unwrap_or_else(|| "-".to_string());
             let path = Path::new(&filename);
-            commands::run_stdin(&pyproject_strategy, path, &autofix)?
+            commands::run_stdin(&pyproject_strategy, path, autofix)?
         } else {
             commands::run(
                 &cli.files,
                 &pyproject_strategy,
                 &file_strategy,
                 &overrides,
-                cache_enabled,
-                &autofix,
+                cache_enabled.into(),
+                autofix,
             )?
         };
 
@@ -227,7 +225,7 @@ fn inner_main() -> Result<ExitCode> {
         // unless we're writing fixes via stdin (in which case, the transformed
         // source code goes to stdout).
         if !(is_stdin && matches!(autofix, fixer::Mode::Apply)) {
-            printer.write_once(&diagnostics, &autofix)?;
+            printer.write_once(&diagnostics, autofix)?;
         }
 
         // Check for updates if we're in a non-silent log level.

src/mccabe/mod.rs

@@ -23,7 +23,6 @@ mod tests {
                 mccabe: mccabe::settings::Settings { max_complexity },
                 ..Settings::for_rules(vec![CheckCode::C901])
             },
-            true,
         )?;
         checks.sort_by_key(|check| check.location);
         insta::assert_yaml_snapshot!(snapshot, checks);