Bump version to 0.0.124

Fix off-by-one in noqa

.github/workflows/ci.yaml

@@ -6,6 +6,11 @@ on:
   pull_request:
     branches: [main]
 
+env:
+  CARGO_INCREMENTAL: 0
+  CARGO_NET_RETRY: 10
+  RUSTUP_MAX_RETRIES: 10
+
 jobs:
   cargo_build:
     name: "cargo build"

.github/workflows/flake8-to-ruff.yaml

@@ -10,6 +10,9 @@ env:
   PACKAGE_NAME: flake8-to-ruff
   CRATE_NAME: flake8_to_ruff
   PYTHON_VERSION: "3.7" # to build abi3 wheels
+  CARGO_INCREMENTAL: 0
+  CARGO_NET_RETRY: 10
+  RUSTUP_MAX_RETRIES: 10
 
 jobs:
   macos-x86_64:

.github/workflows/ruff.yaml

@@ -12,6 +12,9 @@ concurrency:
 env:
   PACKAGE_NAME: ruff
   PYTHON_VERSION: "3.7" # to build abi3 wheels
+  CARGO_INCREMENTAL: 0
+  CARGO_NET_RETRY: 10
+  RUSTUP_MAX_RETRIES: 10
 
 jobs:
   macos-x86_64:

.pre-commit-config.yaml

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

Cargo.lock

@@ -930,7 +930,7 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80"
 
 [[package]]
 name = "flake8-to-ruff"
