Move last-mile check filtering to linter.rs

2022-11-07 22:05:37 -05:00
247 changed files with 1517 additions and 9937 deletions
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -77,7 +77,7 @@ jobs:
            ${{ runner.os }}-build-${{ env.cache-name }}-
            ${{ runner.os }}-build-
            ${{ runner.os }}-
-      - run: cargo clippy --workspace --all-targets --all-features -- -D warnings
+      - run: cargo clippy --all -- -D warnings

  cargo_test:
    name: "cargo test"
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -1,6 +1,6 @@
 repos:
  - repo: https://github.com/charliermarsh/ruff-pre-commit
-    rev: v0.0.121
+    rev: v0.0.107
    hooks:
      - id: ruff

--- a/Cargo.lock
+++ b/Cargo.lock
@@ -14,7 +14,7 @@ version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47"
 dependencies = [
- "getrandom 0.2.8",
+ "getrandom 0.2.7",
 "once_cell",
 "version_check",
 ]
@@ -51,9 +51,9 @@ checksum = "c7021ce4924a3f25f802b2cccd1af585e39ea1a363a1aa2e72afe54b67a3a7a7"

 [[package]]
 name = "anyhow"
-version = "1.0.66"
+version = "1.0.65"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "216261ddc8289130e551ddcd5ce8a064710c0d064a4d2895c67151c92b5443f6"
+checksum = "98161a4e3e2184da77bb14f02184cdd111e83bbbcc9979dfee3c44b9a85f5602"

 [[package]]
 name = "ascii"