-version = "0.0.118-dev.0"
+version = "0.0.124-dev.0"
 dependencies = [
  "anyhow",
  "clap 4.0.22",
@@ -2238,10 +2238,11 @@ dependencies = [
 
 [[package]]
 name = "ruff"
-version = "0.0.118"
+version = "0.0.124"
 dependencies = [
  "anyhow",
  "assert_cmd",
+ "atty",
  "bincode",
  "bitflags",
  "cacache",
@@ -2286,7 +2287,7 @@ dependencies = [
 
 [[package]]
 name = "ruff_dev"
-version = "0.0.118"
+version = "0.0.124"
 dependencies = [
  "anyhow",
  "clap 4.0.22",

Cargo.toml

@@ -6,7 +6,7 @@ members = [
 
 [package]
 name = "ruff"
-version = "0.0.118"
+version = "0.0.124"
 edition = "2021"
 
 [lib]
@@ -14,6 +14,7 @@ name = "ruff"
 
 [dependencies]
 anyhow = { version = "1.0.66" }
+atty = { version = "0.2.14" }
 bincode = { version = "1.3.3" }
 bitflags = { version = "1.3.2" }
 chrono = { version = "0.4.21", default-features = false, features = ["clock"] }

LICENSE

@@ -19,3 +19,378 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
+
+The externally maintained libraries from which parts of the Software is derived
+are:
+
+- Pyflakes, licensed as follows:
+  """
+    Copyright 2005-2011 Divmod, Inc.
+    Copyright 2013-2014 Florent Xicluna
+
+    Permission is hereby granted, free of charge, to any person obtaining
+    a copy of this software and associated documentation files (the
+    "Software"), to deal in the Software without restriction, including
+    without limitation the rights to use, copy, modify, merge, publish,
+    distribute, sublicense, and/or sell copies of the Software, and to
+    permit persons to whom the Software is furnished to do so, subject to
+    the following conditions:
+
+    The above copyright notice and this permission notice shall be
+    included in all copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+    EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+    NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+    LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+    OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+    WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+  """
+
+- autoflake, licensed as follows:
+  """
+    Copyright (C) 2012-2018 Steven Myint
+
+    Permission is hereby granted, free of charge, to any person obtaining a copy of
+    this software and associated documentation files (the "Software"), to deal in
+    the Software without restriction, including without limitation the rights to
+    use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+    of the Software, and to permit persons to whom the Software is furnished to do
+    so, subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be included in all
+    copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+    AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+    SOFTWARE.
+  """
+
+- Flake8, licensed as follows:
+  """
+    == Flake8 License (MIT) ==
+
+    Copyright (C) 2011-2013 Tarek Ziade <tarek@ziade.org>
+    Copyright (C) 2012-2016 Ian Cordasco <graffatcolmingov@gmail.com>
+
+    Permission is hereby granted, free of charge, to any person obtaining a copy of
+    this software and associated documentation files (the "Software"), to deal in
+    the Software without restriction, including without limitation the rights to
+    use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+    of the Software, and to permit persons to whom the Software is furnished to do
+    so, subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be included in all
+    copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+    AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+    SOFTWARE.
+  """
+
+- flake8-2020, licensed as follows:
+  """
+    Copyright (c) 2019 Anthony Sottile
+
+    Permission is hereby granted, free of charge, to any person obtaining a copy
+    of this software and associated documentation files (the "Software"), to deal
+    in the Software without restriction, including without limitation the rights
+    to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+    copies of the Software, and to permit persons to whom the Software is
+    furnished to do so, subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be included in
+    all copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+    AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+    THE SOFTWARE.
+  """
+
+- flake8-annotations, licensed as follows:
+  """
+    MIT License
+
+    Copyright (c) 2019 - Present S. Co1
+
+    Permission is hereby granted, free of charge, to any person obtaining a copy
+    of this software and associated documentation files (the "Software"), to deal
+    in the Software without restriction, including without limitation the rights
+    to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+    copies of the Software, and to permit persons to whom the Software is
+    furnished to do so, subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be included in all
+    copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+    AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+    SOFTWARE.
+  """
+
+- flake8-bandit, licensed as follows:
+  """
+    Copyright (c) 2017 Tyler Wince
+
+    Permission is hereby granted, free of charge, to any person obtaining a copy
+    of this software and associated documentation files (the "Software"), to deal
+    in the Software without restriction, including without limitation the rights
+    to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+    copies of the Software, and to permit persons to whom the Software is
+    furnished to do so, subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be included in
+    all copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+    AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+    THE SOFTWARE.
+  """
+
+- flake8-bugbear, licensed as follows:
+  """
+    The MIT License (MIT)
+
+    Copyright (c) 2016 Łukasz Langa
+
+    Permission is hereby granted, free of charge, to any person obtaining a copy
+    of this software and associated documentation files (the "Software"), to deal
+    in the Software without restriction, including without limitation the rights
+    to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+    copies of the Software, and to permit persons to whom the Software is
+    furnished to do so, subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be included in all
+    copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+    AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+    SOFTWARE.
+  """
+
+- flake8-comprehensions, licensed as follows:
+  """
+    MIT License
+
+    Copyright (c) 2017 Adam Johnson
+
+    Permission is hereby granted, free of charge, to any person obtaining a copy
+    of this software and associated documentation files (the "Software"), to deal
+    in the Software without restriction, including without limitation the rights
+    to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+    copies of the Software, and to permit persons to whom the Software is
+    furnished to do so, subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be included in all
+    copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+    AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+    SOFTWARE.
+  """
+
+- flake8-print, licensed as follows:
+  """
+    MIT License
+
+    Copyright (c) 2016 Joseph Kahn
+
+    Permission is hereby granted, free of charge, to any person obtaining a copy
+    of this software and associated documentation files (the "Software"), to deal
+    in the Software without restriction, including without limitation the rights
+    to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+    copies of the Software, and to permit persons to whom the Software is
+    furnished to do so, subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be included in all
+    copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+    AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+    SOFTWARE.
+  """
+
+- flake8-quotes, licensed as follows:
+  """
+    Permission is hereby granted, free of charge, to any person obtaining a copy
+    of this software and associated documentation files (the "Software"), to deal
+    in the Software without restriction, including without limitation the rights
+    to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+    copies of the Software, and to permit persons to whom the Software is
+    furnished to do so, subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be included in
+    all copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+    AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+    THE SOFTWARE.
+  """
+
+- isort, licensed as follows:
+  """
+    The MIT License (MIT)
+
+    Copyright (c) 2013 Timothy Edmund Crosley
+
+    Permission is hereby granted, free of charge, to any person obtaining a copy
+    of this software and associated documentation files (the "Software"), to deal
+    in the Software without restriction, including without limitation the rights
+    to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+    copies of the Software, and to permit persons to whom the Software is
+    furnished to do so, subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be included in
+    all copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+    AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+    THE SOFTWARE.
+  """
+
+- pep8-naming, licensed as follows:
+  """
+    Copyright © 2013 Florent Xicluna <florent.xicluna@gmail.com>
+
+    Licensed under the terms of the Expat License
+
+    Permission is hereby granted, free of charge, to any person
+    obtaining a copy of this software and associated documentation files
+    (the "Software"), to deal in the Software without restriction,
+    including without limitation the rights to use, copy, modify, merge,
+    publish, distribute, sublicense, and/or sell copies of the Software,
+    and to permit persons to whom the Software is furnished to do so,
+    subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be
+    included in all copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+    EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+    NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+    BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+    ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+    CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+    SOFTWARE.
+  """
+
+- pycodestyle, licensed as follows:
+  """
+    Copyright © 2006-2009 Johann C. Rocholl <johann@rocholl.net>
+    Copyright © 2009-2014 Florent Xicluna <florent.xicluna@gmail.com>
+    Copyright © 2014-2020 Ian Lee <IanLee1521@gmail.com>
+
+    Licensed under the terms of the Expat License
+
+    Permission is hereby granted, free of charge, to any person
+    obtaining a copy of this software and associated documentation files
+    (the "Software"), to deal in the Software without restriction,
+    including without limitation the rights to use, copy, modify, merge,
+    publish, distribute, sublicense, and/or sell copies of the Software,
+    and to permit persons to whom the Software is furnished to do so,
+    subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be
+    included in all copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+    EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+    NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+    BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+    ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+    CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+    SOFTWARE.
+  """
+
+- pydocstyle, licensed as follows:
+  """
+    Copyright (c) 2012 GreenSteam, <http://greensteam.dk/>
+
+    Copyright (c) 2014-2020 Amir Rachum, <http://amir.rachum.com/>
+
+    Copyright (c) 2020 Sambhav Kothari, <https://github.com/samj1912>
+
+    Permission is hereby granted, free of charge, to any person obtaining a copy of
+    this software and associated documentation files (the "Software"), to deal in
+    the Software without restriction, including without limitation the rights to
+    use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+    of the Software, and to permit persons to whom the Software is furnished to do
+    so, subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be included in all
+    copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+    AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+    SOFTWARE.
+  """
+
+- pyupgrade, licensed as follows:
+  """
+    Copyright (c) 2017 Anthony Sottile
+
+    Permission is hereby granted, free of charge, to any person obtaining a copy
+    of this software and associated documentation files (the "Software"), to deal
+    in the Software without restriction, including without limitation the rights
+    to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+    copies of the Software, and to permit persons to whom the Software is
+    furnished to do so, subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be included in
+    all copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+    AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+    THE SOFTWARE.
+  """

README.md

@@ -48,18 +48,20 @@ Read the [launch blog post](https://notes.crmarsh.com/python-tooling-could-be-mu
 3. [Supported Rules](#supported-rules)
    1. [Pyflakes](#pyflakes)
    2. [pycodestyle](#pycodestyle)
-   3. [pydocstyle](#pydocstyle)
-   4. [pyupgrade](#pyupgrade)
-   5. [pep8-naming](#pep8-naming)
-   6. [flake8-comprehensions](#flake8-comprehensions)
-   7. [flake8-bugbear](#flake8-bugbear)
-   8. [flake8-builtins](#flake8-builtins)
-   9. [flake8-print](#flake8-print)
-   10. [flake8-quotes](#flake8-quotes)
-   11. [flake8-annotations](#flake8-annotations)
-   12. [flake8-2020](#flake8-2020)
-   13. [Ruff-specific rules](#ruff-specific-rules)
-   14. [Meta rules](#meta-rules)
+   3. [isort](#isort)
+   4. [pydocstyle](#pydocstyle)
+   5. [pyupgrade](#pyupgrade)
+   6. [pep8-naming](#pep8-naming)
+   7. [flake8-bandit](#flake8-bandit)
+   8. [flake8-comprehensions](#flake8-comprehensions)
+   9. [flake8-bugbear](#flake8-bugbear)
+   10. [flake8-builtins](#flake8-builtins)
+   11. [flake8-print](#flake8-print)
+   12. [flake8-quotes](#flake8-quotes)
+   13. [flake8-annotations](#flake8-annotations)
+   14. [flake8-2020](#flake8-2020)
+   15. [Ruff-specific rules](#ruff-specific-rules)
+   16. [Meta rules](#meta-rules)
 5. [Editor Integrations](#editor-integrations)
 6. [FAQ](#faq)
 7. [Development](#development)
@@ -235,6 +237,8 @@ Options:
           Regular expression matching the name of dummy variables
       --target-version <TARGET_VERSION>
           The minimum Python version that should be supported
+      --line-length <LINE_LENGTH>
+          Set the line-length for length-associated checks and automatic formatting
       --stdin-filename <STDIN_FILENAME>
           The name of the file when passing it through stdin
   -h, --help
@@ -527,6 +531,7 @@ For more, see [flake8-bugbear](https://pypi.org/project/flake8-bugbear/22.10.27/
 | B017 | NoAssertRaisesException | `assertRaises(Exception)` should be considered evil |  |
 | B018 | UselessExpression | Found useless expression. Either assign it to a variable or remove it. |  |
 | B019 | CachedInstanceMethod | Use of `functools.lru_cache` or `functools.cache` on methods can lead to memory leaks |  |
+| B020 | LoopVariableOverridesIterator | Loop control variable `...` overrides iterable it iterates |  |
 | B021 | FStringDocstring | f-string used as docstring. This will be interpreted by python as a joined string rather than a docstring. |  |
 | B022 | UselessContextlibSuppress | No arguments passed to `contextlib.suppress`. No exceptions will be suppressed and therefore this context manager is redundant |  |
 | B024 | AbstractBaseClassWithoutAbstractMethod | `...` is an abstract base class, but it has no abstract methods |  |
@@ -730,7 +735,7 @@ Today, Ruff can be used to replace Flake8 when used with any of the following pl
 - [`flake8-annotations`](https://pypi.org/project/flake8-annotations/)
 - [`flake8-bandit`](https://pypi.org/project/flake8-bandit/) (6/40)
 - [`flake8-comprehensions`](https://pypi.org/project/flake8-comprehensions/)
-- [`flake8-bugbear`](https://pypi.org/project/flake8-bugbear/) (25/32)
+- [`flake8-bugbear`](https://pypi.org/project/flake8-bugbear/) (26/32)
 - [`flake8-2020`](https://pypi.org/project/flake8-2020/)
 
 Ruff can also replace [`isort`](https://pypi.org/project/isort/), [`yesqa`](https://github.com/asottile/yesqa),

flake8_to_ruff/Cargo.lock

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

flake8_to_ruff/Cargo.toml

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

resources/test/fixtures/B020.py

@@ -0,0 +1,40 @@
+"""
+Should emit:
+B020 - on lines 8, 21, and 36
+"""
+
+items = [1, 2, 3]
+
+for items in items:
+    print(items)
+
+items = [1, 2, 3]
+
+for item in items:
+    print(item)
+
+values = {"secret": 123}
+
+for key, value in values.items():
+    print(f"{key}, {value}")
+
+for key, values in values.items():
+    print(f"{key}, {values}")
+
+# Variables defined in a comprehension are local in scope
+# to that comprehension and are therefore allowed.
+for var in [var for var in range(10)]:
+    print(var)
+
+for var in (var for var in range(10)):
+    print(var)
+
+for k, v in {k: v for k, v in zip(range(10), range(10, 20))}.items():
+    print(k, v)
+
+# However we still call out reassigning the iterable in the comprehension.
+for vars in [i for i in vars]:
+    print(vars)
+
+for var in sorted(range(10), key=lambda var: var.real):
+    print(var)

resources/test/fixtures/B024.py

@@ -1,6 +1,6 @@
 """
 Should emit:
-B024 - on lines 17, 34, 52, 58, 69, 74, 84, 89
+B024 - on lines 17, 34, 52, 58, 69, 74, 79, 84, 89
 """
 
 import abc
@@ -76,7 +76,7 @@ class abc_Base_2(metaclass=abc.ABCMeta):  # error
         foo()
 
 
-class notabc_Base_1(notabc.ABC):  # safe
+class notabc_Base_1(notabc.ABC):  # error
     def method(self):
         foo()
 

resources/test/fixtures/B027.py

@@ -2,7 +2,6 @@
 Should emit:
 B027 - on lines 12, 15, 18, 22, 30
 """
-
 import abc
 from abc import ABC
 from abc import abstractmethod
@@ -28,7 +27,7 @@ class AbstractClass(ABC):
         pass
 
     @notabstract
-    def empty_5(self):  # error
+    def abstract_0(self):
         ...
 
     @abstractmethod

resources/test/fixtures/E501.py

@@ -5,7 +5,7 @@
 Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
 """
 
-_ = """Lorem ipsum dolor sit amet.
+_ = """Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
 
     https://github.com/PyCQA/pycodestyle/pull/258/files#diff-841c622497a8033d10152bfdfb15b20b92437ecdea21a260944ea86b77b51533
 

resources/test/fixtures/E731.py

@@ -8,14 +8,14 @@ while False:
 
 
 f = object()
-#: E731
 f.method = lambda: "Method"
 
 f = {}
-#: E731
 f["a"] = lambda x: x ** 2
 
 f = []
 f.append(lambda x: x ** 2)
 
+f = g = lambda x: x ** 2
+
 lambda: "no-op"

resources/test/fixtures/F821_4.py

@@ -0,0 +1,24 @@
+"""Test: import alias tracking."""
+from typing import List
+
+_ = List["Model"]
+
+
+from typing import List as IList
+
+_ = IList["Model"]
+
+
+from collections.abc import ItemsView
+
+_ = ItemsView["Model"]
+
+
+import collections.abc
+
+_ = collections.abc.ItemsView["Model"]
+
+
+from collections import abc
+
+_ = abc.ItemsView["Model"]

resources/test/fixtures/F821_5.py

@@ -0,0 +1,14 @@
+"""Test: inner class annotation."""
+
+
+class RandomClass:
+    def random_func(self) -> "InnerClass":
+        pass
+
+
+class OuterClass:
+    class InnerClass:
+        pass
+
+    def failing_func(self) -> "InnerClass":
+        return self.InnerClass()

resources/test/fixtures/N805.py

@@ -1,5 +1,7 @@
 from abc import ABCMeta
 
+import pydantic
+
 
 class Class:
     def bad_method(this):
@@ -21,6 +23,14 @@ class Class:
     def static_method(x):
         return x
 
+    @pydantic.validator
+    def lower(cls, my_field: str) -> str:
+        pass
+
+    @pydantic.validator("my_field")
+    def lower(cls, my_field: str) -> str:
+        pass
+
     def __init__(self):
         ...
 

resources/test/fixtures/U006.py

@@ -1,3 +1,10 @@
+import typing
+
+
+def f(x: typing.List[str]) -> None:
+    ...
+
+
 from typing import List
 
 
@@ -5,8 +12,15 @@ def f(x: List[str]) -> None:
     ...
 
 
-import typing
+import typing as t
 
 
-def f(x: typing.List[str]) -> None:
+def f(x: t.List[str]) -> None:
+    ...
+
+
+from typing import List as IList
+
+
+def f(x: IList[str]) -> None:
     ...

resources/test/fixtures/YTT101.py

@@ -5,9 +5,8 @@ print(sys.version)
 
 print(sys.version[:3])
 print(version[:3])
-
-# ignore from imports with aliases, patches welcome
 print(v[:3])
+
 # the tool is timid and only flags certain numeric slices
 i = 3
 print(sys.version[:i])

resources/test/fixtures/isort/add_newline_before_comments.py

@@ -0,0 +1,7 @@
+import os
+# This is a comment in the same section, so we need to add one newline.
+import sys
+import numpy as np
+# This is a comment, but it starts a new section, so we don't need to add a newline
+# before it.
+import leading_prefix

resources/test/fixtures/isort/comments.py

@@ -0,0 +1,25 @@
+# Comment 1
+# Comment 2
+import D
+
+# Comment 3a
+import C
+
+# Comment 3b
+import C
+
+import B  # Comment 4
+
+# Comment 5
+
+# Comment 6
+from A import (
+    a,  # Comment 7
+    b,
+    c,  # Comment 8
+)
+from A import (
+    a,  # Comment 9
+    b,  # Comment 10
+    c,  # Comment 11
+)

resources/test/fixtures/isort/fit_line_length_comment.py

@@ -0,0 +1,4 @@
+import a
+# Don't take this comment into account when determining whether the next import can fit on one line.
+from b import c
+from d import e  # Do take this comment into account when determining whether the next import can fit on one line.

resources/test/fixtures/isort/preserve_comment_order.py

@@ -0,0 +1,11 @@
+import io
+# Old MacDonald had a farm,
+# EIEIO
+# And on his farm he had a cow,
+# EIEIO
+# With a moo-moo here and a moo-moo there
+# Here a moo, there a moo, everywhere moo-moo
+# Old MacDonald had a farm,
+# EIEIO
+from errno import EIO
+import abc

resources/test/fixtures/isort/type_comments.py

@@ -0,0 +1,2 @@
+import A  # type: ignore
+from B import C  # type: ignore

resources/test/fixtures/pyproject.toml

@@ -33,6 +33,7 @@ ignore-names = [
 ]
 classmethod-decorators = [
   "classmethod",
+  "pydantic.validator",
 ]
 staticmethod-decorators = [
   "staticmethod",

ruff_dev/Cargo.toml

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

src/ast/helpers.rs

@@ -3,13 +3,14 @@ use once_cell::sync::Lazy;
 use regex::Regex;
 use rustpython_ast::{Excepthandler, ExcepthandlerKind, Expr, ExprKind, Location, StmtKind};
 
-fn compose_call_path_inner<'a>(expr: &'a Expr, parts: &mut Vec<&'a str>) {
+#[inline(always)]
+fn collect_call_path_inner<'a>(expr: &'a Expr, parts: &mut Vec<&'a str>) {
     match &expr.node {
         ExprKind::Call { func, .. } => {
-            compose_call_path_inner(func, parts);
+            collect_call_path_inner(func, parts);
         }
         ExprKind::Attribute { value, attr, .. } => {
-            compose_call_path_inner(value, parts);
+            collect_call_path_inner(value, parts);
             parts.push(attr);
         }
         ExprKind::Name { id, .. } => {
@@ -20,9 +21,9 @@ fn compose_call_path_inner<'a>(expr: &'a Expr, parts: &mut Vec<&'a str>) {
 }
 
 /// Convert an `Expr` to its call path (like `List`, or `typing.List`).
+#[inline(always)]
 pub fn compose_call_path(expr: &Expr) -> Option<String> {
-    let mut segments = vec![];
-    compose_call_path_inner(expr, &mut segments);
+    let segments = collect_call_paths(expr);
     if segments.is_empty() {
         None
     } else {
@@ -30,6 +31,34 @@ pub fn compose_call_path(expr: &Expr) -> Option<String> {
     }
 }
 
+/// Convert an `Expr` to its call path segments (like ["typing", "List"]).
+#[inline(always)]
+pub fn collect_call_paths(expr: &Expr) -> Vec<&str> {
+    let mut segments = vec![];
+    collect_call_path_inner(expr, &mut segments);
+    segments
+}
+
+/// Rewrite any import aliases on a call path.
+pub fn dealias_call_path<'a>(
+    call_path: Vec<&'a str>,
+    import_aliases: &FnvHashMap<&str, &'a str>,
+) -> Vec<&'a str> {
+    if let Some(head) = call_path.first() {
+        if let Some(origin) = import_aliases.get(head) {
+            let tail = &call_path[1..];
+            let mut call_path: Vec<&str> = vec![];
+            call_path.extend(origin.split('.'));
+            call_path.extend(tail);
+            call_path
+        } else {
+            call_path
+        }
+    } else {
+        call_path
+    }
+}
+
 /// Return `true` if the `Expr` is a name or attribute reference to `${target}`.
 pub fn match_name_or_attr(expr: &Expr, target: &str) -> bool {
     match &expr.node {
@@ -39,6 +68,94 @@ pub fn match_name_or_attr(expr: &Expr, target: &str) -> bool {
     }
 }
 
+/// Return `true` if the `Expr` is a reference to `${module}.${target}`.
+///
+/// Useful for, e.g., ensuring that a `Union` reference represents
+/// `typing.Union`.
+pub fn match_module_member(
+    expr: &Expr,
+    module: &str,
+    member: &str,
+    from_imports: &FnvHashMap<&str, FnvHashSet<&str>>,
+    import_aliases: &FnvHashMap<&str, &str>,
+) -> bool {
+    match_call_path(
+        &dealias_call_path(collect_call_paths(expr), import_aliases),
+        module,
+        member,
+        from_imports,
+    )
+}
+
+/// Return `true` if the `call_path` is a reference to `${module}.${target}`.
+///
+/// Optimized version of `match_module_member` for pre-computed call paths.
+pub fn match_call_path(
+    call_path: &[&str],
+    module: &str,
+    member: &str,
+    from_imports: &FnvHashMap<&str, FnvHashSet<&str>>,
+) -> bool {
+    // If we have no segments, we can't ever match.
+    let num_segments = call_path.len();
+    if num_segments == 0 {
+        return false;
+    }
+
+    // If the last segment doesn't match the member, we can't ever match.
+    if call_path[num_segments - 1] != member {
+        return false;
+    }
+
+    // We now only need the module path, so throw out the member name.
+    let call_path = &call_path[..num_segments - 1];
+    let num_segments = call_path.len();
+
+    // Case (1): It's a builtin (like `list`).
+    // Case (2a): We imported from the parent (`from typing.re import Match`,
+    // `Match`).
+    // Case (2b): We imported star from the parent (`from typing.re import *`,
+    // `Match`).
+    if num_segments == 0 {
+        module.is_empty()
+            || from_imports
+                .get(module)
+                .map(|imports| imports.contains(member) || imports.contains("*"))
+                .unwrap_or(false)
+    } else {
+        let components: Vec<&str> = module.split('.').collect();
+
+        // Case (3a): it's a fully qualified call path (`import typing`,
+        // `typing.re.Match`). Case (3b): it's a fully qualified call path (`import
+        // typing.re`, `typing.re.Match`).
+        if components == call_path {
+            return true;
+        }
+
+        // Case (4): We imported from the grandparent (`from typing import re`,
+        // `re.Match`)
+        let num_matches = (0..components.len())
+            .take(num_segments)
+            .take_while(|i| components[components.len() - 1 - i] == call_path[num_segments - 1 - i])
+            .count();
+        if num_matches > 0 {
+            let cut = components.len() - num_matches;
+            // TODO(charlie): Rewrite to avoid this allocation.
+            let module = components[..cut].join(".");
+            let member = components[cut];
+            if from_imports
+                .get(&module.as_str())
+                .map(|imports| imports.contains(member))
+                .unwrap_or(false)
+            {
+                return true;
+            }
+        }
+
+        false
+    }
+}
+
 static DUNDER_REGEX: Lazy<Regex> = Lazy::new(|| Regex::new(r"__[^\s]+__").unwrap());
 
 pub fn is_assignment_to_a_dunder(node: &StmtKind) -> bool {
@@ -72,7 +189,7 @@ pub fn is_assignment_to_a_dunder(node: &StmtKind) -> bool {
 }
 
 /// Extract the names of all handled exceptions.
-pub fn extract_handler_names(handlers: &[Excepthandler]) -> Vec<String> {
+pub fn extract_handler_names(handlers: &[Excepthandler]) -> Vec<Vec<&str>> {
     let mut handler_names = vec![];
     for handler in handlers {
         match &handler.node {
@@ -80,12 +197,16 @@ pub fn extract_handler_names(handlers: &[Excepthandler]) -> Vec<String> {
                 if let Some(type_) = type_ {
                     if let ExprKind::Tuple { elts, .. } = &type_.node {
                         for type_ in elts {
-                            if let Some(name) = compose_call_path(type_) {
-                                handler_names.push(name);
+                            let call_path = collect_call_paths(type_);
+                            if !call_path.is_empty() {
+                                handler_names.push(call_path);
                             }
                         }
-                    } else if let Some(name) = compose_call_path(type_) {
-                        handler_names.push(name);
+                    } else {
+                        let call_path = collect_call_paths(type_);
+                        if !call_path.is_empty() {
+                            handler_names.push(call_path);
+                        }
                     }
                 }
             }
@@ -104,6 +225,29 @@ pub fn is_super_call_with_arguments(func: &Expr, args: &[Expr]) -> bool {
     }
 }
 
+/// Format the module name for a relative import.
+pub fn format_import_from(level: Option<&usize>, module: Option<&String>) -> String {
+    let mut module_name = String::with_capacity(16);
+    if let Some(level) = level {
+        for _ in 0..*level {
+            module_name.push('.');
+        }
+    }
+    if let Some(module) = module {
+        module_name.push_str(module);
+    }
+    module_name
+}
+
+/// Split a target string (like `typing.List`) into (`typing`, `List`).
+pub fn to_module_and_member(target: &str) -> (&str, &str) {
+    if let Some(index) = target.rfind('.') {
+        (&target[..index], &target[index + 1..])
+    } else {
+        ("", target)
+    }
+}
+
 /// Convert a location within a file (relative to `base`) to an absolute
 /// position.
 pub fn to_absolute(relative: &Location, base: &Location) -> Location {
@@ -117,78 +261,6 @@ pub fn to_absolute(relative: &Location, base: &Location) -> Location {
     }
 }
 
-/// Return `true` if the `Expr` is a reference to `${module}.${target}`.
-///
-/// Useful for, e.g., ensuring that a `Union` reference represents
-/// `typing.Union`.
-pub fn match_module_member(
-    expr: &Expr,
-    target: &str,
-    from_imports: &FnvHashMap<&str, FnvHashSet<&str>>,
-) -> bool {
-    compose_call_path(expr)
-        .map(|expr| match_call_path(&expr, target, from_imports))
-        .unwrap_or(false)
-}
-
-/// Return `true` if the `call_path` is a reference to `${module}.${target}`.
-///
-/// Optimized version of `match_module_member` for pre-computed call paths.
-pub fn match_call_path(
-    call_path: &str,
-    target: &str,
-    from_imports: &FnvHashMap<&str, FnvHashSet<&str>>,
-) -> bool {
-    // Case (1a): it's the same call path (`import typing`, `typing.re.Match`).
-    // Case (1b): it's the same call path (`import typing.re`, `typing.re.Match`).
-    if call_path == target {
-        return true;
-    }
-
-    if let Some((parent, member)) = target.rsplit_once('.') {
-        // Case (2): We imported star from the parent (`from typing.re import *`,
-        // `Match`).
-        if call_path == member
-            && from_imports
-                .get(parent)
-                .map(|imports| imports.contains("*"))
-                .unwrap_or(false)
-        {
-            return true;
-        }
-
-        // Case (3): We imported from the parent (`from typing.re import Match`,
-        // `Match`)
-        if call_path == member
-            && from_imports
-                .get(parent)
-                .map(|imports| imports.contains(member))
-                .unwrap_or(false)
-        {
-            return true;
-        }
-    }
-
-    // Case (4): We imported from the grandparent (`from typing import re`,
-    // `re.Match`)
-    let mut parts = target.rsplitn(3, '.');
-    let member = parts.next();
-    let parent = parts.next();
-    let grandparent = parts.next();
-    if let (Some(member), Some(parent), Some(grandparent)) = (member, parent, grandparent) {
-        if call_path == format!("{parent}.{member}")
-            && from_imports
-                .get(grandparent)
-                .map(|imports| imports.contains(parent))
-                .unwrap_or(false)
-        {
-            return true;
-        }
-    }
-
-    false
-}
-
 #[cfg(test)]
 mod tests {
     use anyhow::Result;
@@ -197,13 +269,28 @@ mod tests {
 
     use crate::ast::helpers::match_module_member;
 
+    #[test]
+    fn builtin() -> Result<()> {
+        let expr = parser::parse_expression("list", "<filename>")?;
+        assert!(match_module_member(
+            &expr,
+            "",
+            "list",
+            &FnvHashMap::default(),
+            &FnvHashMap::default(),
+        ));
+        Ok(())
+    }
+
     #[test]
     fn fully_qualified() -> Result<()> {
         let expr = parser::parse_expression("typing.re.Match", "<filename>")?;
         assert!(match_module_member(
             &expr,
-            "typing.re.Match",
-            &FnvHashMap::default()
+            "typing.re",
+            "Match",
+            &FnvHashMap::default(),
+            &FnvHashMap::default(),
         ));
         Ok(())
     }
@@ -213,13 +300,17 @@ mod tests {
         let expr = parser::parse_expression("Match", "<filename>")?;
         assert!(!match_module_member(
             &expr,
-            "typing.re.Match",
+            "typing.re",
+            "Match",
+            &FnvHashMap::default(),
             &FnvHashMap::default(),
         ));
         let expr = parser::parse_expression("re.Match", "<filename>")?;
         assert!(!match_module_member(
             &expr,
-            "typing.re.Match",
+            "typing.re",
+            "Match",
+            &FnvHashMap::default(),
             &FnvHashMap::default(),
         ));
         Ok(())
@@ -230,8 +321,10 @@ mod tests {
         let expr = parser::parse_expression("Match", "<filename>")?;
         assert!(match_module_member(
             &expr,
-            "typing.re.Match",
-            &FnvHashMap::from_iter([("typing.re", FnvHashSet::from_iter(["*"]))])
+            "typing.re",
+            "Match",
+            &FnvHashMap::from_iter([("typing.re", FnvHashSet::from_iter(["*"]))]),
+            &FnvHashMap::default()
         ));
         Ok(())
     }
@@ -241,8 +334,10 @@ mod tests {
         let expr = parser::parse_expression("Match", "<filename>")?;
         assert!(match_module_member(
             &expr,
-            "typing.re.Match",
-            &FnvHashMap::from_iter([("typing.re", FnvHashSet::from_iter(["Match"]))])
+            "typing.re",
+            "Match",
+            &FnvHashMap::from_iter([("typing.re", FnvHashSet::from_iter(["Match"]))]),
+            &FnvHashMap::default()
         ));
         Ok(())
     }
@@ -252,8 +347,67 @@ mod tests {
         let expr = parser::parse_expression("re.Match", "<filename>")?;
         assert!(match_module_member(
             &expr,
-            "typing.re.Match",
-            &FnvHashMap::from_iter([("typing", FnvHashSet::from_iter(["re"]))])
+            "typing.re",
+            "Match",
+            &FnvHashMap::from_iter([("typing", FnvHashSet::from_iter(["re"]))]),
+            &FnvHashMap::default()
+        ));
+
+        let expr = parser::parse_expression("match.Match", "<filename>")?;
+        assert!(match_module_member(
+            &expr,
+            "typing.re.match",
+            "Match",
+            &FnvHashMap::from_iter([("typing.re", FnvHashSet::from_iter(["match"]))]),
+            &FnvHashMap::default()
+        ));
+
+        let expr = parser::parse_expression("re.match.Match", "<filename>")?;
+        assert!(match_module_member(
+            &expr,
+            "typing.re.match",
+            "Match",
+            &FnvHashMap::from_iter([("typing", FnvHashSet::from_iter(["re"]))]),
+            &FnvHashMap::default()
+        ));
+        Ok(())
+    }
+
+    #[test]
+    fn from_alias() -> Result<()> {
+        let expr = parser::parse_expression("IMatch", "<filename>")?;
+        assert!(match_module_member(
+            &expr,
+            "typing.re",
+            "Match",
+            &FnvHashMap::from_iter([("typing.re", FnvHashSet::from_iter(["Match"]))]),
+            &FnvHashMap::from_iter([("IMatch", "Match")]),
+        ));
+        Ok(())
+    }
+
+    #[test]
+    fn from_aliased_parent() -> Result<()> {
+        let expr = parser::parse_expression("t.Match", "<filename>")?;
+        assert!(match_module_member(
+            &expr,
+            "typing.re",
+            "Match",
+            &FnvHashMap::default(),
+            &FnvHashMap::from_iter([("t", "typing.re")]),
+        ));
+        Ok(())
+    }
+
+    #[test]
+    fn from_aliased_grandparent() -> Result<()> {
+        let expr = parser::parse_expression("t.re.Match", "<filename>")?;
+        assert!(match_module_member(
+            &expr,
+            "typing.re",
+            "Match",
+            &FnvHashMap::default(),
+            &FnvHashMap::from_iter([("t", "typing")]),
         ));
         Ok(())
     }

src/ast/types.rs

@@ -1,6 +1,6 @@
-use std::collections::BTreeMap;
 use std::sync::atomic::{AtomicUsize, Ordering};
 
+use fnv::FnvHashMap;
 use rustpython_ast::{Expr, Keyword};
 use rustpython_parser::ast::{Located, Location};
 
@@ -54,7 +54,7 @@ pub struct Scope<'a> {
     pub id: usize,
     pub kind: ScopeKind<'a>,
     pub import_starred: bool,
-    pub values: BTreeMap<String, Binding>,
+    pub values: FnvHashMap<&'a str, Binding>,
 }
 
 impl<'a> Scope<'a> {
@@ -63,7 +63,7 @@ impl<'a> Scope<'a> {
             id: id(),
             kind,
             import_starred: false,
-            values: BTreeMap::new(),
+            values: FnvHashMap::default(),
         }
     }
 }
@@ -86,7 +86,7 @@ pub enum BindingKind {
     Definition,
     Export(Vec<String>),
     FutureImportation,
-    StarImportation,
+    StarImportation(Option<usize>, Option<String>),
     Importation(String, String, BindingContext),
     FromImportation(String, String, BindingContext),
     SubmoduleImportation(String, String, BindingContext),

src/cache.rs

@@ -23,7 +23,7 @@ use crate::autofix::fixer;
 use crate::message::Message;
 use crate::settings::Settings;
 
-const VERSION: &str = env!("CARGO_PKG_VERSION");
+const CARGO_PKG_VERSION: &str = env!("CARGO_PKG_VERSION");
 
 #[derive(Serialize, Deserialize)]
 struct CacheMetadata {
@@ -89,7 +89,7 @@ fn cache_key(path: &Path, settings: &Settings, autofix: &fixer::Mode) -> String
     format!(
         "{}@{}@{}",
         path.absolutize().unwrap().to_string_lossy(),
-        VERSION,
+        CARGO_PKG_VERSION,
         hasher.finish()
     )
 }

src/check_ast.rs

@@ -5,6 +5,7 @@ use std::ops::Deref;
 use std::path::Path;
 
 use fnv::{FnvHashMap, FnvHashSet};
+use itertools::Itertools;
 use log::error;
 use rustpython_parser::ast::{
     Arg, Arguments, Constant, Excepthandler, ExcepthandlerKind, Expr, ExprContext, ExprKind,
@@ -12,7 +13,9 @@ use rustpython_parser::ast::{
 };
 use rustpython_parser::parser;
 
-use crate::ast::helpers::{extract_handler_names, match_module_member};
+use crate::ast::helpers::{
+    collect_call_paths, dealias_call_path, extract_handler_names, match_call_path,
+};
 use crate::ast::operations::extract_all_names;
 use crate::ast::relocate::relocate_expr;
 use crate::ast::types::{
@@ -54,6 +57,7 @@ pub struct Checker<'a> {
     pub(crate) deletions: FnvHashSet<usize>,
     // Import tracking.
     pub(crate) from_imports: FnvHashMap<&'a str, FnvHashSet<&'a str>>,
+    pub(crate) import_aliases: FnvHashMap<&'a str, &'a str>,
     // Retain all scopes and parent nodes, along with a stack of indexes to track which are active
     // at various points in time.
     pub(crate) parents: Vec<&'a Stmt>,
@@ -61,7 +65,7 @@ pub struct Checker<'a> {
     scopes: Vec<Scope<'a>>,
     scope_stack: Vec<usize>,
     dead_scopes: Vec<usize>,
-    deferred_string_annotations: Vec<(Range, &'a str)>,
+    deferred_string_annotations: Vec<(Range, &'a str, Vec<usize>, Vec<usize>)>,
     deferred_annotations: Vec<(&'a Expr, Vec<usize>, Vec<usize>)>,
     deferred_functions: Vec<(&'a Stmt, Vec<usize>, Vec<usize>, VisibleScope)>,
     deferred_lambdas: Vec<(&'a Expr, Vec<usize>, Vec<usize>)>,
@@ -75,7 +79,7 @@ pub struct Checker<'a> {
     seen_import_boundary: bool,
     futures_allowed: bool,
     annotations_future_enabled: bool,
-    except_handlers: Vec<Vec<String>>,
+    except_handlers: Vec<Vec<Vec<&'a str>>>,
 }
 
 impl<'a> Checker<'a> {
@@ -94,6 +98,7 @@ impl<'a> Checker<'a> {
             definitions: Default::default(),
             deletions: Default::default(),
             from_imports: Default::default(),
+            import_aliases: Default::default(),
             parents: Default::default(),
             parent_stack: Default::default(),
             scopes: Default::default(),
@@ -154,14 +159,16 @@ impl<'a> Checker<'a> {
     }
 
     /// Return `true` if the `Expr` is a reference to `typing.${target}`.
-    pub fn match_typing_module(&self, expr: &Expr, target: &str) -> bool {
-        match_module_member(expr, &format!("typing.{target}"), &self.from_imports)
+    pub fn match_typing_expr(&self, expr: &Expr, target: &str) -> bool {
+        let call_path = dealias_call_path(collect_call_paths(expr), &self.import_aliases);
+        self.match_typing_call_path(&call_path, target)
+    }
+
+    /// Return `true` if the call path is a reference to `typing.${target}`.
+    pub fn match_typing_call_path(&self, call_path: &[&str], target: &str) -> bool {
+        match_call_path(call_path, "typing", target, &self.from_imports)
             || (typing::in_extensions(target)
-                && match_module_member(
-                    expr,
-                    &format!("typing_extensions.{target}"),
-                    &self.from_imports,
-                ))
+                && match_call_path(call_path, "typing_extensions", target, &self.from_imports))
     }
 }
 
@@ -215,7 +222,7 @@ where
                     for name in names {
                         for scope in self.scopes.iter_mut().skip(GLOBAL_SCOPE_INDEX + 1) {
                             scope.values.insert(
-                                name.to_string(),
+                                name,
                                 Binding {
                                     kind: BindingKind::Assignment,
                                     used: Some((global_scope_id, Range::from_located(stmt))),
@@ -302,6 +309,8 @@ where
                             name,
                             decorator_list,
                             args,
+                            &self.from_imports,
+                            &self.import_aliases,
                             &self.settings.pep8_naming,
                         )
                     {
@@ -315,6 +324,8 @@ where
                         name,
                         decorator_list,
                         args,
+                        &self.from_imports,
+                        &self.import_aliases,
                         &self.settings.pep8_naming,
                     ) {
                         self.add_check(check);
@@ -390,7 +401,7 @@ where
                     self.visit_expr(expr);
                 }
                 self.add_binding(
-                    name.to_string(),
+                    name,
                     Binding {
                         kind: BindingKind::Definition,
                         used: None,
@@ -495,7 +506,7 @@ where
                         let name = alias.node.name.split('.').next().unwrap();
                         let full_name = &alias.node.name;
                         self.add_binding(
-                            name.to_string(),
+                            name,
                             Binding {
                                 kind: BindingKind::SubmoduleImportation(
                                     name.to_string(),
@@ -517,7 +528,7 @@ where
                         let name = alias.node.asname.as_ref().unwrap_or(&alias.node.name);
                         let full_name = &alias.node.name;
                         self.add_binding(
-                            name.to_string(),
+                            name,
                             Binding {
                                 kind: BindingKind::Importation(
                                     name.to_string(),
@@ -550,6 +561,12 @@ where
                     }
 
                     if let Some(asname) = &alias.node.asname {
+                        for alias in names {
+                            if let Some(asname) = &alias.node.asname {
+                                self.import_aliases.insert(asname, &alias.node.name);
+                            }
+                        }
+
                         let name = alias.node.name.split('.').last().unwrap();
                         if self.settings.enabled.contains(&CheckCode::N811) {
                             if let Some(check) =
@@ -618,6 +635,11 @@ where
                                     .map(|alias| alias.node.name.as_str()),
                             )
                     }
+                    for alias in names {
+                        if let Some(asname) = &alias.node.asname {
+                            self.import_aliases.insert(asname, &alias.node.name);
+                        }
+                    }
                 }
 
                 if self.settings.enabled.contains(&CheckCode::E402) {
@@ -639,7 +661,7 @@ where
                     if let Some("__future__") = module.as_deref() {
                         let name = alias.node.asname.as_ref().unwrap_or(&alias.node.name);
                         self.add_binding(
-                            name.to_string(),
+                            name,
                             Binding {
                                 kind: BindingKind::FutureImportation,
                                 // Always mark `__future__` imports as used.
@@ -676,16 +698,10 @@ where
                             ));
                         }
                     } else if alias.node.name == "*" {
-                        let module_name = format!(
-                            "{}{}",
-                            ".".repeat(level.unwrap_or_default()),
-                            module.clone().unwrap_or_else(|| "module".to_string()),
-                        );
-
                         self.add_binding(
-                            module_name.to_string(),
+                            "*",
                             Binding {
-                                kind: BindingKind::StarImportation,
+                                kind: BindingKind::StarImportation(*level, module.clone()),
                                 used: None,
                                 range: Range::from_located(stmt),
                             },
@@ -696,7 +712,10 @@ where
                                 [*(self.scope_stack.last().expect("No current scope found."))];
                             if !matches!(scope.kind, ScopeKind::Module) {
                                 self.add_check(Check::new(
-                                    CheckKind::ImportStarNotPermitted(module_name.to_string()),
+                                    CheckKind::ImportStarNotPermitted(helpers::format_import_from(
+                                        level.as_ref(),
+                                        module.as_ref(),
+                                    )),
                                     Range::from_located(stmt),
                                 ));
                             }
@@ -704,7 +723,10 @@ where
 
                         if self.settings.enabled.contains(&CheckCode::F403) {
                             self.add_check(Check::new(
-                                CheckKind::ImportStarUsed(module_name.to_string()),
+                                CheckKind::ImportStarUsed(helpers::format_import_from(
+                                    level.as_ref(),
+                                    module.as_ref(),
+                                )),
                                 Range::from_located(stmt),
                             ));
                         }
@@ -728,7 +750,7 @@ where
                             Some(parent) => format!("{}.{}", parent, alias.node.name),
                         };
                         self.add_binding(
-                            name.to_string(),
+                            name,
                             Binding {
                                 kind: BindingKind::FromImportation(
                                     name.to_string(),
@@ -844,7 +866,12 @@ where
                     pyflakes::plugins::assert_tuple(self, stmt, test);
                 }
                 if self.settings.enabled.contains(&CheckCode::B011) {
-                    flake8_bugbear::plugins::assert_false(self, stmt, test, msg);
+                    flake8_bugbear::plugins::assert_false(
+                        self,
+                        stmt,
+                        test,
+                        msg.as_ref().map(|expr| expr.deref()),
+                    );
                 }
                 if self.settings.enabled.contains(&CheckCode::S101) {
                     self.add_check(flake8_bandit::plugins::assert_used(stmt));
@@ -855,10 +882,15 @@ where
                     flake8_bugbear::plugins::assert_raises_exception(self, stmt, items);
                 }
             }
-            StmtKind::For { target, body, .. } => {
+            StmtKind::For {
+                target, body, iter, ..
+            } => {
                 if self.settings.enabled.contains(&CheckCode::B007) {
                     flake8_bugbear::plugins::unused_loop_control_variable(self, target, body);
                 }
+                if self.settings.enabled.contains(&CheckCode::B020) {
+                    flake8_bugbear::plugins::loop_variable_overrides_iterator(self, target, iter);
+                }
             }
             StmtKind::Try { handlers, .. } => {
                 if self.settings.enabled.contains(&CheckCode::F707) {
@@ -877,10 +909,12 @@ where
             }
             StmtKind::Assign { targets, value, .. } => {
                 if self.settings.enabled.contains(&CheckCode::E731) {
-                    if let Some(check) =
-                        pycodestyle::checks::do_not_assign_lambda(value, Range::from_located(stmt))
-                    {
-                        self.add_check(check);
+                    if let [target] = &targets[..] {
+                        if let Some(check) =
+                            pycodestyle::checks::do_not_assign_lambda(target, value, stmt)
+                        {
+                            self.add_check(check);
+                        }
                     }
                 }
                 if self.settings.enabled.contains(&CheckCode::U001) {
@@ -897,13 +931,12 @@ where
                     }
                 }
             }
-            StmtKind::AnnAssign { value, .. } => {
+            StmtKind::AnnAssign { target, value, .. } => {
                 if self.settings.enabled.contains(&CheckCode::E731) {
                     if let Some(value) = value {
-                        if let Some(check) = pycodestyle::checks::do_not_assign_lambda(
-                            value,
-                            Range::from_located(stmt),
-                        ) {
+                        if let Some(check) =
+                            pycodestyle::checks::do_not_assign_lambda(target, value, stmt)
+                        {
                             self.add_check(check);
                         }
                     }
@@ -994,7 +1027,7 @@ where
         if let StmtKind::ClassDef { name, .. } = &stmt.node {
             self.pop_scope();
             self.add_binding(
-                name.to_string(),
+                name,
                 Binding {
                     kind: BindingKind::ClassDefinition,
                     used: None,
@@ -1024,8 +1057,12 @@ where
                 ..
             } = &expr.node
             {
-                self.deferred_string_annotations
-                    .push((Range::from_located(expr), value));
+                self.deferred_string_annotations.push((
+                    Range::from_located(expr),
+                    value,
+                    self.scope_stack.clone(),
+                    self.parent_stack.clone(),
+                ));
             } else {
                 self.deferred_annotations.push((
                     expr,
@@ -1041,12 +1078,12 @@ where
             ExprKind::Subscript { value, slice, .. } => {
                 // Ex) typing.List[...]
                 if self.settings.enabled.contains(&CheckCode::U007)
-                    && self.settings.target_version >= PythonVersion::Py39
+                    && self.settings.target_version >= PythonVersion::Py310
                 {
                     pyupgrade::plugins::use_pep604_annotation(self, expr, value, slice);
                 }
 
-                if self.match_typing_module(value, "Literal") {
+                if self.match_typing_expr(value, "Literal") {
                     self.in_literal = true;
                 }
 
@@ -1080,7 +1117,11 @@ where
                         // Ex) List[...]
                         if self.settings.enabled.contains(&CheckCode::U006)
                             && self.settings.target_version >= PythonVersion::Py39
-                            && typing::is_pep585_builtin(expr, &self.from_imports)
+                            && typing::is_pep585_builtin(
+                                expr,
+                                &self.from_imports,
+                                &self.import_aliases,
+                            )
                         {
                             pyupgrade::plugins::use_pep585_annotation(self, expr, id);
                         }
@@ -1099,7 +1140,7 @@ where
 
                         self.check_builtin_shadowing(id, Range::from_located(expr), true);
 
-                        self.handle_node_store(expr, self.current_parent());
+                        self.handle_node_store(id, expr, self.current_parent());
                     }
                     ExprContext::Del => self.handle_node_delete(expr),
                 }
@@ -1112,7 +1153,7 @@ where
                 // Ex) typing.List[...]
                 if self.settings.enabled.contains(&CheckCode::U006)
                     && self.settings.target_version >= PythonVersion::Py39
-                    && typing::is_pep585_builtin(expr, &self.from_imports)
+                    && typing::is_pep585_builtin(expr, &self.from_imports, &self.import_aliases)
                 {
                     pyupgrade::plugins::use_pep585_annotation(self, expr, attr);
                 }
@@ -1547,8 +1588,12 @@ where
                 ..
             } => {
                 if self.in_annotation && !self.in_literal {
-                    self.deferred_string_annotations
-                        .push((Range::from_located(expr), value));
+                    self.deferred_string_annotations.push((
+                        Range::from_located(expr),
+                        value,
+                        self.scope_stack.clone(),
+                        self.parent_stack.clone(),
+                    ));
                 }
                 if self.settings.enabled.contains(&CheckCode::S104) {
                     if let Some(check) = flake8_bandit::plugins::hardcoded_bind_all_interfaces(
@@ -1629,12 +1674,13 @@ where
                 args,
                 keywords,
             } => {
-                if self.match_typing_module(func, "ForwardRef") {
+                let call_path = dealias_call_path(collect_call_paths(func), &self.import_aliases);
+                if self.match_typing_call_path(&call_path, "ForwardRef") {
                     self.visit_expr(func);
                     for expr in args {
                         self.visit_annotation(expr);
                     }
-                } else if self.match_typing_module(func, "cast") {
+                } else if self.match_typing_call_path(&call_path, "cast") {
                     self.visit_expr(func);
                     if !args.is_empty() {
                         self.visit_annotation(&args[0]);
@@ -1642,12 +1688,12 @@ where
                     for expr in args.iter().skip(1) {
                         self.visit_expr(expr);
                     }
-                } else if self.match_typing_module(func, "NewType") {
+                } else if self.match_typing_call_path(&call_path, "NewType") {
                     self.visit_expr(func);
                     for expr in args.iter().skip(1) {
                         self.visit_annotation(expr);
                     }
-                } else if self.match_typing_module(func, "TypeVar") {
+                } else if self.match_typing_call_path(&call_path, "TypeVar") {
                     self.visit_expr(func);
                     for expr in args.iter().skip(1) {
                         self.visit_annotation(expr);
@@ -1664,7 +1710,7 @@ where
                             }
                         }
                     }
-                } else if self.match_typing_module(func, "NamedTuple") {
+                } else if self.match_typing_call_path(&call_path, "NamedTuple") {
                     self.visit_expr(func);
 
                     // Ex) NamedTuple("a", [("a", int)])
@@ -1696,7 +1742,7 @@ where
                         let KeywordData { value, .. } = &keyword.node;
                         self.visit_annotation(value);
                     }
-                } else if self.match_typing_module(func, "TypedDict") {
+                } else if self.match_typing_call_path(&call_path, "TypedDict") {
                     self.visit_expr(func);
 
                     // Ex) TypedDict("a", {"a": int})
@@ -1735,7 +1781,11 @@ where
                     visitor::walk_expr(self, expr);
                 } else {
                     self.in_subscript = true;
-                    match typing::match_annotated_subscript(value, &self.from_imports) {
+                    match typing::match_annotated_subscript(
+                        value,
+                        &self.from_imports,
+                        &self.import_aliases,
+                    ) {
                         Some(subscript) => {
                             match subscript {
                                 // Ex) Optional[int]
@@ -1820,8 +1870,9 @@ where
                             false,
                         );
 
-                        if self.current_scope().values.contains_key(name) {
+                        if self.current_scope().values.contains_key(&name.as_str()) {
                             self.handle_node_store(
+                                name,
                                 &Expr::new(
                                     excepthandler.location,
                                     excepthandler.end_location.unwrap(),
@@ -1834,8 +1885,9 @@ where
                             );
                         }
 
-                        let definition = self.current_scope().values.get(name).cloned();
+                        let definition = self.current_scope().values.get(&name.as_str()).cloned();
                         self.handle_node_store(
+                            name,
                             &Expr::new(
                                 excepthandler.location,
                                 excepthandler.end_location.unwrap(),
@@ -1852,7 +1904,7 @@ where
                         if let Some(binding) = {
                             let scope = &mut self.scopes
                                 [*(self.scope_stack.last().expect("No current scope found."))];
-                            &scope.values.remove(name)
+                            &scope.values.remove(&name.as_str())
                         } {
                             if binding.used.is_none() {
                                 if self.settings.enabled.contains(&CheckCode::F841) {
@@ -1867,7 +1919,7 @@ where
                         if let Some(binding) = definition {
                             let scope = &mut self.scopes
                                 [*(self.scope_stack.last().expect("No current scope found."))];
-                            scope.values.insert(name.to_string(), binding);
+                            scope.values.insert(name, binding);
                         }
                     }
                     None => walk_excepthandler(self, excepthandler),
@@ -1911,7 +1963,7 @@ where
         // Bind, but intentionally avoid walking the annotation, as we handle it
         // upstream.
         self.add_binding(
-            arg.node.arg.to_string(),
+            &arg.node.arg,
             Binding {
                 kind: BindingKind::Argument,
                 used: None,
@@ -1976,7 +2028,7 @@ fn try_mark_used(scope: &mut Scope, scope_id: usize, id: &str, expr: &Expr) -> b
     };
 
     // Mark the sub-importation as used.
-    if let Some(binding) = scope.values.get_mut(&alias) {
+    if let Some(binding) = scope.values.get_mut(alias.as_str()) {
         binding.used = Some((scope_id, Range::from_located(expr)));
     }
     true
@@ -2012,7 +2064,7 @@ impl<'a> Checker<'a> {
 
         for builtin in BUILTINS {
             scope.values.insert(
-                (*builtin).to_string(),
+                builtin,
                 Binding {
                     kind: BindingKind::Builtin,
                     range: Default::default(),
@@ -2022,7 +2074,7 @@ impl<'a> Checker<'a> {
         }
         for builtin in MAGIC_GLOBALS {
             scope.values.insert(
-                (*builtin).to_string(),
+                builtin,
                 Binding {
                     kind: BindingKind::Builtin,
                     range: Default::default(),
@@ -2050,23 +2102,26 @@ impl<'a> Checker<'a> {
         }
     }
 
-    fn add_binding(&mut self, name: String, binding: Binding) {
+    fn add_binding<'b>(&mut self, name: &'b str, binding: Binding)
+    where
+        'b: 'a,
+    {
         if self.settings.enabled.contains(&CheckCode::F402) {
             let scope = &self.scopes[*(self.scope_stack.last().expect("No current scope found."))];
             if let Some(existing) = scope.values.get(&name) {
                 if matches!(binding.kind, BindingKind::LoopVar)
                     && matches!(
                         existing.kind,
-                        BindingKind::Importation(_, _, _)
-                            | BindingKind::FromImportation(_, _, _)
-                            | BindingKind::SubmoduleImportation(_, _, _)
-                            | BindingKind::StarImportation
+                        BindingKind::Importation(..)
+                            | BindingKind::FromImportation(..)
+                            | BindingKind::SubmoduleImportation(..)
+                            | BindingKind::StarImportation(..)
                             | BindingKind::FutureImportation
                     )
                 {
                     self.add_check(Check::new(
                         CheckKind::ImportShadowedByLoopVar(
-                            name.clone(),
+                            name.to_string(),
                             existing.range.location.row(),
                         ),
                         binding.range,
@@ -2101,6 +2156,7 @@ impl<'a> Checker<'a> {
             let mut import_starred = false;
             for scope_index in self.scope_stack.iter().rev() {
                 let scope = &mut self.scopes[*scope_index];
+
                 if matches!(scope.kind, ScopeKind::Class(_)) {
                     if id == "__class__" {
                         return;
@@ -2123,16 +2179,19 @@ impl<'a> Checker<'a> {
                     let mut from_list = vec![];
                     for scope_index in self.scope_stack.iter().rev() {
                         let scope = &self.scopes[*scope_index];
-                        for (name, binding) in scope.values.iter() {
-                            if matches!(binding.kind, BindingKind::StarImportation) {
-                                from_list.push(name.to_string());
+                        for binding in scope.values.values() {
+                            if let BindingKind::StarImportation(level, module) = &binding.kind {
+                                from_list.push(helpers::format_import_from(
+                                    level.as_ref(),
+                                    module.as_ref(),
+                                ));
                             }
                         }
                     }
                     from_list.sort();
 
                     self.add_check(Check::new(
-                        CheckKind::ImportStarUsage(id.clone(), from_list),
+                        CheckKind::ImportStarUsage(id.to_string(), from_list),
                         Range::from_located(expr),
                     ));
                 }
@@ -2147,7 +2206,10 @@ impl<'a> Checker<'a> {
 
                 // Avoid flagging if NameError is handled.
                 if let Some(handler_names) = self.except_handlers.last() {
-                    if handler_names.contains(&"NameError".to_string()) {
+                    if handler_names
+                        .iter()
+                        .any(|call_path| call_path.len() == 1 && call_path[0] == "NameError")
+                    {
                         return;
                     }
                 }
@@ -2160,113 +2222,112 @@ impl<'a> Checker<'a> {
         }
     }
 
-    fn handle_node_store(&mut self, expr: &Expr, parent: &Stmt) {
-        if let ExprKind::Name { id, .. } = &expr.node {
-            if self.settings.enabled.contains(&CheckCode::F823) {
-                let scopes: Vec<&Scope> = self
-                    .scope_stack
-                    .iter()
-                    .map(|index| &self.scopes[*index])
-                    .collect();
-                if let Some(check) = pyflakes::checks::undefined_local(&scopes, id) {
-                    self.add_check(check);
-                }
+    fn handle_node_store<'b>(&mut self, id: &'b str, expr: &Expr, parent: &Stmt)
+    where
+        'b: 'a,
+    {
+        if self.settings.enabled.contains(&CheckCode::F823) {
+            let scopes: Vec<&Scope> = self
+                .scope_stack
+                .iter()
+                .map(|index| &self.scopes[*index])
+                .collect();
+            if let Some(check) = pyflakes::checks::undefined_local(&scopes, id) {
+                self.add_check(check);
             }
+        }
 
-            if self.settings.enabled.contains(&CheckCode::N806) {
-                if matches!(self.current_scope().kind, ScopeKind::Function(..)) {
-                    pep8_naming::plugins::non_lowercase_variable_in_function(self, expr, parent, id)
-                }
+        if self.settings.enabled.contains(&CheckCode::N806) {
+            if matches!(self.current_scope().kind, ScopeKind::Function(..)) {
+                pep8_naming::plugins::non_lowercase_variable_in_function(self, expr, parent, id)
             }
+        }
 
-            if self.settings.enabled.contains(&CheckCode::N815) {
-                if matches!(self.current_scope().kind, ScopeKind::Class(..)) {
-                    pep8_naming::plugins::mixed_case_variable_in_class_scope(self, expr, parent, id)
-                }
+        if self.settings.enabled.contains(&CheckCode::N815) {
+            if matches!(self.current_scope().kind, ScopeKind::Class(..)) {
+                pep8_naming::plugins::mixed_case_variable_in_class_scope(self, expr, parent, id)
             }
+        }
 
-            if self.settings.enabled.contains(&CheckCode::N816) {
-                if matches!(self.current_scope().kind, ScopeKind::Module) {
-                    pep8_naming::plugins::mixed_case_variable_in_global_scope(
-                        self, expr, parent, id,
-                    )
-                }
-            }
-
-            if matches!(parent.node, StmtKind::AnnAssign { value: None, .. }) {
-                self.add_binding(
-                    id.to_string(),
-                    Binding {
-                        kind: BindingKind::Annotation,
-                        used: None,
-                        range: Range::from_located(expr),
-                    },
-                );
-                return;
-            }
-
-            // TODO(charlie): Include comprehensions here.
-            if matches!(
-                parent.node,
-                StmtKind::For { .. } | StmtKind::AsyncFor { .. }
-            ) {
-                self.add_binding(
-                    id.to_string(),
-                    Binding {
-                        kind: BindingKind::LoopVar,
-                        used: None,
-                        range: Range::from_located(expr),
-                    },
-                );
-                return;
-            }
-
-            if operations::is_unpacking_assignment(parent) {
-                self.add_binding(
-                    id.to_string(),
-                    Binding {
-                        kind: BindingKind::Binding,
-                        used: None,
-                        range: Range::from_located(expr),
-                    },
-                );
-                return;
-            }
-
-            let current =
-                &self.scopes[*(self.scope_stack.last().expect("No current scope found."))];
-            if id == "__all__"
-                && matches!(current.kind, ScopeKind::Module)
-                && matches!(
-                    parent.node,
-                    StmtKind::Assign { .. }
-                        | StmtKind::AugAssign { .. }
-                        | StmtKind::AnnAssign { .. }
-                )
-            {
-                self.add_binding(
-                    id.to_string(),
-                    Binding {
-                        kind: BindingKind::Export(extract_all_names(parent, current)),
-                        used: None,
-                        range: Range::from_located(expr),
-                    },
-                );
-                return;
+        if self.settings.enabled.contains(&CheckCode::N816) {
+            if matches!(self.current_scope().kind, ScopeKind::Module) {
+                pep8_naming::plugins::mixed_case_variable_in_global_scope(self, expr, parent, id)
             }
+        }
 
+        if matches!(parent.node, StmtKind::AnnAssign { value: None, .. }) {
             self.add_binding(
-                id.to_string(),
+                id,
                 Binding {
-                    kind: BindingKind::Assignment,
+                    kind: BindingKind::Annotation,
                     used: None,
                     range: Range::from_located(expr),
                 },
             );
+            return;
         }
+
+        // TODO(charlie): Include comprehensions here.
+        if matches!(
+            parent.node,
+            StmtKind::For { .. } | StmtKind::AsyncFor { .. }
+        ) {
+            self.add_binding(
+                id,
+                Binding {
+                    kind: BindingKind::LoopVar,
+                    used: None,
+                    range: Range::from_located(expr),
+                },
+            );
+            return;
+        }
+
+        if operations::is_unpacking_assignment(parent) {
+            self.add_binding(
+                id,
+                Binding {
+                    kind: BindingKind::Binding,
+                    used: None,
+                    range: Range::from_located(expr),
+                },
+            );
+            return;
+        }
+
+        let current = &self.scopes[*(self.scope_stack.last().expect("No current scope found."))];
+        if id == "__all__"
+            && matches!(current.kind, ScopeKind::Module)
+            && matches!(
+                parent.node,
+                StmtKind::Assign { .. } | StmtKind::AugAssign { .. } | StmtKind::AnnAssign { .. }
+            )
+        {
+            self.add_binding(
+                id,
+                Binding {
+                    kind: BindingKind::Export(extract_all_names(parent, current)),
+                    used: None,
+                    range: Range::from_located(expr),
+                },
+            );
+            return;
+        }
+
+        self.add_binding(
+            id,
+            Binding {
+                kind: BindingKind::Assignment,
+                used: None,
+                range: Range::from_located(expr),
+            },
+        );
     }
 
-    fn handle_node_delete(&mut self, expr: &Expr) {
+    fn handle_node_delete<'b>(&mut self, expr: &'b Expr)
+    where
+        'b: 'a,
+    {
         if let ExprKind::Name { id, .. } = &expr.node {
             if operations::on_conditional_branch(
                 &mut self
@@ -2280,10 +2341,11 @@ impl<'a> Checker<'a> {
 
             let scope =
                 &mut self.scopes[*(self.scope_stack.last().expect("No current scope found."))];
-            if scope.values.remove(id).is_none() && self.settings.enabled.contains(&CheckCode::F821)
+            if scope.values.remove(&id.as_str()).is_none()
+                && self.settings.enabled.contains(&CheckCode::F821)
             {
                 self.add_check(Check::new(
-                    CheckKind::UndefinedName(id.clone()),
+                    CheckKind::UndefinedName(id.to_string()),
                     Range::from_located(expr),
                 ))
             }
@@ -2314,8 +2376,8 @@ impl<'a> Checker<'a> {
 
     fn check_deferred_annotations(&mut self) {
         while let Some((expr, scopes, parents)) = self.deferred_annotations.pop() {
-            self.parent_stack = parents;
             self.scope_stack = scopes;
+            self.parent_stack = parents;
             self.visit_expr(expr);
         }
     }
@@ -2324,10 +2386,14 @@ impl<'a> Checker<'a> {
     where
         'b: 'a,
     {
-        while let Some((range, expression)) = self.deferred_string_annotations.pop() {
+        let mut stacks = vec![];
+        while let Some((range, expression, scopes, parents)) =
+            self.deferred_string_annotations.pop()
+        {
             if let Ok(mut expr) = parser::parse_expression(expression, "<filename>") {
                 relocate_expr(&mut expr, range);
                 allocator.push(expr);
+                stacks.push((scopes, parents));
             } else {
                 if self.settings.enabled.contains(&CheckCode::F722) {
                     self.add_check(Check::new(
@@ -2337,7 +2403,9 @@ impl<'a> Checker<'a> {
                 }
             }
         }
-        for expr in allocator {
+        for (expr, (scopes, parents)) in allocator.iter().zip(stacks) {
+            self.scope_stack = scopes;
+            self.parent_stack = parents;
             self.visit_expr(expr);
         }
     }
@@ -2409,16 +2477,19 @@ impl<'a> Checker<'a> {
 
         let mut checks: Vec<Check> = vec![];
         for scope in self.dead_scopes.iter().map(|index| &self.scopes[*index]) {
-            let all_binding = scope.values.get("__all__");
-            let all_names = all_binding.and_then(|binding| match &binding.kind {
-                BindingKind::Export(names) => Some(names),
-                _ => None,
-            });
+            let all_binding: Option<&Binding> = scope.values.get("__all__");
+            let all_names: Option<Vec<&str>> =
+                all_binding.and_then(|binding| match &binding.kind {
+                    BindingKind::Export(names) => {
+                        Some(names.iter().map(|name| name.as_str()).collect())
+                    }
+                    _ => None,
+                });
 
             if self.settings.enabled.contains(&CheckCode::F822) {
                 if !scope.import_starred && !self.path.ends_with("__init__.py") {
                     if let Some(all_binding) = all_binding {
-                        if let Some(names) = all_names {
+                        if let Some(names) = &all_names {
                             for name in names {
                                 if !scope.values.contains_key(name) {
                                     checks.push(Check::new(
@@ -2435,11 +2506,14 @@ impl<'a> Checker<'a> {
             if self.settings.enabled.contains(&CheckCode::F405) {
                 if scope.import_starred {
                     if let Some(all_binding) = all_binding {
-                        if let Some(names) = all_names {
+                        if let Some(names) = &all_names {
                             let mut from_list = vec![];
-                            for (name, binding) in scope.values.iter() {
-                                if matches!(binding.kind, BindingKind::StarImportation) {
-                                    from_list.push(name.to_string());
+                            for binding in scope.values.values() {
+                                if let BindingKind::StarImportation(level, module) = &binding.kind {
+                                    from_list.push(helpers::format_import_from(
+                                        level.as_ref(),
+                                        module.as_ref(),
+                                    ));
                                 }
                             }
                             from_list.sort();
@@ -2447,7 +2521,10 @@ impl<'a> Checker<'a> {
                             for name in names {
                                 if !scope.values.contains_key(name) {
                                     checks.push(Check::new(
-                                        CheckKind::ImportStarUsage(name.clone(), from_list.clone()),
+                                        CheckKind::ImportStarUsage(
+                                            name.to_string(),
+                                            from_list.clone(),
+                                        ),
                                         all_binding.range,
                                     ));
                                 }
@@ -2463,36 +2540,46 @@ impl<'a> Checker<'a> {
                 let mut unused: BTreeMap<(ImportKind, usize, Option<usize>), Vec<&str>> =
                     BTreeMap::new();
 
-                for (name, binding) in scope.values.iter().rev() {
+                for (name, binding) in scope.values.iter() {
+                    if !matches!(
+                        binding.kind,
+                        BindingKind::Importation(..)
+                            | BindingKind::SubmoduleImportation(..)
+                            | BindingKind::FromImportation(..)
+                    ) {
+                        continue;
+                    }
+
                     let used = binding.used.is_some()
                         || all_names
+                            .as_ref()
                             .map(|names| names.contains(name))
                             .unwrap_or_default();
 
                     if !used {
                         match &binding.kind {
                             BindingKind::FromImportation(_, full_name, context) => {
-                                let full_names = unused
+                                unused
                                     .entry((
                                         ImportKind::ImportFrom,
                                         context.defined_by,
                                         context.defined_in,
                                     ))
-                                    .or_default();
-                                full_names.push(full_name);
+                                    .or_default()
+                                    .push(full_name);
                             }
                             BindingKind::Importation(_, full_name, context)
                             | BindingKind::SubmoduleImportation(_, full_name, context) => {
-                                let full_names = unused
+                                unused
                                     .entry((
                                         ImportKind::Import,
                                         context.defined_by,
                                         context.defined_in,
                                     ))
-                                    .or_default();
-                                full_names.push(full_name);
+                                    .or_default()
+                                    .push(full_name);
                             }
-                            _ => {}
+                            _ => unreachable!("Already filtered on BindingKind."),
                         }
                     }
                 }
@@ -2531,7 +2618,7 @@ impl<'a> Checker<'a> {
                     if self.path.ends_with("__init__.py") {
                         checks.push(Check::new(
                             CheckKind::UnusedImport(
-                                full_names.into_iter().map(String::from).collect(),
+                                full_names.into_iter().sorted().map(String::from).collect(),
                                 true,
                             ),
                             Range::from_located(child),
@@ -2539,7 +2626,7 @@ impl<'a> Checker<'a> {
                     } else {
                         let mut check = Check::new(
                             CheckKind::UnusedImport(
-                                full_names.into_iter().map(String::from).collect(),
+                                full_names.into_iter().sorted().map(String::from).collect(),
                                 false,
                             ),
                             Range::from_located(child),
@@ -2732,8 +2819,5 @@ pub fn check_ast(
     // Check docstrings.
     checker.check_definitions();
 
-    // Check import blocks.
-    // checker.check_import_blocks();
-
     checker.checks
 }

src/check_lines.rs

@@ -58,10 +58,7 @@ pub fn check_lines(
         // 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)
-            .map(|lineno| lineno - 1)
-            .unwrap_or(lineno);
+        let noqa_lineno = noqa_line_for.get(&(lineno + 1)).unwrap_or(&(lineno + 1)) - 1;
 
         // Enforce unnecessary coding comments (U009).
         if enforce_unnecessary_coding_comment {
@@ -155,10 +152,7 @@ pub fn check_lines(
         // want to raise W292 anyway).
         if let Some(line) = lines.last() {
             let lineno = lines.len() - 1;
-            let noqa_lineno = noqa_line_for
-                .get(&lineno)
-                .map(|lineno| lineno - 1)
-                .unwrap_or(lineno);
+            let noqa_lineno = noqa_line_for.get(&(lineno + 1)).unwrap_or(&(lineno + 1)) - 1;
 
             let noqa = noqa_directives
                 .entry(noqa_lineno)

src/checks.rs

@@ -95,6 +95,7 @@ pub enum CheckCode {
     B017,
     B018,
     B019,
+    B020,
     B021,
     B022,
     B024,
@@ -399,6 +400,7 @@ pub enum CheckKind {
     NoAssertRaisesException,
     UselessExpression,
     CachedInstanceMethod,
+    LoopVariableOverridesIterator(String),
     FStringDocstring,
     UselessContextlibSuppress,
     AbstractBaseClassWithoutAbstractMethod(String),
@@ -645,6 +647,7 @@ impl CheckCode {
             CheckCode::B017 => CheckKind::NoAssertRaisesException,
             CheckCode::B018 => CheckKind::UselessExpression,
             CheckCode::B019 => CheckKind::CachedInstanceMethod,
+            CheckCode::B020 => CheckKind::LoopVariableOverridesIterator("...".to_string()),
             CheckCode::B021 => CheckKind::FStringDocstring,
             CheckCode::B022 => CheckKind::UselessContextlibSuppress,
             CheckCode::B024 => CheckKind::AbstractBaseClassWithoutAbstractMethod("...".to_string()),
@@ -890,6 +893,7 @@ impl CheckCode {
             CheckCode::B017 => CheckCategory::Flake8Bugbear,
             CheckCode::B018 => CheckCategory::Flake8Bugbear,
             CheckCode::B019 => CheckCategory::Flake8Bugbear,
+            CheckCode::B020 => CheckCategory::Flake8Bugbear,
             CheckCode::B021 => CheckCategory::Flake8Bugbear,
             CheckCode::B022 => CheckCategory::Flake8Bugbear,
             CheckCode::B024 => CheckCategory::Flake8Bugbear,
@@ -1098,6 +1102,7 @@ impl CheckKind {
             CheckKind::NoAssertRaisesException => &CheckCode::B017,
             CheckKind::UselessExpression => &CheckCode::B018,
             CheckKind::CachedInstanceMethod => &CheckCode::B019,
+            CheckKind::LoopVariableOverridesIterator(_) => &CheckCode::B020,
             CheckKind::FStringDocstring => &CheckCode::B021,
             CheckKind::UselessContextlibSuppress => &CheckCode::B022,
             CheckKind::AbstractBaseClassWithoutAbstractMethod(_) => &CheckCode::B024,
@@ -1472,6 +1477,9 @@ impl CheckKind {
             CheckKind::CachedInstanceMethod => "Use of `functools.lru_cache` or `functools.cache` \
                                                 on methods can lead to memory leaks"
                 .to_string(),
+            CheckKind::LoopVariableOverridesIterator(name) => {
+                format!("Loop control variable `{name}` overrides iterable it iterates")
+            }
             CheckKind::FStringDocstring => "f-string used as docstring. This will be interpreted \
                                             by python as a joined string rather than a docstring."
                 .to_string(),

src/checks_gen.rs

@@ -56,6 +56,7 @@ pub enum CheckCodePrefix {
     B018,
     B019,
     B02,
+    B020,
     B021,
     B022,
     B024,
@@ -386,6 +387,7 @@ impl CheckCodePrefix {
                 CheckCode::B017,
                 CheckCode::B018,
                 CheckCode::B019,
+                CheckCode::B020,
                 CheckCode::B021,
                 CheckCode::B022,
                 CheckCode::B024,
@@ -412,6 +414,7 @@ impl CheckCodePrefix {
                 CheckCode::B017,
                 CheckCode::B018,
                 CheckCode::B019,
+                CheckCode::B020,
                 CheckCode::B021,
                 CheckCode::B022,
                 CheckCode::B024,
@@ -460,6 +463,7 @@ impl CheckCodePrefix {
             CheckCodePrefix::B018 => vec![CheckCode::B018],
             CheckCodePrefix::B019 => vec![CheckCode::B019],
             CheckCodePrefix::B02 => vec![
+                CheckCode::B020,
                 CheckCode::B021,
                 CheckCode::B022,
                 CheckCode::B024,
@@ -467,6 +471,7 @@ impl CheckCodePrefix {
                 CheckCode::B026,
                 CheckCode::B027,
             ],
+            CheckCodePrefix::B020 => vec![CheckCode::B020],
             CheckCodePrefix::B021 => vec![CheckCode::B021],
             CheckCodePrefix::B022 => vec![CheckCode::B022],
             CheckCodePrefix::B024 => vec![CheckCode::B024],
@@ -1213,6 +1218,7 @@ impl CheckCodePrefix {
             CheckCodePrefix::B018 => PrefixSpecificity::Explicit,
             CheckCodePrefix::B019 => PrefixSpecificity::Explicit,
             CheckCodePrefix::B02 => PrefixSpecificity::Tens,
+            CheckCodePrefix::B020 => PrefixSpecificity::Explicit,
             CheckCodePrefix::B021 => PrefixSpecificity::Explicit,
             CheckCodePrefix::B022 => PrefixSpecificity::Explicit,
             CheckCodePrefix::B024 => PrefixSpecificity::Explicit,

src/cli.rs

@@ -87,6 +87,10 @@ pub struct Cli {
     /// The minimum Python version that should be supported.
     #[arg(long)]
     pub target_version: Option<PythonVersion>,
+    /// Set the line-length for length-associated checks and automatic
+    /// formatting.
+    #[arg(long)]
+    pub line_length: Option<usize>,
     /// Round-trip auto-formatting.
     // TODO(charlie): This should be a sub-command.
     #[arg(long, hide = true)]
@@ -120,6 +124,8 @@ pub fn extract_log_level(cli: &Cli) -> LogLevel {
         LogLevel::Quiet
     } else if cli.verbose {
         LogLevel::Verbose
+    } else if matches!(cli.format, SerializationFormat::Json) {
+        LogLevel::Quiet
     } else {
         LogLevel::Default
     }
@@ -146,7 +152,7 @@ pub fn warn_on(
     cli_ignore: &[CheckCodePrefix],
     cli_extend_ignore: &[CheckCodePrefix],
     pyproject_configuration: &Configuration,
-    pyproject_path: &Option<PathBuf>,
+    pyproject_path: Option<&PathBuf>,
 ) {
     for code in codes {
         if !cli_ignore.is_empty() {
@@ -186,7 +192,7 @@ pub fn warn_on(
 /// Convert a list of `PatternPrefixPair` structs to `PerFileIgnore`.
 pub fn collect_per_file_ignores(
     pairs: Vec<PatternPrefixPair>,
-    project_root: &Option<PathBuf>,
+    project_root: Option<&PathBuf>,
 ) -> Vec<PerFileIgnore> {
     let mut per_file_ignores: FnvHashMap<String, Vec<CheckCodePrefix>> = FnvHashMap::default();
     for pair in pairs {

src/flake8_2020/plugins.rs

@@ -7,7 +7,13 @@ use crate::check_ast::Checker;
 use crate::checks::{Check, CheckCode, CheckKind};
 
 fn is_sys(checker: &Checker, expr: &Expr, target: &str) -> bool {
-    match_module_member(expr, &format!("sys.{target}"), &checker.from_imports)
+    match_module_member(
+        expr,
+        "sys",
+        target,
+        &checker.from_imports,
+        &checker.import_aliases,
+    )
 }
 
 /// YTT101, YTT102, YTT301, YTT303
@@ -181,7 +187,13 @@ pub fn compare(checker: &mut Checker, left: &Expr, ops: &[Cmpop], comparators: &
 
 /// YTT202
 pub fn name_or_attribute(checker: &mut Checker, expr: &Expr) {
-    if match_module_member(expr, "six.PY3", &checker.from_imports) {
+    if match_module_member(
+        expr,
+        "six",
+        "PY3",
+        &checker.from_imports,
+        &checker.import_aliases,
+    ) {
         checker.add_check(Check::new(
             CheckKind::SixPY3Referenced,
             Range::from_located(expr),

src/flake8_annotations/plugins.rs

@@ -1,3 +1,5 @@
+use std::ops::Deref;
+
 use rustpython_ast::{Arguments, Constant, Expr, ExprKind, Stmt, StmtKind};
 
 use crate::ast::types::Range;
@@ -11,7 +13,7 @@ use crate::{visibility, Check};
 
 #[derive(Default)]
 struct ReturnStatementVisitor<'a> {
-    returns: Vec<&'a Option<Box<Expr>>>,
+    returns: Vec<Option<&'a Expr>>,
 }
 
 impl<'a, 'b> Visitor<'b> for ReturnStatementVisitor<'a>
@@ -23,7 +25,9 @@ where
             StmtKind::FunctionDef { .. } | StmtKind::AsyncFunctionDef { .. } => {
                 // No recurse.
             }
-            StmtKind::Return { value } => self.returns.push(value),
+            StmtKind::Return { value } => {
+                self.returns.push(value.as_ref().map(|expr| expr.deref()))
+            }
             _ => visitor::walk_stmt(self, stmt),
         }
     }
@@ -49,10 +53,13 @@ fn is_none_returning(body: &[Stmt]) -> bool {
 }
 
 /// ANN401
-fn check_dynamically_typed(checker: &mut Checker, annotation: &Expr, name: &str) {
-    if checker.match_typing_module(annotation, "Any") {
+fn check_dynamically_typed<F>(checker: &mut Checker, annotation: &Expr, func: F)
+where
+    F: FnOnce() -> String,
+{
+    if checker.match_typing_expr(annotation, "Any") {
         checker.add_check(Check::new(
-            CheckKind::DynamicallyTypedExpression(name.to_string()),
+            CheckKind::DynamicallyTypedExpression(func()),
             Range::from_located(annotation),
         ));
     };
@@ -100,7 +107,7 @@ pub fn definition(checker: &mut Checker, definition: &Definition, visibility: &V
             {
                 if let Some(expr) = &arg.node.annotation {
                     if checker.settings.enabled.contains(&CheckCode::ANN401) {
-                        check_dynamically_typed(checker, expr, &arg.node.arg);
+                        check_dynamically_typed(checker, expr, || arg.node.arg.to_string());
                     };
                 } else {
                     if !(checker.settings.flake8_annotations.suppress_dummy_args
@@ -122,7 +129,7 @@ pub fn definition(checker: &mut Checker, definition: &Definition, visibility: &V
                     if !checker.settings.flake8_annotations.allow_star_arg_any {
                         if checker.settings.enabled.contains(&CheckCode::ANN401) {
                             let name = arg.node.arg.to_string();
-                            check_dynamically_typed(checker, expr, &format!("*{name}"));
+                            check_dynamically_typed(checker, expr, || format!("*{name}"));
                         }
                     }
                 } else {
@@ -145,7 +152,7 @@ pub fn definition(checker: &mut Checker, definition: &Definition, visibility: &V
                     if !checker.settings.flake8_annotations.allow_star_arg_any {
                         if checker.settings.enabled.contains(&CheckCode::ANN401) {
                             let name = arg.node.arg.to_string();
-                            check_dynamically_typed(checker, expr, &format!("**{name}"));
+                            check_dynamically_typed(checker, expr, || format!("**{name}"));
                         }
                     }
                 } else {
@@ -165,7 +172,7 @@ pub fn definition(checker: &mut Checker, definition: &Definition, visibility: &V
             // ANN201, ANN202, ANN401
             if let Some(expr) = &returns {
                 if checker.settings.enabled.contains(&CheckCode::ANN401) {
-                    check_dynamically_typed(checker, expr, name);
+                    check_dynamically_typed(checker, expr, || name.to_string());
                 };
             } else {
                 // Allow omission of return annotation in `__init__` functions, if the function
@@ -215,7 +222,7 @@ pub fn definition(checker: &mut Checker, definition: &Definition, visibility: &V
                 if let Some(annotation) = &arg.node.annotation {
                     has_any_typed_arg = true;
                     if checker.settings.enabled.contains(&CheckCode::ANN401) {
-                        check_dynamically_typed(checker, annotation, &arg.node.arg);
+                        check_dynamically_typed(checker, annotation, || arg.node.arg.to_string());
                     }
                 } else {
                     if !(checker.settings.flake8_annotations.suppress_dummy_args
@@ -238,7 +245,7 @@ pub fn definition(checker: &mut Checker, definition: &Definition, visibility: &V
                     if !checker.settings.flake8_annotations.allow_star_arg_any {
                         if checker.settings.enabled.contains(&CheckCode::ANN401) {
                             let name = arg.node.arg.to_string();
-                            check_dynamically_typed(checker, expr, &format!("*{name}"));
+                            check_dynamically_typed(checker, expr, || format!("*{name}"));
                         }
                     }
                 } else {
@@ -262,7 +269,7 @@ pub fn definition(checker: &mut Checker, definition: &Definition, visibility: &V
                     if !checker.settings.flake8_annotations.allow_star_arg_any {
                         if checker.settings.enabled.contains(&CheckCode::ANN401) {
                             let name = arg.node.arg.to_string();
-                            check_dynamically_typed(checker, expr, &format!("**{name}"));
+                            check_dynamically_typed(checker, expr, || format!("**{name}"));
                         }
                     }
                 } else {
@@ -305,7 +312,7 @@ pub fn definition(checker: &mut Checker, definition: &Definition, visibility: &V
             // ANN201, ANN202
             if let Some(expr) = &returns {
                 if checker.settings.enabled.contains(&CheckCode::ANN401) {
-                    check_dynamically_typed(checker, expr, name);
+                    check_dynamically_typed(checker, expr, || name.to_string());
                 }
             } else {
                 // Allow omission of return annotation in `__init__` functions, if the function

src/flake8_bugbear/plugins/abstract_base_class.rs

@@ -1,15 +1,16 @@
 use fnv::{FnvHashMap, FnvHashSet};
 use rustpython_ast::{Constant, Expr, ExprKind, Keyword, Stmt, StmtKind};
 
-use crate::ast::helpers::{compose_call_path, match_call_path};
+use crate::ast::helpers::match_module_member;
 use crate::ast::types::Range;
 use crate::check_ast::Checker;
-use crate::checks::{Check, CheckKind};
+use crate::checks::{Check, CheckCode, CheckKind};
 
 fn is_abc_class(
     bases: &[Expr],
     keywords: &[Keyword],
     from_imports: &FnvHashMap<&str, FnvHashSet<&str>>,
+    import_aliases: &FnvHashMap<&str, &str>,
 ) -> bool {
     keywords.iter().any(|keyword| {
         keyword
@@ -18,14 +19,16 @@ fn is_abc_class(
             .as_ref()
             .map(|a| a == "metaclass")
             .unwrap_or(false)
-            && compose_call_path(&keyword.node.value)
-                .map(|call_path| match_call_path(&call_path, "abc.ABCMeta", from_imports))
-                .unwrap_or(false)
-    }) || bases.iter().any(|base| {
-        compose_call_path(base)
-            .map(|call_path| match_call_path(&call_path, "abc.ABC", from_imports))
-            .unwrap_or(false)
-    })
+            && match_module_member(
+                &keyword.node.value,
+                "abc",
+                "ABCMeta",
+                from_imports,
+                import_aliases,
+            )
+    }) || bases
+        .iter()
+        .any(|base| match_module_member(base, "abc", "ABC", from_imports, import_aliases))
 }
 
 fn is_empty_body(body: &[Stmt]) -> bool {
@@ -41,16 +44,20 @@ fn is_empty_body(body: &[Stmt]) -> bool {
     })
 }
 
-fn is_abstractmethod(expr: &Expr, from_imports: &FnvHashMap<&str, FnvHashSet<&str>>) -> bool {
-    compose_call_path(expr)
-        .map(|call_path| match_call_path(&call_path, "abc.abstractmethod", from_imports))
-        .unwrap_or(false)
+fn is_abstractmethod(
+    expr: &Expr,
+    from_imports: &FnvHashMap<&str, FnvHashSet<&str>>,
+    import_aliases: &FnvHashMap<&str, &str>,
+) -> bool {
+    match_module_member(expr, "abc", "abstractmethod", from_imports, import_aliases)
 }
 
-fn is_overload(expr: &Expr, from_imports: &FnvHashMap<&str, FnvHashSet<&str>>) -> bool {
-    compose_call_path(expr)
-        .map(|call_path| match_call_path(&call_path, "typing.overload", from_imports))
-        .unwrap_or(false)
+fn is_overload(
+    expr: &Expr,
+    from_imports: &FnvHashMap<&str, FnvHashSet<&str>>,
+    import_aliases: &FnvHashMap<&str, &str>,
+) -> bool {
+    match_module_member(expr, "typing", "overload", from_imports, import_aliases)
 }
 
 pub fn abstract_base_class(
@@ -61,7 +68,14 @@ pub fn abstract_base_class(
     keywords: &[Keyword],
     body: &[Stmt],
 ) {
-    if bases.len() + keywords.len() == 1 && is_abc_class(bases, keywords, &checker.from_imports) {
+    if bases.len() + keywords.len() == 1
+        && is_abc_class(
+            bases,
+            keywords,
+            &checker.from_imports,
+            &checker.import_aliases,
+        )
+    {
         let mut has_abstract_method = false;
         for stmt in body {
             // https://github.com/PyCQA/flake8-bugbear/issues/293
@@ -84,28 +98,32 @@ pub fn abstract_base_class(
             {
                 let has_abstract_decorator = decorator_list
                     .iter()
-                    .any(|d| is_abstractmethod(d, &checker.from_imports));
+                    .any(|d| is_abstractmethod(d, &checker.from_imports, &checker.import_aliases));
 
                 has_abstract_method |= has_abstract_decorator;
 
-                if !has_abstract_decorator
-                    && is_empty_body(body)
-                    && !decorator_list
-                        .iter()
-                        .any(|d| is_overload(d, &checker.from_imports))
-                {
-                    checker.add_check(Check::new(
-                        CheckKind::EmptyMethodWithoutAbstractDecorator(name.to_string()),
-                        Range::from_located(stmt),
-                    ));
+                if checker.settings.enabled.contains(&CheckCode::B027) {
+                    if !has_abstract_decorator
+                        && is_empty_body(body)
+                        && !decorator_list
+                            .iter()
+                            .any(|d| is_overload(d, &checker.from_imports, &checker.import_aliases))
+                    {
+                        checker.add_check(Check::new(
+                            CheckKind::EmptyMethodWithoutAbstractDecorator(name.to_string()),
+                            Range::from_located(stmt),
+                        ));
+                    }
                 }
             }
         }
-        if !has_abstract_method {
-            checker.add_check(Check::new(
-                CheckKind::AbstractBaseClassWithoutAbstractMethod(name.to_string()),
-                Range::from_located(stmt),
-            ));
+        if checker.settings.enabled.contains(&CheckCode::B024) {
+            if !has_abstract_method {
+                checker.add_check(Check::new(
+                    CheckKind::AbstractBaseClassWithoutAbstractMethod(name.to_string()),
+                    Range::from_located(stmt),
+                ));
+            }
         }
     }
 }

src/flake8_bugbear/plugins/assert_false.rs

@@ -6,7 +6,7 @@ use crate::check_ast::Checker;
 use crate::checks::{Check, CheckKind};
 use crate::code_gen::SourceGenerator;
 
-fn assertion_error(msg: &Option<Box<Expr>>) -> Stmt {
+fn assertion_error(msg: Option<&Expr>) -> Stmt {
     Stmt::new(
         Default::default(),
         Default::default(),
@@ -24,7 +24,7 @@ fn assertion_error(msg: &Option<Box<Expr>>) -> Stmt {
                         },
                     )),
                     args: if let Some(msg) = msg {
-                        vec![*msg.clone()]
+                        vec![msg.clone()]
                     } else {
                         vec![]
                     },
@@ -36,7 +36,7 @@ fn assertion_error(msg: &Option<Box<Expr>>) -> Stmt {
     )
 }
 
-pub fn assert_false(checker: &mut Checker, stmt: &Stmt, test: &Expr, msg: &Option<Box<Expr>>) {
+pub fn assert_false(checker: &mut Checker, stmt: &Stmt, test: &Expr, msg: Option<&Expr>) {
     if let ExprKind::Constant {
         value: Constant::Bool(false),
         ..

src/flake8_bugbear/plugins/assert_raises_exception.rs

@@ -10,10 +10,10 @@ pub fn assert_raises_exception(checker: &mut Checker, stmt: &Stmt, items: &[With
     if let Some(item) = items.first() {
         let item_context = &item.context_expr;
         if let ExprKind::Call { func, args, .. } = &item_context.node {
-            if match_name_or_attr(func, "assertRaises")
-                && args.len() == 1
-                && match_name_or_attr(args.first().unwrap(), "Exception")
+            if args.len() == 1
                 && item.optional_vars.is_none()
+                && match_name_or_attr(func, "assertRaises")
+                && match_name_or_attr(args.first().unwrap(), "Exception")
             {
                 checker.add_check(Check::new(
                     CheckKind::NoAssertRaisesException,

src/flake8_bugbear/plugins/cached_instance_method.rs

@@ -1,13 +1,14 @@
 use rustpython_ast::{Expr, ExprKind};
 
-use crate::ast::helpers::{compose_call_path, match_module_member};
+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::checks::{Check, CheckKind};
 
 fn is_cache_func(checker: &Checker, expr: &Expr) -> bool {
-    match_module_member(expr, "functools.lru_cache", &checker.from_imports)
-        || match_module_member(expr, "functools.cache", &checker.from_imports)
+    let call_path = dealias_call_path(collect_call_paths(expr), &checker.import_aliases);
+    match_call_path(&call_path, "functools", "lru_cache", &checker.from_imports)
+        || match_call_path(&call_path, "functools", "cache", &checker.from_imports)
 }
 
 /// B019
@@ -16,8 +17,8 @@ pub fn cached_instance_method(checker: &mut Checker, decorator_list: &[Expr]) {
         for decorator in decorator_list {
             // TODO(charlie): This should take into account `classmethod-decorators` and
             // `staticmethod-decorators`.
-            if let Some(decorator_path) = compose_call_path(decorator) {
-                if decorator_path == "classmethod" || decorator_path == "staticmethod" {
+            if let ExprKind::Name { id, .. } = &decorator.node {
+                if id == "classmethod" || id == "staticmethod" {
                     return;
                 }
             }

src/flake8_bugbear/plugins/duplicate_exceptions.rs

@@ -21,20 +21,21 @@ fn type_pattern(elts: Vec<&Expr>) -> Expr {
     )
 }
 
-pub fn duplicate_handler_exceptions(
+fn duplicate_handler_exceptions<'a>(
     checker: &mut Checker,
-    expr: &Expr,
-    elts: &[Expr],
-) -> BTreeSet<String> {
-    let mut seen: BTreeSet<String> = Default::default();
-    let mut duplicates: BTreeSet<String> = Default::default();
+    expr: &'a Expr,
+    elts: &'a [Expr],
+) -> BTreeSet<Vec<&'a str>> {
+    let mut seen: BTreeSet<Vec<&str>> = Default::default();
+    let mut duplicates: BTreeSet<Vec<&str>> = Default::default();
     let mut unique_elts: Vec<&Expr> = Default::default();
     for type_ in elts {
-        if let Some(name) = helpers::compose_call_path(type_) {
-            if seen.contains(&name) {
-                duplicates.insert(name);
+        let call_path = helpers::collect_call_paths(type_);
+        if !call_path.is_empty() {
+            if seen.contains(&call_path) {
+                duplicates.insert(call_path);
             } else {
-                seen.insert(name);
+                seen.insert(call_path);
                 unique_elts.push(type_);
             }
         }
@@ -45,7 +46,11 @@ pub fn duplicate_handler_exceptions(
         if !duplicates.is_empty() {
             let mut check = Check::new(
                 CheckKind::DuplicateHandlerException(
-                    duplicates.into_iter().sorted().collect::<Vec<String>>(),
+                    duplicates
+                        .into_iter()
+                        .map(|call_path| call_path.join("."))
+                        .sorted()
+                        .collect::<Vec<String>>(),
                 ),
                 Range::from_located(expr),
             );
@@ -70,19 +75,20 @@ pub fn duplicate_handler_exceptions(
 }
 
 pub fn duplicate_exceptions(checker: &mut Checker, stmt: &Stmt, handlers: &[Excepthandler]) {
-    let mut seen: BTreeSet<String> = Default::default();
-    let mut duplicates: BTreeSet<String> = Default::default();
+    let mut seen: BTreeSet<Vec<&str>> = Default::default();
+    let mut duplicates: BTreeSet<Vec<&str>> = Default::default();
     for handler in handlers {
         match &handler.node {
             ExcepthandlerKind::ExceptHandler { type_, .. } => {
                 if let Some(type_) = type_ {
                     match &type_.node {
                         ExprKind::Attribute { .. } | ExprKind::Name { .. } => {
-                            if let Some(name) = helpers::compose_call_path(type_) {
-                                if seen.contains(&name) {
-                                    duplicates.insert(name);
+                            let call_path = helpers::collect_call_paths(type_);
+                            if !call_path.is_empty() {
+                                if seen.contains(&call_path) {
+                                    duplicates.insert(call_path);
                                 } else {
-                                    seen.insert(name);
+                                    seen.insert(call_path);
                                 }
                             }
                         }
@@ -105,7 +111,7 @@ pub fn duplicate_exceptions(checker: &mut Checker, stmt: &Stmt, handlers: &[Exce
     if checker.settings.enabled.contains(&CheckCode::B025) {
         for duplicate in duplicates.into_iter().sorted() {
             checker.add_check(Check::new(
-                CheckKind::DuplicateTryBlockException(duplicate),
+                CheckKind::DuplicateTryBlockException(duplicate.join(".")),
                 Range::from_located(stmt),
             ));
         }

src/flake8_bugbear/plugins/function_call_argument_default.rs

@@ -1,7 +1,9 @@
 use fnv::{FnvHashMap, FnvHashSet};
 use rustpython_ast::{Arguments, Constant, Expr, ExprKind};
 
-use crate::ast::helpers::{compose_call_path, match_call_path};
+use crate::ast::helpers::{
+    collect_call_paths, compose_call_path, dealias_call_path, match_call_path, to_module_and_member,
+};
 use crate::ast::types::Range;
 use crate::ast::visitor;
 use crate::ast::visitor::Visitor;
@@ -9,35 +11,34 @@ use crate::check_ast::Checker;
 use crate::checks::{Check, CheckKind};
 use crate::flake8_bugbear::plugins::mutable_argument_default::is_mutable_func;
 
-const IMMUTABLE_FUNCS: [&str; 7] = [
-    "tuple",
-    "frozenset",
-    "operator.attrgetter",
-    "operator.itemgetter",
-    "operator.methodcaller",
-    "types.MappingProxyType",
-    "re.compile",
+const IMMUTABLE_FUNCS: [(&str, &str); 7] = [
+    ("", "tuple"),
+    ("", "frozenset"),
+    ("operator", "attrgetter"),
+    ("operator", "itemgetter"),
+    ("operator", "methodcaller"),
+    ("types", "MappingProxyType"),
+    ("re", "compile"),
 ];
 
 fn is_immutable_func(
     expr: &Expr,
-    extend_immutable_calls: &[&str],
+    extend_immutable_calls: &[(&str, &str)],
     from_imports: &FnvHashMap<&str, FnvHashSet<&str>>,
+    import_aliases: &FnvHashMap<&str, &str>,
 ) -> bool {
-    compose_call_path(expr)
-        .map(|call_path| {
-            IMMUTABLE_FUNCS
-                .iter()
-                .chain(extend_immutable_calls)
-                .any(|target| match_call_path(&call_path, target, from_imports))
-        })
-        .unwrap_or(false)
+    let call_path = dealias_call_path(collect_call_paths(expr), import_aliases);
+    IMMUTABLE_FUNCS
+        .iter()
+        .chain(extend_immutable_calls)
+        .any(|(module, member)| match_call_path(&call_path, module, member, from_imports))
 }
 
 struct ArgumentDefaultVisitor<'a> {
     checks: Vec<(CheckKind, Range)>,
-    extend_immutable_calls: &'a [&'a str],
+    extend_immutable_calls: &'a [(&'a str, &'a str)],
     from_imports: &'a FnvHashMap<&'a str, FnvHashSet<&'a str>>,
+    import_aliases: &'a FnvHashMap<&'a str, &'a str>,
 }
 
 impl<'a, 'b> Visitor<'b> for ArgumentDefaultVisitor<'b>
@@ -47,8 +48,13 @@ where
     fn visit_expr(&mut self, expr: &'b Expr) {
         match &expr.node {
             ExprKind::Call { func, args, .. } => {
-                if !is_mutable_func(func, self.from_imports)
-                    && !is_immutable_func(func, self.extend_immutable_calls, self.from_imports)
+                if !is_mutable_func(func, self.from_imports, self.import_aliases)
+                    && !is_immutable_func(
+                        func,
+                        self.extend_immutable_calls,
+                        self.from_imports,
+                        self.import_aliases,
+                    )
                     && !is_nan_or_infinity(func, args)
                 {
                     self.checks.push((
@@ -92,17 +98,19 @@ fn is_nan_or_infinity(expr: &Expr, args: &[Expr]) -> bool {
 
 /// B008
 pub fn function_call_argument_default(checker: &mut Checker, arguments: &Arguments) {
-    let extend_immutable_cells: Vec<&str> = checker
+    // Map immutable calls to (module, member) format.
+    let extend_immutable_cells: Vec<(&str, &str)> = checker
         .settings
         .flake8_bugbear
         .extend_immutable_calls
         .iter()
-        .map(|s| s.as_str())
+        .map(|target| to_module_and_member(target))
         .collect();
     let mut visitor = ArgumentDefaultVisitor {
         checks: vec![],
         extend_immutable_calls: &extend_immutable_cells,
         from_imports: &checker.from_imports,
+        import_aliases: &checker.import_aliases,
     };
     for expr in arguments
         .defaults

src/flake8_bugbear/plugins/loop_variable_overrides_iterator.rs

@@ -0,0 +1,64 @@
+use fnv::FnvHashMap;
+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::checks::{Check, CheckKind};
+
+#[derive(Default)]
+struct NameFinder<'a> {
+    names: FnvHashMap<&'a str, &'a Expr>,
+}
+
+impl<'a, 'b> Visitor<'b> for NameFinder<'a>
+where
+    'b: 'a,
+{
+    fn visit_expr(&mut self, expr: &'b Expr) {
+        match &expr.node {
+            ExprKind::Name { id, .. } => {
+                self.names.insert(id, expr);
+            }
+            ExprKind::ListComp { generators, .. }
+            | ExprKind::DictComp { generators, .. }
+            | ExprKind::SetComp { generators, .. }
+            | ExprKind::GeneratorExp { generators, .. } => {
+                for comp in generators {
+                    self.visit_expr(&comp.iter);
+                }
+            }
+            ExprKind::Lambda { args, body } => {
+                visitor::walk_expr(self, body);
+                for arg in args.args.iter() {
+                    self.names.remove(arg.node.arg.as_str());
+                }
+            }
+            _ => visitor::walk_expr(self, expr),
+        }
+    }
+}
+
+/// B020
+pub fn loop_variable_overrides_iterator(checker: &mut Checker, target: &Expr, iter: &Expr) {
+    let target_names = {
+        let mut target_finder = NameFinder::default();
+        target_finder.visit_expr(target);
+        target_finder.names
+    };
+    let iter_names = {
+        let mut iter_finder = NameFinder::default();
+        iter_finder.visit_expr(iter);
+        iter_finder.names
+    };
+
+    for (name, expr) in target_names {
+        if iter_names.contains_key(name) {
+            checker.add_check(Check::new(
+                CheckKind::LoopVariableOverridesIterator(name.to_string()),
+                Range::from_located(expr),
+            ));
+        }
+    }
+}

src/flake8_bugbear/plugins/mod.rs

@@ -4,11 +4,12 @@ pub use assert_raises_exception::assert_raises_exception;
 pub use assignment_to_os_environ::assignment_to_os_environ;
 pub use cached_instance_method::cached_instance_method;
 pub use cannot_raise_literal::cannot_raise_literal;
-pub use duplicate_exceptions::{duplicate_exceptions, duplicate_handler_exceptions};
+pub use duplicate_exceptions::duplicate_exceptions;
 pub use f_string_docstring::f_string_docstring;
 pub use function_call_argument_default::function_call_argument_default;
 pub use getattr_with_constant::getattr_with_constant;
 pub use jump_statement_in_finally::jump_statement_in_finally;
+pub use loop_variable_overrides_iterator::loop_variable_overrides_iterator;
 pub use mutable_argument_default::mutable_argument_default;
 pub use redundant_tuple_in_exception_handler::redundant_tuple_in_exception_handler;
 pub use setattr_with_constant::setattr_with_constant;
@@ -32,6 +33,7 @@ mod f_string_docstring;
 mod function_call_argument_default;
 mod getattr_with_constant;
 mod jump_statement_in_finally;
+mod loop_variable_overrides_iterator;
 mod mutable_argument_default;
 mod redundant_tuple_in_exception_handler;
 mod setattr_with_constant;

src/flake8_bugbear/plugins/mutable_argument_default.rs

@@ -1,29 +1,30 @@
 use fnv::{FnvHashMap, FnvHashSet};
 use rustpython_ast::{Arguments, Expr, ExprKind};
 
-use crate::ast::helpers::{compose_call_path, match_call_path};
+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::checks::{Check, CheckKind};
 
-const MUTABLE_FUNCS: [&str; 7] = [
-    "dict",
-    "list",
-    "set",
-    "collections.Counter",
-    "collections.OrderedDict",
-    "collections.defaultdict",
-    "collections.deque",
+const MUTABLE_FUNCS: [(&str, &str); 7] = [
+    ("", "dict"),
+    ("", "list"),
+    ("", "set"),
+    ("collections", "Counter"),
+    ("collections", "OrderedDict"),
+    ("collections", "defaultdict"),
+    ("collections", "deque"),
 ];
 
-pub fn is_mutable_func(expr: &Expr, from_imports: &FnvHashMap<&str, FnvHashSet<&str>>) -> bool {
-    compose_call_path(expr)
-        .map(|call_path| {
-            MUTABLE_FUNCS
-                .iter()
-                .any(|target| match_call_path(&call_path, target, from_imports))
-        })
-        .unwrap_or(false)
+pub fn is_mutable_func(
+    expr: &Expr,
+    from_imports: &FnvHashMap<&str, FnvHashSet<&str>>,
+    import_aliases: &FnvHashMap<&str, &str>,
+) -> bool {
+    let call_path = dealias_call_path(collect_call_paths(expr), import_aliases);
+    MUTABLE_FUNCS
+        .iter()
+        .any(|(module, member)| match_call_path(&call_path, module, member, from_imports))
 }
 
 /// B006
@@ -46,7 +47,7 @@ pub fn mutable_argument_default(checker: &mut Checker, arguments: &Arguments) {
                 ));
             }
             ExprKind::Call { func, .. } => {
-                if is_mutable_func(func, &checker.from_imports) {
+                if is_mutable_func(func, &checker.from_imports, &checker.import_aliases) {
                     checker.add_check(Check::new(
                         CheckKind::MutableArgumentDefault,
                         Range::from_located(expr),

src/flake8_bugbear/plugins/useless_contextlib_suppress.rs

@@ -1,16 +1,18 @@
 use rustpython_ast::Expr;
 
-use crate::ast::helpers::{compose_call_path, match_call_path};
+use crate::ast::helpers::{collect_call_paths, match_call_path};
 use crate::ast::types::Range;
 use crate::check_ast::Checker;
 use crate::checks::{Check, CheckKind};
 
 /// B005
 pub fn useless_contextlib_suppress(checker: &mut Checker, expr: &Expr, args: &[Expr]) {
-    if compose_call_path(expr)
-        .map(|call_path| match_call_path(&call_path, "contextlib.suppress", &checker.from_imports))
-        .unwrap_or(false)
-        && args.is_empty()
+    if match_call_path(
+        &collect_call_paths(expr),
+        "contextlib",
+        "suppress",
+        &checker.from_imports,
+    ) && args.is_empty()
     {
         checker.add_check(Check::new(
             CheckKind::UselessContextlibSuppress,

src/fs.rs

@@ -202,7 +202,7 @@ mod tests {
         let path = Path::new("foo").absolutize_from(project_root).unwrap();
         let exclude = vec![FilePattern::from_user(
             "foo",
-            &Some(project_root.to_path_buf()),
+            Some(&project_root.to_path_buf()),
         )];
         let (file_path, file_basename) = extract_path_names(&path)?;
         assert!(is_excluded(file_path, file_basename, exclude.iter()));
@@ -210,7 +210,7 @@ mod tests {
         let path = Path::new("foo/bar").absolutize_from(project_root).unwrap();
         let exclude = vec![FilePattern::from_user(
             "bar",
-            &Some(project_root.to_path_buf()),
+            Some(&project_root.to_path_buf()),
         )];
         let (file_path, file_basename) = extract_path_names(&path)?;
         assert!(is_excluded(file_path, file_basename, exclude.iter()));
@@ -220,7 +220,7 @@ mod tests {
             .unwrap();
         let exclude = vec![FilePattern::from_user(
             "baz.py",
-            &Some(project_root.to_path_buf()),
+            Some(&project_root.to_path_buf()),
         )];
         let (file_path, file_basename) = extract_path_names(&path)?;
         assert!(is_excluded(file_path, file_basename, exclude.iter()));
@@ -228,7 +228,7 @@ mod tests {
         let path = Path::new("foo/bar").absolutize_from(project_root).unwrap();
         let exclude = vec![FilePattern::from_user(
             "foo/bar",
-            &Some(project_root.to_path_buf()),
+            Some(&project_root.to_path_buf()),
         )];
         let (file_path, file_basename) = extract_path_names(&path)?;
         assert!(is_excluded(file_path, file_basename, exclude.iter()));
@@ -238,7 +238,7 @@ mod tests {
             .unwrap();
         let exclude = vec![FilePattern::from_user(
             "foo/bar/baz.py",
-            &Some(project_root.to_path_buf()),
+            Some(&project_root.to_path_buf()),
         )];
         let (file_path, file_basename) = extract_path_names(&path)?;
         assert!(is_excluded(file_path, file_basename, exclude.iter()));
@@ -248,7 +248,7 @@ mod tests {
             .unwrap();
         let exclude = vec![FilePattern::from_user(
             "foo/bar/*.py",
-            &Some(project_root.to_path_buf()),
+            Some(&project_root.to_path_buf()),
         )];
         let (file_path, file_basename) = extract_path_names(&path)?;
         assert!(is_excluded(file_path, file_basename, exclude.iter()));
@@ -258,7 +258,7 @@ mod tests {
             .unwrap();
         let exclude = vec![FilePattern::from_user(
             "baz",
-            &Some(project_root.to_path_buf()),
+            Some(&project_root.to_path_buf()),
         )];
         let (file_path, file_basename) = extract_path_names(&path)?;
         assert!(!is_excluded(file_path, file_basename, exclude.iter()));

src/isort/categorize.rs

@@ -15,13 +15,13 @@ pub enum ImportType {
 
 pub fn categorize(
     module_base: &str,
-    level: &Option<usize>,
+    level: Option<&usize>,
     src: &[PathBuf],
     known_first_party: &BTreeSet<String>,
     known_third_party: &BTreeSet<String>,
     extra_standard_library: &BTreeSet<String>,
 ) -> ImportType {
-    if level.map(|level| level > 0).unwrap_or(false) {
+    if level.map(|level| *level > 0).unwrap_or(false) {
         ImportType::LocalFolder
     } else if known_first_party.contains(module_base) {
         ImportType::FirstParty

src/isort/comments.rs

@@ -0,0 +1,40 @@
+use std::borrow::Cow;
+
+use rustpython_ast::Location;
+use rustpython_parser::lexer;
+use rustpython_parser::lexer::Tok;
+
+use crate::ast::helpers;
+use crate::ast::types::Range;
+use crate::SourceCodeLocator;
+
+#[derive(Debug)]
+pub struct Comment<'a> {
+    pub value: Cow<'a, str>,
+    pub location: Location,
+    pub end_location: Location,
+}
+
+/// Collect all comments in an import block.
+pub fn collect_comments<'a>(range: &Range, locator: &'a SourceCodeLocator) -> Vec<Comment<'a>> {
+    let contents = locator.slice_source_code_range(range);
+    lexer::make_tokenizer(&contents)
+        .flatten()
+        .filter_map(|(start, tok, end)| {
+            if matches!(tok, Tok::Comment) {
+                let start = helpers::to_absolute(&start, &range.location);
+                let end = helpers::to_absolute(&end, &range.location);
+                Some(Comment {
+                    value: locator.slice_source_code_range(&Range {
+                        location: start,
+                        end_location: end,
+                    }),
+                    location: start,
+                    end_location: end,
+                })
+            } else {
+                None
+            }
+        })
+        .collect()
+}

src/isort/format.rs

@@ -0,0 +1,182 @@
+use crate::isort::types::{AliasData, CommentSet, ImportFromData, Importable};
+
+// Hard-code four-space indentation for the imports themselves, to match Black.
+const INDENT: &str = "    ";
+
+// Guess a capacity to use for string allocation.
+const CAPACITY: usize = 200;
+
+/// Add a plain import statement to the `RopeBuilder`.
+pub fn format_import(alias: &AliasData, comments: &CommentSet, is_first: bool) -> String {
+    let mut output = String::with_capacity(CAPACITY);
+    if !is_first && !comments.atop.is_empty() {
+        output.push('\n');
+    }
+    for comment in &comments.atop {
+        output.push_str(comment);
+        output.push('\n');
+    }
+    if let Some(asname) = alias.asname {
+        output.push_str("import ");
+        output.push_str(alias.name);
+        output.push_str(" as ");
+        output.push_str(asname);
+    } else {
+        output.push_str("import ");
+        output.push_str(alias.name);
+    }
+    for comment in &comments.inline {
+        output.push_str("  ");
+        output.push_str(comment);
+    }
+    output.push('\n');
+    output
+}
+
+/// Add an import-from statement to the `RopeBuilder`.
+pub fn format_import_from(
+    import_from: &ImportFromData,
+    comments: &CommentSet,
+    aliases: &[(AliasData, CommentSet)],
+    line_length: &usize,
+    is_first: bool,
+) -> String {
+    // We can only inline if: (1) none of the aliases have atop comments, and (3)
+    // only the last alias (if any) has inline comments.
+    if aliases
+        .iter()
+        .all(|(_, CommentSet { atop, .. })| atop.is_empty())
+        && aliases
+            .iter()
+            .rev()
+            .skip(1)
+            .all(|(_, CommentSet { inline, .. })| inline.is_empty())
+    {
+        let (single_line, import_length) =
+            format_single_line(import_from, comments, aliases, is_first);
+        if import_length <= *line_length {
+            return single_line;
+        }
+    }
+
+    format_multi_line(import_from, comments, aliases, is_first)
+}
+
+/// Format an import-from statement in single-line format.
+///
+/// This method assumes that the output source code is syntactically valid.
+fn format_single_line(
+    import_from: &ImportFromData,
+    comments: &CommentSet,
+    aliases: &[(AliasData, CommentSet)],
+    is_first: bool,
+) -> (String, usize) {
+    let mut output = String::with_capacity(CAPACITY);
+    let mut line_length = 0;
+
+    if !is_first && !comments.atop.is_empty() {
+        output.push('\n');
+    }
+    for comment in &comments.atop {
+        output.push_str(comment);
+        output.push('\n');
+    }
+
+    let module_name = import_from.module_name();
+    output.push_str("from ");
+    output.push_str(&module_name);
+    output.push_str(" import ");
+    line_length += 5 + module_name.len() + 8;
+
+    for (index, (AliasData { name, asname }, comments)) in aliases.iter().enumerate() {
+        if let Some(asname) = asname {
+            output.push_str(name);
+            output.push_str(" as ");
+            output.push_str(asname);
+            line_length += name.len() + 4 + asname.len();
+        } else {
+            output.push_str(name);
+            line_length += name.len();
+        }
+        if index < aliases.len() - 1 {
+            output.push_str(", ");
+            line_length += 2;
+        }
+
+        for comment in &comments.inline {
+            output.push(' ');
+            output.push(' ');
+            output.push_str(comment);
+            line_length += 2 + comment.len();
+        }
+    }
+
+    for comment in &comments.inline {
+        output.push(' ');
+        output.push(' ');
+        output.push_str(comment);
+        line_length += 2 + comment.len();
+    }
+
+    output.push('\n');
+
+    (output, line_length)
+}
+
+/// Format an import-from statement in multi-line format.
+fn format_multi_line(
+    import_from: &ImportFromData,
+    comments: &CommentSet,
+    aliases: &[(AliasData, CommentSet)],
+    is_first: bool,
+) -> String {
+    let mut output = String::with_capacity(CAPACITY);
+
+    if !is_first && !comments.atop.is_empty() {
+        output.push('\n');
+    }
+    for comment in &comments.atop {
+        output.push_str(comment);
+        output.push('\n');
+    }
+
+    output.push_str("from ");
+    output.push_str(&import_from.module_name());
+    output.push_str(" import ");
+    output.push('(');
+    for comment in &comments.inline {
+        output.push(' ');
+        output.push(' ');
+        output.push_str(comment);
+    }
+    output.push('\n');
+
+    for (AliasData { name, asname }, comments) in aliases {
+        for comment in &comments.atop {
+            output.push_str(INDENT);
+            output.push_str(comment);
+            output.push('\n');
+        }
+        output.push_str(INDENT);
+        if let Some(asname) = asname {
+            output.push_str(name);
+            output.push_str(" as ");
+            output.push_str(asname);
+        } else {
+            output.push_str(name);
+        }
+        output.push(',');
+
+        for comment in &comments.inline {
+            output.push(' ');
+            output.push(' ');
+            output.push_str(comment);
+        }
+        output.push('\n');
+    }
+
+    output.push(')');
+    output.push('\n');
+
+    output
+}

src/isort/mod.rs

@@ -1,64 +1,266 @@
 use std::collections::{BTreeMap, BTreeSet};
 use std::path::PathBuf;
 
-use fnv::FnvHashSet;
+use fnv::FnvHashMap;
 use itertools::Itertools;
 use ropey::RopeBuilder;
 use rustpython_ast::{Stmt, StmtKind};
 
 use crate::isort::categorize::{categorize, ImportType};
+use crate::isort::comments::Comment;
 use crate::isort::sorting::{member_key, module_key};
-use crate::isort::types::{AliasData, ImportBlock, ImportFromData, Importable, OrderedImportBlock};
+use crate::isort::types::{
+    AliasData, CommentSet, ImportBlock, ImportFromData, Importable, OrderedImportBlock,
+};
 
 mod categorize;
+mod comments;
+pub mod format;
 pub mod plugins;
 pub mod settings;
 mod sorting;
 pub mod track;
 mod types;
 
-// Hard-code four-space indentation for the imports themselves, to match Black.
-const INDENT: &str = "    ";
+#[derive(Debug)]
+pub struct AnnotatedAliasData<'a> {
+    pub name: &'a str,
+    pub asname: Option<&'a String>,
+    pub atop: Vec<Comment<'a>>,
+    pub inline: Vec<Comment<'a>>,
+}
+#[derive(Debug)]
+pub enum AnnotatedImport<'a> {
+    Import {
+        names: Vec<AliasData<'a>>,
+        atop: Vec<Comment<'a>>,
+        inline: Vec<Comment<'a>>,
+    },
+    ImportFrom {
+        module: Option<&'a String>,
+        names: Vec<AnnotatedAliasData<'a>>,
+        level: Option<&'a usize>,
+        atop: Vec<Comment<'a>>,
+        inline: Vec<Comment<'a>>,
+    },
+}
 
-fn normalize_imports<'a>(imports: &'a [&'a Stmt]) -> ImportBlock<'a> {
-    let mut block: ImportBlock = Default::default();
+fn annotate_imports<'a>(
+    imports: &'a [&'a Stmt],
+    comments: Vec<Comment<'a>>,
+) -> Vec<AnnotatedImport<'a>> {
+    let mut annotated = vec![];
+    let mut comments_iter = comments.into_iter().peekable();
     for import in imports {
         match &import.node {
             StmtKind::Import { names } => {
-                for name in names {
-                    block.import.insert(AliasData {
-                        name: &name.node.name,
-                        asname: &name.node.asname,
-                    });
+                // Find comments above.
+                let mut atop = vec![];
+                while let Some(comment) =
+                    comments_iter.next_if(|comment| comment.location.row() < import.location.row())
+                {
+                    atop.push(comment);
                 }
+
+                // Find comments inline.
+                let mut inline = vec![];
+                while let Some(comment) = comments_iter.next_if(|comment| {
+                    comment.end_location.row() == import.end_location.unwrap().row()
+                }) {
+                    inline.push(comment);
+                }
+
+                annotated.push(AnnotatedImport::Import {
+                    names: names
+                        .iter()
+                        .map(|alias| AliasData {
+                            name: &alias.node.name,
+                            asname: alias.node.asname.as_ref(),
+                        })
+                        .collect(),
+                    atop,
+                    inline,
+                });
             }
             StmtKind::ImportFrom {
                 module,
                 names,
                 level,
             } => {
-                for name in names {
-                    if name.node.asname.is_none() {
-                        block
+                // Find comments above.
+                let mut atop = vec![];
+                while let Some(comment) =
+                    comments_iter.next_if(|comment| comment.location.row() < import.location.row())
+                {
+                    atop.push(comment);
+                }
+
+                // Find comments inline.
+                let mut inline = vec![];
+                while let Some(comment) =
+                    comments_iter.next_if(|comment| comment.location.row() == import.location.row())
+                {
+                    inline.push(comment);
+                }
+
+                // Capture names.
+                let mut aliases = vec![];
+                for alias in names {
+                    // Find comments above.
+                    let mut alias_atop = vec![];
+                    while let Some(comment) = comments_iter
+                        .next_if(|comment| comment.location.row() < alias.location.row())
+                    {
+                        alias_atop.push(comment);
+                    }
+
+                    // Find comments inline.
+                    let mut alias_inline = vec![];
+                    while let Some(comment) = comments_iter.next_if(|comment| {
+                        comment.end_location.row() == alias.end_location.unwrap().row()
+                    }) {
+                        alias_inline.push(comment);
+                    }
+
+                    aliases.push(AnnotatedAliasData {
+                        name: &alias.node.name,
+                        asname: alias.node.asname.as_ref(),
+                        atop: alias_atop,
+                        inline: alias_inline,
+                    })
+                }
+
+                annotated.push(AnnotatedImport::ImportFrom {
+                    module: module.as_ref(),
+                    names: aliases,
+                    level: level.as_ref(),
+                    atop,
+                    inline,
+                });
+            }
+            _ => unreachable!("Expected StmtKind::Import | StmtKind::ImportFrom"),
+        }
+    }
+    annotated
+}
+
+fn normalize_imports(imports: Vec<AnnotatedImport>) -> ImportBlock {
+    let mut block: ImportBlock = Default::default();
+    for import in imports {
+        match import {
+            AnnotatedImport::Import {
+                names,
+                atop,
+                inline,
+            } => {
+                // Associate the comments with the first alias (best effort).
+                if let Some(name) = names.first() {
+                    let entry = block
+                        .import
+                        .entry(AliasData {
+                            name: name.name,
+                            asname: name.asname,
+                        })
+                        .or_default();
+                    for comment in atop {
+                        entry.atop.push(comment.value);
+                    }
+                    for comment in inline {
+                        entry.inline.push(comment.value);
+                    }
+                }
+
+                // Create an entry for every alias.
+                for name in &names {
+                    block
+                        .import
+                        .entry(AliasData {
+                            name: name.name,
+                            asname: name.asname,
+                        })
+                        .or_default();
+                }
+            }
+            AnnotatedImport::ImportFrom {
+                module,
+                names,
+                level,
+                atop,
+                inline,
+            } => {
+                // Associate the comments with the first alias (best effort).
+                if let Some(alias) = names.first() {
+                    if alias.asname.is_none() {
+                        let entry = &mut block
                             .import_from
                             .entry(ImportFromData { module, level })
                             .or_default()
-                            .insert(AliasData {
-                                name: &name.node.name,
-                                asname: &name.node.asname,
-                            });
+                            .0;
+                        for comment in atop {
+                            entry.atop.push(comment.value);
+                        }
+                        for comment in inline {
+                            entry.inline.push(comment.value);
+                        }
                     } else {
-                        block.import_from_as.insert((
-                            ImportFromData { module, level },
-                            AliasData {
-                                name: &name.node.name,
-                                asname: &name.node.asname,
-                            },
-                        ));
+                        let entry = &mut block
+                            .import_from_as
+                            .entry((
+                                ImportFromData { module, level },
+                                AliasData {
+                                    name: alias.name,
+                                    asname: alias.asname,
+                                },
+                            ))
+                            .or_default();
+                        for comment in atop {
+                            entry.atop.push(comment.value);
+                        }
+                        for comment in inline {
+                            entry.inline.push(comment.value);
+                        }
+                    }
+                }
+
+                // Create an entry for every alias.
+                for alias in names {
+                    if alias.asname.is_none() {
+                        let entry = block
+                            .import_from
+                            .entry(ImportFromData { module, level })
+                            .or_default()
+                            .1
+                            .entry(AliasData {
+                                name: alias.name,
+                                asname: alias.asname,
+                            })
+                            .or_default();
+                        for comment in alias.atop {
+                            entry.atop.push(comment.value);
+                        }
+                        for comment in alias.inline {
+                            entry.inline.push(comment.value);
+                        }
+                    } else {
+                        let entry = block
+                            .import_from_as
+                            .entry((
+                                ImportFromData { module, level },
+                                AliasData {
+                                    name: alias.name,
+                                    asname: alias.asname,
+                                },
+                            ))
+                            .or_default();
+                        entry
+                            .atop
+                            .extend(alias.atop.into_iter().map(|comment| comment.value));
+                        for comment in alias.inline {
+                            entry.inline.push(comment.value);
+                        }
                     }
                 }
             }
-            _ => unreachable!("Expected StmtKind::Import | StmtKind::ImportFrom"),
         }
     }
     block
@@ -73,10 +275,10 @@ fn categorize_imports<'a>(
 ) -> BTreeMap<ImportType, ImportBlock<'a>> {
     let mut block_by_type: BTreeMap<ImportType, ImportBlock> = Default::default();
     // Categorize `StmtKind::Import`.
-    for alias in block.import {
+    for (alias, comments) in block.import {
         let import_type = categorize(
             &alias.module_base(),
-            &None,
+            None,
             src,
             known_first_party,
             known_third_party,
@@ -86,7 +288,7 @@ fn categorize_imports<'a>(
             .entry(import_type)
             .or_default()
             .import
-            .insert(alias);
+            .insert(alias, comments);
     }
     // Categorize `StmtKind::ImportFrom` (without re-export).
     for (import_from, aliases) in block.import_from {
@@ -105,7 +307,7 @@ fn categorize_imports<'a>(
             .insert(import_from, aliases);
     }
     // Categorize `StmtKind::ImportFrom` (with re-export).
-    for (import_from, alias) in block.import_from_as {
+    for ((import_from, alias), comments) in block.import_from_as {
         let classification = categorize(
             &import_from.module_base(),
             import_from.level,
@@ -118,7 +320,7 @@ fn categorize_imports<'a>(
             .entry(classification)
             .or_default()
             .import_from_as
-            .insert((import_from, alias));
+            .insert((import_from, alias), comments);
     }
     block_by_type
 }
@@ -131,7 +333,7 @@ fn sort_imports(block: ImportBlock) -> OrderedImportBlock {
         block
             .import
             .into_iter()
-            .sorted_by_cached_key(|alias| module_key(alias.name, alias.asname)),
+            .sorted_by_cached_key(|(alias, _)| module_key(alias.name, alias.asname)),
     );
 
     // Sort `StmtKind::ImportFrom`.
@@ -145,29 +347,47 @@ fn sort_imports(block: ImportBlock) -> OrderedImportBlock {
                 block
                     .import_from_as
                     .into_iter()
-                    .map(|(import_from, alias)| (import_from, FnvHashSet::from_iter([alias]))),
+                    .map(|((import_from, alias), comments)| {
+                        (
+                            import_from,
+                            (
+                                CommentSet {
+                                    atop: comments.atop,
+                                    inline: Default::default(),
+                                },
+                                FnvHashMap::from_iter([(
+                                    alias,
+                                    CommentSet {
+                                        atop: Default::default(),
+                                        inline: comments.inline,
+                                    },
+                                )]),
+                            ),
+                        )
+                    }),
             )
-            .map(|(import_from, aliases)| {
+            .map(|(import_from, (comments, aliases))| {
                 // Within each `StmtKind::ImportFrom`, sort the members.
                 (
                     import_from,
+                    comments,
                     aliases
                         .into_iter()
-                        .sorted_by_cached_key(|alias| member_key(alias.name, alias.asname))
-                        .collect::<Vec<AliasData>>(),
+                        .sorted_by_cached_key(|(alias, _)| member_key(alias.name, alias.asname))
+                        .collect::<Vec<(AliasData, CommentSet)>>(),
                 )
             })
-            .sorted_by_cached_key(|(import_from, aliases)| {
+            .sorted_by_cached_key(|(import_from, _, aliases)| {
                 // Sort each `StmtKind::ImportFrom` by module key, breaking ties based on
                 // members.
                 (
                     import_from
                         .module
                         .as_ref()
-                        .map(|module| module_key(module, &None)),
+                        .map(|module| module_key(module, None)),
                     aliases
                         .first()
-                        .map(|alias| member_key(alias.name, alias.asname)),
+                        .map(|(alias, _)| member_key(alias.name, alias.asname)),
                 )
             }),
     );
@@ -176,15 +396,18 @@ fn sort_imports(block: ImportBlock) -> OrderedImportBlock {
 }
 
 pub fn format_imports(
-    block: Vec<&Stmt>,
+    block: &[&Stmt],
+    comments: Vec<Comment>,
     line_length: &usize,
     src: &[PathBuf],
     known_first_party: &BTreeSet<String>,
     known_third_party: &BTreeSet<String>,
     extra_standard_library: &BTreeSet<String>,
 ) -> String {
+    let block = annotate_imports(block, comments);
+
     // Normalize imports (i.e., deduplicate, aggregate `from` imports).
-    let block = normalize_imports(&block);
+    let block = normalize_imports(block);
 
     // Categorize by type (e.g., first-party vs. third-party).
     let block_by_type = categorize_imports(
@@ -195,81 +418,38 @@ pub fn format_imports(
         extra_standard_library,
     );
 
-    // Generate replacement source code.
     let mut output = RopeBuilder::new();
-    let mut first_block = true;
+
+    // Generate replacement source code.
+    let mut is_first_block = true;
     for import_block in block_by_type.into_values() {
         let import_block = sort_imports(import_block);
 
         // Add a blank line between every section.
-        if !first_block {
+        if !is_first_block {
             output.append("\n");
         } else {
-            first_block = false;
+            is_first_block = false;
         }
 
+        let mut is_first_statement = true;
+
         // Format `StmtKind::Import` statements.
-        for AliasData { name, asname } in import_block.import.iter() {
-            if let Some(asname) = asname {
-                output.append(&format!("import {} as {}\n", name, asname));
-            } else {
-                output.append(&format!("import {}\n", name));
-            }
+        for (alias, comments) in import_block.import.iter() {
+            output.append(&format::format_import(alias, comments, is_first_statement));
+            is_first_statement = false;
         }
 
         // Format `StmtKind::ImportFrom` statements.
-        for (import_from, aliases) in import_block.import_from.iter() {
-            let prelude: String = format!("from {} import ", import_from.module_name());
-            let members: Vec<String> = aliases
-                .iter()
-                .map(|AliasData { name, asname }| {
-                    if let Some(asname) = asname {
-                        format!("{} as {}", name, asname)
-                    } else {
-                        name.to_string()
-                    }
-                })
-                .collect();
-
-            // Can we fit the import on a single line?
-            let expected_len: usize =
-                    // `from base import `
-                    prelude.len()
-                        // `member( as alias)?`
-                        + members.iter().map(|part| part.len()).sum::<usize>()
-                        // `, `
-                        + 2 * (members.len() - 1);
-
-            if expected_len <= *line_length {
-                // `from base import `
-                output.append(&prelude);
-                // `member( as alias)?(, )?`
-                for (index, part) in members.into_iter().enumerate() {
-                    if index > 0 {
-                        output.append(", ");
-                    }
-                    output.append(&part);
-                }
-                // `\n`
-                output.append("\n");
-            } else {
-                // `from base import (\n`
-                output.append(&prelude);
-                output.append("(");
-                output.append("\n");
-
-                // `    member( as alias)?,\n`
-                for part in members {
-                    output.append(INDENT);
-                    output.append(&part);
-                    output.append(",");
-                    output.append("\n");
-                }
-
-                // `)\n`
-                output.append(")");
-                output.append("\n");
-            }
+        for (import_from, comments, aliases) in import_block.import_from.iter() {
+            output.append(&format::format_import_from(
+                import_from,
+                comments,
+                aliases,
+                line_length,
+                is_first_statement,
+            ));
+            is_first_statement = false;
         }
     }
     output.finish().to_string()
@@ -287,13 +467,17 @@ mod tests {
     use crate::linter::test_path;
     use crate::Settings;
 
+    #[test_case(Path::new("add_newline_before_comments.py"))]
     #[test_case(Path::new("combine_import_froms.py"))]
+    #[test_case(Path::new("comments.py"))]
     #[test_case(Path::new("deduplicate_imports.py"))]
     #[test_case(Path::new("fit_line_length.py"))]
+    #[test_case(Path::new("fit_line_length_comment.py"))]
     #[test_case(Path::new("import_from_after_import.py"))]
     #[test_case(Path::new("leading_prefix.py"))]
     #[test_case(Path::new("no_reorder_within_section.py"))]
     #[test_case(Path::new("order_by_type.py"))]
+    #[test_case(Path::new("preserve_comment_order.py"))]
     #[test_case(Path::new("preserve_indentation.py"))]
     #[test_case(Path::new("reorder_within_section.py"))]
     #[test_case(Path::new("separate_first_party_imports.py"))]
@@ -303,6 +487,7 @@ mod tests {
     #[test_case(Path::new("skip.py"))]
     #[test_case(Path::new("sort_similar_imports.py"))]
     #[test_case(Path::new("trailing_suffix.py"))]
+    #[test_case(Path::new("type_comments.py"))]
     fn isort(path: &Path) -> Result<()> {
         let snapshot = format!("{}", path.to_string_lossy());
         let mut checks = test_path(

src/isort/plugins.rs

@@ -5,7 +5,7 @@ use crate::ast::types::Range;
 use crate::autofix::{fixer, Fix};
 use crate::checks::CheckKind;
 use crate::docstrings::helpers::leading_space;
-use crate::isort::format_imports;
+use crate::isort::{comments, format_imports};
 use crate::{Check, Settings, SourceCodeLocator};
 
 fn extract_range(body: &[&Stmt]) -> Range {
@@ -44,7 +44,15 @@ fn match_trailing_content(body: &[&Stmt], locator: &SourceCodeLocator) -> bool {
         end_location: Location::new(end_location.row() + 1, 0),
     };
     let suffix = locator.slice_source_code_range(&range);
-    suffix.chars().any(|char| !char.is_whitespace())
+    for char in suffix.chars() {
+        if char == '#' {
+            return false;
+        }
+        if !char.is_whitespace() {
+            return true;
+        }
+    }
+    false
 }
 
 /// I001
@@ -57,13 +65,23 @@ pub fn check_imports(
     let range = extract_range(&body);
     let indentation = extract_indentation(&body, locator);
 
+    // Extract comments. Take care to grab any inline comments from the last line.
+    let comments = comments::collect_comments(
+        &Range {
+            location: range.location,
+            end_location: Location::new(range.end_location.row() + 1, 0),
+        },
+        locator,
+    );
+
     // Special-cases: there's leading or trailing content in the import block.
     let has_leading_content = match_leading_content(&body, locator);
     let has_trailing_content = match_trailing_content(&body, locator);
 
     // Generate the sorted import block.
     let expected = format_imports(
-        body,
+        &body,
+        comments,
         &(settings.line_length - indentation.len()),
         &settings.src,
         &settings.isort.known_first_party,

src/isort/snapshots/ruff__isort__tests__add_newline_before_comments.py.snap

@@ -0,0 +1,22 @@
+---
+source: src/isort/mod.rs
+expression: checks
+---
+- kind: UnsortedImports
+  location:
+    row: 1
+    column: 0
+  end_location:
+    row: 8
+    column: 0
+  fix:
+    patch:
+      content: "import os\n\n# This is a comment in the same section, so we need to add one newline.\nimport sys\n\nimport numpy as np\n\n# This is a comment, but it starts a new section, so we don't need to add a newline\n# before it.\nimport leading_prefix\n"
+      location:
+        row: 1
+        column: 0
+      end_location:
+        row: 8
+        column: 0
+    applied: false
+

src/isort/snapshots/ruff__isort__tests__comments.py.snap

@@ -0,0 +1,22 @@
+---
+source: src/isort/mod.rs
+expression: checks
+---
+- kind: UnsortedImports
+  location:
+    row: 3
+    column: 0
+  end_location:
+    row: 26
+    column: 0
+  fix:
+    patch:
+      content: "import B  # Comment 4\n\n# Comment 3a\n# Comment 3b\nimport C\nimport D\n\n# Comment 5\n# Comment 6\nfrom A import (\n    a,  # Comment 7  # Comment 9\n    b,  # Comment 10\n    c,  # Comment 8  # Comment 11\n)\n"
+      location:
+        row: 3
+        column: 0
+      end_location:
+        row: 26
+        column: 0
+    applied: false
+

src/isort/snapshots/ruff__isort__tests__fit_line_length_comment.py.snap

@@ -0,0 +1,22 @@
+---
+source: src/isort/mod.rs
+expression: checks
+---
+- kind: UnsortedImports
+  location:
+    row: 1
+    column: 0
+  end_location:
+    row: 5
+    column: 0
+  fix:
+    patch:
+      content: "import a\n\n# Don't take this comment into account when determining whether the next import can fit on one line.\nfrom b import c\nfrom d import (  # Do take this comment into account when determining whether the next import can fit on one line.\n    e,\n)\n"
+      location:
+        row: 1
+        column: 0
+      end_location:
+        row: 5
+        column: 0
+    applied: false
+

src/isort/snapshots/ruff__isort__tests__preserve_comment_order.py.snap

@@ -0,0 +1,22 @@
+---
+source: src/isort/mod.rs
+expression: checks
+---
+- kind: UnsortedImports
+  location:
+    row: 1
+    column: 0
+  end_location:
+    row: 12
+    column: 0
+  fix:
+    patch:
+      content: "import abc\nimport io\n\n# Old MacDonald had a farm,\n# EIEIO\n# And on his farm he had a cow,\n# EIEIO\n# With a moo-moo here and a moo-moo there\n# Here a moo, there a moo, everywhere moo-moo\n# Old MacDonald had a farm,\n# EIEIO\nfrom errno import EIO\n"
+      location:
+        row: 1
+        column: 0
+      end_location:
+        row: 12
+        column: 0
+    applied: false
+

src/isort/snapshots/ruff__isort__tests__type_comments.py.snap

@@ -0,0 +1,6 @@
+---
+source: src/isort/mod.rs
+expression: checks
+---
+[]
+

src/isort/sorting.rs

@@ -10,15 +10,15 @@ pub enum Prefix {
 
 pub fn module_key<'a>(
     name: &'a str,
-    asname: &'a Option<String>,
-) -> (String, &'a str, &'a Option<String>) {
+    asname: Option<&'a String>,
+) -> (String, &'a str, Option<&'a String>) {
     (name.to_lowercase(), name, asname)
 }
 
 pub fn member_key<'a>(
     name: &'a str,
-    asname: &'a Option<String>,
-) -> (Prefix, String, &'a Option<String>) {
+    asname: Option<&'a String>,
+) -> (Prefix, String, Option<&'a String>) {
     (
         if name.len() > 1 && string::is_upper(name) {
             // Ex) `CONSTANT`

src/isort/types.rs

@@ -1,15 +1,25 @@
-use fnv::{FnvHashMap, FnvHashSet};
+use std::borrow::Cow;
+
+use fnv::FnvHashMap;
+
+use crate::ast;
 
 #[derive(Debug, Hash, Ord, PartialOrd, Eq, PartialEq)]
 pub struct ImportFromData<'a> {
-    pub module: &'a Option<String>,
-    pub level: &'a Option<usize>,
+    pub module: Option<&'a String>,
+    pub level: Option<&'a usize>,
 }
 
 #[derive(Debug, Hash, Ord, PartialOrd, Eq, PartialEq)]
 pub struct AliasData<'a> {
     pub name: &'a str,
-    pub asname: &'a Option<String>,
+    pub asname: Option<&'a String>,
+}
+
+#[derive(Debug, Default)]
+pub struct CommentSet<'a> {
+    pub atop: Vec<Cow<'a, str>>,
+    pub inline: Vec<Cow<'a, str>>,
 }
 
 pub trait Importable {
@@ -29,16 +39,7 @@ impl Importable for AliasData<'_> {
 
 impl Importable for ImportFromData<'_> {
     fn module_name(&self) -> String {
-        let mut module_name = String::new();
-        if let Some(level) = self.level {
-            if level > &0 {
-                module_name.push_str(&".".repeat(*level));
-            }
-        }
-        if let Some(module) = self.module {
-            module_name.push_str(module);
-        }
-        module_name
+        ast::helpers::format_import_from(self.level, self.module)
     }
 
     fn module_base(&self) -> String {
@@ -50,17 +51,24 @@ impl Importable for ImportFromData<'_> {
 pub struct ImportBlock<'a> {
     // Set of (name, asname), used to track regular imports.
     // Ex) `import module`
-    pub import: FnvHashSet<AliasData<'a>>,
+    pub import: FnvHashMap<AliasData<'a>, CommentSet<'a>>,
     // Map from (module, level) to `AliasData`, used to track 'from' imports.
     // Ex) `from module import member`
-    pub import_from: FnvHashMap<ImportFromData<'a>, FnvHashSet<AliasData<'a>>>,
+    pub import_from:
+        FnvHashMap<ImportFromData<'a>, (CommentSet<'a>, FnvHashMap<AliasData<'a>, CommentSet<'a>>)>,
     // Set of (module, level, name, asname), used to track re-exported 'from' imports.
     // Ex) `from module import member as member`
-    pub import_from_as: FnvHashSet<(ImportFromData<'a>, AliasData<'a>)>,
+    pub import_from_as: FnvHashMap<(ImportFromData<'a>, AliasData<'a>), CommentSet<'a>>,
 }
 
+type AliasDataWithComments<'a> = (AliasData<'a>, CommentSet<'a>);
+
 #[derive(Debug, Default)]
 pub struct OrderedImportBlock<'a> {
-    pub import: Vec<AliasData<'a>>,
-    pub import_from: Vec<(ImportFromData<'a>, Vec<AliasData<'a>>)>,
+    pub import: Vec<AliasDataWithComments<'a>>,
+    pub import_from: Vec<(
+        ImportFromData<'a>,
+        CommentSet<'a>,
+        Vec<AliasDataWithComments<'a>>,
+    )>,
 }

src/lib.rs

@@ -52,6 +52,8 @@ mod pyupgrade;
 mod rules;
 pub mod settings;
 pub mod source_code_locator;
+#[cfg(feature = "update-informer")]
+pub mod updates;
 pub mod visibility;
 
 /// Run Ruff over Python source code directly.
@@ -62,14 +64,16 @@ pub fn check(path: &Path, contents: &str, autofix: bool) -> Result<Vec<Check>> {
         Some(path) => debug!("Found project root at: {:?}", path),
         None => debug!("Unable to identify project root; assuming current directory..."),
     };
-    let pyproject = pyproject::find_pyproject_toml(&project_root);
+    let pyproject = pyproject::find_pyproject_toml(project_root.as_ref());
     match &pyproject {
         Some(path) => debug!("Found pyproject.toml at: {:?}", path),
         None => debug!("Unable to find pyproject.toml; using default settings..."),
     };
 
-    let settings =
-        Settings::from_configuration(Configuration::from_pyproject(&pyproject, &project_root)?);
+    let settings = Settings::from_configuration(Configuration::from_pyproject(
+        pyproject.as_ref(),
+        project_root.as_ref(),
+    )?);
 
     // Tokenize once.
     let tokens: Vec<LexResult> = tokenize(contents);

src/linter.rs

@@ -344,6 +344,7 @@ mod tests {
     #[test_case(CheckCode::B017, Path::new("B017.py"); "B017")]
     #[test_case(CheckCode::B018, Path::new("B018.py"); "B018")]
     #[test_case(CheckCode::B019, Path::new("B019.py"); "B019")]
+    #[test_case(CheckCode::B020, Path::new("B020.py"); "B020")]
     #[test_case(CheckCode::B021, Path::new("B021.py"); "B021")]
     #[test_case(CheckCode::B022, Path::new("B022.py"); "B022")]
     #[test_case(CheckCode::B024, Path::new("B024.py"); "B024")]
@@ -455,6 +456,8 @@ mod tests {
     #[test_case(CheckCode::F821, Path::new("F821_1.py"); "F821_1")]
     #[test_case(CheckCode::F821, Path::new("F821_2.py"); "F821_2")]
     #[test_case(CheckCode::F821, Path::new("F821_3.py"); "F821_3")]
+    #[test_case(CheckCode::F821, Path::new("F821_4.py"); "F821_4")]
+    #[test_case(CheckCode::F821, Path::new("F821_5.py"); "F821_5")]
     #[test_case(CheckCode::F822, Path::new("F822.py"); "F822")]
     #[test_case(CheckCode::F823, Path::new("F823.py"); "F823")]
     #[test_case(CheckCode::F831, Path::new("F831.py"); "F831")]

src/main.rs

@@ -17,6 +17,8 @@ use ::ruff::settings::configuration::Configuration;
 use ::ruff::settings::types::FilePattern;
 use ::ruff::settings::user::UserConfiguration;
 use ::ruff::settings::{pyproject, Settings};
+#[cfg(feature = "update-informer")]
+use ::ruff::updates;
 use anyhow::Result;
 use clap::Parser;
 use colored::Colorize;
@@ -26,11 +28,6 @@ use notify::{raw_watcher, RecursiveMode, Watcher};
 use rayon::prelude::*;
 use walkdir::DirEntry;
 
-#[cfg(feature = "update-informer")]
-const CARGO_PKG_NAME: &str = env!("CARGO_PKG_NAME");
-#[cfg(feature = "update-informer")]
-const CARGO_PKG_VERSION: &str = env!("CARGO_PKG_VERSION");
-
 /// Shim that calls par_iter except for wasm because there's no wasm support in
 /// rayon yet (there is a shim to be used for the web, but it requires js
 /// cooperation) Unfortunately, ParallelIterator does not implement Iterator so
@@ -45,30 +42,6 @@ fn par_iter<T: Sync>(iterable: &Vec<T>) -> impl Iterator<Item = &T> {
     iterable.iter()
 }
 
-#[cfg(feature = "update-informer")]
-fn check_for_updates() {
-    use update_informer::{registry, Check};
-
-    let informer = update_informer::new(registry::PyPI, CARGO_PKG_NAME, CARGO_PKG_VERSION);
-
-    if let Some(new_version) = informer.check_version().ok().flatten() {
-        let msg = format!(
-            "A new version of {pkg_name} is available: v{pkg_version} -> {new_version}",
-            pkg_name = CARGO_PKG_NAME.italic().cyan(),
-            pkg_version = CARGO_PKG_VERSION,
-            new_version = new_version.to_string().green()
-        );
-
-        let cmd = format!(
-            "Run to update: {cmd} {pkg_name}",
-            cmd = "pip3 install --upgrade".green(),
-            pkg_name = CARGO_PKG_NAME.green()
-        );
-
-        println!("\n{msg}\n{cmd}");
-    }
-}
-
 fn show_settings(
     configuration: Configuration,
     project_root: Option<PathBuf>,
@@ -235,7 +208,7 @@ fn inner_main() -> Result<ExitCode> {
     };
     let pyproject = cli
         .config
-        .or_else(|| pyproject::find_pyproject_toml(&project_root));
+        .or_else(|| pyproject::find_pyproject_toml(project_root.as_ref()));
     match &pyproject {
         Some(path) => debug!("Found pyproject.toml at: {:?}", path),
         None => debug!("Unable to find pyproject.toml; using default settings..."),
@@ -245,15 +218,16 @@ fn inner_main() -> Result<ExitCode> {
     let exclude: Vec<FilePattern> = cli
         .exclude
         .iter()
-        .map(|path| FilePattern::from_user(path, &project_root))
+        .map(|path| FilePattern::from_user(path, project_root.as_ref()))
         .collect();
     let extend_exclude: Vec<FilePattern> = cli
         .extend_exclude
         .iter()
-        .map(|path| FilePattern::from_user(path, &project_root))
+        .map(|path| FilePattern::from_user(path, project_root.as_ref()))
         .collect();
 
-    let mut configuration = Configuration::from_pyproject(&pyproject, &project_root)?;
+    let mut configuration =
+        Configuration::from_pyproject(pyproject.as_ref(), project_root.as_ref())?;
     if !exclude.is_empty() {
         configuration.exclude = exclude;
     }
@@ -262,7 +236,7 @@ fn inner_main() -> Result<ExitCode> {
     }
     if !cli.per_file_ignores.is_empty() {
         configuration.per_file_ignores =
-            collect_per_file_ignores(cli.per_file_ignores, &project_root);
+            collect_per_file_ignores(cli.per_file_ignores, project_root.as_ref());
     }
     if !cli.select.is_empty() {
         warn_on(
@@ -271,7 +245,7 @@ fn inner_main() -> Result<ExitCode> {
             &cli.ignore,
             &cli.extend_ignore,
             &configuration,
-            &pyproject,
+            pyproject.as_ref(),
         );
         configuration.select = cli.select;
     }
@@ -282,7 +256,7 @@ fn inner_main() -> Result<ExitCode> {
             &cli.ignore,
             &cli.extend_ignore,
             &configuration,
-            &pyproject,
+            pyproject.as_ref(),
         );
         configuration.extend_select = cli.extend_select;
     }
@@ -292,6 +266,9 @@ fn inner_main() -> Result<ExitCode> {
     if !cli.extend_ignore.is_empty() {
         configuration.extend_ignore = cli.extend_ignore;
     }
+    if let Some(line_length) = cli.line_length {
+        configuration.line_length = line_length;
+    }
     if let Some(target_version) = cli.target_version {
         configuration.target_version = target_version;
     }
@@ -402,8 +379,8 @@ fn inner_main() -> Result<ExitCode> {
 
         // Check for updates if we're in a non-silent log level.
         #[cfg(feature = "update-informer")]
-        if !is_stdin && log_level >= LogLevel::Default {
-            check_for_updates();
+        if !is_stdin && log_level >= LogLevel::Default && atty::is(atty::Stream::Stdout) {
+            let _ = updates::check_for_updates();
         }
 
         if messages.iter().any(|message| !message.fixed) && !cli.exit_zero {

src/noqa.rs

@@ -72,10 +72,7 @@ fn add_noqa_inner(
         // 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)
-            .map(|lineno| lineno - 1)
-            .unwrap_or(lineno);
+        let noqa_lineno = noqa_line_for.get(&(lineno + 1)).unwrap_or(&(lineno + 1)) - 1;
 
         if !codes.is_empty() {
             let matches = matches_by_line.entry(noqa_lineno).or_default();

src/pep8_naming/checks.rs

@@ -1,3 +1,4 @@
+use fnv::{FnvHashMap, FnvHashSet};
 use rustpython_ast::{Arguments, Expr, ExprKind, Stmt};
 
 use crate::ast::types::{Range, Scope, ScopeKind};
@@ -58,10 +59,19 @@ pub fn invalid_first_argument_name_for_class_method(
     name: &str,
     decorator_list: &[Expr],
     args: &Arguments,
+    from_imports: &FnvHashMap<&str, FnvHashSet<&str>>,
+    import_aliases: &FnvHashMap<&str, &str>,
     settings: &Settings,
 ) -> Option<Check> {
     if matches!(
-        helpers::function_type(scope, name, decorator_list, settings),
+        helpers::function_type(
+            scope,
+            name,
+            decorator_list,
+            from_imports,
+            import_aliases,
+            settings,
+        ),
         FunctionType::ClassMethod
     ) {
         if let Some(arg) = args.args.first() {
@@ -82,10 +92,19 @@ pub fn invalid_first_argument_name_for_method(
     name: &str,
     decorator_list: &[Expr],
     args: &Arguments,
+    from_imports: &FnvHashMap<&str, FnvHashSet<&str>>,
+    import_aliases: &FnvHashMap<&str, &str>,
     settings: &Settings,
 ) -> Option<Check> {
     if matches!(
-        helpers::function_type(scope, name, decorator_list, settings),
+        helpers::function_type(
+            scope,
+            name,
+            decorator_list,
+            from_imports,
+            import_aliases,
+            settings,
+        ),
         FunctionType::Method
     ) {
         if let Some(arg) = args.args.first() {

src/pep8_naming/helpers.rs

@@ -1,14 +1,16 @@
 use fnv::{FnvHashMap, FnvHashSet};
 use itertools::Itertools;
-use rustpython_ast::{Expr, ExprKind, Stmt, StmtKind};
+use rustpython_ast::{Expr, Stmt, StmtKind};
 
-use crate::ast::helpers::{compose_call_path, match_call_path, match_name_or_attr};
+use crate::ast::helpers::{
+    collect_call_paths, dealias_call_path, match_call_path, to_module_and_member,
+};
 use crate::ast::types::{Scope, ScopeKind};
 use crate::pep8_naming::settings::Settings;
 use crate::python::string::{is_lower, is_upper};
 
 const CLASS_METHODS: [&str; 3] = ["__new__", "__init_subclass__", "__class_getitem__"];
-const METACLASS_BASES: [&str; 2] = ["type", "ABCMeta"];
+const METACLASS_BASES: [(&str, &str); 2] = [("", "type"), ("abc", "ABCMeta")];
 
 pub enum FunctionType {
     Function,
@@ -22,35 +24,39 @@ pub fn function_type(
     scope: &Scope,
     name: &str,
     decorator_list: &[Expr],
+    from_imports: &FnvHashMap<&str, FnvHashSet<&str>>,
+    import_aliases: &FnvHashMap<&str, &str>,
     settings: &Settings,
 ) -> FunctionType {
     if let ScopeKind::Class(scope) = &scope.kind {
         // Special-case class method, like `__new__`.
         if CLASS_METHODS.contains(&name)
-            // The class itself extends a known metaclass, so all methods are class methods.
             || scope.bases.iter().any(|expr| {
-                METACLASS_BASES
-                    .iter()
-                    .any(|target| match_name_or_attr(expr, target))
+                // The class itself extends a known metaclass, so all methods are class methods.
+                let call_path = dealias_call_path(collect_call_paths(expr), import_aliases);
+                METACLASS_BASES.iter().any(|(module, member)| {
+                    match_call_path(&call_path, module, member, from_imports)
+                })
             })
-            // The method is decorated with a class method decorator (like `@classmethod`).
             || decorator_list.iter().any(|expr| {
-            if let ExprKind::Name { id, .. } = &expr.node {
-                settings.classmethod_decorators.contains(id)
-            } else {
-                false
-            }
-        }) {
+                // The method is decorated with a class method decorator (like `@classmethod`).
+                let call_path = dealias_call_path(collect_call_paths(expr), import_aliases);
+                settings.classmethod_decorators.iter().any(|decorator| {
+                    let (module, member) = to_module_and_member(decorator);
+                    match_call_path(&call_path, module, member, from_imports)
+                })
+            })
+        {
             FunctionType::ClassMethod
         } else if decorator_list.iter().any(|expr| {
-            if let ExprKind::Name { id, .. } = &expr.node {
-                settings.staticmethod_decorators.contains(id)
-            } else {
-                false
-            }
-        }) {
             // The method is decorated with a static method decorator (like
             // `@staticmethod`).
+            let call_path = dealias_call_path(collect_call_paths(expr), import_aliases);
+            settings.staticmethod_decorators.iter().any(|decorator| {
+                let (module, member) = to_module_and_member(decorator);
+                match_call_path(&call_path, module, member, from_imports)
+            })
+        }) {
             FunctionType::StaticMethod
         } else {
             // It's an instance method.
@@ -84,9 +90,12 @@ pub fn is_namedtuple_assignment(
     from_imports: &FnvHashMap<&str, FnvHashSet<&str>>,
 ) -> bool {
     if let StmtKind::Assign { value, .. } = &stmt.node {
-        compose_call_path(value)
-            .map(|call_path| match_call_path(&call_path, "collections.namedtuple", from_imports))
-            .unwrap_or(false)
+        match_call_path(
+            &collect_call_paths(value),
+            "collections",
+            "namedtuple",
+            from_imports,
+        )
     } else {
         false
     }

src/pycodestyle/checks.rs

@@ -1,6 +1,6 @@
 use itertools::izip;
 use rustpython_ast::Location;
-use rustpython_parser::ast::{Cmpop, Constant, Expr, ExprKind, Unaryop};
+use rustpython_parser::ast::{Cmpop, Constant, Expr, ExprKind, Stmt, Unaryop};
 
 use crate::ast::types::Range;
 use crate::checks::{Check, CheckKind, RejectedCmpop};
@@ -47,12 +47,16 @@ pub fn ambiguous_function_name(name: &str, location: Range) -> Option<Check> {
 }
 
 /// E731
-pub fn do_not_assign_lambda(value: &Expr, location: Range) -> Option<Check> {
-    if let ExprKind::Lambda { .. } = &value.node {
-        Some(Check::new(CheckKind::DoNotAssignLambda, location))
-    } else {
-        None
+pub fn do_not_assign_lambda(target: &Expr, value: &Expr, stmt: &Stmt) -> Option<Check> {
+    if let ExprKind::Name { .. } = &target.node {
+        if let ExprKind::Lambda { .. } = &value.node {
+            return Some(Check::new(
+                CheckKind::DoNotAssignLambda,
+                Range::from_located(stmt),
+            ));
+        }
     }
+    None
 }
 
 /// E713, E714

src/pyflakes/checks.rs

@@ -64,9 +64,9 @@ pub fn unused_variables(scope: &Scope, dummy_variable_rgx: &Regex) -> Vec<Check>
         if binding.used.is_none()
             && matches!(binding.kind, BindingKind::Assignment)
             && !dummy_variable_rgx.is_match(name)
-            && name != "__tracebackhide__"
-            && name != "__traceback_info__"
-            && name != "__traceback_supplement__"
+            && name != &"__tracebackhide__"
+            && name != &"__traceback_info__"
+            && name != &"__traceback_supplement__"
         {
             checks.push(Check::new(
                 CheckKind::UnusedVariable(name.to_string()),

src/python/typing.rs

@@ -1,6 +1,8 @@
 use fnv::{FnvHashMap, FnvHashSet};
 use once_cell::sync::Lazy;
-use rustpython_ast::{Expr, ExprKind};
+use rustpython_ast::Expr;
+
+use crate::ast::helpers::{collect_call_paths, dealias_call_path, match_call_path};
 
 // See: https://pypi.org/project/typing-extensions/
 static TYPING_EXTENSIONS: Lazy<FnvHashSet<&'static str>> = Lazy::new(|| {
@@ -63,144 +65,144 @@ pub fn in_extensions(name: &str) -> bool {
 }
 
 // See: https://docs.python.org/3/library/typing.html
-static IMPORTED_SUBSCRIPTS: Lazy<FnvHashMap<&'static str, FnvHashSet<&'static str>>> =
-    Lazy::new(|| {
-        let mut import_map = FnvHashMap::default();
-        for (name, module) in [
-            // `collections`
-            ("ChainMap", "collections"),
-            ("Counter", "collections"),
-            ("OrderedDict", "collections"),
-            ("defaultdict", "collections"),
-            ("deque", "collections"),
-            // `collections.abc`
-            ("AsyncGenerator", "collections.abc"),
-            ("AsyncIterable", "collections.abc"),
-            ("AsyncIterator", "collections.abc"),
-            ("Awaitable", "collections.abc"),
-            ("ByteString", "collections.abc"),
-            ("Callable", "collections.abc"),
-            ("Collection", "collections.abc"),
-            ("Container", "collections.abc"),
-            ("Coroutine", "collections.abc"),
-            ("Generator", "collections.abc"),
-            ("ItemsView", "collections.abc"),
-            ("Iterable", "collections.abc"),
-            ("Iterator", "collections.abc"),
-            ("KeysView", "collections.abc"),
-            ("Mapping", "collections.abc"),
-            ("MappingView", "collections.abc"),
-            ("MutableMapping", "collections.abc"),
-            ("MutableSequence", "collections.abc"),
-            ("MutableSet", "collections.abc"),
-            ("Reversible", "collections.abc"),
-            ("Sequence", "collections.abc"),
-            ("Set", "collections.abc"),
-            ("ValuesView", "collections.abc"),
-            // `contextlib`
-            ("AbstractAsyncContextManager", "contextlib"),
-            ("AbstractContextManager", "contextlib"),
-            // `re`
-            ("Match", "re"),
-            ("Pattern", "re"),
-            // `typing`
-            ("AbstractSet", "typing"),
-            ("Annotated", "typing"),
-            ("AsyncContextManager", "typing"),
-            ("AsyncGenerator", "typing"),
-            ("AsyncIterator", "typing"),
-            ("Awaitable", "typing"),
-            ("BinaryIO", "typing"),
-            ("ByteString", "typing"),
-            ("Callable", "typing"),
-            ("ChainMap", "typing"),
-            ("ClassVar", "typing"),
-            ("Collection", "typing"),
-            ("Concatenate", "typing"),
-            ("Container", "typing"),
-            ("ContextManager", "typing"),
-            ("Coroutine", "typing"),
-            ("Counter", "typing"),
-            ("DefaultDict", "typing"),
-            ("Deque", "typing"),
-            ("Dict", "typing"),
-            ("Final", "typing"),
-            ("FrozenSet", "typing"),
-            ("Generator", "typing"),
-            ("Generic", "typing"),
-            ("IO", "typing"),
-            ("ItemsView", "typing"),
-            ("Iterable", "typing"),
-            ("Iterator", "typing"),
-            ("KeysView", "typing"),
-            ("List", "typing"),
-            ("Mapping", "typing"),
-            ("Match", "typing"),
-            ("MutableMapping", "typing"),
-            ("MutableSequence", "typing"),
-            ("MutableSet", "typing"),
-            ("Optional", "typing"),
-            ("OrderedDict", "typing"),
-            ("Pattern", "typing"),
-            ("Reversible", "typing"),
-            ("Sequence", "typing"),
-            ("Set", "typing"),
-            ("TextIO", "typing"),
-            ("Tuple", "typing"),
-            ("Type", "typing"),
-            ("TypeGuard", "typing"),
-            ("Union", "typing"),
-            ("Unpack", "typing"),
-            ("ValuesView", "typing"),
-            // `typing.io`
-            ("BinaryIO", "typing.io"),
-            ("IO", "typing.io"),
-            ("TextIO", "typing.io"),
-            // `typing.re`
-            ("Match", "typing.re"),
-            ("Pattern", "typing.re"),
-            // `typing_extensions`
-            ("Annotated", "typing_extensions"),
-            ("AsyncContextManager", "typing_extensions"),
-            ("AsyncGenerator", "typing_extensions"),
-            ("AsyncIterable", "typing_extensions"),
-            ("AsyncIterator", "typing_extensions"),
-            ("Awaitable", "typing_extensions"),
-            ("ChainMap", "typing_extensions"),
-            ("ClassVar", "typing_extensions"),
-            ("Concatenate", "typing_extensions"),
-            ("ContextManager", "typing_extensions"),
-            ("Coroutine", "typing_extensions"),
-            ("Counter", "typing_extensions"),
-            ("DefaultDict", "typing_extensions"),
-            ("Deque", "typing_extensions"),
-            ("Type", "typing_extensions"),
-            // `weakref`
-            ("WeakKeyDictionary", "weakref"),
-            ("WeakSet", "weakref"),
-            ("WeakValueDictionary", "weakref"),
-        ] {
-            import_map
-                .entry(name)
-                .or_insert_with(FnvHashSet::default)
-                .insert(module);
-        }
-        import_map
-    });
+const SUBSCRIPTS: &[(&str, &str)] = &[
+    // builtins
+    ("", "dict"),
+    ("", "frozenset"),
+    ("", "list"),
+    ("", "set"),
+    ("", "tuple"),
+    ("", "type"),
+    // `collections`
+    ("collections", "ChainMap"),
+    ("collections", "Counter"),
+    ("collections", "OrderedDict"),
+    ("collections", "defaultdict"),
+    ("collections", "deque"),
+    // `collections.abc`
+    ("collections.abc", "AsyncGenerator"),
+    ("collections.abc", "AsyncIterable"),
+    ("collections.abc", "AsyncIterator"),
+    ("collections.abc", "Awaitable"),
+    ("collections.abc", "ByteString"),
+    ("collections.abc", "Callable"),
+    ("collections.abc", "Collection"),
+    ("collections.abc", "Container"),
+    ("collections.abc", "Coroutine"),
+    ("collections.abc", "Generator"),
+    ("collections.abc", "ItemsView"),
+    ("collections.abc", "Iterable"),
+    ("collections.abc", "Iterator"),
+    ("collections.abc", "KeysView"),
+    ("collections.abc", "Mapping"),
+    ("collections.abc", "MappingView"),
+    ("collections.abc", "MutableMapping"),
+    ("collections.abc", "MutableSequence"),
+    ("collections.abc", "MutableSet"),
+    ("collections.abc", "Reversible"),
+    ("collections.abc", "Sequence"),
+    ("collections.abc", "Set"),
+    ("collections.abc", "ValuesView"),
+    // `contextlib`
+    ("contextlib", "AbstractAsyncContextManager"),
+    ("contextlib", "AbstractContextManager"),
+    // `re`
+    ("re", "Match"),
+    ("re", "Pattern"),
+    // `typing`
+    ("typing", "AbstractSet"),
+    ("typing", "AsyncContextManager"),
+    ("typing", "AsyncGenerator"),
+    ("typing", "AsyncIterator"),
+    ("typing", "Awaitable"),
+    ("typing", "BinaryIO"),
+    ("typing", "ByteString"),
+    ("typing", "Callable"),
+    ("typing", "ChainMap"),
+    ("typing", "ClassVar"),
+    ("typing", "Collection"),
+    ("typing", "Concatenate"),
+    ("typing", "Container"),
+    ("typing", "ContextManager"),
+    ("typing", "Coroutine"),
+    ("typing", "Counter"),
+    ("typing", "DefaultDict"),
+    ("typing", "Deque"),
+    ("typing", "Dict"),
+    ("typing", "Final"),
+    ("typing", "FrozenSet"),
+    ("typing", "Generator"),
+    ("typing", "Generic"),
+    ("typing", "IO"),
+    ("typing", "ItemsView"),
+    ("typing", "Iterable"),
+    ("typing", "Iterator"),
+    ("typing", "KeysView"),
+    ("typing", "List"),
+    ("typing", "Mapping"),
+    ("typing", "Match"),
+    ("typing", "MutableMapping"),
+    ("typing", "MutableSequence"),
+    ("typing", "MutableSet"),
+    ("typing", "Optional"),
+    ("typing", "OrderedDict"),
+    ("typing", "Pattern"),
+    ("typing", "Reversible"),
+    ("typing", "Sequence"),
+    ("typing", "Set"),
+    ("typing", "TextIO"),
+    ("typing", "Tuple"),
+    ("typing", "Type"),
+    ("typing", "TypeGuard"),
+    ("typing", "Union"),
+    ("typing", "Unpack"),
+    ("typing", "ValuesView"),
+    // `typing.io`
+    ("typing.io", "BinaryIO"),
+    ("typing.io", "IO"),
+    ("typing.io", "TextIO"),
+    // `typing.re`
+    ("typing.re", "Match"),
+    ("typing.re", "Pattern"),
+    // `typing_extensions`
+    ("typing_extensions", "AsyncContextManager"),
+    ("typing_extensions", "AsyncGenerator"),
+    ("typing_extensions", "AsyncIterable"),
+    ("typing_extensions", "AsyncIterator"),
+    ("typing_extensions", "Awaitable"),
+    ("typing_extensions", "ChainMap"),
+    ("typing_extensions", "ClassVar"),
+    ("typing_extensions", "Concatenate"),
+    ("typing_extensions", "ContextManager"),
+    ("typing_extensions", "Coroutine"),
+    ("typing_extensions", "Counter"),
+    ("typing_extensions", "DefaultDict"),
+    ("typing_extensions", "Deque"),
+    ("typing_extensions", "Type"),
+    // `weakref`
+    ("weakref", "WeakKeyDictionary"),
+    ("weakref", "WeakSet"),
+    ("weakref", "WeakValueDictionary"),
+];
+
+// See: https://docs.python.org/3/library/typing.html
+const PEP_583_SUBSCRIPTS: &[(&str, &str)] = &[
+    // `typing`
+    ("typing", "Annotated"),
+    // `typing_extensions`
+    ("typing_extensions", "Annotated"),
+];
 
-// These are all assumed to come from the `typing` module.
 // See: https://peps.python.org/pep-0585/
-static PEP_585_BUILTINS_ELIGIBLE: Lazy<FnvHashSet<&'static str>> =
-    Lazy::new(|| FnvHashSet::from_iter(["Dict", "FrozenSet", "List", "Set", "Tuple", "Type"]));
-
-// These are all assumed to come from the `typing` module.
-// See: https://peps.python.org/pep-0585/
-static PEP_585_BUILTINS: Lazy<FnvHashSet<&'static str>> =
-    Lazy::new(|| FnvHashSet::from_iter(["dict", "frozenset", "list", "set", "tuple", "type"]));
-
-fn is_pep593_annotated_subscript(name: &str) -> bool {
-    name == "Annotated"
-}
+const PEP_585_BUILTINS_ELIGIBLE: &[(&str, &str)] = &[
+    ("typing", "Dict"),
+    ("typing", "FrozenSet"),
+    ("typing", "List"),
+    ("typing", "Set"),
+    ("typing", "Tuple"),
+    ("typing", "Type"),
+    ("typing_extensions", "Type"),
+];
 
 pub enum SubscriptKind {
     AnnotatedSubscript,
@@ -210,72 +212,38 @@ pub enum SubscriptKind {
 pub fn match_annotated_subscript(
     expr: &Expr,
     from_imports: &FnvHashMap<&str, FnvHashSet<&str>>,
+    import_aliases: &FnvHashMap<&str, &str>,
 ) -> Option<SubscriptKind> {
-    match &expr.node {
-        ExprKind::Attribute { attr, value, .. } => {
-            if let ExprKind::Name { id, .. } = &value.node {
-                // If `id` is `typing` and `attr` is `Union`, verify that `typing.Union` is an
-                // annotated subscript.
-                if IMPORTED_SUBSCRIPTS
-                    .get(&attr.as_str())
-                    .map(|imports| imports.contains(&id.as_str()))
-                    .unwrap_or_default()
-                {
-                    return if is_pep593_annotated_subscript(attr) {
-                        Some(SubscriptKind::PEP593AnnotatedSubscript)
-                    } else {
-                        Some(SubscriptKind::AnnotatedSubscript)
-                    };
-                }
-            }
-        }
-        ExprKind::Name { id, .. } => {
-            // Built-ins (no import necessary).
-            if PEP_585_BUILTINS.contains(&id.as_str()) {
+    let call_path = dealias_call_path(collect_call_paths(expr), import_aliases);
+    if !call_path.is_empty() {
+        for (module, member) in SUBSCRIPTS {
+            if match_call_path(&call_path, module, member, from_imports) {
                 return Some(SubscriptKind::AnnotatedSubscript);
             }
-
-            // Verify that, e.g., `Union` is a reference to `typing.Union`.
-            if let Some(modules) = IMPORTED_SUBSCRIPTS.get(&id.as_str()) {
-                for module in modules {
-                    if from_imports
-                        .get(module)
-                        .map(|imports| imports.contains(&id.as_str()) || imports.contains("*"))
-                        .unwrap_or_default()
-                    {
-                        return if is_pep593_annotated_subscript(id) {
-                            Some(SubscriptKind::PEP593AnnotatedSubscript)
-                        } else {
-                            Some(SubscriptKind::AnnotatedSubscript)
-                        };
-                    }
-                }
+        }
+        for (module, member) in PEP_583_SUBSCRIPTS {
+            if match_call_path(&call_path, module, member, from_imports) {
+                return Some(SubscriptKind::PEP593AnnotatedSubscript);
             }
         }
-        _ => {}
     }
     None
 }
 
 /// Returns `true` if `Expr` represents a reference to a typing object with a
-/// PEP 585 built-in. Note that none of the PEP 585 built-ins are in
-/// `typing_extensions`.
-pub fn is_pep585_builtin(expr: &Expr, from_imports: &FnvHashMap<&str, FnvHashSet<&str>>) -> bool {
-    match &expr.node {
-        ExprKind::Attribute { attr, value, .. } => {
-            if let ExprKind::Name { id, .. } = &value.node {
-                id == "typing" && PEP_585_BUILTINS_ELIGIBLE.contains(&attr.as_str())
-            } else {
-                false
+/// PEP 585 built-in.
+pub fn is_pep585_builtin(
+    expr: &Expr,
+    from_imports: &FnvHashMap<&str, FnvHashSet<&str>>,
+    import_aliases: &FnvHashMap<&str, &str>,
+) -> bool {
+    let call_path = dealias_call_path(collect_call_paths(expr), import_aliases);
+    if !call_path.is_empty() {
+        for (module, member) in PEP_585_BUILTINS_ELIGIBLE {
+            if match_call_path(&call_path, module, member, from_imports) {
+                return true;
             }
         }
-        ExprKind::Name { id, .. } => {
-            from_imports
-                .get("typing")
-                .map(|imports| imports.contains(&id.as_str()) || imports.contains("*"))
-                .unwrap_or_default()
-                && PEP_585_BUILTINS_ELIGIBLE.contains(&id.as_str())
-        }
-        _ => false,
     }
+    false
 }

src/pyupgrade/checks.rs

@@ -115,7 +115,7 @@ pub fn useless_object_inheritance(name: &str, bases: &[Expr], scope: &Scope) ->
     for expr in bases {
         if let ExprKind::Name { id, .. } = &expr.node {
             if id == "object" {
-                match scope.values.get(id) {
+                match scope.values.get(&id.as_str()) {
                     None
                     | Some(Binding {
                         kind: BindingKind::Builtin,
@@ -163,7 +163,8 @@ pub fn type_of_primitive(func: &Expr, args: &[Expr], location: Range) -> Option<
 pub fn unnecessary_lru_cache_params(
     decorator_list: &[Expr],
     target_version: PythonVersion,
-    imports: &FnvHashMap<&str, FnvHashSet<&str>>,
+    from_imports: &FnvHashMap<&str, FnvHashSet<&str>>,
+    import_aliases: &FnvHashMap<&str, &str>,
 ) -> Option<Check> {
     for expr in decorator_list.iter() {
         if let ExprKind::Call {
@@ -172,7 +173,14 @@ pub fn unnecessary_lru_cache_params(
             keywords,
         } = &expr.node
         {
-            if args.is_empty() && helpers::match_module_member(func, "functools.lru_cache", imports)
+            if args.is_empty()
+                && helpers::match_module_member(
+                    func,
+                    "functools",
+                    "lru_cache",
+                    from_imports,
+                    import_aliases,
+                )
             {
                 // Ex) `functools.lru_cache()`
                 if keywords.is_empty() {

src/pyupgrade/plugins/unnecessary_lru_cache_params.rs

@@ -9,6 +9,7 @@ pub fn unnecessary_lru_cache_params(checker: &mut Checker, decorator_list: &[Exp
         decorator_list,
         checker.settings.target_version,
         &checker.from_imports,
+        &checker.import_aliases,
     ) {
         if checker.patch() {
             if let Some(fix) =

src/pyupgrade/plugins/use_pep585_annotation.rs

@@ -7,13 +7,14 @@ use crate::checks::{Check, CheckKind};
 
 /// U006
 pub fn use_pep585_annotation(checker: &mut Checker, expr: &Expr, id: &str) {
+    let replacement = checker.import_aliases.get(id).unwrap_or(&id);
     let mut check = Check::new(
-        CheckKind::UsePEP585Annotation(id.to_string()),
+        CheckKind::UsePEP585Annotation(replacement.to_string()),
         Range::from_located(expr),
     );
     if checker.patch() {
         check.amend(Fix::replacement(
-            id.to_lowercase(),
+            replacement.to_lowercase(),
             expr.location,
             expr.end_location.unwrap(),
         ));

src/pyupgrade/plugins/use_pep604_annotation.rs

@@ -1,5 +1,6 @@
 use rustpython_ast::{Constant, Expr, ExprKind, Operator};
 
+use crate::ast::helpers::{collect_call_paths, dealias_call_path};
 use crate::ast::types::Range;
 use crate::autofix::Fix;
 use crate::check_ast::Checker;
@@ -43,7 +44,8 @@ fn union(elts: &[Expr]) -> Expr {
 
 /// U007
 pub fn use_pep604_annotation(checker: &mut Checker, expr: &Expr, value: &Expr, slice: &Expr) {
-    if checker.match_typing_module(value, "Optional") {
+    let call_path = dealias_call_path(collect_call_paths(value), &checker.import_aliases);
+    if checker.match_typing_call_path(&call_path, "Optional") {
         let mut check = Check::new(CheckKind::UsePEP604Annotation, Range::from_located(expr));
         if checker.patch() {
             let mut generator = SourceGenerator::new();
@@ -58,7 +60,7 @@ pub fn use_pep604_annotation(checker: &mut Checker, expr: &Expr, value: &Expr, s
             }
         }
         checker.add_check(check);
-    } else if checker.match_typing_module(value, "Union") {
+    } else if checker.match_typing_call_path(&call_path, "Union") {
         let mut check = Check::new(CheckKind::UsePEP604Annotation, Range::from_located(expr));
         if checker.patch() {
             match &slice.node {

src/settings/configuration.rs

@@ -65,8 +65,8 @@ static DEFAULT_DUMMY_VARIABLE_RGX: Lazy<Regex> =
 
 impl Configuration {
     pub fn from_pyproject(
-        pyproject: &Option<PathBuf>,
-        project_root: &Option<PathBuf>,
+        pyproject: Option<&PathBuf>,
+        project_root: Option<&PathBuf>,
     ) -> Result<Self> {
         let options = load_options(pyproject)?;
         Ok(Configuration {

src/settings/pyproject.rs

@@ -36,7 +36,7 @@ fn parse_pyproject_toml(path: &Path) -> Result<Pyproject> {
     toml::from_str(&contents).map_err(|e| e.into())
 }
 
-pub fn find_pyproject_toml(path: &Option<PathBuf>) -> Option<PathBuf> {
+pub fn find_pyproject_toml(path: Option<&PathBuf>) -> Option<PathBuf> {
     if let Some(path) = path {
         let path_pyproject_toml = path.join("pyproject.toml");
         if path_pyproject_toml.is_file() {
@@ -80,7 +80,7 @@ pub fn find_project_root(sources: &[PathBuf]) -> Option<PathBuf> {
     None
 }
 
-pub fn load_options(pyproject: &Option<PathBuf>) -> Result<Options> {
+pub fn load_options(pyproject: Option<&PathBuf>) -> Result<Options> {
     match pyproject {
         Some(pyproject) => Ok(parse_pyproject_toml(pyproject)?
             .tool
@@ -323,7 +323,7 @@ other-attribute = 1
         assert_eq!(project_root, cwd.join("resources/test/fixtures"));
 
         let path =
-            find_pyproject_toml(&Some(project_root)).expect("Unable to find pyproject.toml.");
+            find_pyproject_toml(Some(&project_root)).expect("Unable to find pyproject.toml.");
         assert_eq!(path, cwd.join("resources/test/fixtures/pyproject.toml"));
 
         let pyproject = parse_pyproject_toml(&path)?;

src/settings/types.rs

@@ -51,7 +51,7 @@ pub enum FilePattern {
 }
 
 impl FilePattern {
-    pub fn from_user(pattern: &str, project_root: &Option<PathBuf>) -> Self {
+    pub fn from_user(pattern: &str, project_root: Option<&PathBuf>) -> Self {
         let path = Path::new(pattern);
         let absolute_path = match project_root {
             Some(project_root) => fs::normalize_path_to(path, project_root),
@@ -79,7 +79,7 @@ impl PerFileIgnore {
     pub fn new(
         pattern: &str,
         prefixes: &[CheckCodePrefix],
-        project_root: &Option<PathBuf>,
+        project_root: Option<&PathBuf>,
     ) -> Self {
         let pattern = FilePattern::from_user(pattern, project_root);
         let codes = BTreeSet::from_iter(prefixes.iter().flat_map(|prefix| prefix.codes()));

src/snapshots/ruff__linter__tests__B020_B020.py.snap

@@ -0,0 +1,32 @@
+---
+source: src/linter.rs
+expression: checks
+---
+- kind:
+    LoopVariableOverridesIterator: items
+  location:
+    row: 8
+    column: 4
+  end_location:
+    row: 8
+    column: 9
+  fix: ~
+- kind:
+    LoopVariableOverridesIterator: values
+  location:
+    row: 21
+    column: 9
+  end_location:
+    row: 21
+    column: 15
+  fix: ~
+- kind:
+    LoopVariableOverridesIterator: vars
+  location:
+    row: 36
+    column: 4
+  end_location:
+    row: 36
+    column: 8
+  fix: ~
+

src/snapshots/ruff__linter__tests__B024_B024.py.snap

@@ -11,42 +11,6 @@ expression: checks
     row: 22
     column: 0
   fix: ~
-- kind:
-    AbstractBaseClassWithoutAbstractMethod: Base_4
-  location:
-    row: 34
-    column: 0
-  end_location:
-    row: 40
-    column: 0
-  fix: ~
-- kind:
-    AbstractBaseClassWithoutAbstractMethod: Base_5
-  location:
-    row: 40
-    column: 0
-  end_location:
-    row: 46
-    column: 0
-  fix: ~
-- kind:
-    AbstractBaseClassWithoutAbstractMethod: Base_6
-  location:
-    row: 46
-    column: 0
-  end_location:
-    row: 52
-    column: 0
-  fix: ~
-- kind:
-    AbstractBaseClassWithoutAbstractMethod: Base_7
-  location:
-    row: 52
-    column: 0
-  end_location:
-    row: 58
-    column: 0
-  fix: ~
 - kind:
     AbstractBaseClassWithoutAbstractMethod: MetaBase_1
   location:
@@ -74,6 +38,15 @@ expression: checks
     row: 79
     column: 0
   fix: ~
+- kind:
+    AbstractBaseClassWithoutAbstractMethod: notabc_Base_1
+  location:
+    row: 79
+    column: 0
+  end_location:
+    row: 84
+    column: 0
+  fix: ~
 - kind:
     AbstractBaseClassWithoutAbstractMethod: abc_set_class_variable_4
   location:

src/snapshots/ruff__linter__tests__B027_B027.py.snap

@@ -5,64 +5,37 @@ expression: checks
 - kind:
     EmptyMethodWithoutAbstractDecorator: AbstractClass
   location:
-    row: 13
+    row: 12
     column: 4
   end_location:
-    row: 16
+    row: 15
     column: 4
   fix: ~
 - kind:
     EmptyMethodWithoutAbstractDecorator: AbstractClass
   location:
-    row: 16
+    row: 15
     column: 4
   end_location:
-    row: 19
+    row: 18
     column: 4
   fix: ~
 - kind:
     EmptyMethodWithoutAbstractDecorator: AbstractClass
   location:
-    row: 19
+    row: 18
     column: 4
   end_location:
-    row: 23
+    row: 22
     column: 4
   fix: ~
 - kind:
     EmptyMethodWithoutAbstractDecorator: AbstractClass
   location:
-    row: 23
+    row: 22
     column: 4
   end_location:
-    row: 30
-    column: 4
-  fix: ~
-- kind:
-    EmptyMethodWithoutAbstractDecorator: AbstractClass
-  location:
-    row: 31
-    column: 4
-  end_location:
-    row: 34
-    column: 4
-  fix: ~
-- kind:
-    EmptyMethodWithoutAbstractDecorator: AbstractClass
-  location:
-    row: 80
-    column: 4
-  end_location:
-    row: 83
-    column: 4
-  fix: ~
-- kind:
-    EmptyMethodWithoutAbstractDecorator: AbstractClass
-  location:
-    row: 84
-    column: 4
-  end_location:
-    row: 87
+    row: 29
     column: 4
   fix: ~
 

src/snapshots/ruff__linter__tests__E731_E731.py.snap

@@ -26,20 +26,4 @@ expression: checks
     row: 7
     column: 29
   fix: ~
-- kind: DoNotAssignLambda
-  location:
-    row: 12
-    column: 0
-  end_location:
-    row: 12
-    column: 27
-  fix: ~
-- kind: DoNotAssignLambda
-  location:
-    row: 16
-    column: 0
-  end_location:
-    row: 16
-    column: 25
-  fix: ~
 

src/snapshots/ruff__linter__tests__F821_F821_4.py.snap

@@ -0,0 +1,50 @@
+---
+source: src/linter.rs
+expression: checks
+---
+- kind:
+    UndefinedName: Model
+  location:
+    row: 4
+    column: 9
+  end_location:
+    row: 4
+    column: 16
+  fix: ~
+- kind:
+    UndefinedName: Model
+  location:
+    row: 9
+    column: 10
+  end_location:
+    row: 9
+    column: 17
+  fix: ~
+- kind:
+    UndefinedName: Model
+  location:
+    row: 14
+    column: 14
+  end_location:
+    row: 14
+    column: 21
+  fix: ~
+- kind:
+    UndefinedName: Model
+  location:
+    row: 19
+    column: 30
+  end_location:
+    row: 19
+    column: 37
+  fix: ~
+- kind:
+    UndefinedName: Model
+  location:
+    row: 24
+    column: 18
+  end_location:
+    row: 24
+    column: 25
+  fix: ~
+

src/snapshots/ruff__linter__tests__F821_F821_5.py.snap

@@ -0,0 +1,14 @@
+---
+source: src/linter.rs
+expression: checks
+---
+- kind:
+    UndefinedName: InnerClass
+  location:
+    row: 5
+    column: 29
+  end_location:
+    row: 5
+    column: 41
+  fix: ~
+

src/snapshots/ruff__linter__tests__N805_N805.py.snap

@@ -4,18 +4,34 @@ expression: checks
 ---
 - kind: InvalidFirstArgumentNameForMethod
   location:
-    row: 5
+    row: 7
     column: 19
   end_location:
-    row: 5
+    row: 7
     column: 23
   fix: ~
 - kind: InvalidFirstArgumentNameForMethod
   location:
-    row: 10
+    row: 12
     column: 29
   end_location:
-    row: 10
+    row: 12
     column: 33
   fix: ~
+- kind: InvalidFirstArgumentNameForMethod
+  location:
+    row: 27
+    column: 14
+  end_location:
+    row: 27
+    column: 17
+  fix: ~
+- kind: InvalidFirstArgumentNameForMethod
+  location:
+    row: 31
+    column: 14
+  end_location:
+    row: 31
+    column: 17
+  fix: ~
 

src/snapshots/ruff__linter__tests__U006_U006.py.snap

@@ -9,7 +9,7 @@ expression: checks
     column: 9
   end_location:
     row: 4
-    column: 13
+    column: 20
   fix:
     patch:
       content: list
@@ -18,7 +18,7 @@ expression: checks
         column: 9
       end_location:
         row: 4
-        column: 13
+        column: 20
     applied: false
 - kind:
     UsePEP585Annotation: List
@@ -27,7 +27,7 @@ expression: checks
     column: 9
   end_location:
     row: 11
-    column: 20
+    column: 13
   fix:
     patch:
       content: list
@@ -36,6 +36,42 @@ expression: checks
         column: 9
       end_location:
         row: 11
-        column: 20
+        column: 13
+    applied: false
+- kind:
+    UsePEP585Annotation: List
+  location:
+    row: 18
+    column: 9
+  end_location:
+    row: 18
+    column: 15
+  fix:
+    patch:
+      content: list
+      location:
+        row: 18
+        column: 9
+      end_location:
+        row: 18
+        column: 15
+    applied: false
+- kind:
+    UsePEP585Annotation: List
+  location:
+    row: 25
+    column: 9
+  end_location:
+    row: 25
+    column: 14
+  fix:
+    patch:
+      content: list
+      location:
+        row: 25
+        column: 9
+      end_location:
+        row: 25
+        column: 14
     applied: false
 

src/snapshots/ruff__linter__tests__YTT101_YTT101.py.snap

@@ -18,4 +18,12 @@ expression: checks
     row: 7
     column: 13
   fix: ~
+- kind: SysVersionSlice3Referenced
+  location:
+    row: 8
+    column: 6
+  end_location:
+    row: 8
+    column: 7
+  fix: ~
 

src/updates.rs

@@ -0,0 +1,75 @@
+use std::fs::{create_dir_all, read_to_string, File};
+use std::io::Write;
+use std::path::{Path, PathBuf};
+
+use anyhow::Result;
+use colored::Colorize;
+
+const CARGO_PKG_NAME: &str = env!("CARGO_PKG_NAME");
+const CARGO_PKG_VERSION: &str = env!("CARGO_PKG_VERSION");
+
+fn cache_dir() -> &'static str {
+    "./.ruff_cache"
+}
+
+fn file_path() -> PathBuf {
+    Path::new(cache_dir()).join(".update-informer")
+}
+
+/// Get the "latest" version for which the user has been informed.
+fn get_latest() -> Result<Option<String>> {
+    let path = file_path();
+    if path.exists() {
+        Ok(Some(read_to_string(path)?.trim().to_string()))
+    } else {
+        Ok(None)
+    }
+}
+
+/// Set the "latest" version for which the user has been informed.
+fn set_latest(version: &str) -> Result<()> {
+    create_dir_all(cache_dir())?;
+    let path = file_path();
+    let mut file = File::create(path)?;
+    file.write_all(version.trim().as_bytes())
+        .map_err(|e| e.into())
+}
+
+/// Update the user if a newer version is available.
+pub fn check_for_updates() -> Result<()> {
+    use update_informer::{registry, Check};
+
+    let informer = update_informer::new(registry::PyPI, CARGO_PKG_NAME, CARGO_PKG_VERSION);
+
+    if let Some(new_version) = informer
+        .check_version()
+        .ok()
+        .flatten()
+        .map(|version| version.to_string())
+    {
+        // If we've already notified the user about this version, return early.
+        if let Some(latest_version) = get_latest()? {
+            if latest_version == new_version {
+                return Ok(());
+            }
+        }
+        set_latest(&new_version)?;
+
+        let msg = format!(
+            "A new version of {pkg_name} is available: v{pkg_version} -> {new_version}",
+            pkg_name = CARGO_PKG_NAME.italic().cyan(),
+            pkg_version = CARGO_PKG_VERSION,
+            new_version = new_version.green()
+        );
+
+        let cmd = format!(
+            "Run to update: {cmd} {pkg_name}",
+            cmd = "pip3 install --upgrade".green(),
+            pkg_name = CARGO_PKG_NAME.green()
+        );
+
+        println!("\n{msg}\n{cmd}");
+    }
+
+    Ok(())
+}