@@ -72,11 +72,11 @@ dependencies = [

 [[package]]
 name = "assert_cmd"
-version = "2.0.6"
+version = "2.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba45b8163c49ab5f972e59a8a5a03b6d2972619d486e19ec9fe744f7c2753d3c"
+checksum = "93ae1ddd39efd67689deb1979d80bad3bf7f2b09c6e6117c8d1f2443b5e2f83e"
 dependencies = [
- "bstr 1.0.1",
+ "bstr",
 "doc-comment",
 "predicates",
 "predicates-core",
@@ -111,9 +111,9 @@ dependencies = [

 [[package]]
 name = "async-global-executor"
-version = "2.3.1"
+version = "2.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1b6f5d7df27bd294849f8eec66ecfc63d11814df7a4f5d74168a2394467b776"
+checksum = "0da5b41ee986eed3f524c380e6d64965aea573882a8907682ad100f7859305ca"
 dependencies = [
 "async-channel",
 "async-executor",
@@ -126,16 +126,16 @@ dependencies = [

 [[package]]
 name = "async-io"
-version = "1.10.0"
+version = "1.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8121296a9f05be7f34aa4196b1747243b3b62e048bb7906f644f3fbfc490cf7"
+checksum = "83e21f3a490c72b3b0cf44962180e60045de2925d8dff97918f7ee43c8f637c7"
 dependencies = [
- "async-lock",
 "autocfg",
 "concurrent-queue",
 "futures-lite",
 "libc",
 "log",
+ "once_cell",
 "parking",
 "polling",
 "slab",
@@ -146,12 +146,11 @@ dependencies = [

 [[package]]
 name = "async-lock"
-version = "2.6.0"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c8101efe8695a6c17e02911402145357e718ac92d3ff88ae8419e84b1707b685"
+checksum = "e97a171d191782fba31bb902b14ad94e24a68145032b7eedf871ab0bc0d077b6"
 dependencies = [
 "event-listener",
- "futures-lite",
 ]

 [[package]]
@@ -239,9 +238,9 @@ dependencies = [

 [[package]]
 name = "base64"
-version = "0.13.1"
+version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8"
+checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd"

 [[package]]
 name = "bincode"
@@ -328,23 +327,11 @@ dependencies = [
 "regex-automata",
 ]

-[[package]]
-name = "bstr"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fca0852af221f458706eb0725c03e4ed6c46af9ac98e6a689d5e634215d594dd"
-dependencies = [
- "memchr",
- "once_cell",
- "regex-automata",
- "serde",
-]
-
 [[package]]
 name = "bumpalo"
-version = "3.11.1"
+version = "3.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "572f695136211188308f16ad2ca5c851a712c464060ae6974944458eb83880ba"
+checksum = "c1ad822118d20d2c234f427000d5acc36eabe1e29a348c89b63dd60b13f28e5d"

 [[package]]
 name = "byte-tools"
@@ -395,9 +382,9 @@ checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5"

 [[package]]
 name = "cc"
-version = "1.0.75"
+version = "1.0.73"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41ca34107f97baef6cfb231b32f36115781856b8f8208e8c580e0bcaea374842"
+checksum = "2fff2a6927b3bb87f9595d67196a70493f627687a71d87a0d692242c33f58c11"

 [[package]]
 name = "cfg-if"
@@ -427,8 +414,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bfd4d1b31faaa3a89d7934dbded3111da0d2ef28e3ebccdb4f0179f5929d1ef1"
 dependencies = [
 "iana-time-zone",
+ "js-sys",
 "num-integer",
 "num-traits",
+ "time",
+ "wasm-bindgen",
 "winapi 0.3.9",
 ]

@@ -474,14 +464,14 @@ dependencies = [
 "bitflags",
 "clap_lex 0.2.4",
 "indexmap",
- "textwrap",
+ "textwrap 0.16.0",
 ]

 [[package]]
 name = "clap"
-version = "4.0.22"
+version = "4.0.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91b9970d7505127a162fdaa9b96428d28a479ba78c9ec7550a63a5d9863db682"
+checksum = "6bf8832993da70a4c6d13c581f4463c2bdda27b9bf1c5498dc4365543abe6d6f"
 dependencies = [
 "atty",
 "bitflags",
@@ -494,9 +484,9 @@ dependencies = [

 [[package]]
 name = "clap_derive"
-version = "4.0.21"
+version = "4.0.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0177313f9f02afc995627906bbd8967e2be069f5261954222dac78290c2b9014"
+checksum = "c42f169caba89a7d512b5418b09864543eeb4d497416c917d7137863bd2076ad"
 dependencies = [
 "heck",
 "proc-macro-error",
@@ -711,9 +701,9 @@ checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7"

 [[package]]
 name = "ctor"
-version = "0.1.26"
+version = "0.1.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d2301688392eb071b0bf1a37be05c469d3cc4dbbd95df672fe28ab021e6a096"
+checksum = "cdffe87e1d521a10f9696f833fe502293ea446d7f256c06128293a4119bdf4cb"
 dependencies = [
 "quote",
 "syn",
@@ -721,9 +711,9 @@ dependencies = [

 [[package]]
 name = "cxx"
-version = "1.0.81"
+version = "1.0.78"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97abf9f0eca9e52b7f81b945524e76710e6cb2366aead23b7d4fbf72e281f888"
+checksum = "19f39818dcfc97d45b03953c1292efc4e80954e1583c4aa770bac1383e2310a4"
 dependencies = [
 "cc",
 "cxxbridge-flags",
@@ -733,9 +723,9 @@ dependencies = [

 [[package]]
 name = "cxx-build"
-version = "1.0.81"
+version = "1.0.78"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7cc32cc5fea1d894b77d269ddb9f192110069a8a9c1f1d441195fba90553dea3"
+checksum = "3e580d70777c116df50c390d1211993f62d40302881e54d4b79727acb83d0199"
 dependencies = [
 "cc",
 "codespan-reporting",
@@ -748,15 +738,15 @@ dependencies = [

 [[package]]
 name = "cxxbridge-flags"
-version = "1.0.81"
+version = "1.0.78"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ca220e4794c934dc6b1207c3b42856ad4c302f2df1712e9f8d2eec5afaacf1f"
+checksum = "56a46460b88d1cec95112c8c363f0e2c39afdb237f60583b0b36343bf627ea9c"

 [[package]]
 name = "cxxbridge-macro"
-version = "1.0.81"
+version = "1.0.78"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b846f081361125bfc8dc9d3940c84e1fd83ba54bbca7b17cd29483c828be0704"
+checksum = "747b608fecf06b0d72d440f27acc99288207324b793be2c17991839f3d4995ea"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -912,9 +902,9 @@ dependencies = [

 [[package]]
 name = "filetime"
-version = "0.2.18"
+version = "0.2.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b9663d381d07ae25dc88dbdf27df458faa83a9b25336bcac83d5e452b5fc9d3"
+checksum = "e94a7bbaa59354bc20dd75b67f23e2797b4490e9d6928203fb105c79e448c86c"
 dependencies = [
 "cfg-if 1.0.0",
 "libc",
@@ -930,12 +920,11 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80"

 [[package]]
 name = "flake8-to-ruff"
-version = "0.0.121-dev.0"
+version = "0.0.107-dev.0"
 dependencies = [
 "anyhow",
- "clap 4.0.22",
+ "clap 4.0.15",
 "configparser",
- "fnv",
 "once_cell",
 "regex",
 "ruff",
@@ -1006,9 +995,9 @@ checksum = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7"

 [[package]]
 name = "futures"
-version = "0.3.25"
+version = "0.3.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38390104763dc37a5145a53c29c63c1290b5d316d6086ec32c293f6736051bb0"
+checksum = "7f21eda599937fba36daeb58a22e8f5cee2d14c4a17b5b7739c7c8e5e3b8230c"
 dependencies = [
 "futures-channel",
 "futures-core",
@@ -1021,9 +1010,9 @@ dependencies = [

 [[package]]
 name = "futures-channel"
-version = "0.3.25"
+version = "0.3.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "52ba265a92256105f45b719605a571ffe2d1f0fea3807304b522c1d778f79eed"
+checksum = "30bdd20c28fadd505d0fd6712cdfcb0d4b5648baf45faef7f852afb2399bb050"
 dependencies = [
 "futures-core",
 "futures-sink",
@@ -1031,15 +1020,15 @@ dependencies = [

 [[package]]
 name = "futures-core"
-version = "0.3.25"
+version = "0.3.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04909a7a7e4633ae6c4a9ab280aeb86da1236243a77b694a49eacd659a4bd3ac"
+checksum = "4e5aa3de05362c3fb88de6531e6296e85cde7739cccad4b9dfeeb7f6ebce56bf"

 [[package]]
 name = "futures-executor"
-version = "0.3.25"
+version = "0.3.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7acc85df6714c176ab5edf386123fafe217be88c0840ec11f199441134a074e2"
+checksum = "9ff63c23854bee61b6e9cd331d523909f238fc7636290b96826e9cfa5faa00ab"
 dependencies = [
 "futures-core",
 "futures-task",
@@ -1048,9 +1037,9 @@ dependencies = [

 [[package]]
 name = "futures-io"
-version = "0.3.25"
+version = "0.3.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "00f5fb52a06bdcadeb54e8d3671f8888a39697dcb0b81b23b55174030427f4eb"
+checksum = "bbf4d2a7a308fd4578637c0b17c7e1c7ba127b8f6ba00b29f717e9655d85eb68"

 [[package]]
 name = "futures-lite"
@@ -1069,9 +1058,9 @@ dependencies = [

 [[package]]
 name = "futures-macro"
-version = "0.3.25"
+version = "0.3.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bdfb8ce053d86b91919aad980c220b1fb8401a9394410e1c289ed7e66b61835d"
+checksum = "42cd15d1c7456c04dbdf7e88bcd69760d74f3a798d6444e16974b505b0e62f17"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -1080,21 +1069,21 @@ dependencies = [

 [[package]]
 name = "futures-sink"
-version = "0.3.25"
+version = "0.3.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39c15cf1a4aa79df40f1bb462fb39676d0ad9e366c2a33b590d7c66f4f81fcf9"
+checksum = "21b20ba5a92e727ba30e72834706623d94ac93a725410b6a6b6fbc1b07f7ba56"

 [[package]]
 name = "futures-task"
-version = "0.3.25"
+version = "0.3.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2ffb393ac5d9a6eaa9d3fdf37ae2776656b706e200c8e16b1bdb227f5198e6ea"
+checksum = "a6508c467c73851293f390476d4491cf4d227dbabcd4170f3bb6044959b294f1"

 [[package]]
 name = "futures-util"
-version = "0.3.25"
+version = "0.3.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "197676987abd2f9cadff84926f410af1c183608d36641465df73ae8211dc65d6"
+checksum = "44fb6cb1be61cc1d2e43b262516aafcf63b241cffdb1d3fa115f91d9c7b09c90"
 dependencies = [
 "futures-channel",
 "futures-core",
@@ -1140,9 +1129,9 @@ dependencies = [

 [[package]]
 name = "getrandom"
-version = "0.2.8"
+version = "0.2.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31"
+checksum = "4eb1a864a501629691edf6c15a593b7a51eebaa1e8468e9ddc623de7c9b58ec6"
 dependencies = [
 "cfg-if 1.0.0",
 "js-sys",
@@ -1219,9 +1208,9 @@ checksum = "dfa686283ad6dd069f105e5ab091b04c62850d3e4cf5d67debad1933f55023df"

 [[package]]
 name = "iana-time-zone"
-version = "0.1.53"
+version = "0.1.51"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64c122667b287044802d6ce17ee2ddf13207ed924c712de9a66a5814d5b64765"
+checksum = "f5a6ef98976b22b3b7f2f3a806f858cb862044cfa66805aa3ad84cb3d3b785ed"
 dependencies = [
 "android_system_properties",
 "core-foundation-sys",
@@ -1233,9 +1222,9 @@ dependencies = [

 [[package]]
 name = "iana-time-zone-haiku"
-version = "0.1.1"
+version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0703ae284fc167426161c2e3f1da3ea71d94b21bedbcc9494e92b28e334e3dca"
+checksum = "fde6edd6cef363e9359ed3c98ba64590ba9eecba2293eb5a723ab32aee8926aa"
 dependencies = [
 "cxx",
 "cxx-build",
@@ -1438,14 +1427,14 @@ dependencies = [

 [[package]]
 name = "libc"
-version = "0.2.137"
+version = "0.2.135"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc7fcc620a3bff7cdd7a365be3376c97191aeaccc2a603e600951e452615bf89"
+checksum = "68783febc7782c6c5cb401fbda4de5a9898be1762314da0bb2c10ced61f18b0c"

 [[package]]
 name = "libcst"
 version = "0.1.0"
-source = "git+https://github.com/charliermarsh/LibCST?rev=a13ec97dd4eb925bde4d426c6e422582793b260c#a13ec97dd4eb925bde4d426c6e422582793b260c"
+source = "git+https://github.com/charliermarsh/LibCST?rev=32a044c127668df44582f85699358e67803b0d73#32a044c127668df44582f85699358e67803b0d73"
 dependencies = [
 "chic",
 "itertools",
@@ -1460,7 +1449,7 @@ dependencies = [
 [[package]]
 name = "libcst_derive"
 version = "0.1.0"
-source = "git+https://github.com/charliermarsh/LibCST?rev=a13ec97dd4eb925bde4d426c6e422582793b260c#a13ec97dd4eb925bde4d426c6e422582793b260c"
+source = "git+https://github.com/charliermarsh/LibCST?rev=32a044c127668df44582f85699358e67803b0d73#32a044c127668df44582f85699358e67803b0d73"
 dependencies = [
 "quote",
 "syn",
@@ -1594,9 +1583,9 @@ dependencies = [

 [[package]]
 name = "net2"
-version = "0.2.38"
+version = "0.2.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74d0df99cfcd2530b2e694f6e17e7f37b8e26bb23983ac530c0c97408837c631"
+checksum = "391630d12b68002ae1e25e8f974306474966550ad82dac6886fb8910c19568ae"
 dependencies = [
 "cfg-if 0.1.10",
 "libc",
@@ -1620,12 +1609,6 @@ dependencies = [
 "libc",
 ]

-[[package]]
-name = "nohash-hasher"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2bf50223579dc7cdcfb3bfcacf7069ff68243f8c363f62ffa99cf000a6b9c451"
-
 [[package]]
 name = "nom"
 version = "5.1.2"
@@ -1697,9 +1680,9 @@ dependencies = [

 [[package]]
 name = "num_cpus"
-version = "1.14.0"
+version = "1.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6058e64324c71e02bc2b150e4f3bc8286db6c83092132ffa3f6b1eab0f9def5"
+checksum = "19e64526ebdee182341572e50e9ad03965aa510cd94427a4549448f285e957a1"
 dependencies = [
 "hermit-abi",
 "libc",
@@ -1707,9 +1690,9 @@ dependencies = [

 [[package]]
 name = "once_cell"
-version = "1.16.0"
+version = "1.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "86f0b0d4bf799edbc74508c1e8bf170ff5f41238e5f8225603ca7caaae2b7860"
+checksum = "e82dad04139b71a90c080c8463fe0dc7902db5192d939bd0950f074d014339e1"

 [[package]]
 name = "oorandom"
@@ -1731,9 +1714,9 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5"

 [[package]]
 name = "os_str_bytes"
-version = "6.3.1"
+version = "6.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3baf96e39c5359d2eb0dd6ccb42c62b91d9678aa68160d261b9e0ccbf9e9dea9"
+checksum = "9ff7415e9ae3fff1225851df9e0d9e4e5479f947619774677a63572e55e80eff"

 [[package]]
 name = "parking"
@@ -1753,9 +1736,9 @@ dependencies = [

 [[package]]
 name = "parking_lot_core"
-version = "0.9.4"
+version = "0.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4dc9e0dc2adc1c69d09143aff38d3d30c5c3f0df0dad82e6d25547af174ebec0"
+checksum = "09a279cbf25cb0757810394fbc1e359949b59e348145c643a939a525692e6929"
 dependencies = [
 "cfg-if 1.0.0",
 "libc",
@@ -1955,9 +1938,9 @@ dependencies = [

 [[package]]
 name = "polling"
-version = "2.4.0"
+version = "2.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab4609a838d88b73d8238967b60dd115cc08d38e2bbaf51ee1e4b695f89122e2"
+checksum = "899b00b9c8ab553c743b3e11e87c5c7d423b2a2de229ba95b24a756344748011"
 dependencies = [
 "autocfg",
 "cfg-if 1.0.0",
@@ -1969,9 +1952,9 @@ dependencies = [

 [[package]]
 name = "ppv-lite86"
-version = "0.2.17"
+version = "0.2.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
+checksum = "eb9f9e6e233e5c4a35559a617bf40a4ec447db2e84c20b55a6f83167b7e57872"

 [[package]]
 name = "precomputed-hash"
@@ -1981,9 +1964,9 @@ checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c"

 [[package]]
 name = "predicates"
-version = "2.1.2"
+version = "2.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab68289ded120dcbf9d571afcf70163233229052aec9b08ab09532f698d0e1e6"
+checksum = "a5aab5be6e4732b473071984b3164dbbfb7a3674d30ea5ff44410b6bcd960c3c"
 dependencies = [
 "difflib",
 "itertools",
@@ -1992,15 +1975,15 @@ dependencies = [

 [[package]]
 name = "predicates-core"
-version = "1.0.4"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a6e7125585d872860e9955ca571650b27a4979c5823084168c5ed5bbfb016b56"
+checksum = "da1c2388b1513e1b605fcec39a95e0a9e8ef088f71443ef37099fa9ae6673fcb"

 [[package]]
 name = "predicates-tree"
-version = "1.0.6"
+version = "1.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad3f7fa8d61e139cbc7c3edfebf3b6678883a53f5ffac65d1259329a93ee43a5"
+checksum = "4d86de6de25020a36c6d3643a86d9a6a9f552107c0559c60ea03551b5e16c032"
 dependencies = [
 "predicates-core",
 "termtree",
@@ -2032,9 +2015,9 @@ dependencies = [

 [[package]]
 name = "proc-macro2"
-version = "1.0.47"
+version = "1.0.46"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ea3d908b0e36316caf9e9e2c4625cdde190a7e6f440d794667ed17a1855e725"
+checksum = "94e2ef8dbfc347b10c094890f778ee2e36ca9bb4262e86dc99cd217e35f3470b"
 dependencies = [
 "unicode-ident",
 ]
@@ -2114,7 +2097,7 @@ version = "0.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
 dependencies = [
- "getrandom 0.2.8",
+ "getrandom 0.2.7",
 ]

 [[package]]
@@ -2174,16 +2157,16 @@ version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b"
 dependencies = [
- "getrandom 0.2.8",
+ "getrandom 0.2.7",
 "redox_syscall",
 "thiserror",
 ]

 [[package]]
 name = "regex"
-version = "1.7.0"
+version = "1.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e076559ef8e241f2ae3479e36f97bd5741c0330689e217ad51ce2c76808b868a"
+checksum = "4c4eb3267174b8c6c2f654116623910a0fef09c4753f8dd83db29c48a0df988b"
 dependencies = [
 "aho-corasick",
 "memchr",
@@ -2198,9 +2181,9 @@ checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132"

 [[package]]
 name = "regex-syntax"
-version = "0.6.28"
+version = "0.6.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848"
+checksum = "a3f87b73ce11b1619a3c6332f45341e0047173771e8b8b73f87bfeefb7b56244"

 [[package]]
 name = "remove_dir_all"
@@ -2238,16 +2221,14 @@ dependencies = [

 [[package]]
 name = "ruff"
-version = "0.0.121"
+version = "0.0.107"
 dependencies = [
 "anyhow",
 "assert_cmd",
- "atty",
 "bincode",
- "bitflags",
 "cacache",
 "chrono",
- "clap 4.0.22",
+ "clap 4.0.15",
 "clearscreen",
 "colored",
 "common-path",
@@ -2255,14 +2236,12 @@ dependencies = [
 "dirs 4.0.0",
 "fern",
 "filetime",
- "fnv",
- "getrandom 0.2.8",
+ "getrandom 0.2.7",
 "glob",
 "insta",
 "itertools",
 "libcst",
 "log",
- "nohash-hasher",
 "notify",
 "num-bigint",
 "once_cell",
@@ -2278,7 +2257,7 @@ dependencies = [
 "strum",
 "strum_macros",
 "test-case",
- "textwrap",
+ "textwrap 0.15.1",
 "titlecase",
 "toml",
 "update-informer",
@@ -2287,13 +2266,12 @@ dependencies = [

 [[package]]
 name = "ruff_dev"
-version = "0.0.121"
+version = "0.0.107"
 dependencies = [
 "anyhow",
- "clap 4.0.22",
+ "clap 4.0.15",
 "codegen",
 "itertools",
- "libcst",
 "ruff",
 "rustpython-ast",
 "rustpython-common",
@@ -2304,9 +2282,9 @@ dependencies = [

 [[package]]
 name = "rustls"
-version = "0.20.7"
+version = "0.20.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "539a2bfe908f471bfa933876bd1eb6a19cf2176d375f82ef7f99530a40e48c2c"
+checksum = "5aab8ee6c7097ed6057f43c187a62418d0c05a4bd5f18b3571db50ee0f9ce033"
 dependencies = [
 "log",
 "ring",
@@ -2354,7 +2332,7 @@ source = "git+https://github.com/RustPython/RustPython.git?rev=27bf82a2251d7e6ac
 dependencies = [
 "bincode",
 "bitflags",
- "bstr 0.2.17",
+ "bstr",
 "itertools",
 "lz4_flex",
 "num-bigint",
@@ -2439,18 +2417,18 @@ checksum = "e25dfac463d778e353db5be2449d1cce89bd6fd23c9f1ea21310ce6e5a1b29c4"

 [[package]]
 name = "serde"
-version = "1.0.147"
+version = "1.0.145"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d193d69bae983fc11a79df82342761dfbf28a99fc8d203dca4c3c1b590948965"
+checksum = "728eb6351430bccb993660dfffc5a72f91ccc1295abaa8ce19b27ebe4f75568b"
 dependencies = [
 "serde_derive",
 ]

 [[package]]
 name = "serde_derive"
-version = "1.0.147"
+version = "1.0.145"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f1d362ca8fc9c3e3a7484440752472d68a6caa98f1ab81d99b5dfe517cec852"
+checksum = "81fa1584d3d1bcacd84c277a0dfe21f5b0f6accf4a23d04d4c6d61f1af522b4c"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -2459,9 +2437,9 @@ dependencies = [

 [[package]]
 name = "serde_json"
-version = "1.0.87"
+version = "1.0.86"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ce777b7b150d76b9cf60d28b55f5847135a003f7d7350c6be7a773508ce7d45"
+checksum = "41feea4228a6f1cd09ec7a3593a682276702cd67b5273544757dae23c096f074"
 dependencies = [
 "itoa",
 "ryu",
@@ -2656,9 +2634,9 @@ dependencies = [

 [[package]]
 name = "syn"
-version = "1.0.103"
+version = "1.0.102"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a864042229133ada95abf3b54fdc62ef5ccabe9515b64717bcb9a1919e59445d"
+checksum = "3fcd952facd492f9be3ef0d0b7032a6e442ee9b361d4acc2b1d0c4aaa5f613a1"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -2724,9 +2702,9 @@ dependencies = [

 [[package]]
 name = "termtree"
-version = "0.4.0"
+version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95059e91184749cb66be6dc994f67f182b6d897cb3df74a5bf66b5e709295fd8"
+checksum = "507e9898683b6c43a9aa55b64259b721b52ba226e0f3779137e50ad114a4c90b"

 [[package]]
 name = "test-case"
@@ -2752,15 +2730,21 @@ dependencies = [

 [[package]]
 name = "textwrap"
-version = "0.16.0"
+version = "0.15.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d"
+checksum = "949517c0cf1bf4ee812e2e07e08ab448e3ae0d23472aee8a06c985f0c8815b16"
 dependencies = [
 "smawk",
 "unicode-linebreak",
 "unicode-width",
 ]

+[[package]]
+name = "textwrap"
+version = "0.16.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d"
+
 [[package]]
 name = "thiserror"
 version = "1.0.37"
@@ -2781,6 +2765,17 @@ dependencies = [
 "syn",
 ]

+[[package]]
+name = "time"
+version = "0.1.44"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6db9e6914ab8b1ae1c260a4ae7a49b6c5611b40328a735b21862567685e73255"
+dependencies = [
+ "libc",
+ "wasi 0.10.0+wasi-snapshot-preview1",
+ "winapi 0.3.9",
+]
+
 [[package]]
 name = "tiny-keccak"
 version = "2.0.2"
@@ -2989,7 +2984,7 @@ version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b97acb4c28a254fd7a4aeec976c46a7fa404eac4d7c134b30c75144846d7cb8f"
 dependencies = [
- "base64 0.13.1",
+ "base64 0.13.0",
 "chunked_transfer",
 "flate2",
 "log",
@@ -3067,6 +3062,12 @@ version = "0.9.0+wasi-snapshot-preview1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519"

+[[package]]
+name = "wasi"
+version = "0.10.0+wasi-snapshot-preview1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f"
+
 [[package]]
 name = "wasi"
 version = "0.11.0+wasi-snapshot-preview1"
@@ -3239,60 +3240,46 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"

 [[package]]
 name = "windows-sys"
-version = "0.42.0"
+version = "0.36.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7"
+checksum = "ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2"
 dependencies = [
- "windows_aarch64_gnullvm",
 "windows_aarch64_msvc",
 "windows_i686_gnu",
 "windows_i686_msvc",
 "windows_x86_64_gnu",
- "windows_x86_64_gnullvm",
 "windows_x86_64_msvc",
 ]

-[[package]]
-name = "windows_aarch64_gnullvm"
-version = "0.42.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41d2aa71f6f0cbe00ae5167d90ef3cfe66527d6f613ca78ac8024c3ccab9a19e"
-
 [[package]]
 name = "windows_aarch64_msvc"
-version = "0.42.0"
+version = "0.36.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd0f252f5a35cac83d6311b2e795981f5ee6e67eb1f9a7f64eb4500fbc4dcdb4"
+checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47"

 [[package]]
 name = "windows_i686_gnu"
-version = "0.42.0"
+version = "0.36.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fbeae19f6716841636c28d695375df17562ca208b2b7d0dc47635a50ae6c5de7"
+checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6"

 [[package]]
 name = "windows_i686_msvc"
-version = "0.42.0"
+version = "0.36.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "84c12f65daa39dd2babe6e442988fc329d6243fdce47d7d2d155b8d874862246"
+checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024"

 [[package]]
 name = "windows_x86_64_gnu"
-version = "0.42.0"
+version = "0.36.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf7b1b21b5362cbc318f686150e5bcea75ecedc74dd157d874d754a2ca44b0ed"
-
-[[package]]
-name = "windows_x86_64_gnullvm"
-version = "0.42.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09d525d2ba30eeb3297665bd434a54297e4170c7f1a44cad4ef58095b4cd2028"
+checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1"

 [[package]]
 name = "windows_x86_64_msvc"
-version = "0.42.0"
+version = "0.36.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f40009d85759725a34da6d89a94e63d7bdc50a862acf0dbc7c8e488f1edcb6f5"
+checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680"

 [[package]]
 name = "ws2_32-sys"
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -6,48 +6,44 @@ members = [

 [package]
 name = "ruff"
-version = "0.0.121"
+version = "0.0.107"
 edition = "2021"

 [lib]
 name = "ruff"

 [dependencies]
-anyhow = { version = "1.0.66" }
-atty = { version = "0.2.14" }
+anyhow = { version = "1.0.60" }
 bincode = { version = "1.3.3" }
-bitflags = { version = "1.3.2" }
-chrono = { version = "0.4.21", default-features = false, features = ["clock"] }
+chrono = { version = "0.4.21" }
 clap = { version = "4.0.1", features = ["derive"] }
 colored = { version = "2.0.0" }
 common-path = { version = "1.0.0" }
 dirs = { version = "4.0.0" }
 fern = { version = "0.6.1" }
 filetime = { version = "0.2.17" }
-fnv = { version = "1.0.7" }
 glob = { version = "0.3.0" }
 itertools = { version = "0.10.5" }
-libcst = { git = "https://github.com/charliermarsh/LibCST", rev = "a13ec97dd4eb925bde4d426c6e422582793b260c" }
+libcst = { git = "https://github.com/charliermarsh/LibCST", rev = "32a044c127668df44582f85699358e67803b0d73" }
 log = { version = "0.4.17" }
-nohash-hasher = { version = "0.2.0" }
 notify = { version = "4.0.17" }
 num-bigint = { version = "0.4.3" }
-once_cell = { version = "1.16.0" }
+once_cell = { version = "1.13.1" }
 path-absolutize = { version = "3.0.14", features = ["once_cell_cache", "use_unix_paths_on_wasm"] }
 rayon = { version = "1.5.3" }
 regex = { version = "1.6.0" }
-ropey = { version = "1.5.0", features = ["cr_lines", "simd"], default-features = false }
+ropey = { version = "1.5.0" }
 rustpython-ast = { features = ["unparse"], git = "https://github.com/RustPython/RustPython.git", rev = "27bf82a2251d7e6ac6cd75e6ad51be12a53d84bb" }
 rustpython-common = { git = "https://github.com/RustPython/RustPython.git", rev = "27bf82a2251d7e6ac6cd75e6ad51be12a53d84bb" }
 rustpython-parser = { features = ["lalrpop"], git = "https://github.com/RustPython/RustPython.git", rev = "27bf82a2251d7e6ac6cd75e6ad51be12a53d84bb" }
-serde = { version = "1.0.147", features = ["derive"] }
-serde_json = { version = "1.0.87" }
+serde = { version = "1.0.143", features = ["derive"] }
+serde_json = { version = "1.0.83" }
 strum = { version = "0.24.1", features = ["strum_macros"] }
 strum_macros = { version = "0.24.3" }
-textwrap = { version = "0.16.0" }
+textwrap = { version = "0.15.1" }
 titlecase = { version = "2.2.1" }
 toml = { version = "0.5.9" }
-update-informer = { version = "0.5.0", default-features = false, features = ["pypi"], optional = true }
+update-informer = { version = "0.5.0", default_features = false, features = ["pypi"], optional = true }
 walkdir = { version = "2.3.2" }

 [target.'cfg(not(target_family = "wasm"))'.dependencies]
--- a/README.md
+++ b/README.md
@@ -27,17 +27,16 @@ An extremely fast Python linter, written in Rust.

 Ruff aims to be orders of magnitude faster than alternative tools while integrating more
 functionality behind a single, common interface. Ruff can be used to replace Flake8 (plus a variety
-of plugins), [`isort`](https://pypi.org/project/isort/), [`pydocstyle`](https://pypi.org/project/pydocstyle/),
-[`yesqa`](https://github.com/asottile/yesqa), and even a subset of [`pyupgrade`](https://pypi.org/project/pyupgrade/)
-and [`autoflake`](https://pypi.org/project/autoflake/) all while executing tens or hundreds of times
-faster than any individual tool.
+of plugins), [`pydocstyle`](https://pypi.org/project/pydocstyle/), [`yesqa`](https://github.com/asottile/yesqa),
+and even a subset of [`pyupgrade`](https://pypi.org/project/pyupgrade/) and [`autoflake`](https://pypi.org/project/autoflake/)
+all while executing tens or hundreds of times faster than any individual tool.

 (Coming from Flake8? Try [`flake8-to-ruff`](https://pypi.org/project/flake8-to-ruff/) to
 automatically convert your existing configuration.)

 Ruff is actively developed and used in major open-source projects
-like [FastAPI](https://github.com/tiangolo/fastapi), [Zulip](https://github.com/zulip/zulip),
-[pydantic](https://github.com/pydantic/pydantic), and [Saleor](https://github.com/saleor/saleor).
+like [Zulip](https://github.com/zulip/zulip), [pydantic](https://github.com/pydantic/pydantic),
+and [Saleor](https://github.com/saleor/saleor).

 Read the [launch blog post](https://notes.crmarsh.com/python-tooling-could-be-much-much-faster).

@@ -48,20 +47,17 @@ 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. [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)
+   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. [Ruff-specific rules](#ruff-specific-rules)
+   13. [Meta rules](#meta-rules)
 5. [Editor Integrations](#editor-integrations)
 6. [FAQ](#faq)
 7. [Development](#development)
@@ -101,7 +97,7 @@ Ruff also works with [pre-commit](https://pre-commit.com):
 ```yaml
 repos:
  - repo: https://github.com/charliermarsh/ruff-pre-commit
-    rev: v0.0.116
+    rev: v0.0.107
    hooks:
      - id: ruff
 ```
@@ -237,8 +233,6 @@ 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
@@ -291,16 +285,16 @@ Ruff supports several workflows to aid in `noqa` management.

 First, Ruff provides a special error code, `M001`, to enforce that your `noqa` directives are
 "valid", in that the errors they _say_ they ignore are actually being triggered on that line (and
-thus suppressed). You can run `ruff /path/to/file.py --extend-select M001` to flag unused `noqa`
-directives.
+thus suppressed). **You can run `ruff /path/to/file.py --extend-select M001` to flag unused `noqa`
+directives.**

 Second, Ruff can _automatically remove_ unused `noqa` directives via its autofix functionality.
-You can run `ruff /path/to/file.py --extend-select M001 --fix` to automatically remove unused
-`noqa` directives.
+**You can run `ruff /path/to/file.py --extend-select M001 --fix` to automatically remove unused
+`noqa` directives.**

 Third, Ruff can _automatically add_ `noqa` directives to all failing lines. This is useful when
-migrating a new codebase to Ruff. You can run `ruff /path/to/file.py --add-noqa` to automatically
-add `noqa` directives to all failing lines, with the appropriate error codes.
+migrating a new codebase to Ruff. **You can run `ruff /path/to/file.py --add-noqa` to automatically
+add `noqa` directives to all failing lines, with the appropriate error codes.**

 ## Supported Rules

@@ -339,7 +333,7 @@ For more, see [Pyflakes](https://pypi.org/project/pyflakes/2.5.0/) on PyPI.
 | F702 | ContinueOutsideLoop | `continue` not properly in loop |  |
 | F704 | YieldOutsideFunction | `yield` or `yield from` statement outside of a function |  |
 | F706 | ReturnOutsideFunction | `return` statement outside of a function/method |  |
-| F707 | DefaultExceptNotLast | An `except` block as not the last exception handler |  |
+| F707 | DefaultExceptNotLast | An `except:` block as not the last exception handler |  |
 | F722 | ForwardAnnotationSyntaxError | Syntax error in forward annotation: `...` |  |
 | F821 | UndefinedName | Undefined name `...` |  |
 | F822 | UndefinedExport | Undefined name `...` in `__all__` |  |
@@ -371,14 +365,6 @@ For more, see [pycodestyle](https://pypi.org/project/pycodestyle/2.9.1/) on PyPI
 | W292 | NoNewLineAtEndOfFile | No newline at end of file |  |
 | W605 | InvalidEscapeSequence | Invalid escape sequence: '\c' |  |

-### isort
-
-For more, see [isort](https://pypi.org/project/isort/5.10.1/) on PyPI.
-
-| Code | Name | Message | Fix |
-| ---- | ---- | ------- | --- |
-| I001 | UnsortedImports | Import block is un-sorted or un-formatted | 🛠 |
-
 ### pydocstyle

 For more, see [pydocstyle](https://pypi.org/project/pydocstyle/6.1.1/) on PyPI.
@@ -413,7 +399,7 @@ For more, see [pydocstyle](https://pypi.org/project/pydocstyle/6.1.1/) on PyPI.
 | D400 | EndsInPeriod | First line should end with a period |  |
 | D402 | NoSignature | First line should not be the function's signature |  |
 | D403 | FirstLineCapitalized | First word of the first line should be properly capitalized |  |
-| D404 | NoThisPrefix | First word of the docstring should not be "This" |  |
+| D404 | NoThisPrefix | First word of the docstring should not be 'This' |  |
 | D405 | CapitalizeSectionName | Section name should be properly capitalized ("returns") | 🛠 |
 | D406 | NewLineAfterSectionName | Section name should end with a newline ("Returns") | 🛠 |
 | D407 | DashedUnderlineAfterSection | Missing dashed underline after section ("Returns") | 🛠 |
@@ -444,10 +430,7 @@ For more, see [pyupgrade](https://pypi.org/project/pyupgrade/3.2.0/) on PyPI.
 | U006 | UsePEP585Annotation | Use `list` instead of `List` for type annotations | 🛠 |
 | U007 | UsePEP604Annotation | Use `X \| Y` for type annotations | 🛠 |
 | U008 | SuperCallWithParameters | Use `super()` instead of `super(__class__, self)` | 🛠 |
-| U009 | PEP3120UnnecessaryCodingComment | UTF-8 encoding declaration is unnecessary | 🛠 |
-| U010 | UnnecessaryFutureImport | Unnecessary `__future__` import `...` for target Python version | 🛠 |
-| U011 | UnnecessaryLRUCacheParams | Unnecessary parameters to `functools.lru_cache` | 🛠 |
-| U012 | UnnecessaryEncodeUTF8 | Unnecessary call to `encode` as UTF-8 | 🛠 |
+| U009 | PEP3120UnnecessaryCodingComment | utf-8 encoding declaration is unnecessary | 🛠 |

 ### pep8-naming

@@ -471,19 +454,6 @@ For more, see [pep8-naming](https://pypi.org/project/pep8-naming/0.13.2/) on PyP
 | N817 | CamelcaseImportedAsAcronym | Camelcase `...` imported as acronym `...` |  |
 | N818 | ErrorSuffixOnExceptionName | Exception name `...` should be named with an Error suffix |  |

-### flake8-bandit
-
-For more, see [flake8-bandit](https://pypi.org/project/flake8-bandit/4.1.1/) on PyPI.
-
-| Code | Name | Message | Fix |
-| ---- | ---- | ------- | --- |
-| S101 | AssertUsed | Use of `assert` detected |  |
-| S102 | ExecUsed | Use of `exec` detected |  |
-| S104 | HardcodedBindAllInterfaces | Possible binding to all interfaces |  |
-| S105 | HardcodedPasswordString | Possible hardcoded password: `"..."` |  |
-| S106 | HardcodedPasswordFuncArg | Possible hardcoded password: `"..."` |  |
-| S107 | HardcodedPasswordDefault | Possible hardcoded password: `"..."` |  |
-
 ### flake8-comprehensions

 For more, see [flake8-comprehensions](https://pypi.org/project/flake8-comprehensions/3.10.1/) on PyPI.
@@ -494,7 +464,7 @@ For more, see [flake8-comprehensions](https://pypi.org/project/flake8-comprehens
 | C401 | UnnecessaryGeneratorSet | Unnecessary generator (rewrite as a `set` comprehension) | 🛠 |
 | C402 | UnnecessaryGeneratorDict | Unnecessary generator (rewrite as a `dict` comprehension) | 🛠 |
 | C403 | UnnecessaryListComprehensionSet | Unnecessary `list` comprehension (rewrite as a `set` comprehension) | 🛠 |
-| C404 | UnnecessaryListComprehensionDict | Unnecessary `list` comprehension (rewrite as a `dict` comprehension) | 🛠 |
+| C404 | UnnecessaryListComprehensionDict | Unnecessary `list` comprehension (rewrite as a `dict` comprehension) |  |
 | C405 | UnnecessaryLiteralSet | Unnecessary `(list\|tuple)` literal (rewrite as a `set` literal) | 🛠 |
 | C406 | UnnecessaryLiteralDict | Unnecessary `(list\|tuple)` literal (rewrite as a `dict` literal) | 🛠 |
 | C408 | UnnecessaryCollectionCall | Unnecessary `(dict\|list\|tuple)` call (rewrite as a literal) | 🛠 |
@@ -513,31 +483,21 @@ For more, see [flake8-bugbear](https://pypi.org/project/flake8-bugbear/22.10.27/

 | Code | Name | Message | Fix |
 | ---- | ---- | ------- | --- |
-| B002 | UnaryPrefixIncrement | Python does not support the unary prefix increment |  |
-| B003 | AssignmentToOsEnviron | Assigning to `os.environ` doesn't clear the environment |  |
+| B002 | UnaryPrefixIncrement | Python does not support the unary prefix increment. |  |
+| B003 | AssignmentToOsEnviron | Assigning to `os.environ` doesn't clear the environment. |  |
 | B004 | UnreliableCallableCheck |  Using `hasattr(x, '__call__')` to test if x is callable is unreliable. Use `callable(x)` for consistent results. |  |
-| B005 | StripWithMultiCharacters | Using `.strip()` with multi-character strings is misleading the reader |  |
-| B006 | MutableArgumentDefault | Do not use mutable data structures for argument defaults |  |
-| B007 | UnusedLoopControlVariable | Loop control variable `i` not used within the loop body | 🛠 |
-| B008 | FunctionCallArgumentDefault | Do not perform function call in argument defaults |  |
-| B009 | GetAttrWithConstant | Do not call `getattr` with a constant attribute value. It is not any safer than normal property access. | 🛠 |
-| B010 | SetAttrWithConstant | Do not call `setattr` with a constant attribute value. It is not any safer than normal property access. |  |
+| B005 | StripWithMultiCharacters | Using `.strip()` with multi-character strings is misleading the reader. |  |
+| B006 | MutableArgumentDefault | Do not use mutable data structures for argument defaults. |  |
+| B007 | UnusedLoopControlVariable | Loop control variable `i` not used within the loop body. | 🛠 |
+| B008 | FunctionCallArgumentDefault | Do not perform function calls in argument defaults. |  |
 | B011 | DoNotAssertFalse | Do not `assert False` (`python -O` removes these calls), raise `AssertionError()` | 🛠 |
-| B012 | JumpStatementInFinally | `return/continue/break` inside finally blocks cause exceptions to be silenced |  |
-| B013 | RedundantTupleInExceptionHandler | A length-one tuple literal is redundant. Write `except ValueError` instead of `except (ValueError,)`. |  |
+| B013 | RedundantTupleInExceptionHandler | A length-one tuple literal is redundant. Write `except ValueError:` instead of `except (ValueError,):`. |  |
 | B014 | DuplicateHandlerException | Exception handler with duplicate exception: `ValueError` | 🛠 |
 | B015 | UselessComparison | Pointless comparison. This comparison does nothing but waste CPU instructions. Either prepend `assert` or remove it. |  |
 | B016 | CannotRaiseLiteral | Cannot raise a literal. Did you intend to return it or raise an Exception? |  |
-| B017 | NoAssertRaisesException | `assertRaises(Exception)` should be considered evil |  |
+| 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 |  |
 | B025 | DuplicateTryBlockException | try-except block with duplicate exception `Exception` |  |
-| B026 | StarArgUnpackingAfterKeywordArg | Star-arg unpacking after a keyword argument is strongly discouraged |  |
-| B027 | EmptyMethodWithoutAbstractDecorator | `...` is an empty method in an abstract base class, but has no abstract decorator |  |

 ### flake8-builtins

@@ -585,24 +545,6 @@ For more, see [flake8-annotations](https://pypi.org/project/flake8-annotations/2
 | ANN204 | MissingReturnTypeMagicMethod | Missing return type annotation for magic method `...` |  |
 | ANN205 | MissingReturnTypeStaticMethod | Missing return type annotation for staticmethod `...` |  |
 | ANN206 | MissingReturnTypeClassMethod | Missing return type annotation for classmethod `...` |  |
-| ANN401 | DynamicallyTypedExpression | Dynamically typed expressions (typing.Any) are disallowed in `...` |  |
-
-### flake8-2020
-
-For more, see [flake8-2020](https://pypi.org/project/flake8-2020/1.7.0/) on PyPI.
-
-| Code | Name | Message | Fix |
-| ---- | ---- | ------- | --- |
-| YTT101 | SysVersionSlice3Referenced | `sys.version[:3]` referenced (python3.10), use `sys.version_info` |  |
-| YTT102 | SysVersion2Referenced | `sys.version[2]` referenced (python3.10), use `sys.version_info` |  |
-| YTT103 | SysVersionCmpStr3 | `sys.version` compared to string (python3.10), use `sys.version_info` |  |
-| YTT201 | SysVersionInfo0Eq3Referenced | `sys.version_info[0] == 3` referenced (python4), use `>=` |  |
-| YTT202 | SixPY3Referenced | `six.PY3` referenced (python4), use `not six.PY2` |  |
-| YTT203 | SysVersionInfo1CmpInt | `sys.version_info[1]` compared to integer (python4), compare `sys.version_info` to tuple |  |
-| YTT204 | SysVersionInfoMinorCmpInt | `sys.version_info.minor` compared to integer (python4), compare `sys.version_info` to tuple |  |
-| YTT301 | SysVersion0Referenced | `sys.version[0]` referenced (python10), use `sys.version_info` |  |
-| YTT302 | SysVersionCmpStr10 | `sys.version` compared to string (python10), use `sys.version_info` |  |
-| YTT303 | SysVersionSlice1Referenced | `sys.version[:1]` referenced (python10), use `sys.version_info` |  |

 ### Ruff-specific rules

@@ -622,10 +564,6 @@ For more, see [flake8-2020](https://pypi.org/project/flake8-2020/1.7.0/) on PyPI

 ## Editor Integrations

-### VS Code (Official)
-
-Download the [Ruff VS Code extension](https://marketplace.visualstudio.com/items?itemName=charliermarsh.ruff).
-
 ### PyCharm

 Ruff can be installed as an [External Tool](https://www.jetbrains.com/help/pycharm/configuring-third-party-tools.html)
@@ -638,19 +576,6 @@ Ruff should then appear as a runnable action:

 ![Ruff as a runnable action](https://user-images.githubusercontent.com/1309177/193156026-732b0aaf-3dd9-4549-9b4d-2de6d2168a33.png)

-### Vim & Neovim (Unofficial)
-
-Ruff is available as part of the [coc-pyright](https://github.com/fannheyward/coc-pyright) extension
-for coc.nvim.
-
-Ruff can also be integrated via [efm](https://github.com/neovim/nvim-lspconfig/blob/master/doc/server_configurations.md#efm)
-in just a [few lines](https://github.com/JafarAbdi/myconfigs/blob/6f0b6b2450e92ec8fc50422928cd22005b919110/efm-langserver/config.yaml#L14-L20).
-
-### Language Server Protocol (Unofficial)
-
-[`ruffd`](https://github.com/Seamooo/ruffd) is a Rust-based language server for Ruff that implements
-the Language Server Protocol (LSP).
-
 ### GitHub Actions

 GitHub Actions has everything you need to run Ruff out-of-the-box:
@@ -709,10 +634,8 @@ including:
 - [`flake8-quotes`](https://pypi.org/project/flake8-quotes/)
 - [`flake8-annotations`](https://pypi.org/project/flake8-annotations/)
 - [`flake8-comprehensions`](https://pypi.org/project/flake8-comprehensions/)
- [`flake8-bandit`](https://pypi.org/project/flake8-bandit/) (6/40)
- [`flake8-bugbear`](https://pypi.org/project/flake8-bugbear/) (25/32)
- [`flake8-2020`](https://pypi.org/project/flake8-2020/)
- [`pyupgrade`](https://pypi.org/project/pyupgrade/) (15/34)
+- [`flake8-bugbear`](https://pypi.org/project/flake8-bugbear/) (17/32)
+- [`pyupgrade`](https://pypi.org/project/pyupgrade/) (11/34)
 - [`autoflake`](https://pypi.org/project/autoflake/) (1/7)

 Beyond rule-set parity, Ruff suffers from the following limitations vis-à-vis Flake8:
@@ -733,13 +656,11 @@ Today, Ruff can be used to replace Flake8 when used with any of the following pl
 - [`flake8-print`](https://pypi.org/project/flake8-print/)
 - [`flake8-quotes`](https://pypi.org/project/flake8-quotes/)
 - [`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/) (26/32)
- [`flake8-2020`](https://pypi.org/project/flake8-2020/)
+- [`flake8-bugbear`](https://pypi.org/project/flake8-bugbear/) (17/32)

-Ruff can also replace [`isort`](https://pypi.org/project/isort/), [`yesqa`](https://github.com/asottile/yesqa),
-and a subset of the rules implemented in [`pyupgrade`](https://pypi.org/project/pyupgrade/) (15/34).
+Ruff also implements the functionality that you get from [`yesqa`](https://github.com/asottile/yesqa),
+and a subset of the rules implemented in [`pyupgrade`](https://pypi.org/project/pyupgrade/) (11/34).

 If you're looking to use Ruff, but rely on an unsupported Flake8 plugin, free to file an Issue.

@@ -759,33 +680,6 @@ on Rust at all.
 Ruff does not yet support third-party plugins, though a plugin system is within-scope for the
 project. See [#283](https://github.com/charliermarsh/ruff/issues/283) for more.

-### How does Ruff's import sorting compare to [`isort`](https://pypi.org/project/isort/)?
-
-Ruff's import sorting is intended to be nearly equivalent to `isort` when used `profile = "black"`.
-(There are some minor differences in how Ruff and isort break ties between similar imports.)
-
-Like `isort`, Ruff's import sorting is compatible with Black.
-
-Ruff is less configurable than `isort`, but supports the `known-first-party`, `known-third-party`,
-`extra-standard-library`, and `src` settings, like so:
-
-```toml
-[tool.ruff]
-select = [
-    # Pyflakes
-    "F",
-    # Pycodestyle
-    "E",
-    "W",
-    # isort
-    "I"
-]
-src = ["src", "tests"]
-
-[tool.ruff.isort]
-known-first-party = ["my_module1", "my_module2"]
-```
-
 ### Does Ruff support NumPy- or Google-style docstrings?

 Yes! To enable a specific docstring convention, start by enabling all `pydocstyle` error codes, and
--- a/benches/source_code_locator.rs
+++ b/benches/source_code_locator.rs
@@ -1,11 +1,11 @@
-use std::fs;
 use std::path::Path;

 use criterion::{black_box, criterion_group, criterion_main, Criterion};
 use ropey::Rope;
+use ruff::fs;

 fn criterion_benchmark(c: &mut Criterion) {
-    let contents = fs::read_to_string(Path::new("resources/test/fixtures/D.py")).unwrap();
+    let contents = fs::read_file(Path::new("resources/test/fixtures/D.py")).unwrap();
    c.bench_function("rope", |b| {
        b.iter(|| {
            let rope = Rope::from_str(black_box(&contents));
--- a/flake8_to_ruff/Cargo.lock
+++ b/flake8_to_ruff/Cargo.lock
@@ -771,7 +771,7 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80"

 [[package]]
 name = "flake8_to_ruff"
-version = "0.0.121"
+version = "0.0.107"
 dependencies = [
 "anyhow",
 "clap",
@@ -1265,7 +1265,7 @@ checksum = "fc7fcc620a3bff7cdd7a365be3376c97191aeaccc2a603e600951e452615bf89"
 [[package]]
 name = "libcst"
 version = "0.1.0"
-source = "git+https://github.com/charliermarsh/LibCST?rev=a13ec97dd4eb925bde4d426c6e422582793b260c#a13ec97dd4eb925bde4d426c6e422582793b260c"
+source = "git+https://github.com/charliermarsh/LibCST?rev=32a044c127668df44582f85699358e67803b0d73#32a044c127668df44582f85699358e67803b0d73"
 dependencies = [
 "chic",
 "itertools",
@@ -1280,7 +1280,7 @@ dependencies = [
 [[package]]
 name = "libcst_derive"
 version = "0.1.0"
-source = "git+https://github.com/charliermarsh/LibCST?rev=a13ec97dd4eb925bde4d426c6e422582793b260c#a13ec97dd4eb925bde4d426c6e422582793b260c"
+source = "git+https://github.com/charliermarsh/LibCST?rev=32a044c127668df44582f85699358e67803b0d73#32a044c127668df44582f85699358e67803b0d73"
 dependencies = [
 "quote",
 "syn",
@@ -1505,7 +1505,7 @@ dependencies = [

 [[package]]
 name = "num_cpus"
-version = "1.16.0"
+version = "1.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "19e64526ebdee182341572e50e9ad03965aa510cd94427a4549448f285e957a1"
 dependencies = [
@@ -1975,7 +1975,7 @@ dependencies = [

 [[package]]
 name = "ruff"
-version = "0.0.121"
+version = "0.0.107"
 dependencies = [
 "anyhow",
 "bincode",
--- a/flake8_to_ruff/Cargo.toml
+++ b/flake8_to_ruff/Cargo.toml
@@ -1,21 +1,20 @@
 [package]
 name = "flake8-to-ruff"
-version = "0.0.121-dev.0"
+version = "0.0.107-dev.0"
 edition = "2021"

 [lib]
 name = "flake8_to_ruff"

 [dependencies]
-anyhow = { version = "1.0.66" }
+anyhow = { version = "1.0.60" }
 clap = { version = "4.0.1", features = ["derive"] }
 configparser = { version = "3.0.2" }
-fnv = { version = "1.0.7" }
-once_cell = { version = "1.16.0" }
+once_cell = { version = "1.13.1" }
 regex = { version = "1.6.0" }
 ruff = { path = "..", default-features = false }
-serde = { version = "1.0.147", features = ["derive"] }
-serde_json = { version = "1.0.87" }
+serde = { version = "1.0.143", features = ["derive"] }
+serde_json = { version = "1.0.83" }
 toml = { version = "0.5.9" }

 [dev-dependencies]
--- a/flake8_to_ruff/src/converter.rs
+++ b/flake8_to_ruff/src/converter.rs
@@ -5,7 +5,7 @@ use ruff::checks_gen::CheckCodePrefix;
 use ruff::flake8_quotes::settings::Quote;
 use ruff::settings::options::Options;
 use ruff::settings::pyproject::Pyproject;
-use ruff::{flake8_annotations, flake8_bugbear, flake8_quotes, pep8_naming};
+use ruff::{flake8_annotations, flake8_quotes, pep8_naming};

 use crate::plugin::Plugin;
 use crate::{parser, plugin};
@@ -69,7 +69,6 @@ pub fn convert(
    // Parse each supported option.
    let mut options: Options = Default::default();
    let mut flake8_annotations: flake8_annotations::settings::Options = Default::default();
-    let mut flake8_bugbear: flake8_bugbear::settings::Options = Default::default();
    let mut flake8_quotes: flake8_quotes::settings::Options = Default::default();
    let mut pep8_naming: pep8_naming::settings::Options = Default::default();
    for (key, value) in flake8 {
@@ -110,11 +109,6 @@ pub fn convert(
                        Err(e) => eprintln!("Unable to parse '{key}' property: {e}"),
                    }
                }
-                // flake8-bugbear
-                "extend-immutable-calls" | "extend_immutable_calls" => {
-                    flake8_bugbear.extend_immutable_calls =
-                        Some(parser::parse_strings(value.as_ref()));
-                }
                // flake8-annotations
                "suppress-none-returning" | "suppress_none_returning" => {
                    match parser::parse_bool(value.as_ref()) {
@@ -134,12 +128,6 @@ pub fn convert(
                        Err(e) => eprintln!("Unable to parse '{key}' property: {e}"),
                    }
                }
-                "allow-star-arg-any" | "allow_star_arg_any" => {
-                    match parser::parse_bool(value.as_ref()) {
-                        Ok(bool) => flake8_annotations.allow_star_arg_any = Some(bool),
-                        Err(e) => eprintln!("Unable to parse '{key}' property: {e}"),
-                    }
-                }
                // flake8-quotes
                "quotes" | "inline-quotes" | "inline_quotes" => match value.trim() {
                    "'" | "single" => flake8_quotes.inline_quotes = Some(Quote::Single),
@@ -185,12 +173,6 @@ pub fn convert(
    // Deduplicate and sort.
    options.select = Some(Vec::from_iter(select));
    options.ignore = Some(Vec::from_iter(ignore));
-    if flake8_annotations != Default::default() {
-        options.flake8_annotations = Some(flake8_annotations);
-    }
-    if flake8_bugbear != Default::default() {
-        options.flake8_bugbear = Some(flake8_bugbear);
-    }
    if flake8_quotes != Default::default() {
        options.flake8_quotes = Some(flake8_quotes);
    }
@@ -220,7 +202,6 @@ mod tests {
        let actual = convert(&HashMap::from([]), None)?;
        let expected = Pyproject::new(Options {
            line_length: None,
-            src: None,
            fix: None,
            exclude: None,
            extend_exclude: None,
@@ -236,9 +217,7 @@ mod tests {
            dummy_variable_rgx: None,
            target_version: None,
            flake8_annotations: None,
-            flake8_bugbear: None,
            flake8_quotes: None,
-            isort: None,
            pep8_naming: None,
        });
        assert_eq!(actual, expected);
@@ -254,7 +233,6 @@ mod tests {
        )?;
        let expected = Pyproject::new(Options {
            line_length: Some(100),
-            src: None,
            fix: None,
            exclude: None,
            extend_exclude: None,
@@ -270,9 +248,7 @@ mod tests {
            dummy_variable_rgx: None,
            target_version: None,
            flake8_annotations: None,
-            flake8_bugbear: None,
            flake8_quotes: None,
-            isort: None,
            pep8_naming: None,
        });
        assert_eq!(actual, expected);
@@ -288,7 +264,6 @@ mod tests {
        )?;
        let expected = Pyproject::new(Options {
            line_length: Some(100),
-            src: None,
            fix: None,
            exclude: None,
            extend_exclude: None,
@@ -304,9 +279,7 @@ mod tests {
            dummy_variable_rgx: None,
            target_version: None,
            flake8_annotations: None,
-            flake8_bugbear: None,
            flake8_quotes: None,
-            isort: None,
            pep8_naming: None,
        });
        assert_eq!(actual, expected);
@@ -322,7 +295,6 @@ mod tests {
        )?;
        let expected = Pyproject::new(Options {
            line_length: None,
-            src: None,
            fix: None,
            exclude: None,
            extend_exclude: None,
@@ -338,9 +310,7 @@ mod tests {
            dummy_variable_rgx: None,
            target_version: None,
            flake8_annotations: None,
-            flake8_bugbear: None,
            flake8_quotes: None,
-            isort: None,
            pep8_naming: None,
        });
        assert_eq!(actual, expected);
@@ -356,7 +326,6 @@ mod tests {
        )?;
        let expected = Pyproject::new(Options {
            line_length: None,
-            src: None,
            fix: None,
            exclude: None,
            extend_exclude: None,
@@ -372,14 +341,12 @@ mod tests {
            dummy_variable_rgx: None,
            target_version: None,
            flake8_annotations: None,
-            flake8_bugbear: None,
            flake8_quotes: Some(flake8_quotes::settings::Options {
                inline_quotes: Some(flake8_quotes::settings::Quote::Single),
                multiline_quotes: None,
                docstring_quotes: None,
                avoid_escape: None,
            }),
-            isort: None,
            pep8_naming: None,
        });
        assert_eq!(actual, expected);
@@ -398,7 +365,6 @@ mod tests {
        )?;
        let expected = Pyproject::new(Options {
            line_length: None,
-            src: None,
            fix: None,
            exclude: None,
            extend_exclude: None,
@@ -449,9 +415,7 @@ mod tests {
            dummy_variable_rgx: None,
            target_version: None,
            flake8_annotations: None,
-            flake8_bugbear: None,
            flake8_quotes: None,
-            isort: None,
            pep8_naming: None,
        });
        assert_eq!(actual, expected);
@@ -467,7 +431,6 @@ mod tests {
        )?;
        let expected = Pyproject::new(Options {
            line_length: None,
-            src: None,
            fix: None,
            exclude: None,
            extend_exclude: None,
@@ -484,14 +447,12 @@ mod tests {
            dummy_variable_rgx: None,
            target_version: None,
            flake8_annotations: None,
-            flake8_bugbear: None,
            flake8_quotes: Some(flake8_quotes::settings::Options {
                inline_quotes: Some(flake8_quotes::settings::Quote::Single),
                multiline_quotes: None,
                docstring_quotes: None,
                avoid_escape: None,
            }),
-            isort: None,
            pep8_naming: None,
        });
        assert_eq!(actual, expected);
--- a/flake8_to_ruff/src/parser.rs
+++ b/flake8_to_ruff/src/parser.rs
@@ -1,7 +1,7 @@
+use std::collections::BTreeMap;
 use std::str::FromStr;

 use anyhow::Result;
-use fnv::FnvHashMap;
 use once_cell::sync::Lazy;
 use regex::Regex;
 use ruff::checks_gen::CheckCodePrefix;
@@ -179,8 +179,8 @@ pub fn parse_files_to_codes_mapping(value: &str) -> Result<Vec<PatternPrefixPair
 /// Collect a list of `PatternPrefixPair` structs as a `BTreeMap`.
 pub fn collect_per_file_ignores(
    pairs: Vec<PatternPrefixPair>,
-) -> FnvHashMap<String, Vec<CheckCodePrefix>> {
-    let mut per_file_ignores: FnvHashMap<String, Vec<CheckCodePrefix>> = FnvHashMap::default();
+) -> BTreeMap<String, Vec<CheckCodePrefix>> {
+    let mut per_file_ignores: BTreeMap<String, Vec<CheckCodePrefix>> = BTreeMap::new();
    for pair in pairs {
        per_file_ignores
            .entry(pair.pattern)
--- a/flake8_to_ruff/src/plugin.rs
+++ b/flake8_to_ruff/src/plugin.rs
@@ -6,7 +6,6 @@ use ruff::checks_gen::CheckCodePrefix;

 #[derive(Debug, Clone, Ord, PartialOrd, Eq, PartialEq)]
 pub enum Plugin {
-    Flake8Bandit,
    Flake8Bugbear,
    Flake8Builtins,
    Flake8Comprehensions,
@@ -23,7 +22,6 @@ impl FromStr for Plugin {

    fn from_str(string: &str) -> Result<Self, Self::Err> {
        match string {
-            "flake8-bandit" => Ok(Plugin::Flake8Bandit),
            "flake8-bugbear" => Ok(Plugin::Flake8Bugbear),
            "flake8-builtins" => Ok(Plugin::Flake8Builtins),
            "flake8-comprehensions" => Ok(Plugin::Flake8Comprehensions),
@@ -41,7 +39,6 @@ impl FromStr for Plugin {
 impl Plugin {
    pub fn default(&self) -> CheckCodePrefix {
        match self {
-            Plugin::Flake8Bandit => CheckCodePrefix::S,
            Plugin::Flake8Bugbear => CheckCodePrefix::B,
            Plugin::Flake8Builtins => CheckCodePrefix::A,
            Plugin::Flake8Comprehensions => CheckCodePrefix::C,
@@ -56,7 +53,6 @@ impl Plugin {

    pub fn select(&self, flake8: &HashMap<String, Option<String>>) -> Vec<CheckCodePrefix> {
        match self {
-            Plugin::Flake8Bandit => vec![CheckCodePrefix::S],
            Plugin::Flake8Bugbear => vec![CheckCodePrefix::B],
            Plugin::Flake8Builtins => vec![CheckCodePrefix::A],
            Plugin::Flake8Comprehensions => vec![CheckCodePrefix::C],
@@ -269,10 +265,6 @@ pub fn infer_plugins_from_options(flake8: &HashMap<String, Option<String>>) -> V
            "docstring-convention" | "docstring_convention" => {
                plugins.insert(Plugin::Flake8Docstrings);
            }
-            // flake8-bugbear
-            "extend-immutable-calls" | "extend_immutable_calls" => {
-                plugins.insert(Plugin::Flake8Bugbear);
-            }
            // flake8-builtins
            "builtins-ignorelist" | "builtins_ignorelist" => {
                plugins.insert(Plugin::Flake8Builtins);
@@ -337,7 +329,6 @@ pub fn infer_plugins_from_options(flake8: &HashMap<String, Option<String>>) -> V
 /// `flake8-annotations` is active.
 pub fn infer_plugins_from_codes(codes: &BTreeSet<CheckCodePrefix>) -> Vec<Plugin> {
    [
-        Plugin::Flake8Bandit,
        Plugin::Flake8Bugbear,
        Plugin::Flake8Builtins,
        Plugin::Flake8Comprehensions,
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -32,7 +32,3 @@ build-backend = "maturin"
 bindings = "bin"
 sdist-include = ["Cargo.lock"]
 strip = true
-
-[tool.isort]
-profile = "black"
-known_third_party = ["fastapi", "pydantic", "starlette"]
--- a/resources/test/fixtures/B008_extended.py
+++ b/resources/test/fixtures/B008_extended.py
@@ -1,20 +0,0 @@
-from typing import List
-
-import fastapi
-from fastapi import Query
-
-
-def okay(db=fastapi.Depends(get_db)):
-    ...
-
-
-def okay(data: List[str] = fastapi.Query(None)):
-    ...
-
-
-def okay(data: List[str] = Query(None)):
-    ...
-
-
-def error_due_to_missing_import(data: List[str] = Depends(None)):
-    ...
--- a/resources/test/fixtures/B009_B010.py
+++ b/resources/test/fixtures/B009_B010.py
@@ -1,36 +0,0 @@
-"""
-Should emit:
-B009 - Line 18, 19, 20, 21, 22
-B010 - Line 33, 34, 35, 36
-"""
-
-# Valid getattr usage
-getattr(foo, bar)
-getattr(foo, "bar", None)
-getattr(foo, "bar{foo}".format(foo="a"), None)
-getattr(foo, "bar{foo}".format(foo="a"))
-getattr(foo, bar, None)
-getattr(foo, "123abc")
-getattr(foo, r"123\abc")
-getattr(foo, "except")
-
-# Invalid usage
-getattr(foo, "bar")
-getattr(foo, "_123abc")
-getattr(foo, "abc123")
-getattr(foo, r"abc123")
-_ = lambda x: getattr(x, "bar")
-
-# Valid setattr usage
-setattr(foo, bar, None)
-setattr(foo, "bar{foo}".format(foo="a"), None)
-setattr(foo, "123abc", None)
-setattr(foo, r"123\abc", None)
-setattr(foo, "except", None)
-_ = lambda x: setattr(x, "bar", 1)
-
-# Invalid usage
-setattr(foo, "bar", None)
-setattr(foo, "_123abc", None)
-setattr(foo, "abc123", None)
-setattr(foo, r"abc123", None)
--- a/resources/test/fixtures/B012.py
+++ b/resources/test/fixtures/B012.py
@@ -1,107 +0,0 @@
-def a():
-    try:
-        pass
-    finally:
-        return  # warning
-
-
-def b():
-    try:
-        pass
-    finally:
-        if 1 + 0 == 2 - 1:
-            return  # warning
-
-
-def c():
-    try:
-        pass
-    finally:
-        try:
-            return  # warning
-        except Exception:
-            pass
-
-
-def d():
-    try:
-        try:
-            pass
-        finally:
-            return  # warning
-    finally:
-        pass
-
-
-def e():
-    if 1 == 2 - 1:
-        try:
-
-            def f():
-                try:
-                    pass
-                finally:
-                    return  # warning
-
-        finally:
-            pass
-
-
-def g():
-    try:
-        pass
-    finally:
-
-        def h():
-            return  # no warning
-
-        e()
-
-
-def i():
-    while True:
-        try:
-            pass
-        finally:
-            break  # warning
-
-            def j():
-                while True:
-                    break  # no warning
-
-
-def h():
-    while True:
-        try:
-            pass
-        finally:
-            continue  # warning
-
-            def j():
-                while True:
-                    continue  # no warning
-
-
-def k():
-    try:
-        pass
-    finally:
-        while True:
-            break  # no warning
-        while True:
-            continue  # no warning
-        while True:
-            return  # warning
-
-
-while True:
-    try:
-        pass
-    finally:
-        continue  # warning
-
-while True:
-    try:
-        pass
-    finally:
-        break  # warning
--- a/resources/test/fixtures/B019.py
+++ b/resources/test/fixtures/B019.py
@@ -1,108 +0,0 @@
-"""
-Should emit:
-B019 - on lines 73, 77, 81, 85, 89, 93, 97, 101
-"""
-import functools
-from functools import cache, cached_property, lru_cache
-
-
-def some_other_cache():
-    ...
-
-
-@functools.cache
-def compute_func(self, y):
-    ...
-
-
-class Foo:
-    def __init__(self, x):
-        self.x = x
-
-    def compute_method(self, y):
-        ...
-
-    @some_other_cache
-    def user_cached_instance_method(self, y):
-        ...
-
-    @classmethod
-    @functools.cache
-    def cached_classmethod(cls, y):
-        ...
-
-    @classmethod
-    @cache
-    def other_cached_classmethod(cls, y):
-        ...
-
-    @classmethod
-    @functools.lru_cache
-    def lru_cached_classmethod(cls, y):
-        ...
-
-    @classmethod
-    @lru_cache
-    def other_lru_cached_classmethod(cls, y):
-        ...
-
-    @staticmethod
-    @functools.cache
-    def cached_staticmethod(y):
-        ...
-
-    @staticmethod
-    @cache
-    def other_cached_staticmethod(y):
-        ...
-
-    @staticmethod
-    @functools.lru_cache
-    def lru_cached_staticmethod(y):
-        ...
-
-    @staticmethod
-    @lru_cache
-    def other_lru_cached_staticmethod(y):
-        ...
-
-    @functools.cached_property
-    def some_cached_property(self):
-        ...
-
-    @cached_property
-    def some_other_cached_property(self):
-        ...
-
-    # Remaining methods should emit B019
-    @functools.cache
-    def cached_instance_method(self, y):
-        ...
-
-    @cache
-    def another_cached_instance_method(self, y):
-        ...
-
-    @functools.cache()
-    def called_cached_instance_method(self, y):
-        ...
-
-    @cache()
-    def another_called_cached_instance_method(self, y):
-        ...
-
-    @functools.lru_cache
-    def lru_cached_instance_method(self, y):
-        ...
-
-    @lru_cache
-    def another_lru_cached_instance_method(self, y):
-        ...
-
-    @functools.lru_cache()
-    def called_lru_cached_instance_method(self, y):
-        ...
-
-    @lru_cache()
-    def another_called_lru_cached_instance_method(self, y):
-        ...
--- a/resources/test/fixtures/B020.py
+++ b/resources/test/fixtures/B020.py
@@ -1,40 +0,0 @@
-"""
-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)
--- a/resources/test/fixtures/B021.py
+++ b/resources/test/fixtures/B021.py
@@ -1,76 +0,0 @@
-f"""
-Should emit:
-B021 - on lines 14, 22, 30, 38, 46, 54, 62, 70, 73
-"""
-
-VARIABLE = "world"
-
-
-def foo1():
-    """hello world!"""
-
-
-def foo2():
-    f"""hello {VARIABLE}!"""
-
-
-class bar1:
-    """hello world!"""
-
-
-class bar2:
-    f"""hello {VARIABLE}!"""
-
-
-def foo1():
-    """hello world!"""
-
-
-def foo2():
-    f"""hello {VARIABLE}!"""
-
-
-class bar1:
-    """hello world!"""
-
-
-class bar2:
-    f"""hello {VARIABLE}!"""
-
-
-def foo1():
-    "hello world!"
-
-
-def foo2():
-    f"hello {VARIABLE}!"
-
-
-class bar1:
-    "hello world!"
-
-
-class bar2:
-    f"hello {VARIABLE}!"
-
-
-def foo1():
-    "hello world!"
-
-
-def foo2():
-    f"hello {VARIABLE}!"
-
-
-class bar1:
-    "hello world!"
-
-
-class bar2:
-    f"hello {VARIABLE}!"
-
-
-def baz():
-    f"""I'm probably a docstring: {VARIABLE}!"""
-    print(f"""I'm a normal string""")
-    f"""Don't detect me!"""
--- a/resources/test/fixtures/B022.py
+++ b/resources/test/fixtures/B022.py
@@ -1,23 +0,0 @@
-"""
-Should emit:
-B022 - on lines 8
-"""
-
-import contextlib
-from contextlib import suppress
-
-with contextlib.suppress():
-    raise ValueError
-
-with suppress():
-    raise ValueError
-
-with contextlib.suppress(ValueError):
-    raise ValueError
-
-exceptions_to_suppress = []
-if True:
-    exceptions_to_suppress.append(ValueError)
-
-with contextlib.suppress(*exceptions_to_suppress):
-    raise
--- a/resources/test/fixtures/B024.py
+++ b/resources/test/fixtures/B024.py
@@ -1,129 +0,0 @@
-"""
-Should emit:
-B024 - on lines 17, 34, 52, 58, 69, 74, 79, 84, 89
-"""
-
-import abc
-import abc as notabc
-from abc import ABC, ABCMeta
-from abc import abstractmethod
-from abc import abstractmethod as abstract
-from abc import abstractmethod as abstractaoeuaoeuaoeu
-from abc import abstractmethod as notabstract
-
-import foo
-
-
-class Base_1(ABC):  # error
-    def method(self):
-        foo()
-
-
-class Base_2(ABC):
-    @abstractmethod
-    def method(self):
-        foo()
-
-
-class Base_3(ABC):
-    @abc.abstractmethod
-    def method(self):
-        foo()
-
-
-class Base_4(ABC):
-    @notabc.abstractmethod
-    def method(self):
-        foo()
-
-
-class Base_5(ABC):
-    @abstract
-    def method(self):
-        foo()
-
-
-class Base_6(ABC):
-    @abstractaoeuaoeuaoeu
-    def method(self):
-        foo()
-
-
-class Base_7(ABC):  # error
-    @notabstract
-    def method(self):
-        foo()
-
-
-class MetaBase_1(metaclass=ABCMeta):  # error
-    def method(self):
-        foo()
-
-
-class MetaBase_2(metaclass=ABCMeta):
-    @abstractmethod
-    def method(self):
-        foo()
-
-
-class abc_Base_1(abc.ABC):  # error
-    def method(self):
-        foo()
-
-
-class abc_Base_2(metaclass=abc.ABCMeta):  # error
-    def method(self):
-        foo()
-
-
-class notabc_Base_1(notabc.ABC):  # error
-    def method(self):
-        foo()
-
-
-class multi_super_1(notabc.ABC, abc.ABCMeta):  # safe
-    def method(self):
-        foo()
-
-
-class multi_super_2(notabc.ABC, metaclass=abc.ABCMeta):  # safe
-    def method(self):
-        foo()
-
-
-class non_keyword_abcmeta_1(ABCMeta):  # safe
-    def method(self):
-        foo()
-
-
-class non_keyword_abcmeta_2(abc.ABCMeta):  # safe
-    def method(self):
-        foo()
-
-
-# very invalid code, but that's up to mypy et al to check
-class keyword_abc_1(metaclass=ABC):  # safe
-    def method(self):
-        foo()
-
-
-class keyword_abc_2(metaclass=abc.ABC):  # safe
-    def method(self):
-        foo()
-
-
-class abc_set_class_variable_1(ABC):  # safe
-    foo: int
-
-
-class abc_set_class_variable_2(ABC):  # safe
-    foo = 2
-
-
-class abc_set_class_variable_3(ABC):  # safe
-    foo: int = 2
-
-
-# this doesn't actually declare a class variable, it's just an expression
-class abc_set_class_variable_4(ABC):  # error
-    foo
--- a/resources/test/fixtures/B026.py
+++ b/resources/test/fixtures/B026.py
@@ -1,21 +0,0 @@
-"""
-Should emit:
-B026 - on lines 16, 17, 18, 19, 20, 21
-"""
-
-
-def foo(bar, baz, bam):
-    print(bar, baz, bam)
-
-
-bar_baz = ["bar", "baz"]
-
-foo("bar", "baz", bam="bam")
-foo("bar", baz="baz", bam="bam")
-foo(bar="bar", baz="baz", bam="bam")
-foo(bam="bam", *["bar", "baz"])
-foo(bam="bam", *bar_baz)
-foo(baz="baz", bam="bam", *["bar"])
-foo(bar="bar", baz="baz", bam="bam", *[])
-foo(bam="bam", *["bar"], *["baz"])
-foo(*["bar"], bam="bam", *["baz"])
--- a/resources/test/fixtures/B027.py
+++ b/resources/test/fixtures/B027.py
@@ -1,88 +0,0 @@
-"""
-Should emit:
-B027 - on lines 12, 15, 18, 22, 30
-"""
-import abc
-from abc import ABC
-from abc import abstractmethod
-from abc import abstractmethod as notabstract
-
-
-class AbstractClass(ABC):
-    def empty_1(self):  # error
-        ...
-
-    def empty_2(self):  # error
-        pass
-
-    def empty_3(self):  # error
-        """docstring"""
-        ...
-
-    def empty_4(self):  # error
-        """multiple ellipsis/pass"""
-        ...
-        pass
-        ...
-        pass
-
-    @notabstract
-    def abstract_0(self):
-        ...
-
-    @abstractmethod
-    def abstract_1(self):
-        ...
-
-    @abstractmethod
-    def abstract_2(self):
-        pass
-
-    @abc.abstractmethod
-    def abstract_3(self):
-        ...
-
-    def body_1(self):
-        print("foo")
-        ...
-
-    def body_2(self):
-        self.body_1()
-
-
-class NonAbstractClass:
-    def empty_1(self):  # safe
-        ...
-
-    def empty_2(self):  # safe
-        pass
-
-
-# ignore @overload, fixes issue #304
-# ignore overload with other imports, fixes #308
-import typing
-import typing as t
-import typing as anything
-from typing import Union, overload
-
-
-class AbstractClass(ABC):
-    @overload
-    def empty_1(self, foo: str):
-        ...
-
-    @typing.overload
-    def empty_1(self, foo: int):
-        ...
-
-    @t.overload
-    def empty_1(self, foo: list):
-        ...
-
-    @anything.overload
-    def empty_1(self, foo: float):
-        ...
-
-    @abstractmethod
-    def empty_1(self, foo: Union[str, int, list, float]):
-        ...
--- a/resources/test/fixtures/C413.py
+++ b/resources/test/fixtures/C413.py
@@ -1,6 +1,4 @@
 x = [2, 3, 1]
-list(x)
 list(sorted(x))
 reversed(sorted(x))
-reversed(sorted(x, key=lambda e: e))
 reversed(sorted(x, reverse=True))
--- a/resources/test/fixtures/F401_0.py
+++ b/resources/test/fixtures/F401_0.py
@@ -28,6 +28,7 @@ from blah import ClassA, ClassB, ClassC
 if TYPE_CHECKING:
    from models import Fruit, Nut, Vegetable

+
 if TYPE_CHECKING:
    import shelve
    import importlib
--- a/resources/test/fixtures/F401_6.py
+++ b/resources/test/fixtures/F401_6.py
@@ -1,20 +0,0 @@
-"""Test: explicit re-export."""
-
-# OK
-from .applications import FastAPI as FastAPI
-
-# F401 `background.BackgroundTasks` imported but unused
-from .background import BackgroundTasks
-
-# F401 `datastructures.UploadFile` imported but unused
-from .datastructures import UploadFile as FileUpload
-
-
-# OK
-import applications as applications
-
-# F401 `background` imported but unused
-import background
-
-# F401 `datastructures` imported but unused
-import datastructures as structures
--- a/resources/test/fixtures/F821_4.py
+++ b/resources/test/fixtures/F821_4.py
@@ -1,24 +0,0 @@
-"""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"]
--- a/resources/test/fixtures/F821_5.py
+++ b/resources/test/fixtures/F821_5.py
@@ -1,14 +0,0 @@
-"""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()
--- a/resources/test/fixtures/N806.py
+++ b/resources/test/fixtures/N806.py
@@ -1,11 +1,5 @@
-import collections
-from collections import namedtuple
-
-
 def f():
    lower = 0
    Camel = 0
    CONSTANT = 0
    _ = 0
-    MyObj1 = collections.namedtuple("MyObj1", ["a", "b"])
-    MyObj2 = namedtuple("MyObj12", ["a", "b"])
--- a/resources/test/fixtures/N815.py
+++ b/resources/test/fixtures/N815.py
@@ -1,12 +1,6 @@
-import collections
-from collections import namedtuple
-
-
 class C:
    lower = 0
    CONSTANT = 0
    mixedCase = 0
    _mixedCase = 0
    mixed_Case = 0
-    myObj1 = collections.namedtuple("MyObj1", ["a", "b"])
-    myObj2 = namedtuple("MyObj2", ["a", "b"])
--- a/resources/test/fixtures/N816.py
+++ b/resources/test/fixtures/N816.py
@@ -1,10 +1,5 @@
-import collections
-from collections import namedtuple
-
 lower = 0
 CONSTANT = 0
 mixedCase = 0
 _mixedCase = 0
 mixed_Case = 0
-myObj1 = collections.namedtuple("MyObj1", ["a", "b"])
-myObj2 = namedtuple("MyObj2", ["a", "b"])
--- a/resources/test/fixtures/S101.py
+++ b/resources/test/fixtures/S101.py
@@ -1,11 +0,0 @@
-# Error
-assert True
-
-def fn():
-    x = 1
-
-    # Error
-    assert x == 1
-
-    # Error
-    assert x == 2
--- a/resources/test/fixtures/S102.py
+++ b/resources/test/fixtures/S102.py
@@ -1,5 +0,0 @@
-def fn():
-    # Error
-    exec('x = 2')
-
-exec('y = 3')
--- a/resources/test/fixtures/S104.py
+++ b/resources/test/fixtures/S104.py
@@ -1,19 +0,0 @@
-def func(address):
-    print(address)
-
-
-# OK
-"OK"
-
-# Error
-"0.0.0.0"
-'0.0.0.0'
-
-
-# Error
-func("0.0.0.0")
-
-
-def my_func():
-    x = "0.0.0.0"
-    print(x)
--- a/resources/test/fixtures/S105.py
+++ b/resources/test/fixtures/S105.py
@@ -1,53 +0,0 @@
-d = {}
-
-# OK
-safe = "s3cr3t"
-password = True
-password = safe
-password is True
-password == 1
-d["safe"] = "s3cr3t"
-
-# Errors
-password = "s3cr3t"
-_pass = "s3cr3t"
-passwd = "s3cr3t"
-pwd = "s3cr3t"
-secret = "s3cr3t"
-token = "s3cr3t"
-secrete = "s3cr3t"
-safe = password = "s3cr3t"
-password = safe = "s3cr3t"
-
-d["password"] = "s3cr3t"
-d["pass"] = "s3cr3t"
-d["passwd"] = "s3cr3t"
-d["pwd"] = "s3cr3t"
-d["secret"] = "s3cr3t"
-d["token"] = "s3cr3t"
-d["secrete"] = "s3cr3t"
-safe = d["password"] = "s3cr3t"
-d["password"] = safe = "s3cr3t"
-
-
-class MyClass:
-    password = "s3cr3t"
-    safe = password
-
-
-MyClass.password = "s3cr3t"
-MyClass._pass = "s3cr3t"
-MyClass.passwd = "s3cr3t"
-MyClass.pwd = "s3cr3t"
-MyClass.secret = "s3cr3t"
-MyClass.token = "s3cr3t"
-MyClass.secrete = "s3cr3t"
-
-password == "s3cr3t"
-_pass == "s3cr3t"
-passwd == "s3cr3t"
-pwd == "s3cr3t"
-secret == "s3cr3t"
-token == "s3cr3t"
-secrete == "s3cr3t"
-password == safe == "s3cr3t"
--- a/resources/test/fixtures/S106.py
+++ b/resources/test/fixtures/S106.py
@@ -1,13 +0,0 @@
-def func(pos, password):
-    pass
-
-
-string = "Hello World"
-
-# OK
-func("s3cr3t")
-func(1, password=string)
-func(pos="s3cr3t", password=string)
-
-# Error
-func(1, password="s3cr3t")
--- a/resources/test/fixtures/S107.py
+++ b/resources/test/fixtures/S107.py
@@ -1,30 +0,0 @@
-def ok(first, default="default"):
-    pass
-
-
-def default(first, password="default"):
-    pass
-
-
-def ok_posonly(first, /, pos, default="posonly"):
-    pass
-
-
-def default_posonly(first, /, pos, password="posonly"):
-    pass
-
-
-def ok_kwonly(first, *, default="kwonly"):
-    pass
-
-
-def default_kwonly(first, *, password="kwonly"):
-    pass
-
-
-def ok_all(first, /, pos, default="posonly", *, kwonly="kwonly"):
-    pass
-
-
-def default_all(first, /, pos, secret="posonly", *, password="kwonly"):
-    pass
--- a/resources/test/fixtures/U006.py
+++ b/resources/test/fixtures/U006.py
@@ -1,10 +1,3 @@
-import typing
-
-
-def f(x: typing.List[str]) -> None:
-    ...
-
-
 from typing import List


@@ -12,15 +5,8 @@ def f(x: List[str]) -> None:
    ...


-import typing as t
+import typing


-def f(x: t.List[str]) -> None:
-    ...
-
-
-from typing import List as IList
-
-
-def f(x: IList[str]) -> None:
+def f(x: typing.List[str]) -> None:
    ...
--- a/resources/test/fixtures/U010.py
+++ b/resources/test/fixtures/U010.py
@@ -1,14 +0,0 @@
-from __future__ import nested_scopes, generators
-from __future__ import with_statement, unicode_literals
-from __future__ import absolute_import, division
-from __future__ import generator_stop
-from __future__ import print_function, generator_stop
-from __future__ import invalid_module, generators
-
-if True:
-    from __future__ import generator_stop
-    from __future__ import generators
-
-if True:
-    from __future__ import generator_stop
-    from __future__ import invalid_module, generators
--- a/resources/test/fixtures/U011_0.py
+++ b/resources/test/fixtures/U011_0.py
@@ -1,103 +0,0 @@
-import functools
-from functools import lru_cache
-
-
-@lru_cache()
-def fixme1():
-    pass
-
-
-@other_deco_after
-@functools.lru_cache()
-def fixme2():
-    pass
-
-
-@lru_cache(maxsize=None)
-def fixme3():
-    pass
-
-
-@functools.lru_cache(maxsize=None)
-@other_deco_before
-def fixme4():
-    pass
-
-
-@lru_cache( # A 
-) # B
-def fixme5():
-    pass
-
-
-@lru_cache(
-    # A
-)   # B
-def fixme6():
-    pass
-
-
-@functools.lru_cache(
-    # A
-    maxsize = None) # B
-def fixme7():
-    pass
-
-
-@functools.lru_cache(
-    # A1
-    maxsize = None
-    # A2
-) # B
-def fixme8():
-    pass
-
-
-@functools.lru_cache(
-    # A1
-    maxsize = 
-    None
-    # A2
-
-)
-def fixme9():
-    pass
-
-
-@functools.lru_cache(
-    # A1
-    maxsize = 
-    None
-    # A2
-)
-def fixme10():
-    pass
-
-
-@lru_cache
-def correct1():
-    pass
-
-
-@functools.lru_cache
-def correct2():
-    pass
-
-
-@functoools.lru_cache(maxsize=64)
-def correct3():
-    pass
-
-
-def user_func():
-    pass
-
-
-@lru_cache(user_func)
-def correct4():
-    pass
-
-
-@lru_cache(user_func, maxsize=None)
-def correct5():
-    pass
--- a/resources/test/fixtures/U011_1.py
+++ b/resources/test/fixtures/U011_1.py
@@ -1,15 +0,0 @@
-import functools
-
-
-def lru_cache(maxsize=None):
-    pass
-
-
-@lru_cache()
-def dont_fixme():
-    pass
-
-
-@lru_cache(maxsize=None)
-def dont_fixme():
-    pass
--- a/resources/test/fixtures/U012.py
+++ b/resources/test/fixtures/U012.py
@@ -1,52 +0,0 @@
-# ASCII literals should be replaced by a bytes literal
-"foo".encode("utf-8")  # b"foo"
-"foo".encode("u8")  # b"foo"
-"foo".encode()  # b"foo"
-"foo".encode("UTF8")  # b"foo"
-U"foo".encode("utf-8")  # b"foo"
-"foo".encode(encoding="utf-8")  # b"foo"
-"""
-Lorem
-
-Ipsum
-""".encode(
-    "utf-8"
-)
-# b"""
-# Lorem
-#
-# Ipsum
-# """
-
-# `encode` on variables should not be processed.
-string = "hello there"
-string.encode("utf-8")
-
-bar = "bar"
-f"foo{bar}".encode("utf-8")  # f"foo{bar}".encode()
-encoding = "latin"
-"foo".encode(encoding)
-f"foo{bar}".encode(encoding)
-
-# `encode` with custom args and kwargs should not be processed.
-"foo".encode("utf-8", errors="replace")
-"foo".encode("utf-8", "replace")
-"foo".encode(errors="replace")
-"foo".encode(encoding="utf-8", errors="replace")
-
-# `encode` with custom args and kwargs on unicode should not be processed.
-"unicode text©".encode("utf-8", errors="replace")
-"unicode text©".encode("utf-8", "replace")
-"unicode text©".encode(errors="replace")
-"unicode text©".encode(encoding="utf-8", errors="replace")
-
-# Unicode literals should only be stripped of default encoding.
-"unicode text©".encode("utf-8")  # "unicode text©".encode()
-"unicode text©".encode()
-"unicode text©".encode(encoding="UTF8")  # "unicode text©".encode()
-
-r"fo\o".encode("utf-8")  # br"fo\o"
-u"foo".encode("utf-8")  # b"foo"
-R"fo\o".encode("utf-8")  # br"fo\o"
-U"foo".encode("utf-8")  # b"foo"
-print("foo".encode())  # print(b"foo")
--- a/resources/test/fixtures/YTT101.py
+++ b/resources/test/fixtures/YTT101.py
@@ -1,12 +0,0 @@
-import sys
-from sys import version, version as v
-
-print(sys.version)
-
-print(sys.version[:3])
-print(version[:3])
-print(v[:3])
-
-# the tool is timid and only flags certain numeric slices
-i = 3
-print(sys.version[:i])
--- a/resources/test/fixtures/YTT102.py
+++ b/resources/test/fixtures/YTT102.py
@@ -1,5 +0,0 @@
-import sys
-from sys import version
-
-py_minor = sys.version[2]
-py_minor = version[2]
--- a/resources/test/fixtures/YTT103.py
+++ b/resources/test/fixtures/YTT103.py
@@ -1,8 +0,0 @@
-import sys
-from sys import version
-
-version < "3.5"
-sys.version < "3.5"
-sys.version <= "3.5"
-sys.version > "3.5"
-sys.version >= "3.5"
--- a/resources/test/fixtures/YTT201.py
+++ b/resources/test/fixtures/YTT201.py
@@ -1,10 +0,0 @@
-import sys
-from sys import version_info
-
-print("{}.{}".format(*sys.version_info))
-PY3 = sys.version_info[0] >= 3
-
-PY3 = sys.version_info[0] == 3
-PY3 = version_info[0] == 3
-PY2 = sys.version_info[0] != 3
-PY2 = version_info[0] != 3
--- a/resources/test/fixtures/YTT202.py
+++ b/resources/test/fixtures/YTT202.py
@@ -1,7 +0,0 @@
-import six
-from six import PY3
-
-if six.PY3:
-    print("3")
-if PY3:
-    print("3")
--- a/resources/test/fixtures/YTT203.py
+++ b/resources/test/fixtures/YTT203.py
@@ -1,5 +0,0 @@
-import sys
-from sys import version_info
-
-sys.version_info[1] >= 5
-version_info[1] < 6
--- a/resources/test/fixtures/YTT204.py
+++ b/resources/test/fixtures/YTT204.py
@@ -1,5 +0,0 @@
-import sys
-from sys import version_info
-
-sys.version_info.minor <= 7
-version_info.minor > 8
--- a/resources/test/fixtures/YTT301.py
+++ b/resources/test/fixtures/YTT301.py
@@ -1,5 +0,0 @@
-import sys
-from sys import version
-
-py_major = sys.version[0]
-py_major = version[0]
--- a/resources/test/fixtures/YTT302.py
+++ b/resources/test/fixtures/YTT302.py
@@ -1,8 +0,0 @@
-import sys
-from sys import version
-
-version < "3"
-sys.version < "3"
-sys.version <= "3"
-sys.version > "3"
-sys.version >= "3"
--- a/resources/test/fixtures/YTT303.py
+++ b/resources/test/fixtures/YTT303.py
@@ -1,5 +0,0 @@
-import sys
-from sys import version
-
-print(sys.version[:1])
-print(version[:1])
--- a/resources/test/fixtures/with_excluded_mdirectory/init.py
+++ b/resources/test/fixtures/with_excluded_mdirectory/init.py
--- a/resources/test/fixtures/with_excluded_mdirectory/migrations/init.py
+++ b/resources/test/fixtures/with_excluded_mdirectory/migrations/init.py
--- a/resources/test/fixtures/with_excluded_mdirectory/migrations/migration.py
+++ b/resources/test/fixtures/with_excluded_mdirectory/migrations/migration.py
--- a/resources/test/fixtures/directory/also_excluded.py
+++ b/resources/test/fixtures/directory/also_excluded.py
--- a/resources/test/fixtures/with_excluded_file/other_excluded_file.py
+++ b/resources/test/fixtures/with_excluded_file/other_excluded_file.py
--- a/resources/test/fixtures/flake8_annotations/allow_star_arg_any.py
+++ b/resources/test/fixtures/flake8_annotations/allow_star_arg_any.py
@@ -1,57 +0,0 @@
-from typing import Any
-
-
-# OK
-def foo(a: int, *args: str, **kwargs: str) -> int:
-    pass
-
-
-# ANN401
-def foo(a: Any, *args: str, **kwargs: str) -> int:
-    pass
-
-
-# ANN401
-def foo(a: int, *args: str, **kwargs: str) -> Any:
-    pass
-
-
-# OK
-def foo(a: int, *args: Any, **kwargs: Any) -> int:
-    pass
-
-
-# OK
-def foo(a: int, *args: Any, **kwargs: str) -> int:
-    pass
-
-
-# ANN401
-def foo(a: int, *args: str, **kwargs: Any) -> int:
-    pass
-
-
-class Bar:
-    # OK
-    def foo_method(self, a: int, *params: str, **options: str) -> int:
-        pass
-
-    # ANN401
-    def foo_method(self, a: Any, *params: str, **options: str) -> int:
-        pass
-
-    # ANN401
-    def foo_method(self, a: int, *params: str, **options: str) -> Any:
-        pass
-
-    # OK
-    def foo_method(self, a: int, *params: Any, **options: Any) -> int:
-        pass
-
-    # OK
-    def foo_method(self, a: int, *params: Any, **options: str) -> int:
-        pass
-
-    # OK
-    def foo_method(self, a: int, *params: str, **options: Any) -> int:
-        pass
--- a/resources/test/fixtures/flake8_annotations/annotation_presence.py
+++ b/resources/test/fixtures/flake8_annotations/annotation_presence.py
@@ -1,4 +1,4 @@
-from typing import Any, Type
+from typing import Type

 # Error
 def foo(a, b):
@@ -35,36 +35,6 @@ def foo() -> int:
    pass


-# OK
-def foo(a: int, *args: str, **kwargs: str) -> int:
-    pass
-
-
-# ANN401
-def foo(a: Any, *args: str, **kwargs: str) -> int:
-    pass
-
-
-# ANN401
-def foo(a: int, *args: str, **kwargs: str) -> Any:
-    pass
-
-
-# ANN401
-def foo(a: int, *args: Any, **kwargs: Any) -> int:
-    pass
-
-
-# ANN401
-def foo(a: int, *args: Any, **kwargs: str) -> int:
-    pass
-
-
-# ANN401
-def foo(a: int, *args: str, **kwargs: Any) -> int:
-    pass
-
-
 class Foo:
    # OK
    def foo(self: "Foo", a: int, b: int) -> int:
@@ -74,26 +44,6 @@ class Foo:
    def foo(self, a: int, b: int) -> int:
        pass

-    # ANN401
-    def foo(self: "Foo", a: Any, *params: str, **options: str) -> int:
-        pass
-
-    # ANN401
-    def foo(self: "Foo", a: int, *params: str, **options: str) -> Any:
-        pass
-
-    # ANN401
-    def foo(self: "Foo", a: int, *params: Any, **options: Any) -> int:
-        pass
-
-    # ANN401
-    def foo(self: "Foo", a: int, *params: Any, **options: str) -> int:
-        pass
-
-    # ANN401
-    def foo(self: "Foo", a: int, *params: str, **options: Any) -> int:
-        pass
-
    # OK
    @classmethod
    def foo(cls: Type["Foo"], a: int, b: int) -> int:
--- a/resources/test/fixtures/foo/init.py
+++ b/resources/test/fixtures/foo/init.py
--- a/resources/test/fixtures/foo/migrations/init.py
+++ b/resources/test/fixtures/foo/migrations/init.py
--- a/resources/test/fixtures/foo/migrations/migration.py
+++ b/resources/test/fixtures/foo/migrations/migration.py
@@ -0,0 +1,9 @@
+a = "abc"
+b = f"ghi{'jkl'}"
+
+c = f"def"
+d = f"def" + "ghi"
+e = (
+    f"def" +
+    "ghi"
+)
--- a/resources/test/fixtures/isort/combine_import_froms.py
+++ b/resources/test/fixtures/isort/combine_import_froms.py
@@ -1,5 +0,0 @@
-from collections import Awaitable
-from collections import AsyncIterable
-from collections import Collection
-from collections import ChainMap
-from collections import MutableSequence, MutableMapping
--- a/resources/test/fixtures/isort/deduplicate_imports.py
+++ b/resources/test/fixtures/isort/deduplicate_imports.py
@@ -1,4 +0,0 @@
-import os
-import os
-import os as os1
-import os as os2
--- a/resources/test/fixtures/isort/fit_line_length.py
+++ b/resources/test/fixtures/isort/fit_line_length.py
@@ -1,14 +0,0 @@
-from line_with_88 import aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-from line_with_89 import (
-    aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa,
-)
-
-if indented:
-    from line_with_88 import aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-    from line_with_89 import aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-    from line_with_90 import aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-    from line_with_91 import aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-    from line_with_92 import aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-    from line_with_93 import (
-        aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa,
-    )
--- a/resources/test/fixtures/isort/import_from_after_import.py
+++ b/resources/test/fixtures/isort/import_from_after_import.py
@@ -1,2 +0,0 @@
-from collections import Collection
-import os
--- a/resources/test/fixtures/isort/leading_prefix.py
+++ b/resources/test/fixtures/isort/leading_prefix.py
@@ -1,6 +0,0 @@
-x = 1; import sys
-import os
-
-if True:
-    x = 1; import sys
-    import os
--- a/resources/test/fixtures/isort/no_reorder_within_section.py
+++ b/resources/test/fixtures/isort/no_reorder_within_section.py
@@ -1,3 +0,0 @@
-# OK
-import os
-import sys
--- a/resources/test/fixtures/isort/order_by_type.py
+++ b/resources/test/fixtures/isort/order_by_type.py
@@ -1,12 +0,0 @@
-import StringIO
-import glob
-import os
-import shutil
-import tempfile
-import time
-from subprocess import PIPE, Popen, STDOUT
-from module import Class, CONSTANT, function, BASIC, Apple
-import foo
-import FOO
-import BAR
-import bar
--- a/resources/test/fixtures/isort/preserve_indentation.py
+++ b/resources/test/fixtures/isort/preserve_indentation.py
@@ -1,6 +0,0 @@
-if True:
-    import sys
-    import os
-else:
-    import sys
-    import os
--- a/resources/test/fixtures/isort/pyproject.toml
+++ b/resources/test/fixtures/isort/pyproject.toml
@@ -1,2 +0,0 @@
-[tool.ruff]
-line-length = 88
--- a/resources/test/fixtures/isort/reorder_within_section.py
+++ b/resources/test/fixtures/isort/reorder_within_section.py
@@ -1,2 +0,0 @@
-import sys
-import os
--- a/resources/test/fixtures/isort/separate_first_party_imports.py
+++ b/resources/test/fixtures/isort/separate_first_party_imports.py
@@ -1,5 +0,0 @@
-import sys
-import leading_prefix
-import numpy as np
-import os
-from leading_prefix import Class
--- a/resources/test/fixtures/isort/separate_future_imports.py
+++ b/resources/test/fixtures/isort/separate_future_imports.py
@@ -1,3 +0,0 @@
-import sys
-import os
-from __future__ import annotations
--- a/resources/test/fixtures/isort/separate_local_folder_imports.py
+++ b/resources/test/fixtures/isort/separate_local_folder_imports.py
@@ -1,4 +0,0 @@
-import sys
-import leading_prefix
-import os
-from . import leading_prefix
--- a/resources/test/fixtures/isort/separate_third_party_imports.py
+++ b/resources/test/fixtures/isort/separate_third_party_imports.py
@@ -1,4 +0,0 @@
-import pandas as pd
-import sys
-import numpy as np
-import os
--- a/resources/test/fixtures/isort/skip.py
+++ b/resources/test/fixtures/isort/skip.py
@@ -1,10 +0,0 @@
-# isort: off
-import sys
-import os
-import collections
-# isort: on
-
-import sys
-import os  # isort: skip
-import collections
-import abc
--- a/resources/test/fixtures/isort/sort_similar_imports.py
+++ b/resources/test/fixtures/isort/sort_similar_imports.py
@@ -1,26 +0,0 @@
-from a import b
-from a import BAD as DEF
-from a import B
-from a import Boo as DEF
-from a import B as Abc
-from a import B as A
-from a import B as DEF
-from a import b as a
-from a import b as x
-from a import b as c
-from b import c
-from a import b as d
-from a import b as y
-from b import C
-from b import c as d
-
-import A
-import a
-import b
-import B
-
-import x as y
-import x as A
-import x as Y
-import x
-import x as a
--- a/resources/test/fixtures/isort/trailing_suffix.py
+++ b/resources/test/fixtures/isort/trailing_suffix.py
@@ -1,6 +0,0 @@
-import sys
-import os; x = 1
-
-if True:
-    import sys
-    import os; x = 1
--- a/resources/test/fixtures/pyproject.toml
+++ b/resources/test/fixtures/pyproject.toml
@@ -1,15 +1,12 @@
 [tool.ruff]
 line-length = 88
 extend-exclude = [
-  "excluded_file.py",
+  "excluded.py",
  "migrations",
-  "with_excluded_file/other_excluded_file.py",
+  "directory/also_excluded.py",
 ]
 per-file-ignores = { "__init__.py" = ["F401"] }

-[tool.ruff.flake8-bugbear]
-extend-immutable-calls = ["fastapi.Depends", "fastapi.Query"]
-
 [tool.ruff.flake8-quotes]
 inline-quotes = "single"
 multiline-quotes = "double"
--- a/ruff/main.py
+++ b/ruff/main.py
@@ -1,7 +0,0 @@
-import os
-import sys
-import sysconfig
-
-if __name__ == "__main__":
-    ruff = os.path.join(sysconfig.get_path("scripts"), "ruff")
-    os.spawnv(os.P_WAIT, ruff, [ruff, *sys.argv[1:]])
--- a/ruff_dev/Cargo.toml
+++ b/ruff_dev/Cargo.toml
@@ -1,14 +1,13 @@
 [package]
 name = "ruff_dev"
-version = "0.0.121"
+version = "0.0.107"
 edition = "2021"

 [dependencies]
-anyhow = { version = "1.0.66" }
+anyhow = { version = "1.0.60" }
 clap = { version = "4.0.1", features = ["derive"] }
 codegen = { version = "0.2.0" }
 itertools = { version = "0.10.5" }
-libcst = { git = "https://github.com/charliermarsh/LibCST", rev = "a13ec97dd4eb925bde4d426c6e422582793b260c" }
 ruff = { path = ".." }
 rustpython-ast = { features = ["unparse"], git = "https://github.com/RustPython/RustPython.git", rev = "27bf82a2251d7e6ac6cd75e6ad51be12a53d84bb" }
 rustpython-common = { git = "https://github.com/RustPython/RustPython.git", rev = "27bf82a2251d7e6ac6cd75e6ad51be12a53d84bb" }
--- a/ruff_dev/src/lib.rs
+++ b/ruff_dev/src/lib.rs
@@ -2,5 +2,4 @@ pub mod generate_check_code_prefix;
 pub mod generate_rules_table;
 pub mod generate_source_code;
 pub mod print_ast;
-pub mod print_cst;
 pub mod print_tokens;
--- a/ruff_dev/src/main.rs
+++ b/ruff_dev/src/main.rs
@@ -1,8 +1,7 @@
 use anyhow::Result;
 use clap::{Parser, Subcommand};
 use ruff_dev::{
-    generate_check_code_prefix, generate_rules_table, generate_source_code, print_ast, print_cst,
-    print_tokens,
+    generate_check_code_prefix, generate_rules_table, generate_source_code, print_ast, print_tokens,
 };

 #[derive(Parser)]
@@ -23,8 +22,6 @@ enum Commands {
    GenerateSourceCode(generate_source_code::Cli),
    /// Print the AST for a given Python file.
    PrintAST(print_ast::Cli),
-    /// Print the LibCST CST for a given Python file.
-    PrintCST(print_cst::Cli),
    /// Print the token stream for a given Python file.
    PrintTokens(print_tokens::Cli),
 }
@@ -36,7 +33,6 @@ fn main() -> Result<()> {
        Commands::GenerateRulesTable(args) => generate_rules_table::main(args)?,
        Commands::GenerateSourceCode(args) => generate_source_code::main(args)?,
        Commands::PrintAST(args) => print_ast::main(args)?,
-        Commands::PrintCST(args) => print_cst::main(args)?,
        Commands::PrintTokens(args) => print_tokens::main(args)?,
    }
    Ok(())
--- a/ruff_dev/src/print_cst.rs
+++ b/ruff_dev/src/print_cst.rs
@@ -1,25 +0,0 @@
-//! Print the LibCST CST for a given Python file.
-
-use std::fs;
-use std::path::PathBuf;
-
-use anyhow::Result;
-use clap::Args;
-
-#[derive(Args)]
-pub struct Cli {
-    /// Python file for which to generate the CST.
-    #[arg(required = true)]
-    file: PathBuf,
-}
-
-pub fn main(cli: &Cli) -> Result<()> {
-    let contents = fs::read_to_string(&cli.file)?;
-    match libcst_native::parse_module(&contents, None) {
-        Ok(python_cst) => {
-            println!("{:#?}", python_cst);
-            Ok(())
-        }
-        Err(_) => Err(anyhow::anyhow!("Failed to parse CST")),
-    }
-}
--- a/src/ast/helpers.rs
+++ b/src/ast/helpers.rs
@@ -1,16 +1,16 @@
-use fnv::{FnvHashMap, FnvHashSet};
+use std::collections::BTreeSet;
+
 use once_cell::sync::Lazy;
 use regex::Regex;
 use rustpython_ast::{Excepthandler, ExcepthandlerKind, Expr, ExprKind, Location, StmtKind};

-#[inline(always)]
-fn collect_call_path_inner<'a>(expr: &'a Expr, parts: &mut Vec<&'a str>) {
+fn compose_call_path_inner<'a>(expr: &'a Expr, parts: &mut Vec<&'a str>) {
    match &expr.node {
        ExprKind::Call { func, .. } => {
-            collect_call_path_inner(func, parts);
+            compose_call_path_inner(func, parts);
        }
        ExprKind::Attribute { value, attr, .. } => {
-            collect_call_path_inner(value, parts);
+            compose_call_path_inner(value, parts);
            parts.push(attr);
        }
        ExprKind::Name { id, .. } => {
@@ -20,10 +20,9 @@ fn collect_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 segments = collect_call_paths(expr);
+    let mut segments = vec![];
+    compose_call_path_inner(expr, &mut segments);
    if segments.is_empty() {
        None
    } else {
@@ -31,34 +30,6 @@ 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 {
@@ -72,87 +43,24 @@ pub fn match_name_or_attr(expr: &Expr, target: &str) -> bool {
 ///
 /// Useful for, e.g., ensuring that a `Union` reference represents
 /// `typing.Union`.
-pub fn match_module_member(
+pub fn match_name_or_attr_from_module(
    expr: &Expr,
+    target: &str,
    module: &str,
-    member: &str,
-    from_imports: &FnvHashMap<&str, FnvHashSet<&str>>,
-    import_aliases: &FnvHashMap<&str, &str>,
+    imports: Option<&BTreeSet<&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;
+    match &expr.node {
+        ExprKind::Attribute { value, attr, .. } => match &value.node {
+            ExprKind::Name { id, .. } => id == module && target == attr,
+            _ => false,
+        },
+        ExprKind::Name { id, .. } => {
+            target == id
+                && imports
+                    .map(|imports| imports.contains(&id.as_str()))
+                    .unwrap_or_default()
        }
-
-        // 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
+        _ => false,
    }
 }

@@ -189,7 +97,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<Vec<&str>> {
+pub fn extract_handler_names(handlers: &[Excepthandler]) -> Vec<String> {
    let mut handler_names = vec![];
    for handler in handlers {
        match &handler.node {
@@ -197,16 +105,12 @@ pub fn extract_handler_names(handlers: &[Excepthandler]) -> Vec<Vec<&str>> {
                if let Some(type_) = type_ {
                    if let ExprKind::Tuple { elts, .. } = &type_.node {
                        for type_ in elts {
-                            let call_path = collect_call_paths(type_);
-                            if !call_path.is_empty() {
-                                handler_names.push(call_path);
+                            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);
-                        }
+                    } else if let Some(name) = compose_call_path(type_) {
+                        handler_names.push(name);
                    }
                }
            }
@@ -237,155 +141,3 @@ pub fn to_absolute(relative: &Location, base: &Location) -> Location {
        Location::new(relative.row() + base.row() - 1, relative.column())
    }
 }
-
-#[cfg(test)]
-mod tests {
-    use anyhow::Result;
-    use fnv::{FnvHashMap, FnvHashSet};
-    use rustpython_parser::parser;
-
-    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(),
-            &FnvHashMap::default(),
-        ));
-        Ok(())
-    }
-
-    #[test]
-    fn unimported() -> Result<()> {
-        let expr = parser::parse_expression("Match", "<filename>")?;
-        assert!(!match_module_member(
-            &expr,
-            "typing.re",
-            "Match",
-            &FnvHashMap::default(),
-            &FnvHashMap::default(),
-        ));
-        let expr = parser::parse_expression("re.Match", "<filename>")?;
-        assert!(!match_module_member(
-            &expr,
-            "typing.re",
-            "Match",
-            &FnvHashMap::default(),
-            &FnvHashMap::default(),
-        ));
-        Ok(())
-    }
-
-    #[test]
-    fn from_star() -> Result<()> {
-        let expr = parser::parse_expression("Match", "<filename>")?;
-        assert!(match_module_member(
-            &expr,
-            "typing.re",
-            "Match",
-            &FnvHashMap::from_iter([("typing.re", FnvHashSet::from_iter(["*"]))]),
-            &FnvHashMap::default()
-        ));
-        Ok(())
-    }
-
-    #[test]
-    fn from_parent() -> Result<()> {
-        let expr = parser::parse_expression("Match", "<filename>")?;
-        assert!(match_module_member(
-            &expr,
-            "typing.re",
-            "Match",
-            &FnvHashMap::from_iter([("typing.re", FnvHashSet::from_iter(["Match"]))]),
-            &FnvHashMap::default()
-        ));
-        Ok(())
-    }
-
-    #[test]
-    fn from_grandparent() -> Result<()> {
-        let expr = parser::parse_expression("re.Match", "<filename>")?;
-        assert!(match_module_member(
-            &expr,
-            "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(())
-    }
-}
--- a/src/ast/operations.rs
+++ b/src/ast/operations.rs
@@ -67,8 +67,9 @@ pub fn extract_all_names(stmt: &Stmt, scope: &Scope) -> Vec<String> {
 }

 /// Check if a node is parent of a conditional branch.
-pub fn on_conditional_branch<'a>(parents: &mut impl Iterator<Item = &'a Stmt>) -> bool {
-    parents.any(|parent| {
+pub fn on_conditional_branch(parent_stack: &[usize], parents: &[&Stmt]) -> bool {
+    for index in parent_stack.iter().rev() {
+        let parent = parents[*index];
        if matches!(parent.node, StmtKind::If { .. } | StmtKind::While { .. }) {
            return true;
        }
@@ -77,18 +78,24 @@ pub fn on_conditional_branch<'a>(parents: &mut impl Iterator<Item = &'a Stmt>) -
                return true;
            }
        }
-        false
-    })
+    }
+
+    false
 }

 /// Check if a node is in a nested block.
-pub fn in_nested_block<'a>(parents: &mut impl Iterator<Item = &'a Stmt>) -> bool {
-    parents.any(|parent| {
-        matches!(
+pub fn in_nested_block(parent_stack: &[usize], parents: &[&Stmt]) -> bool {
+    for index in parent_stack.iter().rev() {
+        let parent = parents[*index];
+        if matches!(
            parent.node,
            StmtKind::Try { .. } | StmtKind::If { .. } | StmtKind::With { .. }
-        )
-    })
+        ) {
+            return true;
+        }
+    }
+
+    false
 }

 /// Check if a node represents an unpacking assignment.
--- a/src/ast/types.rs
+++ b/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};

@@ -46,7 +46,6 @@ pub enum ScopeKind<'a> {
    Generator,
    Module,
    Arg,
-    Lambda,
 }

 #[derive(Clone, Debug)]
@@ -54,7 +53,7 @@ pub struct Scope<'a> {
    pub id: usize,
    pub kind: ScopeKind<'a>,
    pub import_starred: bool,
-    pub values: FnvHashMap<String, Binding>,
+    pub values: BTreeMap<String, Binding>,
 }

 impl<'a> Scope<'a> {
@@ -63,7 +62,7 @@ impl<'a> Scope<'a> {
            id: id(),
            kind,
            import_starred: false,
-            values: FnvHashMap::default(),
+            values: BTreeMap::new(),
        }
    }
 }
--- a/src/autofix/fixer.rs
+++ b/src/autofix/fixer.rs
@@ -61,7 +61,7 @@ fn apply_fixes<'a>(
 ) -> Cow<'a, str> {
    let mut output = RopeBuilder::new();
    let mut last_pos: Location = Location::new(1, 0);
-    let mut applied: BTreeSet<&Patch> = BTreeSet::default();
+    let mut applied: BTreeSet<&Patch> = BTreeSet::new();

    for fix in fixes.sorted_by_key(|fix| fix.patch.location) {
        // If we already applied an identical fix as part of another correction, skip
--- a/src/cache.rs
+++ b/src/cache.rs
@@ -23,7 +23,7 @@ use crate::autofix::fixer;
 use crate::message::Message;
 use crate::settings::Settings;

-const CARGO_PKG_VERSION: &str = env!("CARGO_PKG_VERSION");
+const 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(),
-        CARGO_PKG_VERSION,
+        VERSION,
        hasher.finish()
    )
 }
--- a/src/check_ast.rs
+++ b/src/check_ast.rs
@@ -1,11 +1,9 @@
 //! Lint rules based on AST traversal.

-use std::collections::BTreeMap;
+use std::collections::{BTreeMap, BTreeSet};
 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,
@@ -13,9 +11,7 @@ use rustpython_parser::ast::{
 };
 use rustpython_parser::parser;

-use crate::ast::helpers::{
-    collect_call_paths, dealias_call_path, extract_handler_names, match_call_path,
-};
+use crate::ast::helpers::{extract_handler_names, match_name_or_attr_from_module};
 use crate::ast::operations::extract_all_names;
 use crate::ast::relocate::relocate_expr;
 use crate::ast::types::{
@@ -36,11 +32,22 @@ use crate::settings::Settings;
 use crate::source_code_locator::SourceCodeLocator;
 use crate::visibility::{module_visibility, transition_scope, Modifier, Visibility, VisibleScope};
 use crate::{
-    docstrings, flake8_2020, flake8_annotations, flake8_bandit, flake8_bugbear, flake8_builtins,
-    flake8_comprehensions, flake8_print, pep8_naming, pycodestyle, pydocstyle, pyflakes, pyupgrade,
+    docstrings, flake8_annotations, flake8_bugbear, flake8_builtins, flake8_comprehensions,
+    flake8_print, pep8_naming, pycodestyle, pydocstyle, pyflakes, pyupgrade,
 };

 const GLOBAL_SCOPE_INDEX: usize = 0;
+const TRACK_FROM_IMPORTS: [&str; 9] = [
+    "collections",
+    "collections.abc",
+    "contextlib",
+    "re",
+    "typing",
+    "typing.io",
+    "typing.re",
+    "typing_extensions",
+    "weakref",
+];

 pub struct Checker<'a> {
    // Input data.
@@ -54,10 +61,7 @@ pub struct Checker<'a> {
    definitions: Vec<(Definition<'a>, Visibility)>,
    // Edit tracking.
    // TODO(charlie): Instead of exposing deletions, wrap in a public API.
-    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>,
+    pub(crate) deletions: BTreeSet<usize>,
    // 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>,
@@ -65,7 +69,7 @@ pub struct Checker<'a> {
    scopes: Vec<Scope<'a>>,
    scope_stack: Vec<usize>,
    dead_scopes: Vec<usize>,
-    deferred_string_annotations: Vec<(Range, &'a str, Vec<usize>, Vec<usize>)>,
+    deferred_string_annotations: Vec<(Range, &'a str)>,
    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>)>,
@@ -79,7 +83,8 @@ pub struct Checker<'a> {
    seen_import_boundary: bool,
    futures_allowed: bool,
    annotations_future_enabled: bool,
-    except_handlers: Vec<Vec<Vec<&'a str>>>,
+    except_handlers: Vec<Vec<String>>,
+    from_imports: BTreeMap<&'a str, BTreeSet<&'a str>>,
 }

 impl<'a> Checker<'a> {
@@ -97,8 +102,6 @@ impl<'a> Checker<'a> {
            checks: Default::default(),
            definitions: Default::default(),
            deletions: Default::default(),
-            from_imports: Default::default(),
-            import_aliases: Default::default(),
            parents: Default::default(),
            parent_stack: Default::default(),
            scopes: Default::default(),
@@ -109,7 +112,6 @@ impl<'a> Checker<'a> {
            deferred_functions: Default::default(),
            deferred_lambdas: Default::default(),
            deferred_assignments: Default::default(),
-            // Internal, derivative state.
            visible_scope: VisibleScope {
                modifier: Modifier::Module,
                visibility: module_visibility(path),
@@ -122,6 +124,7 @@ impl<'a> Checker<'a> {
            futures_allowed: true,
            annotations_future_enabled: Default::default(),
            except_handlers: Default::default(),
+            from_imports: Default::default(),
        }
    }

@@ -159,16 +162,15 @@ impl<'a> Checker<'a> {
    }

    /// Return `true` if the `Expr` is a reference to `typing.${target}`.
-    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)
+    pub fn match_typing_module(&self, expr: &Expr, target: &str) -> bool {
+        match_name_or_attr_from_module(expr, target, "typing", self.from_imports.get("typing"))
            || (typing::in_extensions(target)
-                && match_call_path(call_path, "typing_extensions", target, &self.from_imports))
+                && match_name_or_attr_from_module(
+                    expr,
+                    target,
+                    "typing_extensions",
+                    self.from_imports.get("typing_extensions"),
+                ))
    }
 }

@@ -198,13 +200,7 @@ where
                self.futures_allowed = false;
                if !self.seen_import_boundary
                    && !helpers::is_assignment_to_a_dunder(node)
-                    && !operations::in_nested_block(
-                        &mut self
-                            .parent_stack
-                            .iter()
-                            .rev()
-                            .map(|index| self.parents[*index]),
-                    )
+                    && !operations::in_nested_block(&self.parent_stack, &self.parents)
                {
                    self.seen_import_boundary = true;
                }
@@ -336,24 +332,9 @@ where
                    }
                }

-                if self.settings.enabled.contains(&CheckCode::U011)
-                    && self.settings.target_version >= PythonVersion::Py38
-                {
-                    pyupgrade::plugins::unnecessary_lru_cache_params(self, decorator_list);
-                }
-
                if self.settings.enabled.contains(&CheckCode::B018) {
                    flake8_bugbear::plugins::useless_expression(self, body);
                }
-                if self.settings.enabled.contains(&CheckCode::B019) {
-                    flake8_bugbear::plugins::cached_instance_method(self, decorator_list);
-                }
-
-                if self.settings.enabled.contains(&CheckCode::S107) {
-                    self.add_checks(
-                        flake8_bandit::plugins::hardcoded_password_default(args).into_iter(),
-                    );
-                }

                self.check_builtin_shadowing(name, Range::from_located(stmt), true);

@@ -408,14 +389,14 @@ where
            StmtKind::Return { .. } => {
                if self.settings.enabled.contains(&CheckCode::F706) {
                    if let Some(index) = self.scope_stack.last().cloned() {
-                        if matches!(
-                            self.scopes[index].kind,
-                            ScopeKind::Class(_) | ScopeKind::Module
-                        ) {
-                            self.add_check(Check::new(
-                                CheckKind::ReturnOutsideFunction,
-                                Range::from_located(stmt),
-                            ));
+                        match self.scopes[index].kind {
+                            ScopeKind::Class(_) | ScopeKind::Module => {
+                                self.add_check(Check::new(
+                                    CheckKind::ReturnOutsideFunction,
+                                    Range::from_located(stmt),
+                                ));
+                            }
+                            _ => {}
                        }
                    }
                }
@@ -459,14 +440,6 @@ where
                    flake8_bugbear::plugins::useless_expression(self, body);
                }

-                if self.settings.enabled.contains(&CheckCode::B024)
-                    || self.settings.enabled.contains(&CheckCode::B027)
-                {
-                    flake8_bugbear::plugins::abstract_base_class(
-                        self, stmt, name, bases, keywords, body,
-                    );
-                }
-
                self.check_builtin_shadowing(name, Range::from_located(stmt), false);

                for expr in bases {
@@ -531,38 +504,13 @@ where
                                    full_name.to_string(),
                                    self.binding_context(),
                                ),
-                                // Treat explicit re-export as usage (e.g., `import applications
-                                // as applications`).
-                                used: if alias
-                                    .node
-                                    .asname
-                                    .as_ref()
-                                    .map(|asname| asname == &alias.node.name)
-                                    .unwrap_or(false)
-                                {
-                                    Some((
-                                        self.scopes[*(self
-                                            .scope_stack
-                                            .last()
-                                            .expect("No current scope found."))]
-                                        .id,
-                                        Range::from_located(stmt),
-                                    ))
-                                } else {
-                                    None
-                                },
+                                used: None,
                                range: Range::from_located(stmt),
                            },
                        )
                    }

                    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) =
@@ -621,19 +569,16 @@ where
                // references like `from typing import Union`.
                if level.map(|level| level == 0).unwrap_or(true) {
                    if let Some(module) = module {
-                        self.from_imports
-                            .entry(module)
-                            .or_insert_with(FnvHashSet::default)
-                            .extend(
-                                names
-                                    .iter()
-                                    .filter(|alias| alias.node.asname.is_none())
-                                    .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 TRACK_FROM_IMPORTS.contains(&module.as_str()) {
+                            self.from_imports
+                                .entry(module)
+                                .or_insert_with(BTreeSet::new)
+                                .extend(
+                                    names
+                                        .iter()
+                                        .filter(|alias| alias.node.asname.is_none())
+                                        .map(|alias| alias.node.name.as_str()),
+                                )
                        }
                    }
                }
@@ -647,12 +592,6 @@ where
                    }
                }

-                if let Some("__future__") = module.as_deref() {
-                    if self.settings.enabled.contains(&CheckCode::U010) {
-                        pyupgrade::plugins::unnecessary_future_import(self, stmt, names);
-                    }
-                }
-
                for alias in names {
                    if let Some("__future__") = module.as_deref() {
                        let name = alias.node.asname.as_ref().unwrap_or(&alias.node.name);
@@ -660,7 +599,6 @@ where
                            name.to_string(),
                            Binding {
                                kind: BindingKind::FutureImportation,
-                                // Always mark `__future__` imports as used.
                                used: Some((
                                    self.scopes[*(self
                                        .scope_stack
@@ -753,26 +691,7 @@ where
                                    full_name,
                                    self.binding_context(),
                                ),
-                                // Treat explicit re-export as usage (e.g., `from .applications
-                                // import FastAPI as FastAPI`).
-                                used: if alias
-                                    .node
-                                    .asname
-                                    .as_ref()
-                                    .map(|asname| asname == &alias.node.name)
-                                    .unwrap_or(false)
-                                {
-                                    Some((
-                                        self.scopes[*(self
-                                            .scope_stack
-                                            .last()
-                                            .expect("No current scope found."))]
-                                        .id,
-                                        Range::from_located(stmt),
-                                    ))
-                                } else {
-                                    None
-                                },
+                                used: None,
                                range: Range::from_located(stmt),
                            },
                        )
@@ -864,24 +783,16 @@ where
                if self.settings.enabled.contains(&CheckCode::B011) {
                    flake8_bugbear::plugins::assert_false(self, stmt, test, msg);
                }
-                if self.settings.enabled.contains(&CheckCode::S101) {
-                    self.add_check(flake8_bandit::plugins::assert_used(stmt));
-                }
            }
            StmtKind::With { items, .. } | StmtKind::AsyncWith { items, .. } => {
                if self.settings.enabled.contains(&CheckCode::B017) {
                    flake8_bugbear::plugins::assert_raises_exception(self, stmt, items);
                }
            }
-            StmtKind::For {
-                target, body, iter, ..
-            } => {
+            StmtKind::For { target, body, .. } => {
                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) {
@@ -912,13 +823,6 @@ where
                if self.settings.enabled.contains(&CheckCode::B003) {
                    flake8_bugbear::plugins::assignment_to_os_environ(self, targets);
                }
-                if self.settings.enabled.contains(&CheckCode::S105) {
-                    if let Some(check) =
-                        flake8_bandit::plugins::assign_hardcoded_password_string(value, targets)
-                    {
-                        self.add_check(check);
-                    }
-                }
            }
            StmtKind::AnnAssign { value, .. } => {
                if self.settings.enabled.contains(&CheckCode::E731) {
@@ -945,9 +849,6 @@ where
        let prev_visible_scope = self.visible_scope.clone();
        match &stmt.node {
            StmtKind::FunctionDef { body, .. } | StmtKind::AsyncFunctionDef { body, .. } => {
-                if self.settings.enabled.contains(&CheckCode::B021) {
-                    flake8_bugbear::plugins::f_string_docstring(self, body);
-                }
                let definition = docstrings::extraction::extract(
                    &self.visible_scope,
                    stmt,
@@ -967,9 +868,6 @@ where
                ));
            }
            StmtKind::ClassDef { body, .. } => {
-                if self.settings.enabled.contains(&CheckCode::B021) {
-                    flake8_bugbear::plugins::f_string_docstring(self, body);
-                }
                let definition = docstrings::extraction::extract(
                    &self.visible_scope,
                    stmt,
@@ -992,9 +890,6 @@ where
                finalbody,
            } => {
                self.except_handlers.push(extract_handler_names(handlers));
-                if self.settings.enabled.contains(&CheckCode::B012) {
-                    flake8_bugbear::plugins::jump_statement_in_finally(self, finalbody);
-                }
                for stmt in body {
                    self.visit_stmt(stmt);
                }
@@ -1047,12 +942,8 @@ where
                ..
            } = &expr.node
            {
-                self.deferred_string_annotations.push((
-                    Range::from_located(expr),
-                    value,
-                    self.scope_stack.clone(),
-                    self.parent_stack.clone(),
-                ));
+                self.deferred_string_annotations
+                    .push((Range::from_located(expr), value));
            } else {
                self.deferred_annotations.push((
                    expr,
@@ -1068,89 +959,64 @@ where
            ExprKind::Subscript { value, slice, .. } => {
                // Ex) typing.List[...]
                if self.settings.enabled.contains(&CheckCode::U007)
-                    && self.settings.target_version >= PythonVersion::Py310
+                    && self.settings.target_version >= PythonVersion::Py39
                {
                    pyupgrade::plugins::use_pep604_annotation(self, expr, value, slice);
                }

-                if self.match_typing_expr(value, "Literal") {
+                if self.match_typing_module(value, "Literal") {
                    self.in_literal = true;
                }
-
-                if self.settings.enabled.contains(&CheckCode::YTT101)
-                    || self.settings.enabled.contains(&CheckCode::YTT102)
-                    || self.settings.enabled.contains(&CheckCode::YTT301)
-                    || self.settings.enabled.contains(&CheckCode::YTT303)
-                {
-                    flake8_2020::plugins::subscript(self, value, slice);
-                }
            }
            ExprKind::Tuple { elts, ctx } | ExprKind::List { elts, ctx } => {
                if matches!(ctx, ExprContext::Store) {
-                    let check_too_many_expressions =
-                        self.settings.enabled.contains(&CheckCode::F621);
-                    let check_two_starred_expressions =
-                        self.settings.enabled.contains(&CheckCode::F622);
-                    if let Some(check) = pyflakes::checks::starred_expressions(
-                        elts,
-                        check_too_many_expressions,
-                        check_two_starred_expressions,
-                        Range::from_located(expr),
-                    ) {
-                        self.add_check(check);
-                    }
-                }
-            }
-            ExprKind::Name { id, ctx } => {
-                match ctx {
-                    ExprContext::Load => {
-                        // Ex) List[...]
-                        if self.settings.enabled.contains(&CheckCode::U006)
-                            && self.settings.target_version >= PythonVersion::Py39
-                            && typing::is_pep585_builtin(
-                                expr,
-                                &self.from_imports,
-                                &self.import_aliases,
-                            )
+                    if self.settings.enabled.contains(&CheckCode::F621)
+                        || self.settings.enabled.contains(&CheckCode::F622)
+                    {
+                        if let Some(check) =
+                            pyflakes::checks::starred_expressions(elts, Range::from_located(expr))
                        {
-                            pyupgrade::plugins::use_pep585_annotation(self, expr, id);
+                            self.add_check(check);
                        }
-
-                        self.handle_node_load(expr);
                    }
-                    ExprContext::Store => {
-                        if self.settings.enabled.contains(&CheckCode::E741) {
-                            if let Some(check) = pycodestyle::checks::ambiguous_variable_name(
-                                id,
-                                Range::from_located(expr),
-                            ) {
-                                self.add_check(check);
-                            }
-                        }
-
-                        self.check_builtin_shadowing(id, Range::from_located(expr), true);
-
-                        self.handle_node_store(expr, self.current_parent());
-                    }
-                    ExprContext::Del => self.handle_node_delete(expr),
-                }
-
-                if self.settings.enabled.contains(&CheckCode::YTT202) {
-                    flake8_2020::plugins::name_or_attribute(self, expr);
                }
            }
+            ExprKind::Name { id, ctx } => match ctx {
+                ExprContext::Load => {
+                    // Ex) List[...]
+                    if self.settings.enabled.contains(&CheckCode::U006)
+                        && self.settings.target_version >= PythonVersion::Py39
+                        && typing::is_pep585_builtin(expr, self.from_imports.get("typing"))
+                    {
+                        pyupgrade::plugins::use_pep585_annotation(self, expr, id);
+                    }
+
+                    self.handle_node_load(expr);
+                }
+                ExprContext::Store => {
+                    if self.settings.enabled.contains(&CheckCode::E741) {
+                        if let Some(check) = pycodestyle::checks::ambiguous_variable_name(
+                            id,
+                            Range::from_located(expr),
+                        ) {
+                            self.add_check(check);
+                        }
+                    }
+
+                    self.check_builtin_shadowing(id, Range::from_located(expr), true);
+
+                    self.handle_node_store(expr, self.current_parent());
+                }
+                ExprContext::Del => self.handle_node_delete(expr),
+            },
            ExprKind::Attribute { attr, .. } => {
                // Ex) typing.List[...]
                if self.settings.enabled.contains(&CheckCode::U006)
                    && self.settings.target_version >= PythonVersion::Py39
-                    && typing::is_pep585_builtin(expr, &self.from_imports, &self.import_aliases)
+                    && typing::is_pep585_builtin(expr, self.from_imports.get("typing"))
                {
                    pyupgrade::plugins::use_pep585_annotation(self, expr, attr);
                }
-
-                if self.settings.enabled.contains(&CheckCode::YTT202) {
-                    flake8_2020::plugins::name_or_attribute(self, expr);
-                }
            }
            ExprKind::Call {
                func,
@@ -1166,10 +1032,6 @@ where
                    pyupgrade::plugins::super_call_with_parameters(self, expr, func, args);
                }

-                if self.settings.enabled.contains(&CheckCode::U012) {
-                    pyupgrade::plugins::unnecessary_encode_utf8(self, expr, func, args, keywords);
-                }
-
                // flake8-print
                if self.settings.enabled.contains(&CheckCode::T201)
                    || self.settings.enabled.contains(&CheckCode::T203)
@@ -1183,37 +1045,6 @@ where
                if self.settings.enabled.contains(&CheckCode::B005) {
                    flake8_bugbear::plugins::strip_with_multi_characters(self, expr, func, args);
                }
-                if self.settings.enabled.contains(&CheckCode::B009) {
-                    flake8_bugbear::plugins::getattr_with_constant(self, expr, func, args);
-                }
-                if self.settings.enabled.contains(&CheckCode::B010) {
-                    if !self
-                        .scope_stack
-                        .iter()
-                        .rev()
-                        .any(|index| matches!(self.scopes[*index].kind, ScopeKind::Lambda))
-                    {
-                        flake8_bugbear::plugins::setattr_with_constant(self, expr, func, args);
-                    }
-                }
-                if self.settings.enabled.contains(&CheckCode::B022) {
-                    flake8_bugbear::plugins::useless_contextlib_suppress(self, expr, args);
-                }
-                if self.settings.enabled.contains(&CheckCode::B026) {
-                    flake8_bugbear::plugins::star_arg_unpacking_after_keyword_arg(
-                        self, args, keywords,
-                    );
-                }
-                if self.settings.enabled.contains(&CheckCode::S102) {
-                    if let Some(check) = flake8_bandit::plugins::exec_used(expr, func) {
-                        self.add_check(check);
-                    }
-                }
-                if self.settings.enabled.contains(&CheckCode::S106) {
-                    self.add_checks(
-                        flake8_bandit::plugins::hardcoded_password_func_arg(keywords).into_iter(),
-                    );
-                }

                // flake8-comprehensions
                if self.settings.enabled.contains(&CheckCode::C400) {
@@ -1277,12 +1108,9 @@ where
                if self.settings.enabled.contains(&CheckCode::C404) {
                    if let Some(check) =
                        flake8_comprehensions::checks::unnecessary_list_comprehension_dict(
-                            expr,
                            func,
                            args,
                            keywords,
-                            self.locator,
-                            self.patch(),
                            Range::from_located(expr),
                        )
                    {
@@ -1378,11 +1206,8 @@ where
                if self.settings.enabled.contains(&CheckCode::C413) {
                    if let Some(check) =
                        flake8_comprehensions::checks::unnecessary_call_around_sorted(
-                            expr,
                            func,
                            args,
-                            self.locator,
-                            self.patch(),
                            Range::from_located(expr),
                        )
                    {
@@ -1451,17 +1276,10 @@ where
                }
            }
            ExprKind::Dict { keys, .. } => {
-                let check_repeated_literals = self.settings.enabled.contains(&CheckCode::F601);
-                let check_repeated_variables = self.settings.enabled.contains(&CheckCode::F602);
-                if check_repeated_literals || check_repeated_variables {
-                    self.add_checks(
-                        pyflakes::checks::repeated_keys(
-                            keys,
-                            check_repeated_literals,
-                            check_repeated_variables,
-                        )
-                        .into_iter(),
-                    );
+                if self.settings.enabled.contains(&CheckCode::F601)
+                    || self.settings.enabled.contains(&CheckCode::F602)
+                {
+                    self.add_checks(pyflakes::checks::repeated_keys(keys).into_iter());
                }
            }
            ExprKind::Yield { .. } | ExprKind::YieldFrom { .. } | ExprKind::Await { .. } => {
@@ -1500,13 +1318,10 @@ where
                }
            }
            ExprKind::UnaryOp { op, operand } => {
-                let check_not_in = self.settings.enabled.contains(&CheckCode::E713);
-                let check_not_is = self.settings.enabled.contains(&CheckCode::E714);
-                if check_not_in || check_not_is {
-                    self.add_checks(
-                        pycodestyle::checks::not_tests(op, operand, check_not_in, check_not_is)
-                            .into_iter(),
-                    );
+                if self.settings.enabled.contains(&CheckCode::E713)
+                    || self.settings.enabled.contains(&CheckCode::E714)
+                {
+                    self.add_checks(pycodestyle::checks::not_tests(op, operand).into_iter());
                }

                if self.settings.enabled.contains(&CheckCode::B002) {
@@ -1518,18 +1333,12 @@ where
                ops,
                comparators,
            } => {
-                let check_none_comparisons = self.settings.enabled.contains(&CheckCode::E711);
-                let check_true_false_comparisons = self.settings.enabled.contains(&CheckCode::E712);
-                if check_none_comparisons || check_true_false_comparisons {
+                if self.settings.enabled.contains(&CheckCode::E711)
+                    || self.settings.enabled.contains(&CheckCode::E712)
+                {
                    self.add_checks(
-                        pycodestyle::checks::literal_comparisons(
-                            left,
-                            ops,
-                            comparators,
-                            check_none_comparisons,
-                            check_true_false_comparisons,
-                        )
-                        .into_iter(),
+                        pycodestyle::checks::literal_comparisons(left, ops, comparators)
+                            .into_iter(),
                    );
                }

@@ -1553,45 +1362,14 @@ where
                        .into_iter(),
                    );
                }
-
-                if self.settings.enabled.contains(&CheckCode::YTT103)
-                    || self.settings.enabled.contains(&CheckCode::YTT201)
-                    || self.settings.enabled.contains(&CheckCode::YTT203)
-                    || self.settings.enabled.contains(&CheckCode::YTT204)
-                    || self.settings.enabled.contains(&CheckCode::YTT302)
-                {
-                    flake8_2020::plugins::compare(self, left, ops, comparators);
-                }
-
-                if self.settings.enabled.contains(&CheckCode::S105) {
-                    self.add_checks(
-                        flake8_bandit::plugins::compare_to_hardcoded_password_string(
-                            left,
-                            comparators,
-                        )
-                        .into_iter(),
-                    );
-                }
            }
            ExprKind::Constant {
                value: Constant::Str(value),
                ..
            } => {
                if self.in_annotation && !self.in_literal {
-                    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(
-                        value,
-                        &Range::from_located(expr),
-                    ) {
-                        self.add_check(check);
-                    }
+                    self.deferred_string_annotations
+                        .push((Range::from_located(expr), value));
                }
            }
            ExprKind::Lambda { args, .. } => {
@@ -1627,8 +1405,8 @@ where
                for expr in &args.defaults {
                    self.visit_expr(expr);
                }
-                self.push_scope(Scope::new(ScopeKind::Lambda))
            }
+
            ExprKind::ListComp { elt, generators } | ExprKind::SetComp { elt, generators } => {
                if self.settings.enabled.contains(&CheckCode::C416) {
                    if let Some(check) = flake8_comprehensions::checks::unnecessary_comprehension(
@@ -1644,6 +1422,7 @@ where
                }
                self.push_scope(Scope::new(ScopeKind::Generator))
            }
+
            ExprKind::GeneratorExp { .. } | ExprKind::DictComp { .. } => {
                self.push_scope(Scope::new(ScopeKind::Generator))
            }
@@ -1664,13 +1443,12 @@ where
                args,
                keywords,
            } => {
-                let call_path = dealias_call_path(collect_call_paths(func), &self.import_aliases);
-                if self.match_typing_call_path(&call_path, "ForwardRef") {
+                if self.match_typing_module(func, "ForwardRef") {
                    self.visit_expr(func);
                    for expr in args {
                        self.visit_annotation(expr);
                    }
-                } else if self.match_typing_call_path(&call_path, "cast") {
+                } else if self.match_typing_module(func, "cast") {
                    self.visit_expr(func);
                    if !args.is_empty() {
                        self.visit_annotation(&args[0]);
@@ -1678,12 +1456,12 @@ where
                    for expr in args.iter().skip(1) {
                        self.visit_expr(expr);
                    }
-                } else if self.match_typing_call_path(&call_path, "NewType") {
+                } else if self.match_typing_module(func, "NewType") {
                    self.visit_expr(func);
                    for expr in args.iter().skip(1) {
                        self.visit_annotation(expr);
                    }
-                } else if self.match_typing_call_path(&call_path, "TypeVar") {
+                } else if self.match_typing_module(func, "TypeVar") {
                    self.visit_expr(func);
                    for expr in args.iter().skip(1) {
                        self.visit_annotation(expr);
@@ -1700,7 +1478,7 @@ where
                            }
                        }
                    }
-                } else if self.match_typing_call_path(&call_path, "NamedTuple") {
+                } else if self.match_typing_module(func, "NamedTuple") {
                    self.visit_expr(func);

                    // Ex) NamedTuple("a", [("a", int)])
@@ -1732,7 +1510,7 @@ where
                        let KeywordData { value, .. } = &keyword.node;
                        self.visit_annotation(value);
                    }
-                } else if self.match_typing_call_path(&call_path, "TypedDict") {
+                } else if self.match_typing_module(func, "TypedDict") {
                    self.visit_expr(func);

                    // Ex) TypedDict("a", {"a": int})
@@ -1771,11 +1549,7 @@ where
                    visitor::walk_expr(self, expr);
                } else {
                    self.in_subscript = true;
-                    match typing::match_annotated_subscript(
-                        value,
-                        &self.from_imports,
-                        &self.import_aliases,
-                    ) {
+                    match typing::match_annotated_subscript(value, &self.from_imports) {
                        Some(subscript) => {
                            match subscript {
                                // Ex) Optional[int]
@@ -1819,8 +1593,7 @@ where

        // Post-visit.
        match &expr.node {
-            ExprKind::Lambda { .. }
-            | ExprKind::GeneratorExp { .. }
+            ExprKind::GeneratorExp { .. }
            | ExprKind::ListComp { .. }
            | ExprKind::DictComp { .. }
            | ExprKind::SetComp { .. } => {
@@ -2141,7 +1914,6 @@ 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;
@@ -2188,10 +1960,7 @@ impl<'a> Checker<'a> {

                // Avoid flagging if NameError is handled.
                if let Some(handler_names) = self.except_handlers.last() {
-                    if handler_names
-                        .iter()
-                        .any(|call_path| call_path.len() == 1 && call_path[0] == "NameError")
-                    {
+                    if handler_names.contains(&"NameError".to_string()) {
                        return;
                    }
                }
@@ -2218,22 +1987,32 @@ impl<'a> Checker<'a> {
            }

            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)
+                let current =
+                    &self.scopes[*(self.scope_stack.last().expect("No current scope found."))];
+                if let Some(check) =
+                    pep8_naming::checks::non_lowercase_variable_in_function(current, expr, id)
+                {
+                    self.add_check(check);
                }
            }

            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)
+                let current =
+                    &self.scopes[*(self.scope_stack.last().expect("No current scope found."))];
+                if let Some(check) =
+                    pep8_naming::checks::mixed_case_variable_in_class_scope(current, expr, id)
+                {
+                    self.add_check(check);
                }
            }

            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,
-                    )
+                let current =
+                    &self.scopes[*(self.scope_stack.last().expect("No current scope found."))];
+                if let Some(check) =
+                    pep8_naming::checks::mixed_case_variable_in_global_scope(current, expr, id)
+                {
+                    self.add_check(check);
                }
            }

@@ -2312,13 +2091,7 @@ impl<'a> Checker<'a> {

    fn handle_node_delete(&mut self, expr: &Expr) {
        if let ExprKind::Name { id, .. } = &expr.node {
-            if operations::on_conditional_branch(
-                &mut self
-                    .parent_stack
-                    .iter()
-                    .rev()
-                    .map(|index| self.parents[*index]),
-            ) {
+            if operations::on_conditional_branch(&self.parent_stack, &self.parents) {
                return;
            }

@@ -2338,9 +2111,6 @@ impl<'a> Checker<'a> {
    where
        'b: 'a,
    {
-        if self.settings.enabled.contains(&CheckCode::B021) {
-            flake8_bugbear::plugins::f_string_docstring(self, python_ast);
-        }
        let docstring = docstrings::extraction::docstring_from(python_ast);
        self.definitions.push((
            Definition {
@@ -2358,8 +2128,8 @@ impl<'a> Checker<'a> {

    fn check_deferred_annotations(&mut self) {
        while let Some((expr, scopes, parents)) = self.deferred_annotations.pop() {
-            self.scope_stack = scopes;
            self.parent_stack = parents;
+            self.scope_stack = scopes;
            self.visit_expr(expr);
        }
    }
@@ -2368,14 +2138,10 @@ impl<'a> Checker<'a> {
    where
        'b: 'a,
    {
-        let mut stacks = vec![];
-        while let Some((range, expression, scopes, parents)) =
-            self.deferred_string_annotations.pop()
-        {
+        while let Some((range, expression)) = 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(
@@ -2385,9 +2151,7 @@ impl<'a> Checker<'a> {
                }
            }
        }
-        for (expr, (scopes, parents)) in allocator.iter().zip(stacks) {
-            self.scope_stack = scopes;
-            self.parent_stack = parents;
+        for expr in allocator {
            self.visit_expr(expr);
        }
    }
@@ -2421,7 +2185,7 @@ impl<'a> Checker<'a> {
        while let Some((expr, scopes, parents)) = self.deferred_lambdas.pop() {
            self.parent_stack = parents;
            self.scope_stack = scopes;
-            self.push_scope(Scope::new(ScopeKind::Lambda));
+            self.push_scope(Scope::new(ScopeKind::Function(Default::default())));

            if let ExprKind::Lambda { args, body } = &expr.node {
                self.visit_arguments(args);
@@ -2513,7 +2277,7 @@ impl<'a> Checker<'a> {
                let mut unused: BTreeMap<(ImportKind, usize, Option<usize>), Vec<&str>> =
                    BTreeMap::new();

-                for (name, binding) in scope.values.iter() {
+                for (name, binding) in scope.values.iter().rev() {
                    let used = binding.used.is_some()
                        || all_names
                            .map(|names| names.contains(name))
@@ -2522,25 +2286,25 @@ impl<'a> Checker<'a> {
                    if !used {
                        match &binding.kind {
                            BindingKind::FromImportation(_, full_name, context) => {
-                                unused
+                                let full_names = unused
                                    .entry((
                                        ImportKind::ImportFrom,
                                        context.defined_by,
                                        context.defined_in,
                                    ))
-                                    .or_default()
-                                    .push(full_name);
+                                    .or_default();
+                                full_names.push(full_name);
                            }
                            BindingKind::Importation(_, full_name, context)
                            | BindingKind::SubmoduleImportation(_, full_name, context) => {
-                                unused
+                                let full_names = unused
                                    .entry((
                                        ImportKind::Import,
                                        context.defined_by,
                                        context.defined_in,
                                    ))
-                                    .or_default()
-                                    .push(full_name);
+                                    .or_default();
+                                full_names.push(full_name);
                            }
                            _ => {}
                        }
@@ -2557,20 +2321,16 @@ impl<'a> Checker<'a> {
                            .iter()
                            .map(|index| self.parents[*index])
                            .collect();
-                        match match kind {
+
+                        let removal_fn = match kind {
                            ImportKind::Import => pyflakes::fixes::remove_unused_imports,
                            ImportKind::ImportFrom => pyflakes::fixes::remove_unused_import_froms,
-                        }(
-                            self.locator, &full_names, child, parent, &deleted
-                        ) {
-                            Ok(fix) => {
-                                if fix.patch.content.is_empty() || fix.patch.content == "pass" {
-                                    self.deletions.insert(defined_by);
-                                }
-                                Some(fix)
-                            }
+                        };
+
+                        match removal_fn(self.locator, &full_names, child, parent, &deleted) {
+                            Ok(fix) => Some(fix),
                            Err(e) => {
-                                error!("Failed to remove unused imports: {}", e);
+                                error!("Failed to fix unused imports: {}", e);
                                None
                            }
                        }
@@ -2581,7 +2341,7 @@ impl<'a> Checker<'a> {
                    if self.path.ends_with("__init__.py") {
                        checks.push(Check::new(
                            CheckKind::UnusedImport(
-                                full_names.into_iter().sorted().map(String::from).collect(),
+                                full_names.into_iter().map(String::from).collect(),
                                true,
                            ),
                            Range::from_located(child),
@@ -2589,7 +2349,7 @@ impl<'a> Checker<'a> {
                    } else {
                        let mut check = Check::new(
                            CheckKind::UnusedImport(
-                                full_names.into_iter().sorted().map(String::from).collect(),
+                                full_names.into_iter().map(String::from).collect(),
                                false,
                            ),
                            Range::from_located(child),
@@ -2618,7 +2378,6 @@ impl<'a> Checker<'a> {
                || self.settings.enabled.contains(&CheckCode::ANN204)
                || self.settings.enabled.contains(&CheckCode::ANN205)
                || self.settings.enabled.contains(&CheckCode::ANN206)
-                || self.settings.enabled.contains(&CheckCode::ANN401)
            {
                flake8_annotations::plugins::definition(self, &definition, &visibility);
            }
--- a/src/check_imports.rs
+++ b/src/check_imports.rs
@@ -1,43 +0,0 @@
-//! Lint rules based on import analysis.
-
-use nohash_hasher::IntSet;
-use rustpython_parser::ast::Suite;
-
-use crate::ast::visitor::Visitor;
-use crate::autofix::fixer;
-use crate::checks::Check;
-use crate::isort;
-use crate::isort::track::ImportTracker;
-use crate::settings::Settings;
-use crate::source_code_locator::SourceCodeLocator;
-
-fn check_import_blocks(
-    tracker: ImportTracker,
-    locator: &SourceCodeLocator,
-    settings: &Settings,
-    autofix: &fixer::Mode,
-) -> Vec<Check> {
-    let mut checks = vec![];
-    for block in tracker.into_iter() {
-        if !block.is_empty() {
-            if let Some(check) = isort::plugins::check_imports(block, locator, settings, autofix) {
-                checks.push(check);
-            }
-        }
-    }
-    checks
-}
-
-pub fn check_imports(
-    python_ast: &Suite,
-    locator: &SourceCodeLocator,
-    exclusions: &IntSet<usize>,
-    settings: &Settings,
-    autofix: &fixer::Mode,
-) -> Vec<Check> {
-    let mut tracker = ImportTracker::new(exclusions);
-    for stmt in python_ast {
-        tracker.visit_stmt(stmt);
-    }
-    check_import_blocks(tracker, locator, settings, autofix)
-}
--- a/src/check_lines.rs
+++ b/src/check_lines.rs
@@ -1,6 +1,7 @@
 //! Lint rules based on checking raw physical lines.

-use nohash_hasher::IntMap;
+use std::collections::BTreeMap;
+
 use once_cell::sync::Lazy;
 use regex::Regex;
 use rustpython_parser::ast::Location;
@@ -35,7 +36,7 @@ fn should_enforce_line_length(line: &str, length: usize, limit: usize) -> bool {
 pub fn check_lines(
    checks: &mut Vec<Check>,
    contents: &str,
-    noqa_line_for: &IntMap<usize, usize>,
+    noqa_line_for: &[usize],
    settings: &Settings,
    autofix: &fixer::Mode,
 ) {
@@ -43,23 +44,18 @@ pub fn check_lines(
    let enforce_line_too_long = settings.enabled.contains(&CheckCode::E501);
    let enforce_noqa = settings.enabled.contains(&CheckCode::M001);

-    let mut noqa_directives: IntMap<usize, (Directive, Vec<&str>)> = IntMap::default();
+    let mut noqa_directives: BTreeMap<usize, (Directive, Vec<&str>)> = BTreeMap::new();
+
    let mut line_checks = vec![];
    let mut ignored = vec![];

-    checks.sort_by_key(|check| check.location);
-    let mut checks_iter = checks.iter().enumerate().peekable();
-    if let Some((_index, check)) = checks_iter.peek() {
-        assert!(check.location.row() >= 1);
-    }
-
    let lines: Vec<&str> = contents.lines().collect();
    for (lineno, line) in lines.iter().enumerate() {
        // 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)
+            .get(lineno)
            .map(|lineno| lineno - 1)
            .unwrap_or(lineno);

@@ -94,25 +90,26 @@ pub fn check_lines(
        }

        // Remove any ignored checks.
-        while let Some((index, check)) =
-            checks_iter.next_if(|(_index, check)| check.location.row() == lineno + 1)
-        {
-            let noqa = noqa_directives
-                .entry(noqa_lineno)
-                .or_insert_with(|| (noqa::extract_noqa_directive(lines[noqa_lineno]), vec![]));
+        // TODO(charlie): Only validate checks for the current line.
+        for (index, check) in checks.iter().enumerate() {
+            if check.location.row() == lineno + 1 {
+                let noqa = noqa_directives
+                    .entry(noqa_lineno)
+                    .or_insert_with(|| (noqa::extract_noqa_directive(lines[noqa_lineno]), vec![]));

-            match noqa {
-                (Directive::All(..), matches) => {
-                    matches.push(check.kind.code().as_ref());
-                    ignored.push(index)
-                }
-                (Directive::Codes(_, _, codes), matches) => {
-                    if codes.contains(&check.kind.code().as_ref()) {
+                match noqa {
+                    (Directive::All(..), matches) => {
                        matches.push(check.kind.code().as_ref());
-                        ignored.push(index);
+                        ignored.push(index)
                    }
+                    (Directive::Codes(_, _, codes), matches) => {
+                        if codes.contains(&check.kind.code().as_ref()) {
+                            matches.push(check.kind.code().as_ref());
+                            ignored.push(index);
+                        }
+                    }
+                    (Directive::None, _) => {}
                }
-                (Directive::None, _) => {}
            }
        }

@@ -156,7 +153,7 @@ pub fn check_lines(
        if let Some(line) = lines.last() {
            let lineno = lines.len() - 1;
            let noqa_lineno = noqa_line_for
-                .get(&lineno)
+                .get(lineno)
                .map(|lineno| lineno - 1)
                .unwrap_or(lineno);

@@ -260,8 +257,6 @@ pub fn check_lines(

 #[cfg(test)]
 mod tests {
-    use nohash_hasher::IntMap;
-
    use super::check_lines;
    use crate::autofix::fixer;
    use crate::checks::{Check, CheckCode};
@@ -270,7 +265,7 @@ mod tests {
    #[test]
    fn e501_non_ascii_char() {
        let line = "'\u{4e9c}' * 2"; // 7 in UTF-32, 9 in UTF-8.
-        let noqa_line_for: IntMap<usize, usize> = Default::default();
+        let noqa_line_for: Vec<usize> = vec![1];
        let check_with_max_line_length = |line_length: usize| {
            let mut checks: Vec<Check> = vec![];
            check_lines(
@@ -283,7 +278,7 @@ mod tests {
                },
                &fixer::Mode::Generate,
            );
-            checks
+            return checks;
        };
        assert!(!check_with_max_line_length(6).is_empty());
        assert!(check_with_max_line_length(7).is_empty());
--- a/src/checks.rs
+++ b/src/checks.rs
@@ -84,24 +84,14 @@ pub enum CheckCode {
    B006,
    B007,
    B008,
-    B009,
-    B010,
    B011,
-    B012,
    B013,
    B014,
    B015,
    B016,
    B017,
    B018,
-    B019,
-    B020,
-    B021,
-    B022,
-    B024,
    B025,
-    B026,
-    B027,
    // flake8-comprehensions
    C400,
    C401,
@@ -138,18 +128,6 @@ pub enum CheckCode {
    ANN204,
    ANN205,
    ANN206,
-    ANN401,
-    // flake8-2020
-    YTT101,
-    YTT102,
-    YTT103,
-    YTT201,
-    YTT202,
-    YTT203,
-    YTT204,
-    YTT301,
-    YTT302,
-    YTT303,
    // pyupgrade
    U001,
    U002,
@@ -160,9 +138,6 @@ pub enum CheckCode {
    U007,
    U008,
    U009,
-    U010,
-    U011,
-    U012,
    // pydocstyle
    D100,
    D101,
@@ -224,15 +199,6 @@ pub enum CheckCode {
    N816,
    N817,
    N818,
-    // isort
-    I001,
-    // flake8-bandit
-    S101,
-    S102,
-    S104,
-    S105,
-    S106,
-    S107,
    // Ruff
    RUF001,
    RUF002,
@@ -245,18 +211,15 @@ pub enum CheckCode {
 pub enum CheckCategory {
    Pyflakes,
    Pycodestyle,
-    Isort,
    Pydocstyle,
    Pyupgrade,
    PEP8Naming,
-    Flake8Bandit,
    Flake8Comprehensions,
    Flake8Bugbear,
    Flake8Builtins,
    Flake8Print,
    Flake8Quotes,
    Flake8Annotations,
-    Flake82020,
    Ruff,
    Meta,
 }
@@ -266,15 +229,12 @@ impl CheckCategory {
        match self {
            CheckCategory::Pycodestyle => "pycodestyle",
            CheckCategory::Pyflakes => "Pyflakes",
-            CheckCategory::Isort => "isort",
-            CheckCategory::Flake8Bandit => "flake8-bandit",
            CheckCategory::Flake8Builtins => "flake8-builtins",
            CheckCategory::Flake8Bugbear => "flake8-bugbear",
            CheckCategory::Flake8Comprehensions => "flake8-comprehensions",
            CheckCategory::Flake8Print => "flake8-print",
            CheckCategory::Flake8Quotes => "flake8-quotes",
            CheckCategory::Flake8Annotations => "flake8-annotations",
-            CheckCategory::Flake82020 => "flake8-2020",
            CheckCategory::Pyupgrade => "pyupgrade",
            CheckCategory::Pydocstyle => "pydocstyle",
            CheckCategory::PEP8Naming => "pep8-naming",
@@ -287,7 +247,6 @@ impl CheckCategory {
        match self {
            CheckCategory::Pycodestyle => Some("https://pypi.org/project/pycodestyle/2.9.1/"),
            CheckCategory::Pyflakes => Some("https://pypi.org/project/pyflakes/2.5.0/"),
-            CheckCategory::Isort => Some("https://pypi.org/project/isort/5.10.1/"),
            CheckCategory::Flake8Builtins => {
                Some("https://pypi.org/project/flake8-builtins/2.0.1/")
            }
@@ -302,11 +261,9 @@ impl CheckCategory {
            CheckCategory::Flake8Annotations => {
                Some("https://pypi.org/project/flake8-annotations/2.9.1/")
            }
-            CheckCategory::Flake82020 => Some("https://pypi.org/project/flake8-2020/1.7.0/"),
            CheckCategory::Pyupgrade => Some("https://pypi.org/project/pyupgrade/3.2.0/"),
            CheckCategory::Pydocstyle => Some("https://pypi.org/project/pydocstyle/6.1.1/"),
            CheckCategory::PEP8Naming => Some("https://pypi.org/project/pep8-naming/0.13.2/"),
-            CheckCategory::Flake8Bandit => Some("https://pypi.org/project/flake8-bandit/4.1.1/"),
            CheckCategory::Ruff => None,
            CheckCategory::Meta => None,
        }
@@ -319,7 +276,6 @@ pub enum LintSource {
    FileSystem,
    Lines,
    Tokens,
-    Imports,
 }

 #[derive(Debug, PartialEq, Eq, Serialize, Deserialize)]
@@ -388,25 +344,15 @@ pub enum CheckKind {
    StripWithMultiCharacters,
    MutableArgumentDefault,
    UnusedLoopControlVariable(String),
-    FunctionCallArgumentDefault(Option<String>),
-    GetAttrWithConstant,
-    SetAttrWithConstant,
+    FunctionCallArgumentDefault,
    DoNotAssertFalse,
-    JumpStatementInFinally(String),
    RedundantTupleInExceptionHandler(String),
    DuplicateHandlerException(Vec<String>),
    UselessComparison,
    CannotRaiseLiteral,
    NoAssertRaisesException,
    UselessExpression,
-    CachedInstanceMethod,
-    LoopVariableOverridesIterator(String),
-    FStringDocstring,
-    UselessContextlibSuppress,
-    AbstractBaseClassWithoutAbstractMethod(String),
    DuplicateTryBlockException(String),
-    StarArgUnpackingAfterKeywordArg,
-    EmptyMethodWithoutAbstractDecorator(String),
    // flake8-comprehensions
    UnnecessaryGeneratorList,
    UnnecessaryGeneratorSet,
@@ -443,18 +389,6 @@ pub enum CheckKind {
    MissingReturnTypeMagicMethod(String),
    MissingReturnTypeStaticMethod(String),
    MissingReturnTypeClassMethod(String),
-    DynamicallyTypedExpression(String),
-    // flake8-2020
-    SysVersionSlice3Referenced,
-    SysVersion2Referenced,
-    SysVersionCmpStr3,
-    SysVersionInfo0Eq3Referenced,
-    SixPY3Referenced,
-    SysVersionInfo1CmpInt,
-    SysVersionInfoMinorCmpInt,
-    SysVersion0Referenced,
-    SysVersionCmpStr10,
-    SysVersionSlice1Referenced,
    // pyupgrade
    TypeOfPrimitive(Primitive),
    UnnecessaryAbspath,
@@ -465,9 +399,6 @@ pub enum CheckKind {
    UsePEP604Annotation,
    SuperCallWithParameters,
    PEP3120UnnecessaryCodingComment,
-    UnnecessaryFutureImport(Vec<String>),
-    UnnecessaryLRUCacheParams,
-    UnnecessaryEncodeUTF8,
    // pydocstyle
    BlankLineAfterLastSection(String),
    BlankLineAfterSection(String),
@@ -529,15 +460,6 @@ pub enum CheckKind {
    MixedCaseVariableInGlobalScope(String),
    CamelcaseImportedAsAcronym(String, String),
    ErrorSuffixOnExceptionName(String),
-    // isort
-    UnsortedImports,
-    // flake8-bandit
-    AssertUsed,
-    ExecUsed,
-    HardcodedBindAllInterfaces,
-    HardcodedPasswordString(String),
-    HardcodedPasswordFuncArg(String),
-    HardcodedPasswordDefault(String),
    // Ruff
    AmbiguousUnicodeCharacterString(char, char),
    AmbiguousUnicodeCharacterDocstring(char, char),
@@ -563,7 +485,6 @@ impl CheckCode {
            | CheckCode::RUF002
            | CheckCode::RUF003 => &LintSource::Tokens,
            CheckCode::E902 => &LintSource::FileSystem,
-            CheckCode::I001 => &LintSource::Imports,
            _ => &LintSource::AST,
        }
    }
@@ -631,13 +552,8 @@ impl CheckCode {
            CheckCode::B005 => CheckKind::StripWithMultiCharacters,
            CheckCode::B006 => CheckKind::MutableArgumentDefault,
            CheckCode::B007 => CheckKind::UnusedLoopControlVariable("i".to_string()),
-            CheckCode::B008 => CheckKind::FunctionCallArgumentDefault(None),
-            CheckCode::B009 => CheckKind::GetAttrWithConstant,
-            CheckCode::B010 => CheckKind::SetAttrWithConstant,
+            CheckCode::B008 => CheckKind::FunctionCallArgumentDefault,
            CheckCode::B011 => CheckKind::DoNotAssertFalse,
-            CheckCode::B012 => {
-                CheckKind::JumpStatementInFinally("return/continue/break".to_string())
-            }
            CheckCode::B013 => {
                CheckKind::RedundantTupleInExceptionHandler("ValueError".to_string())
            }
@@ -646,14 +562,7 @@ impl CheckCode {
            CheckCode::B016 => CheckKind::CannotRaiseLiteral,
            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()),
            CheckCode::B025 => CheckKind::DuplicateTryBlockException("Exception".to_string()),
-            CheckCode::B026 => CheckKind::StarArgUnpackingAfterKeywordArg,
-            CheckCode::B027 => CheckKind::EmptyMethodWithoutAbstractDecorator("...".to_string()),
            // flake8-comprehensions
            CheckCode::C400 => CheckKind::UnnecessaryGeneratorList,
            CheckCode::C401 => CheckKind::UnnecessaryGeneratorSet,
@@ -703,18 +612,6 @@ impl CheckCode {
            CheckCode::ANN204 => CheckKind::MissingReturnTypeMagicMethod("...".to_string()),
            CheckCode::ANN205 => CheckKind::MissingReturnTypeStaticMethod("...".to_string()),
            CheckCode::ANN206 => CheckKind::MissingReturnTypeClassMethod("...".to_string()),
-            CheckCode::ANN401 => CheckKind::DynamicallyTypedExpression("...".to_string()),
-            // flake8-2020
-            CheckCode::YTT101 => CheckKind::SysVersionSlice3Referenced,
-            CheckCode::YTT102 => CheckKind::SysVersion2Referenced,
-            CheckCode::YTT103 => CheckKind::SysVersionCmpStr3,
-            CheckCode::YTT201 => CheckKind::SysVersionInfo0Eq3Referenced,
-            CheckCode::YTT202 => CheckKind::SixPY3Referenced,
-            CheckCode::YTT203 => CheckKind::SysVersionInfo1CmpInt,
-            CheckCode::YTT204 => CheckKind::SysVersionInfoMinorCmpInt,
-            CheckCode::YTT301 => CheckKind::SysVersion0Referenced,
-            CheckCode::YTT302 => CheckKind::SysVersionCmpStr10,
-            CheckCode::YTT303 => CheckKind::SysVersionSlice1Referenced,
            // pyupgrade
            CheckCode::U001 => CheckKind::UselessMetaclassType,
            CheckCode::U002 => CheckKind::UnnecessaryAbspath,
@@ -728,9 +625,6 @@ impl CheckCode {
            CheckCode::U007 => CheckKind::UsePEP604Annotation,
            CheckCode::U008 => CheckKind::SuperCallWithParameters,
            CheckCode::U009 => CheckKind::PEP3120UnnecessaryCodingComment,
-            CheckCode::U010 => CheckKind::UnnecessaryFutureImport(vec!["...".to_string()]),
-            CheckCode::U011 => CheckKind::UnnecessaryLRUCacheParams,
-            CheckCode::U012 => CheckKind::UnnecessaryEncodeUTF8,
            // pydocstyle
            CheckCode::D100 => CheckKind::PublicModule,
            CheckCode::D101 => CheckKind::PublicClass,
@@ -808,15 +702,6 @@ impl CheckCode {
                CheckKind::CamelcaseImportedAsAcronym("...".to_string(), "...".to_string())
            }
            CheckCode::N818 => CheckKind::ErrorSuffixOnExceptionName("...".to_string()),
-            // isort
-            CheckCode::I001 => CheckKind::UnsortedImports,
-            // flake8-bandit
-            CheckCode::S101 => CheckKind::AssertUsed,
-            CheckCode::S102 => CheckKind::ExecUsed,
-            CheckCode::S104 => CheckKind::HardcodedBindAllInterfaces,
-            CheckCode::S105 => CheckKind::HardcodedPasswordString("...".to_string()),
-            CheckCode::S106 => CheckKind::HardcodedPasswordFuncArg("...".to_string()),
-            CheckCode::S107 => CheckKind::HardcodedPasswordDefault("...".to_string()),
            // Ruff
            CheckCode::RUF001 => CheckKind::AmbiguousUnicodeCharacterString('𝐁', 'B'),
            CheckCode::RUF002 => CheckKind::AmbiguousUnicodeCharacterDocstring('𝐁', 'B'),
@@ -882,24 +767,14 @@ impl CheckCode {
            CheckCode::B006 => CheckCategory::Flake8Bugbear,
            CheckCode::B007 => CheckCategory::Flake8Bugbear,
            CheckCode::B008 => CheckCategory::Flake8Bugbear,
-            CheckCode::B009 => CheckCategory::Flake8Bugbear,
-            CheckCode::B010 => CheckCategory::Flake8Bugbear,
            CheckCode::B011 => CheckCategory::Flake8Bugbear,
-            CheckCode::B012 => CheckCategory::Flake8Bugbear,
            CheckCode::B013 => CheckCategory::Flake8Bugbear,
            CheckCode::B014 => CheckCategory::Flake8Bugbear,
            CheckCode::B015 => CheckCategory::Flake8Bugbear,
            CheckCode::B016 => CheckCategory::Flake8Bugbear,
            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,
            CheckCode::B025 => CheckCategory::Flake8Bugbear,
-            CheckCode::B026 => CheckCategory::Flake8Bugbear,
-            CheckCode::B027 => CheckCategory::Flake8Bugbear,
            CheckCode::C400 => CheckCategory::Flake8Comprehensions,
            CheckCode::C401 => CheckCategory::Flake8Comprehensions,
            CheckCode::C402 => CheckCategory::Flake8Comprehensions,
@@ -932,17 +807,6 @@ impl CheckCode {
            CheckCode::ANN204 => CheckCategory::Flake8Annotations,
            CheckCode::ANN205 => CheckCategory::Flake8Annotations,
            CheckCode::ANN206 => CheckCategory::Flake8Annotations,
-            CheckCode::ANN401 => CheckCategory::Flake8Annotations,
-            CheckCode::YTT101 => CheckCategory::Flake82020,
-            CheckCode::YTT102 => CheckCategory::Flake82020,
-            CheckCode::YTT103 => CheckCategory::Flake82020,
-            CheckCode::YTT201 => CheckCategory::Flake82020,
-            CheckCode::YTT202 => CheckCategory::Flake82020,
-            CheckCode::YTT203 => CheckCategory::Flake82020,
-            CheckCode::YTT204 => CheckCategory::Flake82020,
-            CheckCode::YTT301 => CheckCategory::Flake82020,
-            CheckCode::YTT302 => CheckCategory::Flake82020,
-            CheckCode::YTT303 => CheckCategory::Flake82020,
            CheckCode::U001 => CheckCategory::Pyupgrade,
            CheckCode::U002 => CheckCategory::Pyupgrade,
            CheckCode::U003 => CheckCategory::Pyupgrade,
@@ -952,9 +816,6 @@ impl CheckCode {
            CheckCode::U007 => CheckCategory::Pyupgrade,
            CheckCode::U008 => CheckCategory::Pyupgrade,
            CheckCode::U009 => CheckCategory::Pyupgrade,
-            CheckCode::U010 => CheckCategory::Pyupgrade,
-            CheckCode::U011 => CheckCategory::Pyupgrade,
-            CheckCode::U012 => CheckCategory::Pyupgrade,
            CheckCode::D100 => CheckCategory::Pydocstyle,
            CheckCode::D101 => CheckCategory::Pydocstyle,
            CheckCode::D102 => CheckCategory::Pydocstyle,
@@ -1014,13 +875,6 @@ impl CheckCode {
            CheckCode::N816 => CheckCategory::PEP8Naming,
            CheckCode::N817 => CheckCategory::PEP8Naming,
            CheckCode::N818 => CheckCategory::PEP8Naming,
-            CheckCode::I001 => CheckCategory::Isort,
-            CheckCode::S101 => CheckCategory::Flake8Bandit,
-            CheckCode::S102 => CheckCategory::Flake8Bandit,
-            CheckCode::S104 => CheckCategory::Flake8Bandit,
-            CheckCode::S105 => CheckCategory::Flake8Bandit,
-            CheckCode::S106 => CheckCategory::Flake8Bandit,
-            CheckCode::S107 => CheckCategory::Flake8Bandit,
            CheckCode::RUF001 => CheckCategory::Ruff,
            CheckCode::RUF002 => CheckCategory::Ruff,
            CheckCode::RUF003 => CheckCategory::Ruff,
@@ -1090,25 +944,15 @@ impl CheckKind {
            CheckKind::StripWithMultiCharacters => &CheckCode::B005,
            CheckKind::MutableArgumentDefault => &CheckCode::B006,
            CheckKind::UnusedLoopControlVariable(_) => &CheckCode::B007,
-            CheckKind::FunctionCallArgumentDefault(_) => &CheckCode::B008,
-            CheckKind::GetAttrWithConstant => &CheckCode::B009,
-            CheckKind::SetAttrWithConstant => &CheckCode::B010,
+            CheckKind::FunctionCallArgumentDefault => &CheckCode::B008,
            CheckKind::DoNotAssertFalse => &CheckCode::B011,
-            CheckKind::JumpStatementInFinally(_) => &CheckCode::B012,
            CheckKind::RedundantTupleInExceptionHandler(_) => &CheckCode::B013,
            CheckKind::DuplicateHandlerException(_) => &CheckCode::B014,
            CheckKind::UselessComparison => &CheckCode::B015,
            CheckKind::CannotRaiseLiteral => &CheckCode::B016,
            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,
            CheckKind::DuplicateTryBlockException(_) => &CheckCode::B025,
-            CheckKind::StarArgUnpackingAfterKeywordArg => &CheckCode::B026,
-            CheckKind::EmptyMethodWithoutAbstractDecorator(_) => &CheckCode::B027,
            // flake8-comprehensions
            CheckKind::UnnecessaryGeneratorList => &CheckCode::C400,
            CheckKind::UnnecessaryGeneratorSet => &CheckCode::C401,
@@ -1145,18 +989,6 @@ impl CheckKind {
            CheckKind::MissingReturnTypeMagicMethod(_) => &CheckCode::ANN204,
            CheckKind::MissingReturnTypeStaticMethod(_) => &CheckCode::ANN205,
            CheckKind::MissingReturnTypeClassMethod(_) => &CheckCode::ANN206,
-            CheckKind::DynamicallyTypedExpression(_) => &CheckCode::ANN401,
-            // flake8-2020
-            CheckKind::SysVersionSlice3Referenced => &CheckCode::YTT101,
-            CheckKind::SysVersion2Referenced => &CheckCode::YTT102,
-            CheckKind::SysVersionCmpStr3 => &CheckCode::YTT103,
-            CheckKind::SysVersionInfo0Eq3Referenced => &CheckCode::YTT201,
-            CheckKind::SixPY3Referenced => &CheckCode::YTT202,
-            CheckKind::SysVersionInfo1CmpInt => &CheckCode::YTT203,
-            CheckKind::SysVersionInfoMinorCmpInt => &CheckCode::YTT204,
-            CheckKind::SysVersion0Referenced => &CheckCode::YTT301,
-            CheckKind::SysVersionCmpStr10 => &CheckCode::YTT302,
-            CheckKind::SysVersionSlice1Referenced => &CheckCode::YTT303,
            // pyupgrade
            CheckKind::TypeOfPrimitive(_) => &CheckCode::U003,
            CheckKind::UnnecessaryAbspath => &CheckCode::U002,
@@ -1167,9 +999,6 @@ impl CheckKind {
            CheckKind::UselessObjectInheritance(_) => &CheckCode::U004,
            CheckKind::SuperCallWithParameters => &CheckCode::U008,
            CheckKind::PEP3120UnnecessaryCodingComment => &CheckCode::U009,
-            CheckKind::UnnecessaryFutureImport(_) => &CheckCode::U010,
-            CheckKind::UnnecessaryLRUCacheParams => &CheckCode::U011,
-            CheckKind::UnnecessaryEncodeUTF8 => &CheckCode::U012,
            // pydocstyle
            CheckKind::BlankLineAfterLastSection(_) => &CheckCode::D413,
            CheckKind::BlankLineAfterSection(_) => &CheckCode::D410,
@@ -1231,15 +1060,6 @@ impl CheckKind {
            CheckKind::MixedCaseVariableInGlobalScope(..) => &CheckCode::N816,
            CheckKind::CamelcaseImportedAsAcronym(..) => &CheckCode::N817,
            CheckKind::ErrorSuffixOnExceptionName(..) => &CheckCode::N818,
-            // isort
-            CheckKind::UnsortedImports => &CheckCode::I001,
-            // flake8-bandit
-            CheckKind::AssertUsed => &CheckCode::S101,
-            CheckKind::ExecUsed => &CheckCode::S102,
-            CheckKind::HardcodedBindAllInterfaces => &CheckCode::S104,
-            CheckKind::HardcodedPasswordString(..) => &CheckCode::S105,
-            CheckKind::HardcodedPasswordFuncArg(..) => &CheckCode::S106,
-            CheckKind::HardcodedPasswordDefault(..) => &CheckCode::S107,
            // Ruff
            CheckKind::AmbiguousUnicodeCharacterString(..) => &CheckCode::RUF001,
            CheckKind::AmbiguousUnicodeCharacterDocstring(..) => &CheckCode::RUF002,
@@ -1268,7 +1088,7 @@ impl CheckKind {
            CheckKind::BreakOutsideLoop => "`break` outside loop".to_string(),
            CheckKind::ContinueOutsideLoop => "`continue` not properly in loop".to_string(),
            CheckKind::DefaultExceptNotLast => {
-                "An `except` block as not the last exception handler".to_string()
+                "An `except:` block as not the last exception handler".to_string()
            }
            CheckKind::DoNotAssignLambda => {
                "Do not assign a lambda expression, use a def".to_string()
@@ -1405,47 +1225,32 @@ impl CheckKind {
                                                `+(+(n))`, which equals `n`. You meant `n += 1`."
                .to_string(),
            CheckKind::AssignmentToOsEnviron => {
-                "Assigning to `os.environ` doesn't clear the environment".to_string()
+                "Assigning to `os.environ` doesn't clear the environment.".to_string()
            }
            CheckKind::UnreliableCallableCheck => " Using `hasattr(x, '__call__')` to test if x \
                                                   is callable is unreliable. Use `callable(x)` \
                                                   for consistent results."
                .to_string(),
-            CheckKind::StripWithMultiCharacters => {
-                "Using `.strip()` with multi-character strings is misleading the reader".to_string()
-            }
+            CheckKind::StripWithMultiCharacters => "Using `.strip()` with multi-character strings \
+                                                    is misleading the reader."
+                .to_string(),
            CheckKind::MutableArgumentDefault => {
-                "Do not use mutable data structures for argument defaults".to_string()
+                "Do not use mutable data structures for argument defaults.".to_string()
            }
            CheckKind::UnusedLoopControlVariable(name) => format!(
                "Loop control variable `{name}` not used within the loop body. If this is \
                 intended, start the name with an underscore."
            ),
-            CheckKind::FunctionCallArgumentDefault(name) => {
-                if let Some(name) = name {
-                    format!("Do not perform function call `{name}` in argument defaults")
-                } else {
-                    "Do not perform function call in argument defaults".to_string()
-                }
+            CheckKind::FunctionCallArgumentDefault => {
+                "Do not perform function calls in argument defaults.".to_string()
            }
-            CheckKind::GetAttrWithConstant => "Do not call `getattr` with a constant attribute \
-                                               value. It is not any safer than normal property \
-                                               access."
-                .to_string(),
-            CheckKind::SetAttrWithConstant => "Do not call `setattr` with a constant attribute \
-                                               value. It is not any safer than normal property \
-                                               access."
-                .to_string(),
            CheckKind::DoNotAssertFalse => "Do not `assert False` (`python -O` removes these \
                                            calls), raise `AssertionError()`"
                .to_string(),
-            CheckKind::JumpStatementInFinally(name) => {
-                format!("`{name}` inside finally blocks cause exceptions to be silenced")
-            }
            CheckKind::RedundantTupleInExceptionHandler(name) => {
                format!(
-                    "A length-one tuple literal is redundant. Write `except {name}` instead of \
-                     `except ({name},)`."
+                    "A length-one tuple literal is redundant. Write `except {name}:` instead of \
+                     `except ({name},):`."
                )
            }
            CheckKind::UselessComparison => "Pointless comparison. This comparison does nothing \
@@ -1465,7 +1270,7 @@ impl CheckKind {
                }
            }
            CheckKind::NoAssertRaisesException => {
-                "`assertRaises(Exception)` should be considered evil. It can lead to your test \
+                "`assertRaises(Exception):` should be considered evil. It can lead to your test \
                 passing even if the code being tested is never executed due to a typo. Either \
                 assert for a more specific exception (builtin or custom), use \
                 `assertRaisesRegex`, or use the context manager form of `assertRaises`."
@@ -1474,38 +1279,9 @@ impl CheckKind {
            CheckKind::UselessExpression => {
                "Found useless expression. Either assign it to a variable or remove it.".to_string()
            }
-            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(),
-            CheckKind::UselessContextlibSuppress => {
-                "No arguments passed to `contextlib.suppress`. No exceptions will be suppressed \
-                 and therefore this context manager is redundant"
-                    .to_string()
-            }
-            CheckKind::AbstractBaseClassWithoutAbstractMethod(name) => {
-                format!("`{name}` is an abstract base class, but it has no abstract methods")
-            }
            CheckKind::DuplicateTryBlockException(name) => {
                format!("try-except block with duplicate exception `{name}`")
            }
-            CheckKind::StarArgUnpackingAfterKeywordArg => {
-                "Star-arg unpacking after a keyword argument is strongly discouraged. It only \
-                 works when the keyword parameter is declared after all parameters supplied by the \
-                 unpacked sequence, and this change of ordering can surprise and mislead readers."
-                    .to_string()
-            }
-            CheckKind::EmptyMethodWithoutAbstractDecorator(name) => {
-                format!(
-                    "`{name}` is an empty method in an abstract base class, but has no abstract \
-                     decorator"
-                )
-            }
            // flake8-comprehensions
            CheckKind::UnnecessaryGeneratorList => {
                "Unnecessary generator (rewrite as a `list` comprehension)".to_string()
@@ -1635,41 +1411,6 @@ impl CheckKind {
            CheckKind::MissingReturnTypeClassMethod(name) => {
                format!("Missing return type annotation for classmethod `{name}`")
            }
-            CheckKind::DynamicallyTypedExpression(name) => {
-                format!("Dynamically typed expressions (typing.Any) are disallowed in `{name}`")
-            }
-            // flake8-2020
-            CheckKind::SysVersionSlice3Referenced => {
-                "`sys.version[:3]` referenced (python3.10), use `sys.version_info`".to_string()
-            }
-            CheckKind::SysVersion2Referenced => {
-                "`sys.version[2]` referenced (python3.10), use `sys.version_info`".to_string()
-            }
-            CheckKind::SysVersionCmpStr3 => {
-                "`sys.version` compared to string (python3.10), use `sys.version_info`".to_string()
-            }
-            CheckKind::SysVersionInfo0Eq3Referenced => {
-                "`sys.version_info[0] == 3` referenced (python4), use `>=`".to_string()
-            }
-            CheckKind::SixPY3Referenced => {
-                "`six.PY3` referenced (python4), use `not six.PY2`".to_string()
-            }
-            CheckKind::SysVersionInfo1CmpInt => "`sys.version_info[1]` compared to integer \
-                                                 (python4), compare `sys.version_info` to tuple"
-                .to_string(),
-            CheckKind::SysVersionInfoMinorCmpInt => "`sys.version_info.minor` compared to integer \
-                                                     (python4), compare `sys.version_info` to \
-                                                     tuple"
-                .to_string(),
-            CheckKind::SysVersion0Referenced => {
-                "`sys.version[0]` referenced (python10), use `sys.version_info`".to_string()
-            }
-            CheckKind::SysVersionCmpStr10 => {
-                "`sys.version` compared to string (python10), use `sys.version_info`".to_string()
-            }
-            CheckKind::SysVersionSlice1Referenced => {
-                "`sys.version[:1]` referenced (python10), use `sys.version_info`".to_string()
-            }
            // pyupgrade
            CheckKind::TypeOfPrimitive(primitive) => {
                format!("Use `{}` instead of `type(...)`", primitive.builtin())
@@ -1695,19 +1436,6 @@ impl CheckKind {
            CheckKind::SuperCallWithParameters => {
                "Use `super()` instead of `super(__class__, self)`".to_string()
            }
-            CheckKind::UnnecessaryFutureImport(names) => {
-                if names.len() == 1 {
-                    let import = &names[0];
-                    format!("Unnecessary `__future__` import `{import}` for target Python version")
-                } else {
-                    let imports = names.iter().map(|name| format!("`{name}`")).join(", ");
-                    format!("Unnecessary `__future__` imports {imports} for target Python version")
-                }
-            }
-            CheckKind::UnnecessaryLRUCacheParams => {
-                "Unnecessary parameters to `functools.lru_cache`".to_string()
-            }
-            CheckKind::UnnecessaryEncodeUTF8 => "Unnecessary call to `encode` as UTF-8".to_string(),
            // pydocstyle
            CheckKind::FitsOnOneLine => "One-line docstring should fit on one line".to_string(),
            CheckKind::BlankLineAfterSummary => {
@@ -1761,7 +1489,7 @@ impl CheckKind {
            CheckKind::PublicNestedClass => "Missing docstring in public nested class".to_string(),
            CheckKind::PublicInit => "Missing docstring in `__init__`".to_string(),
            CheckKind::NoThisPrefix => {
-                "First word of the docstring should not be \"This\"".to_string()
+                "First word of the docstring should not be 'This'".to_string()
            }
            CheckKind::SkipDocstring => {
                "Function decorated with `@overload` shouldn't contain a docstring".to_string()
@@ -1869,24 +1597,7 @@ impl CheckKind {
                format!("Exception name `{name}` should be named with an Error suffix")
            }
            CheckKind::PEP3120UnnecessaryCodingComment => {
-                "UTF-8 encoding declaration is unnecessary".to_string()
-            }
-            // isort
-            CheckKind::UnsortedImports => "Import block is un-sorted or un-formatted".to_string(),
-            // flake8-bandit
-            CheckKind::AssertUsed => "Use of `assert` detected".to_string(),
-            CheckKind::ExecUsed => "Use of `exec` detected".to_string(),
-            CheckKind::HardcodedBindAllInterfaces => {
-                "Possible binding to all interfaces".to_string()
-            }
-            CheckKind::HardcodedPasswordString(string) => {
-                format!("Possible hardcoded password: `\"{string}\"`")
-            }
-            CheckKind::HardcodedPasswordFuncArg(string) => {
-                format!("Possible hardcoded password: `\"{string}\"`")
-            }
-            CheckKind::HardcodedPasswordDefault(string) => {
-                format!("Possible hardcoded password: `\"{string}\"`")
+                "utf-8 encoding declaration is unnecessary".to_string()
            }
            // Ruff
            CheckKind::AmbiguousUnicodeCharacterString(confusable, representant) => {
@@ -1932,16 +1643,13 @@ impl CheckKind {
    pub fn summary(&self) -> String {
        match self {
            CheckKind::UnaryPrefixIncrement => {
-                "Python does not support the unary prefix increment".to_string()
+                "Python does not support the unary prefix increment.".to_string()
            }
            CheckKind::UnusedLoopControlVariable(name) => {
-                format!("Loop control variable `{name}` not used within the loop body")
+                format!("Loop control variable `{name}` not used within the loop body.")
            }
            CheckKind::NoAssertRaisesException => {
-                "`assertRaises(Exception)` should be considered evil".to_string()
-            }
-            CheckKind::StarArgUnpackingAfterKeywordArg => {
-                "Star-arg unpacking after a keyword argument is strongly discouraged".to_string()
+                "`assertRaises(Exception):` should be considered evil.".to_string()
            }
            _ => self.body(),
        }
@@ -1962,8 +1670,6 @@ impl CheckKind {
                | CheckKind::DeprecatedUnittestAlias(_, _)
                | CheckKind::DoNotAssertFalse
                | CheckKind::DuplicateHandlerException(_)
-                | CheckKind::GetAttrWithConstant
-                | CheckKind::IsLiteral
                | CheckKind::NewLineAfterLastParagraph
                | CheckKind::NewLineAfterSectionName(_)
                | CheckKind::NoBlankLineAfterFunction(_)
@@ -1975,7 +1681,6 @@ impl CheckKind {
                | CheckKind::NoUnderIndentation
                | CheckKind::OneBlankLineAfterClass(_)
                | CheckKind::OneBlankLineBeforeClass(_)
-                | CheckKind::PEP3120UnnecessaryCodingComment
                | CheckKind::PPrintFound
                | CheckKind::PrintFound
                | CheckKind::RaiseNotImplemented
@@ -1989,20 +1694,15 @@ impl CheckKind {
                | CheckKind::UnnecessaryAbspath
                | CheckKind::UnnecessaryCollectionCall(_)
                | CheckKind::UnnecessaryComprehension(_)
-                | CheckKind::UnnecessaryEncodeUTF8
-                | CheckKind::UnnecessaryFutureImport(_)
                | CheckKind::UnnecessaryGeneratorDict
                | CheckKind::UnnecessaryGeneratorList
                | CheckKind::UnnecessaryGeneratorSet
-                | CheckKind::UnnecessaryLRUCacheParams
                | CheckKind::UnnecessaryListCall
-                | CheckKind::UnnecessaryListComprehensionDict
                | CheckKind::UnnecessaryListComprehensionSet
                | CheckKind::UnnecessaryLiteralDict(_)
                | CheckKind::UnnecessaryLiteralSet(_)
                | CheckKind::UnnecessaryLiteralWithinListCall(_)
                | CheckKind::UnnecessaryLiteralWithinTupleCall(_)
-                | CheckKind::UnsortedImports
                | CheckKind::UnusedImport(_, false)
                | CheckKind::UnusedLoopControlVariable(_)
                | CheckKind::UnusedNOQA(_)
@@ -2010,6 +1710,8 @@ impl CheckKind {
                | CheckKind::UsePEP604Annotation
                | CheckKind::UselessMetaclassType
                | CheckKind::UselessObjectInheritance(_)
+                | CheckKind::PEP3120UnnecessaryCodingComment
+                | CheckKind::IsLiteral
        )
    }
 }
--- a/src/checks_gen.rs
+++ b/src/checks_gen.rs
@@ -30,9 +30,6 @@ pub enum CheckCodePrefix {
    ANN204,
    ANN205,
    ANN206,
-    ANN4,
-    ANN40,
-    ANN401,
    B,
    B0,
    B00,
@@ -43,26 +40,16 @@ pub enum CheckCodePrefix {
    B006,
    B007,
    B008,
-    B009,
    B01,
-    B010,
    B011,
-    B012,
    B013,
    B014,
    B015,
    B016,
    B017,
    B018,
-    B019,
    B02,
-    B020,
-    B021,
-    B022,
-    B024,
    B025,
-    B026,
-    B027,
    C,
    C4,
    C40,
@@ -211,10 +198,6 @@ pub enum CheckCodePrefix {
    F9,
    F90,
    F901,
-    I,
-    I0,
-    I00,
-    I001,
    M,
    M0,
    M00,
@@ -251,15 +234,6 @@ pub enum CheckCodePrefix {
    RUF001,
    RUF002,
    RUF003,
-    S,
-    S1,
-    S10,
-    S101,
-    S102,
-    S104,
-    S105,
-    S106,
-    S107,
    T,
    T2,
    T20,
@@ -277,10 +251,6 @@ pub enum CheckCodePrefix {
    U007,
    U008,
    U009,
-    U01,
-    U010,
-    U011,
-    U012,
    W,
    W2,
    W29,
@@ -288,23 +258,6 @@ pub enum CheckCodePrefix {
    W6,
    W60,
    W605,
-    YTT,
-    YTT1,
-    YTT10,
-    YTT101,
-    YTT102,
-    YTT103,
-    YTT2,
-    YTT20,
-    YTT201,
-    YTT202,
-    YTT203,
-    YTT204,
-    YTT3,
-    YTT30,
-    YTT301,
-    YTT302,
-    YTT303,
 }

 #[derive(PartialEq, Eq, PartialOrd, Ord)]
@@ -335,7 +288,6 @@ impl CheckCodePrefix {
                CheckCode::ANN204,
                CheckCode::ANN205,
                CheckCode::ANN206,
-                CheckCode::ANN401,
            ],
            CheckCodePrefix::ANN0 => vec![CheckCode::ANN001, CheckCode::ANN002, CheckCode::ANN003],
            CheckCodePrefix::ANN00 => vec![CheckCode::ANN001, CheckCode::ANN002, CheckCode::ANN003],
@@ -365,9 +317,6 @@ impl CheckCodePrefix {
            CheckCodePrefix::ANN204 => vec![CheckCode::ANN204],
            CheckCodePrefix::ANN205 => vec![CheckCode::ANN205],
            CheckCodePrefix::ANN206 => vec![CheckCode::ANN206],
-            CheckCodePrefix::ANN4 => vec![CheckCode::ANN401],
-            CheckCodePrefix::ANN40 => vec![CheckCode::ANN401],
-            CheckCodePrefix::ANN401 => vec![CheckCode::ANN401],
            CheckCodePrefix::B => vec![
                CheckCode::B002,
                CheckCode::B003,
@@ -376,24 +325,14 @@ impl CheckCodePrefix {
                CheckCode::B006,
                CheckCode::B007,
                CheckCode::B008,
-                CheckCode::B009,
-                CheckCode::B010,
                CheckCode::B011,
-                CheckCode::B012,
                CheckCode::B013,
                CheckCode::B014,
                CheckCode::B015,
                CheckCode::B016,
                CheckCode::B017,
                CheckCode::B018,
-                CheckCode::B019,
-                CheckCode::B020,
-                CheckCode::B021,
-                CheckCode::B022,
-                CheckCode::B024,
                CheckCode::B025,
-                CheckCode::B026,
-                CheckCode::B027,
            ],
            CheckCodePrefix::B0 => vec![
                CheckCode::B002,
@@ -403,24 +342,14 @@ impl CheckCodePrefix {
                CheckCode::B006,
                CheckCode::B007,
                CheckCode::B008,
-                CheckCode::B009,
-                CheckCode::B010,
                CheckCode::B011,
-                CheckCode::B012,
                CheckCode::B013,
                CheckCode::B014,
                CheckCode::B015,
                CheckCode::B016,
                CheckCode::B017,
                CheckCode::B018,
-                CheckCode::B019,
-                CheckCode::B020,
-                CheckCode::B021,
-                CheckCode::B022,
-                CheckCode::B024,
                CheckCode::B025,
-                CheckCode::B026,
-                CheckCode::B027,
            ],
            CheckCodePrefix::B00 => vec![
                CheckCode::B002,
@@ -430,7 +359,6 @@ impl CheckCodePrefix {
                CheckCode::B006,
                CheckCode::B007,
                CheckCode::B008,
-                CheckCode::B009,
            ],
            CheckCodePrefix::B002 => vec![CheckCode::B002],
            CheckCodePrefix::B003 => vec![CheckCode::B003],
@@ -439,45 +367,24 @@ impl CheckCodePrefix {
            CheckCodePrefix::B006 => vec![CheckCode::B006],
            CheckCodePrefix::B007 => vec![CheckCode::B007],
            CheckCodePrefix::B008 => vec![CheckCode::B008],
-            CheckCodePrefix::B009 => vec![CheckCode::B009],
            CheckCodePrefix::B01 => vec![
-                CheckCode::B010,
                CheckCode::B011,
-                CheckCode::B012,
                CheckCode::B013,
                CheckCode::B014,
                CheckCode::B015,
                CheckCode::B016,
                CheckCode::B017,
                CheckCode::B018,
-                CheckCode::B019,
            ],
-            CheckCodePrefix::B010 => vec![CheckCode::B010],
            CheckCodePrefix::B011 => vec![CheckCode::B011],
-            CheckCodePrefix::B012 => vec![CheckCode::B012],
            CheckCodePrefix::B013 => vec![CheckCode::B013],
            CheckCodePrefix::B014 => vec![CheckCode::B014],
            CheckCodePrefix::B015 => vec![CheckCode::B015],
            CheckCodePrefix::B016 => vec![CheckCode::B016],
            CheckCodePrefix::B017 => vec![CheckCode::B017],
            CheckCodePrefix::B018 => vec![CheckCode::B018],
-            CheckCodePrefix::B019 => vec![CheckCode::B019],
-            CheckCodePrefix::B02 => vec![
-                CheckCode::B020,
-                CheckCode::B021,
-                CheckCode::B022,
-                CheckCode::B024,
-                CheckCode::B025,
-                CheckCode::B026,
-                CheckCode::B027,
-            ],
-            CheckCodePrefix::B020 => vec![CheckCode::B020],
-            CheckCodePrefix::B021 => vec![CheckCode::B021],
-            CheckCodePrefix::B022 => vec![CheckCode::B022],
-            CheckCodePrefix::B024 => vec![CheckCode::B024],
+            CheckCodePrefix::B02 => vec![CheckCode::B025],
            CheckCodePrefix::B025 => vec![CheckCode::B025],
-            CheckCodePrefix::B026 => vec![CheckCode::B026],
-            CheckCodePrefix::B027 => vec![CheckCode::B027],
            CheckCodePrefix::C => vec![
                CheckCode::C400,
                CheckCode::C401,
@@ -926,10 +833,6 @@ impl CheckCodePrefix {
            CheckCodePrefix::F9 => vec![CheckCode::F901],
            CheckCodePrefix::F90 => vec![CheckCode::F901],
            CheckCodePrefix::F901 => vec![CheckCode::F901],
-            CheckCodePrefix::I => vec![CheckCode::I001],
-            CheckCodePrefix::I0 => vec![CheckCode::I001],
-            CheckCodePrefix::I00 => vec![CheckCode::I001],
-            CheckCodePrefix::I001 => vec![CheckCode::I001],
            CheckCodePrefix::M => vec![CheckCode::M001],
            CheckCodePrefix::M0 => vec![CheckCode::M001],
            CheckCodePrefix::M00 => vec![CheckCode::M001],
@@ -1030,36 +933,6 @@ impl CheckCodePrefix {
            CheckCodePrefix::RUF001 => vec![CheckCode::RUF001],
            CheckCodePrefix::RUF002 => vec![CheckCode::RUF002],
            CheckCodePrefix::RUF003 => vec![CheckCode::RUF003],
-            CheckCodePrefix::S => vec![
-                CheckCode::S101,
-                CheckCode::S102,
-                CheckCode::S104,
-                CheckCode::S105,
-                CheckCode::S106,
-                CheckCode::S107,
-            ],
-            CheckCodePrefix::S1 => vec![
-                CheckCode::S101,
-                CheckCode::S102,
-                CheckCode::S104,
-                CheckCode::S105,
-                CheckCode::S106,
-                CheckCode::S107,
-            ],
-            CheckCodePrefix::S10 => vec![
-                CheckCode::S101,
-                CheckCode::S102,
-                CheckCode::S104,
-                CheckCode::S105,
-                CheckCode::S106,
-                CheckCode::S107,
-            ],
-            CheckCodePrefix::S101 => vec![CheckCode::S101],
-            CheckCodePrefix::S102 => vec![CheckCode::S102],
-            CheckCodePrefix::S104 => vec![CheckCode::S104],
-            CheckCodePrefix::S105 => vec![CheckCode::S105],
-            CheckCodePrefix::S106 => vec![CheckCode::S106],
-            CheckCodePrefix::S107 => vec![CheckCode::S107],
            CheckCodePrefix::T => vec![CheckCode::T201, CheckCode::T203],
            CheckCodePrefix::T2 => vec![CheckCode::T201, CheckCode::T203],
            CheckCodePrefix::T20 => vec![CheckCode::T201, CheckCode::T203],
@@ -1075,9 +948,6 @@ impl CheckCodePrefix {
                CheckCode::U007,
                CheckCode::U008,
                CheckCode::U009,
-                CheckCode::U010,
-                CheckCode::U011,
-                CheckCode::U012,
            ],
            CheckCodePrefix::U0 => vec![
                CheckCode::U001,
@@ -1089,9 +959,6 @@ impl CheckCodePrefix {
                CheckCode::U007,
                CheckCode::U008,
                CheckCode::U009,
-                CheckCode::U010,
-                CheckCode::U011,
-                CheckCode::U012,
            ],
            CheckCodePrefix::U00 => vec![
                CheckCode::U001,
@@ -1113,10 +980,6 @@ impl CheckCodePrefix {
            CheckCodePrefix::U007 => vec![CheckCode::U007],
            CheckCodePrefix::U008 => vec![CheckCode::U008],
            CheckCodePrefix::U009 => vec![CheckCode::U009],
-            CheckCodePrefix::U01 => vec![CheckCode::U010, CheckCode::U011, CheckCode::U012],
-            CheckCodePrefix::U010 => vec![CheckCode::U010],
-            CheckCodePrefix::U011 => vec![CheckCode::U011],
-            CheckCodePrefix::U012 => vec![CheckCode::U012],
            CheckCodePrefix::W => vec![CheckCode::W292, CheckCode::W605],
            CheckCodePrefix::W2 => vec![CheckCode::W292],
            CheckCodePrefix::W29 => vec![CheckCode::W292],
@@ -1124,44 +987,6 @@ impl CheckCodePrefix {
            CheckCodePrefix::W6 => vec![CheckCode::W605],
            CheckCodePrefix::W60 => vec![CheckCode::W605],
            CheckCodePrefix::W605 => vec![CheckCode::W605],
-            CheckCodePrefix::YTT => vec![
-                CheckCode::YTT101,
-                CheckCode::YTT102,
-                CheckCode::YTT103,
-                CheckCode::YTT201,
-                CheckCode::YTT202,
-                CheckCode::YTT203,
-                CheckCode::YTT204,
-                CheckCode::YTT301,
-                CheckCode::YTT302,
-                CheckCode::YTT303,
-            ],
-            CheckCodePrefix::YTT1 => vec![CheckCode::YTT101, CheckCode::YTT102, CheckCode::YTT103],
-            CheckCodePrefix::YTT10 => vec![CheckCode::YTT101, CheckCode::YTT102, CheckCode::YTT103],
-            CheckCodePrefix::YTT101 => vec![CheckCode::YTT101],
-            CheckCodePrefix::YTT102 => vec![CheckCode::YTT102],
-            CheckCodePrefix::YTT103 => vec![CheckCode::YTT103],
-            CheckCodePrefix::YTT2 => vec![
-                CheckCode::YTT201,
-                CheckCode::YTT202,
-                CheckCode::YTT203,
-                CheckCode::YTT204,
-            ],
-            CheckCodePrefix::YTT20 => vec![
-                CheckCode::YTT201,
-                CheckCode::YTT202,
-                CheckCode::YTT203,
-                CheckCode::YTT204,
-            ],
-            CheckCodePrefix::YTT201 => vec![CheckCode::YTT201],
-            CheckCodePrefix::YTT202 => vec![CheckCode::YTT202],
-            CheckCodePrefix::YTT203 => vec![CheckCode::YTT203],
-            CheckCodePrefix::YTT204 => vec![CheckCode::YTT204],
-            CheckCodePrefix::YTT3 => vec![CheckCode::YTT301, CheckCode::YTT302, CheckCode::YTT303],
-            CheckCodePrefix::YTT30 => vec![CheckCode::YTT301, CheckCode::YTT302, CheckCode::YTT303],
-            CheckCodePrefix::YTT301 => vec![CheckCode::YTT301],
-            CheckCodePrefix::YTT302 => vec![CheckCode::YTT302],
-            CheckCodePrefix::YTT303 => vec![CheckCode::YTT303],
        }
    }
 }
@@ -1192,9 +1017,6 @@ impl CheckCodePrefix {
            CheckCodePrefix::ANN204 => PrefixSpecificity::Explicit,
            CheckCodePrefix::ANN205 => PrefixSpecificity::Explicit,
            CheckCodePrefix::ANN206 => PrefixSpecificity::Explicit,
-            CheckCodePrefix::ANN4 => PrefixSpecificity::Hundreds,
-            CheckCodePrefix::ANN40 => PrefixSpecificity::Tens,
-            CheckCodePrefix::ANN401 => PrefixSpecificity::Explicit,
            CheckCodePrefix::B => PrefixSpecificity::Category,
            CheckCodePrefix::B0 => PrefixSpecificity::Hundreds,
            CheckCodePrefix::B00 => PrefixSpecificity::Tens,
@@ -1205,26 +1027,16 @@ impl CheckCodePrefix {
            CheckCodePrefix::B006 => PrefixSpecificity::Explicit,
            CheckCodePrefix::B007 => PrefixSpecificity::Explicit,
            CheckCodePrefix::B008 => PrefixSpecificity::Explicit,
-            CheckCodePrefix::B009 => PrefixSpecificity::Explicit,
            CheckCodePrefix::B01 => PrefixSpecificity::Tens,
-            CheckCodePrefix::B010 => PrefixSpecificity::Explicit,
            CheckCodePrefix::B011 => PrefixSpecificity::Explicit,
-            CheckCodePrefix::B012 => PrefixSpecificity::Explicit,
            CheckCodePrefix::B013 => PrefixSpecificity::Explicit,
            CheckCodePrefix::B014 => PrefixSpecificity::Explicit,
            CheckCodePrefix::B015 => PrefixSpecificity::Explicit,
            CheckCodePrefix::B016 => PrefixSpecificity::Explicit,
            CheckCodePrefix::B017 => PrefixSpecificity::Explicit,
            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,
            CheckCodePrefix::B025 => PrefixSpecificity::Explicit,
-            CheckCodePrefix::B026 => PrefixSpecificity::Explicit,
-            CheckCodePrefix::B027 => PrefixSpecificity::Explicit,
            CheckCodePrefix::C => PrefixSpecificity::Category,
            CheckCodePrefix::C4 => PrefixSpecificity::Hundreds,
            CheckCodePrefix::C40 => PrefixSpecificity::Tens,
@@ -1373,10 +1185,6 @@ impl CheckCodePrefix {
            CheckCodePrefix::F9 => PrefixSpecificity::Hundreds,
            CheckCodePrefix::F90 => PrefixSpecificity::Tens,
            CheckCodePrefix::F901 => PrefixSpecificity::Explicit,
-            CheckCodePrefix::I => PrefixSpecificity::Category,
-            CheckCodePrefix::I0 => PrefixSpecificity::Hundreds,
-            CheckCodePrefix::I00 => PrefixSpecificity::Tens,
-            CheckCodePrefix::I001 => PrefixSpecificity::Explicit,
            CheckCodePrefix::M => PrefixSpecificity::Category,
            CheckCodePrefix::M0 => PrefixSpecificity::Hundreds,
            CheckCodePrefix::M00 => PrefixSpecificity::Tens,
@@ -1413,15 +1221,6 @@ impl CheckCodePrefix {
            CheckCodePrefix::RUF001 => PrefixSpecificity::Explicit,
            CheckCodePrefix::RUF002 => PrefixSpecificity::Explicit,
            CheckCodePrefix::RUF003 => PrefixSpecificity::Explicit,
-            CheckCodePrefix::S => PrefixSpecificity::Category,
-            CheckCodePrefix::S1 => PrefixSpecificity::Hundreds,
-            CheckCodePrefix::S10 => PrefixSpecificity::Tens,
-            CheckCodePrefix::S101 => PrefixSpecificity::Explicit,
-            CheckCodePrefix::S102 => PrefixSpecificity::Explicit,
-            CheckCodePrefix::S104 => PrefixSpecificity::Explicit,
-            CheckCodePrefix::S105 => PrefixSpecificity::Explicit,
-            CheckCodePrefix::S106 => PrefixSpecificity::Explicit,
-            CheckCodePrefix::S107 => PrefixSpecificity::Explicit,
            CheckCodePrefix::T => PrefixSpecificity::Category,
            CheckCodePrefix::T2 => PrefixSpecificity::Hundreds,
            CheckCodePrefix::T20 => PrefixSpecificity::Tens,
@@ -1439,10 +1238,6 @@ impl CheckCodePrefix {
            CheckCodePrefix::U007 => PrefixSpecificity::Explicit,
            CheckCodePrefix::U008 => PrefixSpecificity::Explicit,
            CheckCodePrefix::U009 => PrefixSpecificity::Explicit,
-            CheckCodePrefix::U01 => PrefixSpecificity::Tens,
-            CheckCodePrefix::U010 => PrefixSpecificity::Explicit,
-            CheckCodePrefix::U011 => PrefixSpecificity::Explicit,
-            CheckCodePrefix::U012 => PrefixSpecificity::Explicit,
            CheckCodePrefix::W => PrefixSpecificity::Category,
            CheckCodePrefix::W2 => PrefixSpecificity::Hundreds,
            CheckCodePrefix::W29 => PrefixSpecificity::Tens,
@@ -1450,23 +1245,6 @@ impl CheckCodePrefix {
            CheckCodePrefix::W6 => PrefixSpecificity::Hundreds,
            CheckCodePrefix::W60 => PrefixSpecificity::Tens,
            CheckCodePrefix::W605 => PrefixSpecificity::Explicit,
-            CheckCodePrefix::YTT => PrefixSpecificity::Category,
-            CheckCodePrefix::YTT1 => PrefixSpecificity::Hundreds,
-            CheckCodePrefix::YTT10 => PrefixSpecificity::Tens,
-            CheckCodePrefix::YTT101 => PrefixSpecificity::Explicit,
-            CheckCodePrefix::YTT102 => PrefixSpecificity::Explicit,
-            CheckCodePrefix::YTT103 => PrefixSpecificity::Explicit,
-            CheckCodePrefix::YTT2 => PrefixSpecificity::Hundreds,
-            CheckCodePrefix::YTT20 => PrefixSpecificity::Tens,
-            CheckCodePrefix::YTT201 => PrefixSpecificity::Explicit,
-            CheckCodePrefix::YTT202 => PrefixSpecificity::Explicit,
-            CheckCodePrefix::YTT203 => PrefixSpecificity::Explicit,
-            CheckCodePrefix::YTT204 => PrefixSpecificity::Explicit,
-            CheckCodePrefix::YTT3 => PrefixSpecificity::Hundreds,
-            CheckCodePrefix::YTT30 => PrefixSpecificity::Tens,
-            CheckCodePrefix::YTT301 => PrefixSpecificity::Explicit,
-            CheckCodePrefix::YTT302 => PrefixSpecificity::Explicit,
-            CheckCodePrefix::YTT303 => PrefixSpecificity::Explicit,
        }
    }
 }
--- a/src/cli.rs
+++ b/src/cli.rs
@@ -1,8 +1,8 @@
+use std::collections::BTreeMap;
 use std::fmt;
 use std::path::PathBuf;

 use clap::{command, Parser};
-use fnv::FnvHashMap;
 use log::warn;
 use regex::Regex;

@@ -87,10 +87,6 @@ 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)]
@@ -124,8 +120,6 @@ 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
    }
@@ -194,7 +188,7 @@ pub fn collect_per_file_ignores(
    pairs: Vec<PatternPrefixPair>,
    project_root: &Option<PathBuf>,
 ) -> Vec<PerFileIgnore> {
-    let mut per_file_ignores: FnvHashMap<String, Vec<CheckCodePrefix>> = FnvHashMap::default();
+    let mut per_file_ignores: BTreeMap<String, Vec<CheckCodePrefix>> = BTreeMap::new();
    for pair in pairs {
        per_file_ignores
            .entry(pair.pattern)
--- a/src/directives.rs
+++ b/src/directives.rs
@@ -1,206 +0,0 @@
-//! Extract `# noqa` and `# isort: skip` directives from tokenized source.
-
-use bitflags::bitflags;
-use nohash_hasher::{IntMap, IntSet};
-use rustpython_ast::Location;
-use rustpython_parser::lexer::{LexResult, Tok};
-
-use crate::ast::types::Range;
-use crate::checks::LintSource;
-use crate::{Settings, SourceCodeLocator};
-
-bitflags! {
-    pub struct Flags: u32 {
-        const NOQA = 0b00000001;
-        const ISORT = 0b00000010;
-    }
-}
-
-impl Flags {
-    pub fn from_settings(settings: &Settings) -> Self {
-        if settings
-            .enabled
-            .iter()
-            .any(|check_code| matches!(check_code.lint_source(), LintSource::Imports))
-        {
-            Flags::NOQA | Flags::ISORT
-        } else {
-            Flags::NOQA
-        }
-    }
-}
-
-pub struct Directives {
-    pub noqa_line_for: IntMap<usize, usize>,
-    pub isort_exclusions: IntSet<usize>,
-}
-
-pub fn extract_directives(
-    lxr: &[LexResult],
-    locator: &SourceCodeLocator,
-    flags: &Flags,
-) -> Directives {
-    Directives {
-        noqa_line_for: if flags.contains(Flags::NOQA) {
-            extract_noqa_line_for(lxr)
-        } else {
-            Default::default()
-        },
-        isort_exclusions: if flags.contains(Flags::ISORT) {
-            extract_isort_exclusions(lxr, locator)
-        } else {
-            Default::default()
-        },
-    }
-}
-
-/// Extract a mapping from logical line to noqa line.
-pub fn extract_noqa_line_for(lxr: &[LexResult]) -> IntMap<usize, usize> {
-    let mut noqa_line_for: IntMap<usize, usize> = IntMap::default();
-    for (start, tok, end) in lxr.iter().flatten() {
-        if matches!(tok, Tok::EndOfFile) {
-            break;
-        }
-        // For multi-line strings, we expect `noqa` directives on the last line of the
-        // string.
-        if matches!(tok, Tok::String { .. }) && end.row() > start.row() {
-            for i in start.row()..end.row() {
-                noqa_line_for.insert(i, end.row());
-            }
-        }
-    }
-    noqa_line_for
-}
-
-/// Extract a set of lines over which to disable isort.
-pub fn extract_isort_exclusions(lxr: &[LexResult], locator: &SourceCodeLocator) -> IntSet<usize> {
-    let mut exclusions: IntSet<usize> = IntSet::default();
-    let mut off: Option<&Location> = None;
-    for (start, tok, end) in lxr.iter().flatten() {
-        // TODO(charlie): Modify RustPython to include the comment text in the token.
-        if matches!(tok, Tok::Comment) {
-            let comment_text = locator.slice_source_code_range(&Range {
-                location: *start,
-                end_location: *end,
-            });
-            if off.is_some() {
-                if comment_text == "# isort: on" {
-                    if let Some(start) = off {
-                        for row in start.row() + 1..=end.row() {
-                            exclusions.insert(row);
-                        }
-                    }
-                    off = None;
-                }
-            } else {
-                if comment_text.contains("isort: skip") || comment_text.contains("isort:skip") {
-                    exclusions.insert(start.row());
-                } else if comment_text == "# isort: off" {
-                    off = Some(start);
-                }
-            }
-        } else if matches!(tok, Tok::EndOfFile) {
-            if let Some(start) = off {
-                for row in start.row() + 1..=end.row() {
-                    exclusions.insert(row);
-                }
-            }
-            break;
-        }
-    }
-    exclusions
-}
-
-#[cfg(test)]
-mod tests {
-    use anyhow::Result;
-    use nohash_hasher::IntMap;
-    use rustpython_parser::lexer;
-    use rustpython_parser::lexer::LexResult;
-
-    use crate::directives::extract_noqa_line_for;
-
-    #[test]
-    fn extraction() -> Result<()> {
-        let empty: IntMap<usize, usize> = Default::default();
-
-        let lxr: Vec<LexResult> = lexer::make_tokenizer(
-            "x = 1
-y = 2
-z = x + 1",
-        )
-        .collect();
-        assert_eq!(extract_noqa_line_for(&lxr), empty);
-
-        let lxr: Vec<LexResult> = lexer::make_tokenizer(
-            "
-x = 1
-y = 2
-z = x + 1",
-        )
-        .collect();
-        assert_eq!(extract_noqa_line_for(&lxr), empty);
-
-        let lxr: Vec<LexResult> = lexer::make_tokenizer(
-            "x = 1
-y = 2
-z = x + 1
-        ",
-        )
-        .collect();
-        assert_eq!(extract_noqa_line_for(&lxr), empty);
-
-        let lxr: Vec<LexResult> = lexer::make_tokenizer(
-            "x = 1
-
-y = 2
-z = x + 1
-        ",
-        )
-        .collect();
-        assert_eq!(extract_noqa_line_for(&lxr), empty);
-
-        let lxr: Vec<LexResult> = lexer::make_tokenizer(
-            "x = '''abc
-def
-ghi
-'''
-y = 2
-z = x + 1",
-        )
-        .collect();
-        assert_eq!(
-            extract_noqa_line_for(&lxr),
-            IntMap::from_iter([(1, 4), (2, 4), (3, 4)])
-        );
-
-        let lxr: Vec<LexResult> = lexer::make_tokenizer(
-            "x = 1
-        y = '''abc
-        def
-        ghi
-        '''
-        z = 2",
-        )
-        .collect();
-        assert_eq!(
-            extract_noqa_line_for(&lxr),
-            IntMap::from_iter([(2, 5), (3, 5), (4, 5)])
-        );
-
-        let lxr: Vec<LexResult> = lexer::make_tokenizer(
-            "x = 1
-        y = '''abc
-        def
-        ghi
-        '''",
-        )
-        .collect();
-        assert_eq!(
-            extract_noqa_line_for(&lxr),
-            IntMap::from_iter([(2, 5), (3, 5), (4, 5)])
-        );
-
-        Ok(())
-    }
-}
--- a/src/docstrings/google.rs
+++ b/src/docstrings/google.rs
@@ -1,10 +1,11 @@
 //! Abstractions for Google-style docstrings.

-use fnv::FnvHashSet;
+use std::collections::BTreeSet;
+
 use once_cell::sync::Lazy;

-pub(crate) static GOOGLE_SECTION_NAMES: Lazy<FnvHashSet<&'static str>> = Lazy::new(|| {
-    FnvHashSet::from_iter([
+pub(crate) static GOOGLE_SECTION_NAMES: Lazy<BTreeSet<&'static str>> = Lazy::new(|| {
+    BTreeSet::from([
        "Args",
        "Arguments",
        "Attention",
@@ -36,36 +37,35 @@ pub(crate) static GOOGLE_SECTION_NAMES: Lazy<FnvHashSet<&'static str>> = Lazy::n
    ])
 });

-pub(crate) static LOWERCASE_GOOGLE_SECTION_NAMES: Lazy<FnvHashSet<&'static str>> =
-    Lazy::new(|| {
-        FnvHashSet::from_iter([
-            "args",
-            "arguments",
-            "attention",
-            "attributes",
-            "caution",
-            "danger",
-            "error",
-            "example",
-            "examples",
-            "hint",
-            "important",
-            "keyword args",
-            "keyword arguments",
-            "methods",
-            "note",
-            "notes",
-            "return",
-            "returns",
-            "raises",
-            "references",
-            "see also",
-            "tip",
-            "todo",
-            "warning",
-            "warnings",
-            "warns",
-            "yield",
-            "yields",
-        ])
-    });
+pub(crate) static LOWERCASE_GOOGLE_SECTION_NAMES: Lazy<BTreeSet<&'static str>> = Lazy::new(|| {
+    BTreeSet::from([
+        "args",
+        "arguments",
+        "attention",
+        "attributes",
+        "caution",
+        "danger",
+        "error",
+        "example",
+        "examples",
+        "hint",
+        "important",
+        "keyword args",
+        "keyword arguments",
+        "methods",
+        "note",
+        "notes",
+        "return",
+        "returns",
+        "raises",
+        "references",
+        "see also",
+        "tip",
+        "todo",
+        "warning",
+        "warnings",
+        "warns",
+        "yield",
+        "yields",
+    ])
+});
--- a/src/docstrings/helpers.rs
+++ b/src/docstrings/helpers.rs
@@ -1,4 +1,4 @@
-use rustpython_ast::{Located, Location};
+use rustpython_ast::{Expr, Location};

 use crate::ast::types::Range;
 use crate::check_ast::Checker;
@@ -24,9 +24,9 @@ pub fn leading_space(line: &str) -> String {
        .collect()
 }

-/// Extract the leading indentation from a line.
-pub fn indentation<'a, T>(checker: &'a Checker, located: &Located<T>) -> String {
-    let range = Range::from_located(located);
+/// Extract the leading indentation from a docstring.
+pub fn indentation<'a>(checker: &'a Checker, docstring: &Expr) -> String {
+    let range = Range::from_located(docstring);
    checker
        .locator
        .slice_source_code_range(&Range {
--- a/src/docstrings/numpy.rs
+++ b/src/docstrings/numpy.rs
@@ -1,10 +1,11 @@
 //! Abstractions for NumPy-style docstrings.

-use fnv::FnvHashSet;
+use std::collections::BTreeSet;
+
 use once_cell::sync::Lazy;

-pub(crate) static LOWERCASE_NUMPY_SECTION_NAMES: Lazy<FnvHashSet<&'static str>> = Lazy::new(|| {
-    FnvHashSet::from_iter([
+pub(crate) static LOWERCASE_NUMPY_SECTION_NAMES: Lazy<BTreeSet<&'static str>> = Lazy::new(|| {
+    BTreeSet::from([
        "short summary",
        "extended summary",
        "parameters",
@@ -21,8 +22,8 @@ pub(crate) static LOWERCASE_NUMPY_SECTION_NAMES: Lazy<FnvHashSet<&'static str>>
    ])
 });

-pub(crate) static NUMPY_SECTION_NAMES: Lazy<FnvHashSet<&'static str>> = Lazy::new(|| {
-    FnvHashSet::from_iter([
+pub(crate) static NUMPY_SECTION_NAMES: Lazy<BTreeSet<&'static str>> = Lazy::new(|| {
+    BTreeSet::from([
        "Short Summary",
        "Extended Summary",
        "Parameters",
--- a/src/docstrings/styles.rs
+++ b/src/docstrings/styles.rs
@@ -1,4 +1,5 @@
-use fnv::FnvHashSet;
+use std::collections::BTreeSet;
+
 use once_cell::sync::Lazy;

 use crate::docstrings::google::{GOOGLE_SECTION_NAMES, LOWERCASE_GOOGLE_SECTION_NAMES};
@@ -10,14 +11,14 @@ pub(crate) enum SectionStyle {
 }

 impl SectionStyle {
-    pub(crate) fn section_names(&self) -> &Lazy<FnvHashSet<&'static str>> {
+    pub(crate) fn section_names(&self) -> &Lazy<BTreeSet<&'static str>> {
        match self {
            SectionStyle::NumPy => &NUMPY_SECTION_NAMES,
            SectionStyle::Google => &GOOGLE_SECTION_NAMES,
        }
    }

-    pub(crate) fn lowercase_section_names(&self) -> &Lazy<FnvHashSet<&'static str>> {
+    pub(crate) fn lowercase_section_names(&self) -> &Lazy<BTreeSet<&'static str>> {
        match self {
            SectionStyle::NumPy => &LOWERCASE_NUMPY_SECTION_NAMES,
            SectionStyle::Google => &LOWERCASE_GOOGLE_SECTION_NAMES,
--- a/Show More
+++ b/Show More