Bump version to 0.0.61

Check newline ending on contents directly (#365 )
Implement C408 (#364 )
2022-10-08 17:25:36 -04:00 · 2022-10-08 17:25:22 -04:00 · 2022-10-08 17:17:34 -04:00 · 2022-10-08 11:15:41 -04:00 · 2022-10-08 09:03:21 -04:00 · 2022-10-08 09:02:03 -04:00
64 changed files with 3548 additions and 748 deletions
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -14,6 +14,12 @@ your proposed change.
 ruff is written in Rust (1.63.0). You'll need to install the
 [Rust toolchain](https://www.rust-lang.org/tools/install) for development.

+You'll also need [Insta](https://insta.rs/docs/) to update snapshot tests:
+
+```shell
+cargo install cargo-insta
+```
+
 ### Development

 After cloning the repository, run ruff locally with:
@@ -58,7 +64,7 @@ similar rules are implemented.
 To add a test fixture, create a file under `resources/test/fixtures`, named to match the `CheckCode`
 you defined earlier (e.g., `E402.py`). This file should contain a variety of violations and
 non-violations designed to evaluate and demonstrate the behavior of your lint rule. Run ruff locally
-with (e.g.) `cargo run resources/test/fixtures/E402.py`. Once you're satisified with the output,
+with (e.g.) `cargo run resources/test/fixtures/E402.py`. Once you're satisfied with the output,
 codify the behavior as a snapshot test by adding a new function to the `mod tests` section of
 `src/linter.rs`, like so:

--- a/Cargo.lock
+++ b/Cargo.lock
@@ -21,18 +21,18 @@ dependencies = [

 [[package]]
 name = "aho-corasick"
-version = "0.7.18"
+version = "0.7.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f"
+checksum = "b4f55bd91a0978cbfd91c457a164bab8b4001c833b7f323132c0a4e1922dd44e"
 dependencies = [
 "memchr",
 ]

 [[package]]
 name = "android_system_properties"
-version = "0.1.4"
+version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d7ed72e1635e121ca3e79420540282af22da58be50de153d36f81ddc6b83aa9e"
+checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311"
 dependencies = [
 "libc",
 ]
@@ -45,9 +45,15 @@ checksum = "c7021ce4924a3f25f802b2cccd1af585e39ea1a363a1aa2e72afe54b67a3a7a7"

 [[package]]
 name = "anyhow"
-version = "1.0.60"
+version = "1.0.65"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c794e162a5eff65c72ef524dfe393eb923c354e350bb78b9c7383df13f3bc142"
+checksum = "98161a4e3e2184da77bb14f02184cdd111e83bbbcc9979dfee3c44b9a85f5602"
+
+[[package]]
+name = "ascii"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d92bec98840b8f03a5ff5413de5293bfcd8bf96467cf5452609f939ec6f5de16"

 [[package]]
 name = "ascii-canvas"
@@ -60,9 +66,9 @@ dependencies = [

 [[package]]
 name = "async-channel"
-version = "1.7.0"
+version = "1.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b31b87a3367ed04dbcbc252bce3f2a8172fef861d47177524c503c908dff2c6"
+checksum = "e14485364214912d3b19cc3435dde4df66065127f05fa0d75c712f36f12c2f28"
 dependencies = [
 "concurrent-queue",
 "event-listener",
@@ -85,9 +91,9 @@ dependencies = [

 [[package]]
 name = "async-global-executor"
-version = "2.2.0"
+version = "2.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5262ed948da60dd8956c6c5aca4d4163593dddb7b32d73267c93dab7b2e98940"
+checksum = "0da5b41ee986eed3f524c380e6d64965aea573882a8907682ad100f7859305ca"
 dependencies = [
 "async-channel",
 "async-executor",
@@ -95,16 +101,16 @@ dependencies = [
 "async-lock",
 "blocking",
 "futures-lite",
- "num_cpus",
 "once_cell",
 ]

 [[package]]
 name = "async-io"
-version = "1.7.0"
+version = "1.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5e18f61464ae81cde0a23e713ae8fd299580c54d697a35820cfd0625b8b0e07"
+checksum = "83e21f3a490c72b3b0cf44962180e60045de2925d8dff97918f7ee43c8f637c7"
 dependencies = [
+ "autocfg",
 "concurrent-queue",
 "futures-lite",
 "libc",
@@ -129,11 +135,12 @@ dependencies = [

 [[package]]
 name = "async-process"
-version = "1.4.0"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf2c06e30a24e8c78a3987d07f0930edf76ef35e027e7bdb063fccafdad1f60c"
+checksum = "02111fd8655a613c25069ea89fc8d9bb89331fa77486eb3bc059ee757cfa481c"
 dependencies = [
 "async-io",
+ "autocfg",
 "blocking",
 "cfg-if 1.0.0",
 "event-listener",
@@ -302,9 +309,9 @@ dependencies = [

 [[package]]
 name = "bumpalo"
-version = "3.10.0"
+version = "3.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37ccbd214614c6783386c1af30caf03192f17891059cecc394b4fb119e363de3"
+checksum = "c1ad822118d20d2c234f427000d5acc36eabe1e29a348c89b63dd60b13f28e5d"

 [[package]]
 name = "byte-tools"
@@ -376,9 +383,9 @@ dependencies = [

 [[package]]
 name = "chrono"
-version = "0.4.21"
+version = "0.4.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f725f340c3854e3cb3ab736dc21f0cca183303acea3b3ffec30f141503ac8eb"
+checksum = "bfd4d1b31faaa3a89d7934dbded3111da0d2ef28e3ebccdb4f0179f5929d1ef1"
 dependencies = [
 "iana-time-zone",
 "js-sys",
@@ -397,9 +404,9 @@ checksum = "fff857943da45f546682664a79488be82e69e43c1a7a2307679ab9afb3a66d2e"

 [[package]]
 name = "clap"
-version = "4.0.1"
+version = "4.0.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd03107d0f87139c1774a15f3db2165b0652b5460c58c27e561f89c20c599eaf"
+checksum = "30607dd93c420c6f1f80b544be522a0238a7db35e6a12968d28910983fee0df0"
 dependencies = [
 "atty",
 "bitflags",
@@ -412,9 +419,9 @@ dependencies = [

 [[package]]
 name = "clap_derive"
-version = "4.0.1"
+version = "4.0.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca689d7434ce44517a12a89456b2be4d1ea1cafcd8f581978c03d45f5a5c12a7"
+checksum = "a4a307492e1a34939f79d3b6b9650bd2b971513cd775436bf2b78defeb5af00b"
 dependencies = [
 "heck",
 "proc-macro-error",
@@ -473,27 +480,17 @@ dependencies = [

 [[package]]
 name = "console"
-version = "0.15.1"
+version = "0.15.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89eab4d20ce20cea182308bca13088fecea9c05f6776cf287205d41a0ed3c847"
+checksum = "c050367d967ced717c04b65d8c619d863ef9292ce0c5760028655a2fb298718c"
 dependencies = [
 "encode_unicode",
+ "lazy_static",
 "libc",
- "once_cell",
 "terminal_size",
 "winapi 0.3.9",
 ]

-[[package]]
-name = "core-foundation"
-version = "0.9.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146"
-dependencies = [
- "core-foundation-sys",
- "libc",
-]
-
 [[package]]
 name = "core-foundation-sys"
 version = "0.8.3"
@@ -502,9 +499,9 @@ checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc"

 [[package]]
 name = "cpufeatures"
-version = "0.2.2"
+version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59a6001667ab124aebae2a495118e11d30984c3a653e99d86d58971708cf5e4b"
+checksum = "28d997bd5e24a5928dd43e46dc529867e207907fe0b239c3477d924f7f2ca320"
 dependencies = [
 "libc",
 ]
@@ -541,26 +538,24 @@ dependencies = [

 [[package]]
 name = "crossbeam-epoch"
-version = "0.9.10"
+version = "0.9.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "045ebe27666471bb549370b4b0b3e51b07f56325befa4284db65fc89c02511b1"
+checksum = "f916dfc5d356b0ed9dae65f1db9fc9770aa2851d2662b988ccf4fe3516e86348"
 dependencies = [
 "autocfg",
 "cfg-if 1.0.0",
 "crossbeam-utils",
 "memoffset",
- "once_cell",
 "scopeguard",
 ]

 [[package]]
 name = "crossbeam-utils"
-version = "0.8.11"
+version = "0.8.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "51887d4adc7b564537b15adcfb307936f8075dfcd5f00dde9a9f1d29383682bc"
+checksum = "edbafec5fa1f196ca66527c1b12c2ec4745ca14b50f1ad8f9f6f720b55d11fac"
 dependencies = [
 "cfg-if 1.0.0",
- "once_cell",
 ]

 [[package]]
@@ -665,9 +660,9 @@ dependencies = [

 [[package]]
 name = "either"
-version = "1.7.0"
+version = "1.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f107b87b6afc2a64fd13cac55fe06d6c8859f12d4b14cbcdd2c67d0976781be"
+checksum = "90e5c1c8368803113bf0c9584fc495a58b86dc8a29edbf8fe877d21d9507e797"

 [[package]]
 name = "ena"
@@ -750,11 +745,10 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"

 [[package]]
 name = "form_urlencoded"
-version = "1.0.1"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5fc25a87fa4fd2094bffb06925852034d90a17f0d1e05197d4956d3555752191"
+checksum = "a9c384f161156f5260c24a097c56119f9be8c798586aecc13afbcbe7b7e26bf8"
 dependencies = [
- "matches",
 "percent-encoding",
 ]

@@ -795,9 +789,9 @@ checksum = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7"

 [[package]]
 name = "futures"
-version = "0.3.21"
+version = "0.3.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f73fe65f54d1e12b726f517d3e2135ca3125a437b6d998caf1962961f7172d9e"
+checksum = "7f21eda599937fba36daeb58a22e8f5cee2d14c4a17b5b7739c7c8e5e3b8230c"
 dependencies = [
 "futures-channel",
 "futures-core",
@@ -810,9 +804,9 @@ dependencies = [

 [[package]]
 name = "futures-channel"
-version = "0.3.21"
+version = "0.3.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3083ce4b914124575708913bca19bfe887522d6e2e6d0952943f5eac4a74010"
+checksum = "30bdd20c28fadd505d0fd6712cdfcb0d4b5648baf45faef7f852afb2399bb050"
 dependencies = [
 "futures-core",
 "futures-sink",
@@ -820,15 +814,15 @@ dependencies = [

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

 [[package]]
 name = "futures-executor"
-version = "0.3.21"
+version = "0.3.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9420b90cfa29e327d0429f19be13e7ddb68fa1cccb09d65e5706b8c7a749b8a6"
+checksum = "9ff63c23854bee61b6e9cd331d523909f238fc7636290b96826e9cfa5faa00ab"
 dependencies = [
 "futures-core",
 "futures-task",
@@ -837,9 +831,9 @@ dependencies = [

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

 [[package]]
 name = "futures-lite"
@@ -858,9 +852,9 @@ dependencies = [

 [[package]]
 name = "futures-macro"
-version = "0.3.21"
+version = "0.3.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33c1e13800337f4d4d7a316bf45a567dbcb6ffe087f16424852d97e97a91f512"
+checksum = "42cd15d1c7456c04dbdf7e88bcd69760d74f3a798d6444e16974b505b0e62f17"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -869,21 +863,21 @@ dependencies = [

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

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

 [[package]]
 name = "futures-util"
-version = "0.3.21"
+version = "0.3.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8b7abd5d659d9b90c8cba917f6ec750a74e2dc23902ef9cd4cc8c8b22e6036a"
+checksum = "44fb6cb1be61cc1d2e43b262516aafcf63b241cffdb1d3fa115f91d9c7b09c90"
 dependencies = [
 "futures-channel",
 "futures-core",
@@ -990,13 +984,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"

 [[package]]
-name = "iana-time-zone"
-version = "0.1.41"
+name = "hexf-parse"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1779539f58004e5dba1c1f093d44325ebeb244bfc04b791acdc0aaeca9c04570"
+checksum = "dfa686283ad6dd069f105e5ab091b04c62850d3e4cf5d67debad1933f55023df"
+
+[[package]]
+name = "iana-time-zone"
+version = "0.1.50"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fd911b35d940d2bd0bea0f9100068e5b97b51a1cbe13d13382f132e0365257a0"
 dependencies = [
 "android_system_properties",
- "core-foundation",
+ "core-foundation-sys",
 "js-sys",
 "wasm-bindgen",
 "winapi 0.3.9",
@@ -1004,11 +1004,10 @@ dependencies = [

 [[package]]
 name = "idna"
-version = "0.2.3"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "418a0a6fab821475f634efe3ccc45c013f742efe03d853e8d3355d5cb850ecf8"
+checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6"
 dependencies = [
- "matches",
 "unicode-bidi",
 "unicode-normalization",
 ]
@@ -1045,13 +1044,13 @@ dependencies = [

 [[package]]
 name = "insta"
-version = "1.19.1"
+version = "1.21.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc61e98be01e89296f3343a878e9f8ca75a494cb5aaf29df65ef55734aeb85f5"
+checksum = "581d4e3314cae4536e5d22ffd23189d4a374696c5ef733eadafae0ed273fd303"
 dependencies = [
 "console",
+ "lazy_static",
 "linked-hash-map",
- "once_cell",
 "serde",
 "similar",
 "yaml-rust",
@@ -1092,9 +1091,9 @@ checksum = "6c8af84674fe1f223a982c933a0ee1086ac4d4052aa0fb8060c12c6ad838e754"

 [[package]]
 name = "js-sys"
-version = "0.3.59"
+version = "0.3.60"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "258451ab10b34f8af53416d1fdab72c22e805f0c92a1136d59470ec0b11138b2"
+checksum = "49409df3e3bf0856b916e2ceaca09ee28e6871cf7d9ce97a692cacfdb2a25a47"
 dependencies = [
 "wasm-bindgen",
 ]
@@ -1163,10 +1162,40 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"

 [[package]]
-name = "libc"
-version = "0.2.127"
+name = "lexical-parse-float"
+version = "0.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "505e71a4706fa491e9b1b55f51b95d4037d0821ee40131190475f692b35b009b"
+checksum = "683b3a5ebd0130b8fb52ba0bdc718cc56815b6a097e28ae5a6997d0ad17dc05f"
+dependencies = [
+ "lexical-parse-integer",
+ "lexical-util",
+ "static_assertions",
+]
+
+[[package]]
+name = "lexical-parse-integer"
+version = "0.8.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6d0994485ed0c312f6d965766754ea177d07f9c00c9b82a5ee62ed5b47945ee9"
+dependencies = [
+ "lexical-util",
+ "static_assertions",
+]
+
+[[package]]
+name = "lexical-util"
+version = "0.8.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5255b9ff16ff898710eb9eb63cb39248ea8a5bb036bea8085b1a767ff6c4e3fc"
+dependencies = [
+ "static_assertions",
+]
+
+[[package]]
+name = "libc"
+version = "0.2.134"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "329c933548736bc49fd575ee68c89e8be4d260064184389a5b77517cddd99ffb"

 [[package]]
 name = "libcst"
@@ -1200,9 +1229,9 @@ checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f"

 [[package]]
 name = "lock_api"
-version = "0.4.7"
+version = "0.4.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "327fa5b6a6940e4699ec49a9beae1ea4845c6bab9314e4f84ac68742139d8c53"
+checksum = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df"
 dependencies = [
 "autocfg",
 "scopeguard",
@@ -1220,9 +1249,9 @@ dependencies = [

 [[package]]
 name = "lz4_flex"
-version = "0.9.4"
+version = "0.9.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c038063f7a78126c539d666a0323a2032de5e7366012cd14a6eafc5ba290bbd6"
+checksum = "1a8cbbb2831780bc3b9c15a41f5b49222ef756b6730a95f3decfdd15903eb5a3"
 dependencies = [
 "twox-hash",
 ]
@@ -1241,9 +1270,9 @@ checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"

 [[package]]
 name = "memmap2"
-version = "0.5.5"
+version = "0.5.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3a79b39c93a7a5a27eeaf9a23b5ff43f1b9e0ad6b1cdd441140ae53c35613fc7"
+checksum = "95af15f345b17af2efc8ead6080fb8bc376f8cec1b35277b935637595fe77498"
 dependencies = [
 "libc",
 ]
@@ -1259,9 +1288,9 @@ dependencies = [

 [[package]]
 name = "miniz_oxide"
-version = "0.5.3"
+version = "0.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f5c75688da582b8ffc1f1799e9db273f32133c49e048f614d22ec3256773ccc"
+checksum = "96590ba8f175222643a85693f33d26e9c8a015f599c216509b1a6894af675d34"
 dependencies = [
 "adler",
 ]
@@ -1436,9 +1465,9 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5"

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

 [[package]]
 name = "parking"
@@ -1522,9 +1551,9 @@ checksum = "9fa00462b37ead6d11a82c9d568b26682d78e0477dc02d1966c013af80969739"

 [[package]]
 name = "percent-encoding"
-version = "2.1.0"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e"
+checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e"

 [[package]]
 name = "petgraph"
@@ -1632,10 +1661,11 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"

 [[package]]
 name = "polling"
-version = "2.2.0"
+version = "2.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "685404d509889fade3e86fe3a5803bca2ec09b0c0778d5ada6ec8bf7a8de5259"
+checksum = "899b00b9c8ab553c743b3e11e87c5c7d423b2a2de229ba95b24a756344748011"
 dependencies = [
+ "autocfg",
 "cfg-if 1.0.0",
 "libc",
 "log",
@@ -1681,9 +1711,9 @@ dependencies = [

 [[package]]
 name = "proc-macro2"
-version = "1.0.43"
+version = "1.0.46"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0a2ca2c61bc9f3d74d2886294ab7b9853abd9c1ad903a3ac7815c58989bb7bab"
+checksum = "94e2ef8dbfc347b10c094890f778ee2e36ca9bb4262e86dc99cd217e35f3470b"
 dependencies = [
 "unicode-ident",
 ]
@@ -1697,6 +1727,12 @@ dependencies = [
 "proc-macro2",
 ]

+[[package]]
+name = "radium"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09"
+
 [[package]]
 name = "rand"
 version = "0.7.3"
@@ -1719,7 +1755,7 @@ checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
 dependencies = [
 "libc",
 "rand_chacha 0.3.1",
- "rand_core 0.6.3",
+ "rand_core 0.6.4",
 ]

 [[package]]
@@ -1739,7 +1775,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
 dependencies = [
 "ppv-lite86",
- "rand_core 0.6.3",
+ "rand_core 0.6.4",
 ]

 [[package]]
@@ -1753,9 +1789,9 @@ dependencies = [

 [[package]]
 name = "rand_core"
-version = "0.6.3"
+version = "0.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7"
+checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
 dependencies = [
 "getrandom 0.2.7",
 ]
@@ -1871,7 +1907,7 @@ dependencies = [

 [[package]]
 name = "ruff"
-version = "0.0.54"
+version = "0.0.61"
 dependencies = [
 "anyhow",
 "bincode",
@@ -1894,6 +1930,8 @@ dependencies = [
 "path-absolutize",
 "rayon",
 "regex",
+ "rustpython-ast",
+ "rustpython-common",
 "rustpython-parser",
 "serde",
 "serde_json",
@@ -1920,9 +1958,33 @@ version = "0.1.0"
 source = "git+https://github.com/charliermarsh/RustPython.git?rev=4f457893efc381ad5c432576b24bcc7e4a08c641#4f457893efc381ad5c432576b24bcc7e4a08c641"
 dependencies = [
 "num-bigint",
+ "rustpython-common",
 "rustpython-compiler-core",
 ]

+[[package]]
+name = "rustpython-common"
+version = "0.0.0"
+source = "git+https://github.com/charliermarsh/RustPython.git?rev=4f457893efc381ad5c432576b24bcc7e4a08c641#4f457893efc381ad5c432576b24bcc7e4a08c641"
+dependencies = [
+ "ascii",
+ "cfg-if 1.0.0",
+ "hexf-parse",
+ "lexical-parse-float",
+ "libc",
+ "lock_api",
+ "num-bigint",
+ "num-complex",
+ "num-traits",
+ "once_cell",
+ "radium",
+ "rand 0.8.5",
+ "siphasher",
+ "unic-ucd-category",
+ "volatile",
+ "widestring",
+]
+
 [[package]]
 name = "rustpython-compiler-core"
 version = "0.1.2"
@@ -2003,24 +2065,24 @@ dependencies = [

 [[package]]
 name = "semver"
-version = "1.0.13"
+version = "1.0.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "93f6841e709003d68bb2deee8c343572bf446003ec20a583e76f7b15cebf3711"
+checksum = "e25dfac463d778e353db5be2449d1cce89bd6fd23c9f1ea21310ce6e5a1b29c4"

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

 [[package]]
 name = "serde_derive"
-version = "1.0.143"
+version = "1.0.145"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3d8e8de557aee63c26b85b947f5e59b690d0454c753f3adeb5cd7835ab88391"
+checksum = "81fa1584d3d1bcacd84c277a0dfe21f5b0f6accf4a23d04d4c6d61f1af522b4c"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -2029,9 +2091,9 @@ dependencies = [

 [[package]]
 name = "serde_json"
-version = "1.0.83"
+version = "1.0.85"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38dd04e3c8279e75b31ef29dbdceebfe5ad89f4d0937213c53f7d49d01b3d5a7"
+checksum = "e55a28e3aaef9d5ce0506d0a14dbba8054ddc7e499ef522dd8b26859ec9d4a44"
 dependencies = [
 "itoa",
 "ryu",
@@ -2130,15 +2192,15 @@ dependencies = [

 [[package]]
 name = "smallvec"
-version = "1.9.0"
+version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2fd0db749597d91ff862fd1d55ea87f7855a744a8425a64695b6fca237d1dad1"
+checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0"

 [[package]]
 name = "socket2"
-version = "0.4.4"
+version = "0.4.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "66d72b759436ae32898a2af0a14218dbf55efde3feeb170eb623637db85ee1e0"
+checksum = "02e2d2db9033d13a1567121ddd7a095ee144db4e1ca1b1bda3419bc0da294ebd"
 dependencies = [
 "libc",
 "winapi 0.3.9",
@@ -2192,9 +2254,9 @@ checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"

 [[package]]
 name = "syn"
-version = "1.0.99"
+version = "1.0.101"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "58dbef6ec655055e20b86b15a8cc6d439cca19b667537ac6a1369572d151ab13"
+checksum = "e90cde112c4b9690b8cbe810cba9ddd8bc1d7472e2cae317b69e9438c1cba7d2"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -2370,6 +2432,18 @@ dependencies = [
 "unic-ucd-version",
 ]

+[[package]]
+name = "unic-ucd-category"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1b8d4591f5fcfe1bd4453baaf803c40e1b1e69ff8455c47620440b46efef91c0"
+dependencies = [
+ "matches",
+ "unic-char-property",
+ "unic-char-range",
+ "unic-ucd-version",
+]
+
 [[package]]
 name = "unic-ucd-ident"
 version = "0.9.0"
@@ -2398,30 +2472,30 @@ checksum = "099b7128301d285f79ddd55b9a83d5e6b9e97c92e0ea0daebee7263e932de992"

 [[package]]
 name = "unicode-ident"
-version = "1.0.3"
+version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4f5b37a154999a8f3f98cc23a628d850e154479cd94decf3414696e12e31aaf"
+checksum = "dcc811dc4066ac62f84f11307873c4850cb653bfa9b1719cee2bd2204a4bc5dd"

 [[package]]
 name = "unicode-normalization"
-version = "0.1.21"
+version = "0.1.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "854cbdc4f7bc6ae19c820d44abdc3277ac3e1b2b93db20a636825d9322fb60e6"
+checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921"
 dependencies = [
 "tinyvec",
 ]

 [[package]]
 name = "unicode-xid"
-version = "0.2.3"
+version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "957e51f3646910546462e67d5f7599b9e4fb8acdd304b087a6494730f9eebf04"
+checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c"

 [[package]]
 name = "unicode_names2"
-version = "0.5.0"
+version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eec8e807a365e5c972debc47b8f06d361b37b94cfd18d48f7adc715fb86404dd"
+checksum = "029df4cc8238cefc911704ff8fa210853a0f3bce2694d8f51181dd41ee0f3301"

 [[package]]
 name = "untrusted"
@@ -2463,13 +2537,12 @@ dependencies = [

 [[package]]
 name = "url"
-version = "2.2.2"
+version = "2.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a507c383b2d33b5fc35d1861e77e6b383d158b2da5e14fe51b83dfedf6fd578c"
+checksum = "0d68c799ae75762b8c3fe375feb6600ef5602c883c5d21eb51c09f22b83c4643"
 dependencies = [
 "form_urlencoded",
 "idna",
- "matches",
 "percent-encoding",
 ]

@@ -2489,6 +2562,12 @@ version = "0.9.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"

+[[package]]
+name = "volatile"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f8e76fae08f03f96e166d2dfda232190638c10e0383841252416f9cfe2ae60e6"
+
 [[package]]
 name = "waker-fn"
 version = "1.1.0"
@@ -2526,9 +2605,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"

 [[package]]
 name = "wasm-bindgen"
-version = "0.2.82"
+version = "0.2.83"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc7652e3f6c4706c8d9cd54832c4a4ccb9b5336e2c3bd154d5cccfbf1c1f5f7d"
+checksum = "eaf9f5aceeec8be17c128b2e93e031fb8a4d469bb9c4ae2d7dc1888b26887268"
 dependencies = [
 "cfg-if 1.0.0",
 "wasm-bindgen-macro",
@@ -2536,9 +2615,9 @@ dependencies = [

 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.82"
+version = "0.2.83"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "662cd44805586bd52971b9586b1df85cdbbd9112e4ef4d8f41559c334dc6ac3f"
+checksum = "4c8ffb332579b0557b52d268b91feab8df3615f265d5270fec2a8c95b17c1142"
 dependencies = [
 "bumpalo",
 "log",
@@ -2551,9 +2630,9 @@ dependencies = [

 [[package]]
 name = "wasm-bindgen-futures"
-version = "0.4.32"
+version = "0.4.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa76fb221a1f8acddf5b54ace85912606980ad661ac7a503b4570ffd3a624dad"
+checksum = "23639446165ca5a5de86ae1d8896b737ae80319560fbaa4c2887b7da6e7ebd7d"
 dependencies = [
 "cfg-if 1.0.0",
 "js-sys",
@@ -2563,9 +2642,9 @@ dependencies = [

 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.82"
+version = "0.2.83"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b260f13d3012071dfb1512849c033b1925038373aea48ced3012c09df952c602"
+checksum = "052be0f94026e6cbc75cdefc9bae13fd6052cdcaf532fa6c45e7ae33a1e6c810"
 dependencies = [
 "quote",
 "wasm-bindgen-macro-support",
@@ -2573,9 +2652,9 @@ dependencies = [

 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.82"
+version = "0.2.83"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5be8e654bdd9b79216c2929ab90721aa82faf65c48cdf08bdc4e7f51357b80da"
+checksum = "07bc0c051dc5f23e307b13285f9d75df86bfdf816c5721e573dec1f9b8aa193c"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -2586,15 +2665,15 @@ dependencies = [

 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.82"
+version = "0.2.83"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6598dd0bd3c7d51095ff6531a5b23e02acdc81804e30d8f07afb77b7215a140a"
+checksum = "1c38c045535d93ec4f0b4defec448e4291638ee608530863b1e2ba115d4fff7f"

 [[package]]
 name = "web-sys"
-version = "0.3.59"
+version = "0.3.60"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed055ab27f941423197eb86b2035720b1a3ce40504df082cac2ecc6ed73335a1"
+checksum = "bcda906d8be16e728fd5adc5b729afad4e444e106ab28cd1c7256e54fa61510f"
 dependencies = [
 "js-sys",
 "wasm-bindgen",
@@ -2612,9 +2691,9 @@ dependencies = [

 [[package]]
 name = "webpki-roots"
-version = "0.22.4"
+version = "0.22.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1c760f0d366a6c24a02ed7816e23e691f5d92291f94d15e836006fd11b04daf"
+checksum = "368bfe657969fb01238bb756d351dcade285e0f6fcbd36dcb23359a5169975be"
 dependencies = [
 "webpki",
 ]
@@ -2630,15 +2709,21 @@ dependencies = [

 [[package]]
 name = "which"
-version = "4.2.5"
+version = "4.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c4fb54e6113b6a8772ee41c3404fb0301ac79604489467e0a9ce1f3e97c24ae"
+checksum = "1c831fbbee9e129a8cf93e7747a82da9d95ba8e16621cae60ec2cdc849bacb7b"
 dependencies = [
 "either",
- "lazy_static",
 "libc",
+ "once_cell",
 ]

+[[package]]
+name = "widestring"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "17882f045410753661207383517a6f62ec3dbeb6a4ed2acce01f0728238d1983"
+
 [[package]]
 name = "winapi"
 version = "0.2.8"
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "ruff"
-version = "0.0.54"
+version = "0.0.61"
 edition = "2021"

 [lib]
@@ -27,7 +27,9 @@ once_cell = { version = "1.13.1" }
 path-absolutize = { version = "3.0.13", features = ["once_cell_cache"] }
 rayon = { version = "1.5.3" }
 regex = { version = "1.6.0" }
+rustpython-ast = { features = ["unparse"], git = "https://github.com/charliermarsh/RustPython.git", rev = "4f457893efc381ad5c432576b24bcc7e4a08c641" }
 rustpython-parser = { features = ["lalrpop"], git = "https://github.com/charliermarsh/RustPython.git", rev = "4f457893efc381ad5c432576b24bcc7e4a08c641" }
+rustpython-common = { git = "https://github.com/charliermarsh/RustPython.git", rev = "4f457893efc381ad5c432576b24bcc7e4a08c641" }
 serde = { version = "1.0.143", features = ["derive"] }
 serde_json = { version = "1.0.83" }
 toml = { version = "0.5.9" }
--- a/README.md
+++ b/README.md
@@ -130,6 +130,8 @@ Options:
          Enable automatic additions of noqa directives to failing lines
      --dummy-variable-rgx <DUMMY_VARIABLE_RGX>
          Regular expression matching the name of dummy variables
+      --target-version <TARGET_VERSION>
+          The minimum Python version that should be supported
  -h, --help
          Print help information
  -V, --version
@@ -213,6 +215,7 @@ ruff also implements some of the most popular Flake8 plugins natively, including
 - [`flake8-builtins`](https://pypi.org/project/flake8-builtins/)
 - [`flake8-super`](https://pypi.org/project/flake8-super/)
 - [`flake8-print`](https://pypi.org/project/flake8-print/)
+- [`flake8-comprehensions`](https://pypi.org/project/flake8-comprehensions/) (partial)
 - [`pyupgrade`](https://pypi.org/project/pyupgrade/) (partial)

 Beyond rule-set parity, ruff suffers from the following limitations vis-à-vis Flake8:
@@ -243,6 +246,7 @@ The 🛠 emoji indicates that a rule is automatically fixable by the `--fix` com
 | E743 | AmbiguousFunctionName | Ambiguous function name: `...` | ✅ |  |
 | E902 | IOError | IOError: `...` | ✅ |  |
 | E999 | SyntaxError | SyntaxError: `...` | ✅ |  |
+| W292 | NoNewLineAtEndOfFile | No newline at end of file | ✅ |  |
 | F401 | UnusedImport | `...` imported but unused | ✅ | 🛠 |
 | F402 | ImportShadowedByLoopVar | Import `...` from line 1 shadowed by loop variable | ✅ |  |
 | F403 | ImportStarUsed | `from ... import *` used; unable to detect undefined names | ✅ |  |
@@ -274,14 +278,25 @@ The 🛠 emoji indicates that a rule is automatically fixable by the `--fix` com
 | A001 | BuiltinVariableShadowing | Variable `...` is shadowing a python builtin |  |  |
 | A002 | BuiltinArgumentShadowing | Argument `...` is shadowing a python builtin |  |  |
 | A003 | BuiltinAttributeShadowing | Class attribute `...` is shadowing a python builtin |  |  |
+| C400 | UnnecessaryGeneratorList | Unnecessary generator - rewrite as a list comprehension |  |  |
+| 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 |  |  |
+| 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 |  |  |
 | SPR001 | SuperCallWithParameters | Use `super()` instead of `super(__class__, self)` |  | 🛠 |
 | T201 | PrintFound | `print` found |  | 🛠 |
 | T203 | PPrintFound | `pprint` found |  | 🛠 |
 | U001 | UselessMetaclassType | `__metaclass__ = type` is implied |  | 🛠 |
-| R001 | UselessObjectInheritance | Class `...` inherits from object |  | 🛠 |
-| R002 | NoAssertEquals | `assertEquals` is deprecated, use `assertEqual` instead |  | 🛠 |
+| U002 | UnnecessaryAbspath | `abspath(__file__)` is unnecessary in Python 3.9 and later |  | 🛠 |
+| U003 | TypeOfPrimitive | Use `str` instead of `type(...)` |  | 🛠 |
+| U004 | UselessObjectInheritance | Class `...` inherits from object |  | 🛠 |
+| U005 | NoAssertEquals | `assertEquals` is deprecated, use `assertEqual` instead |  | 🛠 |
 | M001 | UnusedNOQA | Unused `noqa` directive |  | 🛠 |

+
 ## Integrations

 ### PyCharm
@@ -307,9 +322,9 @@ jobs:
  build:
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
      - name: Install Python
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v4
        with:
          python-version: "3.10"
      - name: Install dependencies
--- a/examples/generate_source_code.rs
+++ b/examples/generate_source_code.rs
@@ -0,0 +1,26 @@
+use std::path::PathBuf;
+
+use anyhow::Result;
+use clap::Parser;
+use rustpython_parser::parser;
+
+use ruff::code_gen::SourceGenerator;
+use ruff::fs;
+
+#[derive(Debug, Parser)]
+struct Cli {
+    #[arg(required = true)]
+    file: PathBuf,
+}
+
+fn main() -> Result<()> {
+    let cli = Cli::parse();
+
+    let contents = fs::read_file(&cli.file)?;
+    let python_ast = parser::parse_program(&contents, &cli.file.to_string_lossy())?;
+    let mut generator = SourceGenerator::new();
+    generator.unparse_suite(&python_ast)?;
+    println!("{}", generator.generate()?);
+
+    Ok(())
+}
--- a/resources/test/fixtures/C400.py
+++ b/resources/test/fixtures/C400.py
@@ -0,0 +1 @@
+x = list(x for x in range(3))
--- a/resources/test/fixtures/C401.py
+++ b/resources/test/fixtures/C401.py
@@ -0,0 +1 @@
+x = set(x for x in range(3))
--- a/resources/test/fixtures/C402.py
+++ b/resources/test/fixtures/C402.py
@@ -0,0 +1 @@
+d = dict((x, x) for x in range(3))
--- a/resources/test/fixtures/C403.py
+++ b/resources/test/fixtures/C403.py
@@ -0,0 +1 @@
+s = set([x for x in range(3)])
--- a/resources/test/fixtures/C404.py
+++ b/resources/test/fixtures/C404.py
@@ -0,0 +1 @@
+d = dict([(i, i) for i in range(3)])
--- a/resources/test/fixtures/C405.py
+++ b/resources/test/fixtures/C405.py
@@ -0,0 +1,5 @@
+s1 = set([1, 2])
+s2 = set((1, 2))
+s3 = set([])
+s4 = set(())
+s5 = set()
--- a/resources/test/fixtures/C406.py
+++ b/resources/test/fixtures/C406.py
@@ -0,0 +1,5 @@
+d1 = dict([(1, 2)])
+d2 = dict(((1, 2),))
+d3 = dict([])
+d4 = dict(())
+d5 = dict()
--- a/resources/test/fixtures/C408.py
+++ b/resources/test/fixtures/C408.py
@@ -0,0 +1,5 @@
+t = tuple()
+l = list()
+d1 = dict()
+d2 = dict(a=1)
+d3 = dict(**d2)
--- a/resources/test/fixtures/F821.py
+++ b/resources/test/fixtures/F821.py
@@ -89,3 +89,36 @@ A = (
    f'B'
    f'{B}'
 )
+
+
+from typing import Annotated, Literal
+
+
+def arbitrary_callable() -> None:
+    ...
+
+
+class PEP593Test:
+    field: Annotated[
+        int,
+        "base64",
+        arbitrary_callable(),
+        123,
+        (1, 2, 3),
+    ]
+    field_with_stringified_type: Annotated[
+        "PEP593Test",
+        123,
+    ]
+    field_with_undefined_stringified_type: Annotated[
+        "PEP593Test123",
+        123,
+    ]
+    field_with_nested_subscript: Annotated[
+        dict[Literal["foo"], str],
+        123,
+    ]
+    field_with_undefined_nested_subscript: Annotated[
+        dict["foo", "bar"],  # Expected to fail as undefined.
+        123,
+    ]
--- a/resources/test/fixtures/U002.py
+++ b/resources/test/fixtures/U002.py
@@ -0,0 +1,15 @@
+from os.path import abspath
+
+x = abspath(__file__)
+
+
+import os
+
+
+y = os.path.abspath(__file__)
+
+
+from os import path
+
+
+z = path.abspath(__file__)
--- a/resources/test/fixtures/U003.py
+++ b/resources/test/fixtures/U003.py
@@ -0,0 +1,5 @@
+type('')
+type(b'')
+type(0)
+type(0.)
+type(0j)
--- a/resources/test/fixtures/U004.py
+++ b/resources/test/fixtures/U004.py
--- a/resources/test/fixtures/U005.py
+++ b/resources/test/fixtures/U005.py
--- a/resources/test/fixtures/W292_0.py
+++ b/resources/test/fixtures/W292_0.py
@@ -0,0 +1,2 @@
+def fn() -> None:
+    pass
--- a/resources/test/fixtures/W292_1.py
+++ b/resources/test/fixtures/W292_1.py
@@ -0,0 +1,2 @@
+def fn() -> None:
+    pass  # noqa: W292
--- a/resources/test/fixtures/W292_2.py
+++ b/resources/test/fixtures/W292_2.py
@@ -0,0 +1,2 @@
+def fn() -> None:
+    pass
--- a/src/ast/checks.rs
+++ b/src/ast/checks.rs
@@ -4,15 +4,14 @@ use itertools::izip;
 use regex::Regex;
 use rustpython_parser::ast::{
    Arg, ArgData, Arguments, Cmpop, Constant, Excepthandler, ExcepthandlerKind, Expr, ExprKind,
-    Keyword, Location, Stmt, StmtKind, Unaryop,
+    KeywordData, Located, Stmt, StmtKind, Unaryop,
 };
+use serde::{Deserialize, Serialize};

-use crate::ast::operations::SourceCodeLocator;
 use crate::ast::types::{
    Binding, BindingKind, CheckLocator, FunctionScope, Range, Scope, ScopeKind,
 };
-use crate::autofix::{fixer, fixes};
-use crate::checks::{Check, CheckKind, Fix, RejectedCmpop};
+use crate::checks::{Check, CheckKind, RejectedCmpop};
 use crate::python::builtins::BUILTINS;

 /// Check IfTuple compliance.
@@ -136,6 +135,86 @@ pub fn check_useless_metaclass_type(
    None
 }

+/// Check UnnecessaryAbspath compliance.
+pub fn check_unnecessary_abspath(func: &Expr, args: &Vec<Expr>, location: Range) -> Option<Check> {
+    // Validate the arguments.
+    if args.len() == 1 {
+        if let ExprKind::Name { id, .. } = &args[0].node {
+            if id == "__file__" {
+                match &func.node {
+                    ExprKind::Attribute { attr: id, .. } | ExprKind::Name { id, .. } => {
+                        if id == "abspath" {
+                            return Some(Check::new(CheckKind::UnnecessaryAbspath, location));
+                        }
+                    }
+                    _ => {}
+                }
+            }
+        }
+    }
+
+    None
+}
+
+#[derive(Debug, PartialEq, Eq, Serialize, Deserialize)]
+pub enum Primitive {
+    Bool,
+    Str,
+    Bytes,
+    Int,
+    Float,
+    Complex,
+}
+
+impl Primitive {
+    fn from_constant(constant: &Constant) -> Option<Self> {
+        match constant {
+            Constant::Bool(_) => Some(Primitive::Bool),
+            Constant::Str(_) => Some(Primitive::Str),
+            Constant::Bytes(_) => Some(Primitive::Bytes),
+            Constant::Int(_) => Some(Primitive::Int),
+            Constant::Float(_) => Some(Primitive::Float),
+            Constant::Complex { .. } => Some(Primitive::Complex),
+            _ => None,
+        }
+    }
+
+    pub fn builtin(&self) -> String {
+        match self {
+            Primitive::Bool => "bool".to_string(),
+            Primitive::Str => "str".to_string(),
+            Primitive::Bytes => "bytes".to_string(),
+            Primitive::Int => "int".to_string(),
+            Primitive::Float => "float".to_string(),
+            Primitive::Complex => "complex".to_string(),
+        }
+    }
+}
+
+/// Check TypeOfPrimitive compliance.
+pub fn check_type_of_primitive(func: &Expr, args: &Vec<Expr>, location: Range) -> Option<Check> {
+    // Validate the arguments.
+    if args.len() == 1 {
+        match &func.node {
+            ExprKind::Attribute { attr: id, .. } | ExprKind::Name { id, .. } => {
+                if id == "type" {
+                    if let ExprKind::Constant { value, .. } = &args[0].node {
+                        if let Some(primitive) = Primitive::from_constant(value) {
+                            return Some(Check::new(
+                                CheckKind::TypeOfPrimitive(primitive),
+                                location,
+                            ));
+                        }
+                    }
+                }
+            }
+            _ => {}
+        }
+    }
+
+    None
+}
+
 fn is_ambiguous_name(name: &str) -> bool {
    name == "l" || name == "I" || name == "O"
 }
@@ -178,13 +257,9 @@ pub fn check_ambiguous_function_name(name: &str, location: Range) -> Option<Chec

 /// Check UselessObjectInheritance compliance.
 pub fn check_useless_object_inheritance(
-    stmt: &Stmt,
    name: &str,
    bases: &[Expr],
-    keywords: &[Keyword],
    scope: &Scope,
-    locator: &mut SourceCodeLocator,
-    autofix: &fixer::Mode,
 ) -> Option<Check> {
    for expr in bases {
        if let ExprKind::Name { id, .. } = &expr.node {
@@ -195,22 +270,10 @@ pub fn check_useless_object_inheritance(
                        kind: BindingKind::Builtin,
                        ..
                    }) => {
-                        let mut check = Check::new(
+                        return Some(Check::new(
                            CheckKind::UselessObjectInheritance(name.to_string()),
                            Range::from_located(expr),
-                        );
-                        if matches!(autofix, fixer::Mode::Generate | fixer::Mode::Apply) {
-                            if let Some(fix) = fixes::remove_class_def_base(
-                                locator,
-                                &stmt.location,
-                                expr.location,
-                                bases,
-                                keywords,
-                            ) {
-                                check.amend(fix);
-                            }
-                        }
-                        return Some(check);
+                        ));
                    }
                    _ => {}
                }
@@ -298,28 +361,15 @@ pub fn check_duplicate_arguments(arguments: &Arguments) -> Vec<Check> {
 }

 /// Check AssertEquals compliance.
-pub fn check_assert_equals(expr: &Expr, autofix: &fixer::Mode) -> Option<Check> {
+pub fn check_assert_equals(expr: &Expr) -> Option<Check> {
    if let ExprKind::Attribute { value, attr, .. } = &expr.node {
        if attr == "assertEquals" {
            if let ExprKind::Name { id, .. } = &value.node {
                if id == "self" {
-                    let mut check =
-                        Check::new(CheckKind::NoAssertEquals, Range::from_located(expr));
-                    if matches!(autofix, fixer::Mode::Generate | fixer::Mode::Apply) {
-                        check.amend(Fix {
-                            content: "assertEqual".to_string(),
-                            location: Location::new(
-                                expr.location.row(),
-                                expr.location.column() + 1,
-                            ),
-                            end_location: Location::new(
-                                expr.location.row(),
-                                expr.location.column() + 1 + "assertEquals".len(),
-                            ),
-                            applied: false,
-                        });
-                    }
-                    return Some(check);
+                    return Some(Check::new(
+                        CheckKind::NoAssertEquals,
+                        Range::from_located(expr),
+                    ));
                }
            }
        }
@@ -723,6 +773,218 @@ pub fn is_super_call_with_arguments(func: &Expr, args: &Vec<Expr>) -> bool {
    }
 }

+// flakes8-comprehensions
+/// Check `list(generator)` compliance.
+pub fn unnecessary_generator_list(expr: &Expr, func: &Expr, args: &Vec<Expr>) -> Option<Check> {
+    if args.len() == 1 {
+        if let ExprKind::Name { id, .. } = &func.node {
+            if id == "list" {
+                if let ExprKind::GeneratorExp { .. } = &args[0].node {
+                    return Some(Check::new(
+                        CheckKind::UnnecessaryGeneratorList,
+                        Range::from_located(expr),
+                    ));
+                }
+            }
+        }
+    }
+    None
+}
+
+/// Check `set(generator)` compliance.
+pub fn unnecessary_generator_set(expr: &Expr, func: &Expr, args: &Vec<Expr>) -> Option<Check> {
+    if args.len() == 1 {
+        if let ExprKind::Name { id, .. } = &func.node {
+            if id == "set" {
+                if let ExprKind::GeneratorExp { .. } = &args[0].node {
+                    return Some(Check::new(
+                        CheckKind::UnnecessaryGeneratorList,
+                        Range::from_located(expr),
+                    ));
+                }
+            }
+        }
+    }
+    None
+}
+
+/// Check `dict((x, y) for x, y in iterable)` compliance.
+pub fn unnecessary_generator_dict(expr: &Expr, func: &Expr, args: &Vec<Expr>) -> Option<Check> {
+    if args.len() == 1 {
+        if let ExprKind::Name { id, .. } = &func.node {
+            if id == "dict" {
+                if let ExprKind::GeneratorExp { elt, .. } = &args[0].node {
+                    match &elt.node {
+                        ExprKind::Tuple { elts, .. } if elts.len() == 2 => {
+                            return Some(Check::new(
+                                CheckKind::UnnecessaryListComprehensionDict,
+                                Range::from_located(expr),
+                            ));
+                        }
+                        _ => {}
+                    }
+                }
+            }
+        }
+    }
+    None
+}
+
+/// Check `set([...])` compliance.
+pub fn unnecessary_list_comprehension_set(
+    expr: &Expr,
+    func: &Expr,
+    args: &Vec<Expr>,
+) -> Option<Check> {
+    if args.len() == 1 {
+        if let ExprKind::Name { id, .. } = &func.node {
+            if id == "set" {
+                if let ExprKind::ListComp { .. } = &args[0].node {
+                    return Some(Check::new(
+                        CheckKind::UnnecessaryListComprehensionSet,
+                        Range::from_located(expr),
+                    ));
+                }
+            }
+        }
+    }
+    None
+}
+
+/// Check `dict([...])` compliance.
+pub fn unnecessary_list_comprehension_dict(
+    expr: &Expr,
+    func: &Expr,
+    args: &Vec<Expr>,
+) -> Option<Check> {
+    if args.len() == 1 {
+        if let ExprKind::Name { id, .. } = &func.node {
+            if id == "dict" {
+                if let ExprKind::ListComp { elt, .. } = &args[0].node {
+                    match &elt.node {
+                        ExprKind::Tuple { elts, .. } if elts.len() == 2 => {
+                            return Some(Check::new(
+                                CheckKind::UnnecessaryListComprehensionDict,
+                                Range::from_located(expr),
+                            ));
+                        }
+                        _ => {}
+                    }
+                }
+            }
+        }
+    }
+    None
+}
+
+/// Check `set([1, 2])` compliance.
+pub fn unnecessary_literal_set(expr: &Expr, func: &Expr, args: &Vec<Expr>) -> Option<Check> {
+    if args.len() == 1 {
+        if let ExprKind::Name { id, .. } = &func.node {
+            if id == "set" {
+                match &args[0].node {
+                    ExprKind::List { .. } => {
+                        return Some(Check::new(
+                            CheckKind::UnnecessaryLiteralSet("list".to_string()),
+                            Range::from_located(expr),
+                        ));
+                    }
+                    ExprKind::Tuple { .. } => {
+                        return Some(Check::new(
+                            CheckKind::UnnecessaryLiteralSet("tuple".to_string()),
+                            Range::from_located(expr),
+                        ));
+                    }
+                    _ => {}
+                }
+            }
+        }
+    }
+    None
+}
+
+/// Check `dict([(1, 2)])` compliance.
+pub fn unnecessary_literal_dict(expr: &Expr, func: &Expr, args: &Vec<Expr>) -> Option<Check> {
+    if args.len() == 1 {
+        if let ExprKind::Name { id, .. } = &func.node {
+            if id == "dict" {
+                match &args[0].node {
+                    ExprKind::Tuple { elts, .. } => {
+                        if let Some(elt) = elts.first() {
+                            match &elt.node {
+                                // dict((1, 2), ...))
+                                ExprKind::Tuple { elts, .. } if elts.len() == 2 => {
+                                    return Some(Check::new(
+                                        CheckKind::UnnecessaryLiteralDict("tuple".to_string()),
+                                        Range::from_located(expr),
+                                    ));
+                                }
+                                _ => {}
+                            }
+                        } else {
+                            // dict(())
+                            return Some(Check::new(
+                                CheckKind::UnnecessaryLiteralDict("tuple".to_string()),
+                                Range::from_located(expr),
+                            ));
+                        }
+                    }
+                    ExprKind::List { elts, .. } => {
+                        if let Some(elt) = elts.first() {
+                            match &elt.node {
+                                // dict([(1, 2), ...])
+                                ExprKind::Tuple { elts, .. } if elts.len() == 2 => {
+                                    return Some(Check::new(
+                                        CheckKind::UnnecessaryLiteralDict("list".to_string()),
+                                        Range::from_located(expr),
+                                    ));
+                                }
+                                _ => {}
+                            }
+                        } else {
+                            // dict([])
+                            return Some(Check::new(
+                                CheckKind::UnnecessaryLiteralDict("list".to_string()),
+                                Range::from_located(expr),
+                            ));
+                        }
+                    }
+                    _ => {}
+                }
+            }
+        }
+    }
+    None
+}
+
+pub fn unnecessary_collection_call(
+    expr: &Expr,
+    func: &Expr,
+    args: &Vec<Expr>,
+    keywords: &Vec<Located<KeywordData>>,
+) -> Option<Check> {
+    if args.is_empty() {
+        if let ExprKind::Name { id, .. } = &func.node {
+            if id == "list" || id == "tuple" {
+                // list() or tuple()
+                return Some(Check::new(
+                    CheckKind::UnnecessaryCollectionCall(id.to_string()),
+                    Range::from_located(expr),
+                ));
+            } else if id == "dict" {
+                // dict() or dict(a=1)
+                if keywords.is_empty() || keywords.iter().all(|kw| kw.node.arg.is_some()) {
+                    return Some(Check::new(
+                        CheckKind::UnnecessaryCollectionCall(id.to_string()),
+                        Range::from_located(expr),
+                    ));
+                }
+            }
+        }
+    }
+    None
+}
+
 // flake8-super
 /// Check that `super()` has no args
 pub fn check_super_args(
@@ -791,11 +1053,16 @@ pub fn check_super_args(

 // flake8-print
 /// Check whether a function call is a `print` or `pprint` invocation
-pub fn check_print_call(expr: &Expr, func: &Expr) -> Option<Check> {
+pub fn check_print_call(
+    expr: &Expr,
+    func: &Expr,
+    check_print: bool,
+    check_pprint: bool,
+) -> Option<Check> {
    if let ExprKind::Name { id, .. } = &func.node {
-        if id == "print" {
+        if check_print && id == "print" {
            return Some(Check::new(CheckKind::PrintFound, Range::from_located(expr)));
-        } else if id == "pprint" {
+        } else if check_pprint && id == "pprint" {
            return Some(Check::new(
                CheckKind::PPrintFound,
                Range::from_located(expr),
@@ -805,7 +1072,7 @@ pub fn check_print_call(expr: &Expr, func: &Expr) -> Option<Check> {

    if let ExprKind::Attribute { value, attr, .. } = &func.node {
        if let ExprKind::Name { id, .. } = &value.node {
-            if id == "pprint" && attr == "pprint" {
+            if check_pprint && id == "pprint" && attr == "pprint" {
                return Some(Check::new(
                    CheckKind::PPrintFound,
                    Range::from_located(expr),
--- a/src/check_ast.rs
+++ b/src/check_ast.rs
@@ -21,27 +21,32 @@ use crate::ast::visitor::{walk_excepthandler, Visitor};
 use crate::ast::{checks, operations, visitor};
 use crate::autofix::{fixer, fixes};
 use crate::checks::{Check, CheckCode, CheckKind};
+use crate::plugins;
 use crate::python::builtins::{BUILTINS, MAGIC_GLOBALS};
 use crate::python::future::ALL_FEATURE_NAMES;
 use crate::python::typing;
-use crate::settings::Settings;
+use crate::settings::{PythonVersion, Settings};

 pub const GLOBAL_SCOPE_INDEX: usize = 0;

 static DUNDER_REGEX: Lazy<Regex> = Lazy::new(|| Regex::new(r"__[^\s]+__").unwrap());

-struct Checker<'a> {
+pub struct Checker<'a> {
    // Input data.
-    locator: SourceCodeLocator<'a>,
-    settings: &'a Settings,
-    autofix: &'a fixer::Mode,
    path: &'a Path,
+    // TODO(charlie): Separate immutable from mutable state. (None of these should ever change.)
+    pub(crate) locator: SourceCodeLocator<'a>,
+    pub(crate) settings: &'a Settings,
+    pub(crate) autofix: &'a fixer::Mode,
    // Computed checks.
    checks: Vec<Check>,
+    // Edit tracking.
+    // TODO(charlie): Instead of exposing deletions, wrap in a public API.
+    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.
-    parents: Vec<&'a Stmt>,
-    parent_stack: Vec<usize>,
+    pub(crate) parents: Vec<&'a Stmt>,
+    pub(crate) parent_stack: Vec<usize>,
    scopes: Vec<Scope>,
    scope_stack: Vec<usize>,
    dead_scopes: Vec<usize>,
@@ -50,7 +55,7 @@ struct Checker<'a> {
    deferred_functions: Vec<(&'a Stmt, Vec<usize>, Vec<usize>)>,
    deferred_lambdas: Vec<(&'a Expr, Vec<usize>, Vec<usize>)>,
    deferred_assignments: Vec<usize>,
-    // Derivative state.
+    // Internal, derivative state.
    in_f_string: Option<Range>,
    in_annotation: bool,
    in_literal: bool,
@@ -58,8 +63,6 @@ struct Checker<'a> {
    seen_docstring: bool,
    futures_allowed: bool,
    annotations_future_enabled: bool,
-    // Edit tracking.
-    deletions: BTreeSet<usize>,
 }

 impl<'a> Checker<'a> {
@@ -105,11 +108,32 @@ fn match_name_or_attr(expr: &Expr, target: &str) -> bool {
    }
 }

-fn is_annotated_subscript(expr: &Expr) -> bool {
+enum SubscriptKind {
+    AnnotatedSubscript,
+    PEP593AnnotatedSubscript,
+}
+
+fn match_annotated_subscript(expr: &Expr) -> Option<SubscriptKind> {
    match &expr.node {
-        ExprKind::Attribute { attr, .. } => typing::is_annotated_subscript(attr),
-        ExprKind::Name { id, .. } => typing::is_annotated_subscript(id),
-        _ => false,
+        ExprKind::Attribute { attr, .. } => {
+            if typing::is_annotated_subscript(attr) {
+                Some(SubscriptKind::AnnotatedSubscript)
+            } else if typing::is_pep593_annotated_subscript(attr) {
+                Some(SubscriptKind::PEP593AnnotatedSubscript)
+            } else {
+                None
+            }
+        }
+        ExprKind::Name { id, .. } => {
+            if typing::is_annotated_subscript(id) {
+                Some(SubscriptKind::AnnotatedSubscript)
+            } else if typing::is_pep593_annotated_subscript(id) {
+                Some(SubscriptKind::PEP593AnnotatedSubscript)
+            } else {
+                None
+            }
+        }
+        _ => None,
    }
 }

@@ -216,8 +240,7 @@ where
            StmtKind::Global { names } | StmtKind::Nonlocal { names } => {
                let global_scope_id = self.scopes[GLOBAL_SCOPE_INDEX].id;

-                let current_scope =
-                    &self.scopes[*(self.scope_stack.last().expect("No current scope found."))];
+                let current_scope = self.current_scope();
                let current_scope_id = current_scope.id;
                if current_scope_id != global_scope_id {
                    for name in names {
@@ -234,7 +257,7 @@ where
                    }
                }

-                if self.settings.select.contains(&CheckCode::E741) {
+                if self.settings.enabled.contains(&CheckCode::E741) {
                    let location = self.locate_check(Range::from_located(stmt));
                    self.checks.extend(
                        names.iter().filter_map(|name| {
@@ -244,7 +267,7 @@ where
                }
            }
            StmtKind::Break => {
-                if self.settings.select.contains(&CheckCode::F701) {
+                if self.settings.enabled.contains(&CheckCode::F701) {
                    if let Some(check) = checks::check_break_outside_loop(
                        stmt,
                        &self.parents,
@@ -256,7 +279,7 @@ where
                }
            }
            StmtKind::Continue => {
-                if self.settings.select.contains(&CheckCode::F702) {
+                if self.settings.enabled.contains(&CheckCode::F702) {
                    if let Some(check) = checks::check_continue_outside_loop(
                        stmt,
                        &self.parents,
@@ -281,7 +304,7 @@ where
                args,
                ..
            } => {
-                if self.settings.select.contains(&CheckCode::E743) {
+                if self.settings.enabled.contains(&CheckCode::E743) {
                    if let Some(check) = checks::check_ambiguous_function_name(
                        name,
                        self.locate_check(Range::from_located(stmt)),
@@ -342,7 +365,7 @@ where
            StmtKind::Return { .. } => {
                if self
                    .settings
-                    .select
+                    .enabled
                    .contains(CheckKind::ReturnOutsideFunction.code())
                {
                    if let Some(scope_index) = self.scope_stack.last().cloned() {
@@ -365,23 +388,11 @@ where
                decorator_list,
                ..
            } => {
-                if self.settings.select.contains(&CheckCode::R001) {
-                    let scope =
-                        &self.scopes[*(self.scope_stack.last().expect("No current scope found."))];
-                    if let Some(check) = checks::check_useless_object_inheritance(
-                        stmt,
-                        name,
-                        bases,
-                        keywords,
-                        scope,
-                        &mut self.locator,
-                        self.autofix,
-                    ) {
-                        self.checks.push(check);
-                    }
+                if self.settings.enabled.contains(&CheckCode::U004) {
+                    plugins::useless_object_inheritance(self, stmt, name, bases, keywords);
                }

-                if self.settings.select.contains(&CheckCode::E742) {
+                if self.settings.enabled.contains(&CheckCode::E742) {
                    if let Some(check) = checks::check_ambiguous_class_name(
                        name,
                        self.locate_check(Range::from_located(stmt)),
@@ -410,7 +421,7 @@ where
            StmtKind::Import { names } => {
                if self
                    .settings
-                    .select
+                    .enabled
                    .contains(CheckKind::ModuleImportNotAtTopOfFile.code())
                    && self.seen_non_import
                    && stmt.location.column() == 1
@@ -470,7 +481,7 @@ where
            } => {
                if self
                    .settings
-                    .select
+                    .enabled
                    .contains(CheckKind::ModuleImportNotAtTopOfFile.code())
                    && self.seen_non_import
                    && stmt.location.column() == 1
@@ -508,7 +519,7 @@ where
                            self.annotations_future_enabled = true;
                        }

-                        if self.settings.select.contains(&CheckCode::F407)
+                        if self.settings.enabled.contains(&CheckCode::F407)
                            && !ALL_FEATURE_NAMES.contains(&alias.node.name.deref())
                        {
                            self.checks.push(Check::new(
@@ -517,7 +528,7 @@ where
                            ));
                        }

-                        if self.settings.select.contains(&CheckCode::F404) && !self.futures_allowed
+                        if self.settings.enabled.contains(&CheckCode::F404) && !self.futures_allowed
                        {
                            self.checks.push(Check::new(
                                CheckKind::LateFutureImport,
@@ -540,7 +551,7 @@ where
                            },
                        );

-                        if self.settings.select.contains(&CheckCode::F406) {
+                        if self.settings.enabled.contains(&CheckCode::F406) {
                            let scope = &self.scopes
                                [*(self.scope_stack.last().expect("No current scope found."))];
                            if !matches!(scope.kind, ScopeKind::Module) {
@@ -551,7 +562,7 @@ where
                            }
                        }

-                        if self.settings.select.contains(&CheckCode::F403) {
+                        if self.settings.enabled.contains(&CheckCode::F403) {
                            self.checks.push(Check::new(
                                CheckKind::ImportStarUsed(module_name.to_string()),
                                self.locate_check(Range::from_located(stmt)),
@@ -584,7 +595,7 @@ where
                }
            }
            StmtKind::Raise { exc, .. } => {
-                if self.settings.select.contains(&CheckCode::F901) {
+                if self.settings.enabled.contains(&CheckCode::F901) {
                    if let Some(expr) = exc {
                        if let Some(check) = checks::check_raise_not_implemented(expr) {
                            self.checks.push(check);
@@ -596,33 +607,24 @@ where
                self.handle_node_load(target);
            }
            StmtKind::If { test, .. } => {
-                if self.settings.select.contains(&CheckCode::F634) {
-                    if let Some(check) =
-                        checks::check_if_tuple(test, self.locate_check(Range::from_located(stmt)))
-                    {
-                        self.checks.push(check);
-                    }
+                if self.settings.enabled.contains(&CheckCode::F634) {
+                    plugins::if_tuple(self, stmt, test);
                }
            }
            StmtKind::Assert { test, .. } => {
-                if self.settings.select.contains(CheckKind::AssertTuple.code()) {
-                    if let Some(check) = checks::check_assert_tuple(
-                        test,
-                        self.locate_check(Range::from_located(stmt)),
-                    ) {
-                        self.checks.push(check);
-                    }
+                if self.settings.enabled.contains(&CheckCode::F631) {
+                    plugins::assert_tuple(self, stmt, test);
                }
            }
            StmtKind::Try { handlers, .. } => {
-                if self.settings.select.contains(&CheckCode::F707) {
+                if self.settings.enabled.contains(&CheckCode::F707) {
                    if let Some(check) = checks::check_default_except_not_last(handlers) {
                        self.checks.push(check);
                    }
                }
            }
            StmtKind::Assign { targets, value, .. } => {
-                if self.settings.select.contains(&CheckCode::E731) {
+                if self.settings.enabled.contains(&CheckCode::E731) {
                    if let Some(check) = checks::check_do_not_assign_lambda(
                        value,
                        self.locate_check(Range::from_located(stmt)),
@@ -630,40 +632,12 @@ where
                        self.checks.push(check);
                    }
                }
-                if self.settings.select.contains(&CheckCode::U001) {
-                    if let Some(mut check) = checks::check_useless_metaclass_type(
-                        targets,
-                        value,
-                        self.locate_check(Range::from_located(stmt)),
-                    ) {
-                        if matches!(self.autofix, fixer::Mode::Generate | fixer::Mode::Apply) {
-                            let context = self.binding_context();
-                            let deleted: Vec<&Stmt> = self
-                                .deletions
-                                .iter()
-                                .map(|index| self.parents[*index])
-                                .collect();
-
-                            match fixes::remove_stmt(
-                                self.parents[context.defined_by],
-                                context.defined_in.map(|index| self.parents[index]),
-                                &deleted,
-                            ) {
-                                Ok(fix) => {
-                                    if fix.content.is_empty() || fix.content == "pass" {
-                                        self.deletions.insert(context.defined_by);
-                                    }
-                                    check.amend(fix)
-                                }
-                                Err(e) => error!("Failed to fix unused imports: {}", e),
-                            }
-                        }
-                        self.checks.push(check);
-                    }
+                if self.settings.enabled.contains(&CheckCode::U001) {
+                    plugins::useless_metaclass_type(self, stmt, value, targets);
                }
            }
            StmtKind::AnnAssign { value, .. } => {
-                if self.settings.select.contains(&CheckCode::E731) {
+                if self.settings.enabled.contains(&CheckCode::E731) {
                    if let Some(value) = value {
                        if let Some(check) = checks::check_do_not_assign_lambda(
                            value,
@@ -743,9 +717,9 @@ where
            ExprKind::Tuple { elts, ctx } | ExprKind::List { elts, ctx } => {
                if matches!(ctx, ExprContext::Store) {
                    let check_too_many_expressions =
-                        self.settings.select.contains(&CheckCode::F621);
+                        self.settings.enabled.contains(&CheckCode::F621);
                    let check_two_starred_expressions =
-                        self.settings.select.contains(&CheckCode::F622);
+                        self.settings.enabled.contains(&CheckCode::F622);
                    if let Some(check) = checks::check_starred_expressions(
                        elts,
                        check_too_many_expressions,
@@ -759,7 +733,7 @@ where
            ExprKind::Name { id, ctx } => match ctx {
                ExprContext::Load => self.handle_node_load(expr),
                ExprContext::Store => {
-                    if self.settings.select.contains(&CheckCode::E741) {
+                    if self.settings.enabled.contains(&CheckCode::E741) {
                        if let Some(check) = checks::check_ambiguous_variable_name(
                            id,
                            self.locate_check(Range::from_located(expr)),
@@ -770,81 +744,96 @@ where

                    self.check_builtin_shadowing(id, Range::from_located(expr), true);

-                    let parent =
-                        self.parents[*(self.parent_stack.last().expect("No parent found."))];
-                    self.handle_node_store(expr, parent);
+                    self.handle_node_store(expr, self.current_parent());
                }
                ExprContext::Del => self.handle_node_delete(expr),
            },
-            ExprKind::Call { func, args, .. } => {
-                if self.settings.select.contains(&CheckCode::R002) {
-                    if let Some(check) = checks::check_assert_equals(func, self.autofix) {
-                        self.checks.push(check)
-                    }
+            ExprKind::Call {
+                func,
+                args,
+                keywords,
+                ..
+            } => {
+                if self.settings.enabled.contains(&CheckCode::U005) {
+                    plugins::assert_equals(self, func);
                }

                // flake8-super
-                if self.settings.select.contains(&CheckCode::SPR001) {
-                    // Only bother going through the super check at all if we're in a `super` call.
-                    // (We check this in `check_super_args` too, so this is just an optimization.)
-                    if checks::is_super_call_with_arguments(func, args) {
-                        let scope = &mut self.scopes
-                            [*(self.scope_stack.last().expect("No current scope found."))];
-                        let parents: Vec<&Stmt> = self
-                            .parent_stack
-                            .iter()
-                            .map(|index| self.parents[*index])
-                            .collect();
-                        if let Some(mut check) =
-                            checks::check_super_args(scope, &parents, expr, func, args)
-                        {
-                            if matches!(self.autofix, fixer::Mode::Generate | fixer::Mode::Apply) {
-                                if let Some(fix) =
-                                    fixes::remove_super_arguments(&mut self.locator, expr)
-                                {
-                                    check.amend(fix);
-                                }
-                            }
-                            self.checks.push(check)
-                        }
-                    }
+                if self.settings.enabled.contains(&CheckCode::SPR001) {
+                    plugins::super_call_with_parameters(self, expr, func, args);
                }

                // flake8-print
-                if self.settings.select.contains(&CheckCode::T201)
-                    || self.settings.select.contains(&CheckCode::T203)
+                if self.settings.enabled.contains(&CheckCode::T201)
+                    || self.settings.enabled.contains(&CheckCode::T203)
                {
-                    if let Some(mut check) = checks::check_print_call(expr, func) {
-                        if matches!(self.autofix, fixer::Mode::Generate | fixer::Mode::Apply) {
-                            let context = self.binding_context();
-                            if matches!(
-                                self.parents[context.defined_by].node,
-                                StmtKind::Expr { .. }
-                            ) {
-                                let deleted: Vec<&Stmt> = self
-                                    .deletions
-                                    .iter()
-                                    .map(|index| self.parents[*index])
-                                    .collect();
+                    plugins::print_call(self, expr, func);
+                }

-                                match fixes::remove_stmt(
-                                    self.parents[context.defined_by],
-                                    context.defined_in.map(|index| self.parents[index]),
-                                    &deleted,
-                                ) {
-                                    Ok(fix) => {
-                                        if fix.content.is_empty() || fix.content == "pass" {
-                                            self.deletions.insert(context.defined_by);
-                                        }
-                                        check.amend(fix)
-                                    }
-                                    Err(e) => error!("Failed to fix unused imports: {}", e),
-                                }
-                            }
-                        }
+                // flake8-comprehensions
+                if self.settings.enabled.contains(&CheckCode::C400) {
+                    if let Some(check) = checks::unnecessary_generator_list(expr, func, args) {
+                        self.checks.push(check);
+                    };
+                }

-                        self.checks.push(check)
-                    }
+                if self.settings.enabled.contains(&CheckCode::C401) {
+                    if let Some(check) = checks::unnecessary_generator_set(expr, func, args) {
+                        self.checks.push(check);
+                    };
+                }
+
+                if self.settings.enabled.contains(&CheckCode::C402) {
+                    if let Some(check) = checks::unnecessary_generator_dict(expr, func, args) {
+                        self.checks.push(check);
+                    };
+                }
+
+                if self.settings.enabled.contains(&CheckCode::C403) {
+                    if let Some(check) =
+                        checks::unnecessary_list_comprehension_set(expr, func, args)
+                    {
+                        self.checks.push(check);
+                    };
+                }
+
+                if self.settings.enabled.contains(&CheckCode::C404) {
+                    if let Some(check) =
+                        checks::unnecessary_list_comprehension_dict(expr, func, args)
+                    {
+                        self.checks.push(check);
+                    };
+                }
+
+                if self.settings.enabled.contains(&CheckCode::C405) {
+                    if let Some(check) = checks::unnecessary_literal_set(expr, func, args) {
+                        self.checks.push(check);
+                    };
+                }
+
+                if self.settings.enabled.contains(&CheckCode::C406) {
+                    if let Some(check) = checks::unnecessary_literal_dict(expr, func, args) {
+                        self.checks.push(check);
+                    };
+                }
+
+                if self.settings.enabled.contains(&CheckCode::C408) {
+                    if let Some(check) =
+                        checks::unnecessary_collection_call(expr, func, args, keywords)
+                    {
+                        self.checks.push(check);
+                    };
+                }
+
+                // pyupgrade
+                if self.settings.enabled.contains(&CheckCode::U002)
+                    && self.settings.target_version >= PythonVersion::Py310
+                {
+                    plugins::unnecessary_abspath(self, expr, func, args);
+                }
+
+                if self.settings.enabled.contains(&CheckCode::U003) {
+                    plugins::type_of_primitive(self, expr, func, args);
                }

                if let ExprKind::Name { id, ctx } = &func.node {
@@ -863,8 +852,8 @@ where
                }
            }
            ExprKind::Dict { keys, .. } => {
-                let check_repeated_literals = self.settings.select.contains(&CheckCode::F601);
-                let check_repeated_variables = self.settings.select.contains(&CheckCode::F602);
+                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.checks.extend(checks::check_repeated_keys(
                        keys,
@@ -875,11 +864,10 @@ where
                }
            }
            ExprKind::Yield { .. } | ExprKind::YieldFrom { .. } | ExprKind::Await { .. } => {
-                let scope =
-                    &self.scopes[*(self.scope_stack.last().expect("No current scope found."))];
+                let scope = self.current_scope();
                if self
                    .settings
-                    .select
+                    .enabled
                    .contains(CheckKind::YieldOutsideFunction.code())
                    && matches!(scope.kind, ScopeKind::Class | ScopeKind::Module)
                {
@@ -893,7 +881,7 @@ where
                if self.in_f_string.is_none()
                    && self
                        .settings
-                        .select
+                        .enabled
                        .contains(CheckKind::FStringMissingPlaceholders.code())
                    && !values
                        .iter()
@@ -911,28 +899,13 @@ where
                op: Operator::RShift,
                ..
            } => {
-                if self.settings.select.contains(&CheckCode::F633) {
-                    if let ExprKind::Name { id, .. } = &left.node {
-                        if id == "print" {
-                            let scope = &self.scopes
-                                [*(self.scope_stack.last().expect("No current scope found."))];
-                            if let Some(Binding {
-                                kind: BindingKind::Builtin,
-                                ..
-                            }) = scope.values.get("print")
-                            {
-                                self.checks.push(Check::new(
-                                    CheckKind::InvalidPrintSyntax,
-                                    Range::from_located(left),
-                                ));
-                            }
-                        }
-                    }
+                if self.settings.enabled.contains(&CheckCode::F633) {
+                    plugins::invalid_print_syntax(self, left);
                }
            }
            ExprKind::UnaryOp { op, operand } => {
-                let check_not_in = self.settings.select.contains(&CheckCode::E713);
-                let check_not_is = self.settings.select.contains(&CheckCode::E714);
+                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.checks.extend(checks::check_not_tests(
                        op,
@@ -948,8 +921,8 @@ where
                ops,
                comparators,
            } => {
-                let check_none_comparisons = self.settings.select.contains(&CheckCode::E711);
-                let check_true_false_comparisons = self.settings.select.contains(&CheckCode::E712);
+                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 {
                    self.checks.extend(checks::check_literal_comparisons(
                        left,
@@ -961,7 +934,7 @@ where
                    ));
                }

-                if self.settings.select.contains(&CheckCode::F632) {
+                if self.settings.enabled.contains(&CheckCode::F632) {
                    self.checks.extend(checks::check_is_literal(
                        left,
                        ops,
@@ -970,7 +943,7 @@ where
                    ));
                }

-                if self.settings.select.contains(&CheckCode::E721) {
+                if self.settings.enabled.contains(&CheckCode::E721) {
                    self.checks.extend(checks::check_type_comparison(
                        ops,
                        comparators,
@@ -981,9 +954,11 @@ where
            ExprKind::Constant {
                value: Constant::Str(value),
                ..
-            } if self.in_annotation && !self.in_literal => {
-                self.deferred_string_annotations
-                    .push((Range::from_located(expr), value));
+            } => {
+                if self.in_annotation && !self.in_literal {
+                    self.deferred_string_annotations
+                        .push((Range::from_located(expr), value));
+                }
            }
            ExprKind::Lambda { args, .. } => {
                // Visit the arguments, but avoid the body, which will be deferred.
@@ -1134,12 +1109,35 @@ where
                }
            }
            ExprKind::Subscript { value, slice, ctx } => {
-                if is_annotated_subscript(value) {
-                    self.visit_expr(value);
-                    self.visit_annotation(slice);
-                    self.visit_expr_context(ctx);
-                } else {
-                    visitor::walk_expr(self, expr);
+                match match_annotated_subscript(value) {
+                    Some(subscript) => match subscript {
+                        // Ex) Optional[int]
+                        SubscriptKind::AnnotatedSubscript => {
+                            self.visit_expr(value);
+                            self.visit_annotation(slice);
+                            self.visit_expr_context(ctx);
+                        }
+                        // Ex) Annotated[int, "Hello, world!"]
+                        SubscriptKind::PEP593AnnotatedSubscript => {
+                            // First argument is a type (including forward references); the rest are
+                            // arbitrary Python objects.
+                            self.visit_expr(value);
+                            if let ExprKind::Tuple { elts, ctx } = &slice.node {
+                                if let Some(expr) = elts.first() {
+                                    self.visit_expr(expr);
+                                    self.in_annotation = false;
+                                    for expr in elts.iter().skip(1) {
+                                        self.visit_expr(expr);
+                                    }
+                                    self.in_annotation = true;
+                                    self.visit_expr_context(ctx);
+                                }
+                            } else {
+                                error!("Found non-ExprKind::Tuple argument to PEP 593 Annotation.")
+                            }
+                        }
+                    },
+                    None => visitor::walk_expr(self, expr),
                }
            }
            _ => visitor::walk_expr(self, expr),
@@ -1164,7 +1162,7 @@ where
    fn visit_excepthandler(&mut self, excepthandler: &'b Excepthandler) {
        match &excepthandler.node {
            ExcepthandlerKind::ExceptHandler { type_, name, .. } => {
-                if self.settings.select.contains(&CheckCode::E722) && type_.is_none() {
+                if self.settings.enabled.contains(&CheckCode::E722) && type_.is_none() {
                    self.checks.push(Check::new(
                        CheckKind::DoNotUseBareExcept,
                        Range::from_located(excepthandler),
@@ -1172,7 +1170,7 @@ where
                }
                match name {
                    Some(name) => {
-                        if self.settings.select.contains(&CheckCode::E741) {
+                        if self.settings.enabled.contains(&CheckCode::E741) {
                            if let Some(check) = checks::check_ambiguous_variable_name(
                                name,
                                self.locate_check(Range::from_located(excepthandler)),
@@ -1187,11 +1185,7 @@ where
                            false,
                        );

-                        let scope = &self.scopes
-                            [*(self.scope_stack.last().expect("No current scope found."))];
-                        if scope.values.contains_key(name) {
-                            let parent = self.parents
-                                [*(self.parent_stack.last().expect("No parent found."))];
+                        if self.current_scope().values.contains_key(name) {
                            self.handle_node_store(
                                &Expr::new(
                                    excepthandler.location,
@@ -1201,15 +1195,11 @@ where
                                        ctx: ExprContext::Store,
                                    },
                                ),
-                                parent,
+                                self.current_parent(),
                            );
                        }

-                        let parent =
-                            self.parents[*(self.parent_stack.last().expect("No parent found."))];
-                        let scope = &self.scopes
-                            [*(self.scope_stack.last().expect("No current scope found."))];
-                        let definition = scope.values.get(name).cloned();
+                        let definition = self.current_scope().values.get(name).cloned();
                        self.handle_node_store(
                            &Expr::new(
                                excepthandler.location,
@@ -1219,7 +1209,7 @@ where
                                    ctx: ExprContext::Store,
                                },
                            ),
-                            parent,
+                            self.current_parent(),
                        );

                        walk_excepthandler(self, excepthandler);
@@ -1227,7 +1217,7 @@ where
                        let scope = &mut self.scopes
                            [*(self.scope_stack.last().expect("No current scope found."))];
                        if let Some(binding) = &scope.values.remove(name) {
-                            if self.settings.select.contains(&CheckCode::F841)
+                            if self.settings.enabled.contains(&CheckCode::F841)
                                && binding.used.is_none()
                            {
                                self.checks.push(Check::new(
@@ -1248,7 +1238,7 @@ where
    }

    fn visit_arguments(&mut self, arguments: &'b Arguments) {
-        if self.settings.select.contains(&CheckCode::F831) {
+        if self.settings.enabled.contains(&CheckCode::F831) {
            self.checks
                .extend(checks::check_duplicate_arguments(arguments));
        }
@@ -1282,7 +1272,7 @@ where
            },
        );

-        if self.settings.select.contains(&CheckCode::E741) {
+        if self.settings.enabled.contains(&CheckCode::E741) {
            if let Some(check) = checks::check_ambiguous_variable_name(
                &arg.node.arg,
                self.locate_check(Range::from_located(arg)),
@@ -1302,6 +1292,10 @@ impl CheckLocator for Checker<'_> {
 }

 impl<'a> Checker<'a> {
+    pub fn add_check(&mut self, check: Check) {
+        self.checks.push(check);
+    }
+
    fn push_parent(&mut self, parent: &'a Stmt) {
        self.parent_stack.push(self.parents.len());
        self.parents.push(parent);
@@ -1351,7 +1345,15 @@ impl<'a> Checker<'a> {
        }
    }

-    fn binding_context(&self) -> BindingContext {
+    pub fn current_scope(&self) -> &Scope {
+        &self.scopes[*(self.scope_stack.last().expect("No current scope found."))]
+    }
+
+    pub fn current_parent(&self) -> &'a Stmt {
+        self.parents[*(self.parent_stack.last().expect("No parent found."))]
+    }
+
+    pub fn binding_context(&self) -> BindingContext {
        let mut rev = self.parent_stack.iter().rev().fuse();
        let defined_by = *rev.next().expect("Expected to bind within a statement.");
        let defined_in = rev.next().cloned();
@@ -1368,7 +1370,7 @@ impl<'a> Checker<'a> {
        let binding = match scope.values.get(&name) {
            None => binding,
            Some(existing) => {
-                if self.settings.select.contains(&CheckCode::F402)
+                if self.settings.enabled.contains(&CheckCode::F402)
                    && matches!(binding.kind, BindingKind::LoopVar)
                    && matches!(
                        existing.kind,
@@ -1422,7 +1424,7 @@ impl<'a> Checker<'a> {
            }

            if import_starred {
-                if self.settings.select.contains(&CheckCode::F405) {
+                if self.settings.enabled.contains(&CheckCode::F405) {
                    let mut from_list = vec![];
                    for scope_index in self.scope_stack.iter().rev() {
                        let scope = &self.scopes[*scope_index];
@@ -1442,7 +1444,7 @@ impl<'a> Checker<'a> {
                return;
            }

-            if self.settings.select.contains(&CheckCode::F821) {
+            if self.settings.enabled.contains(&CheckCode::F821) {
                // Allow __path__.
                if self.path.ends_with("__init__.py") && id == "__path__" {
                    return;
@@ -1460,7 +1462,7 @@ impl<'a> Checker<'a> {
            let current =
                &self.scopes[*(self.scope_stack.last().expect("No current scope found."))];

-            if self.settings.select.contains(&CheckCode::F823)
+            if self.settings.enabled.contains(&CheckCode::F823)
                && matches!(current.kind, ScopeKind::Function(_))
                && !current.values.contains_key(id)
            {
@@ -1560,7 +1562,7 @@ impl<'a> Checker<'a> {

            let scope =
                &mut self.scopes[*(self.scope_stack.last().expect("No current scope found."))];
-            if scope.values.remove(id).is_none() && self.settings.select.contains(&CheckCode::F821)
+            if scope.values.remove(id).is_none() && self.settings.enabled.contains(&CheckCode::F821)
            {
                self.checks.push(Check::new(
                    CheckKind::UndefinedName(id.clone()),
@@ -1586,7 +1588,7 @@ impl<'a> Checker<'a> {
            if let Ok(mut expr) = parser::parse_expression(expression, "<filename>") {
                relocate_expr(&mut expr, location);
                allocator.push(expr);
-            } else if self.settings.select.contains(&CheckCode::F722) {
+            } else if self.settings.enabled.contains(&CheckCode::F722) {
                self.checks.push(Check::new(
                    CheckKind::ForwardAnnotationSyntaxError(expression.to_string()),
                    self.locate_check(location),
@@ -1641,7 +1643,7 @@ impl<'a> Checker<'a> {
    }

    fn check_deferred_assignments(&mut self) {
-        if self.settings.select.contains(&CheckCode::F841) {
+        if self.settings.enabled.contains(&CheckCode::F841) {
            while let Some(index) = self.deferred_assignments.pop() {
                self.checks.extend(checks::check_unused_variables(
                    &self.scopes[index],
@@ -1653,9 +1655,9 @@ impl<'a> Checker<'a> {
    }

    fn check_dead_scopes(&mut self) {
-        if !self.settings.select.contains(&CheckCode::F401)
-            && !self.settings.select.contains(&CheckCode::F405)
-            && !self.settings.select.contains(&CheckCode::F822)
+        if !self.settings.enabled.contains(&CheckCode::F401)
+            && !self.settings.enabled.contains(&CheckCode::F405)
+            && !self.settings.enabled.contains(&CheckCode::F822)
        {
            return;
        }
@@ -1669,7 +1671,7 @@ impl<'a> Checker<'a> {
                _ => None,
            });

-            if self.settings.select.contains(&CheckCode::F822)
+            if self.settings.enabled.contains(&CheckCode::F822)
                && !scope.import_starred
                && !self.path.ends_with("__init__.py")
            {
@@ -1687,7 +1689,7 @@ impl<'a> Checker<'a> {
                }
            }

-            if self.settings.select.contains(&CheckCode::F405) && scope.import_starred {
+            if self.settings.enabled.contains(&CheckCode::F405) && scope.import_starred {
                if let Some(all_binding) = all_binding {
                    if let Some(names) = all_names {
                        let mut from_list = vec![];
@@ -1710,7 +1712,7 @@ impl<'a> Checker<'a> {
                }
            }

-            if self.settings.select.contains(&CheckCode::F401) {
+            if self.settings.enabled.contains(&CheckCode::F401) {
                // Collect all unused imports by location. (Multiple unused imports at the same
                // location indicates an `import from`.)
                let mut unused: BTreeMap<(ImportKind, usize, Option<usize>), Vec<&str>> =
@@ -1731,7 +1733,7 @@ impl<'a> Checker<'a> {
                                        context.defined_by,
                                        context.defined_in,
                                    ))
-                                    .or_insert(vec![]);
+                                    .or_default();
                                full_names.push(full_name);
                            }
                            BindingKind::Importation(full_name, context)
@@ -1742,7 +1744,7 @@ impl<'a> Checker<'a> {
                                        context.defined_by,
                                        context.defined_in,
                                    ))
-                                    .or_insert(vec![]);
+                                    .or_default();
                                full_names.push(full_name);
                            }
                            _ => {}
@@ -1754,12 +1756,8 @@ impl<'a> Checker<'a> {
                    let child = self.parents[defined_by];
                    let parent = defined_in.map(|defined_in| self.parents[defined_in]);

-                    let mut check = Check::new(
-                        CheckKind::UnusedImport(full_names.join(", ")),
-                        self.locate_check(Range::from_located(child)),
-                    );
-
-                    if matches!(self.autofix, fixer::Mode::Generate | fixer::Mode::Apply) {
+                    let fix = if matches!(self.autofix, fixer::Mode::Generate | fixer::Mode::Apply)
+                    {
                        let deleted: Vec<&Stmt> = self
                            .deletions
                            .iter()
@@ -1772,14 +1770,22 @@ impl<'a> Checker<'a> {
                        };

                        match removal_fn(&mut self.locator, &full_names, child, parent, &deleted) {
-                            Ok(fix) => {
-                                if fix.content.is_empty() || fix.content == "pass" {
-                                    self.deletions.insert(defined_by);
-                                }
-                                check.amend(fix)
+                            Ok(fix) => Some(fix),
+                            Err(e) => {
+                                error!("Failed to fix unused imports: {}", e);
+                                None
                            }
-                            Err(e) => error!("Failed to fix unused imports: {}", e),
                        }
+                    } else {
+                        None
+                    };
+
+                    let mut check = Check::new(
+                        CheckKind::UnusedImport(full_names.into_iter().map(String::from).collect()),
+                        self.locate_check(Range::from_located(child)),
+                    );
+                    if let Some(fix) = fix {
+                        check.amend(fix);
                    }

                    self.checks.push(check);
@@ -1789,11 +1795,11 @@ impl<'a> Checker<'a> {
    }

    fn check_builtin_shadowing(&mut self, name: &str, location: Range, is_attribute: bool) {
-        let scope = &self.scopes[*(self.scope_stack.last().expect("No current scope found."))];
+        let scope = self.current_scope();

        // flake8-builtins
        if is_attribute && matches!(scope.kind, ScopeKind::Class) {
-            if self.settings.select.contains(&CheckCode::A003) {
+            if self.settings.enabled.contains(&CheckCode::A003) {
                if let Some(check) = checks::check_builtin_shadowing(
                    name,
                    self.locate_check(location),
@@ -1802,7 +1808,7 @@ impl<'a> Checker<'a> {
                    self.checks.push(check);
                }
            }
-        } else if self.settings.select.contains(&CheckCode::A001) {
+        } else if self.settings.enabled.contains(&CheckCode::A001) {
            if let Some(check) = checks::check_builtin_shadowing(
                name,
                self.locate_check(location),
@@ -1814,7 +1820,7 @@ impl<'a> Checker<'a> {
    }

    fn check_builtin_arg_shadowing(&mut self, name: &str, location: Range) {
-        if self.settings.select.contains(&CheckCode::A002) {
+        if self.settings.enabled.contains(&CheckCode::A002) {
            if let Some(check) = checks::check_builtin_shadowing(
                name,
                self.locate_check(location),
--- a/src/check_lines.rs
+++ b/src/check_lines.rs
@@ -32,8 +32,8 @@ pub fn check_lines(
    settings: &Settings,
    autofix: &fixer::Mode,
 ) {
-    let enforce_line_too_long = settings.select.contains(&CheckCode::E501);
-    let enforce_noqa = settings.select.contains(&CheckCode::M001);
+    let enforce_line_too_long = settings.enabled.contains(&CheckCode::E501);
+    let enforce_noqa = settings.enabled.contains(&CheckCode::M001);

    let mut noqa_directives: BTreeMap<usize, (Directive, Vec<&str>)> = BTreeMap::new();

@@ -113,6 +113,45 @@ pub fn check_lines(
        }
    }

+    // Enforce newlines at end of files.
+    if settings.enabled.contains(&CheckCode::W292) && !contents.ends_with('\n') {
+        // Note: if `lines.last()` is `None`, then `contents` is empty (and so we don't want to
+        // raise W292 anyway).
+        if let Some(line) = lines.last() {
+            let lineno = lines.len() - 1;
+            let noqa_lineno = noqa_line_for
+                .get(lineno)
+                .map(|lineno| lineno - 1)
+                .unwrap_or(lineno);
+
+            let noqa = noqa_directives
+                .entry(noqa_lineno)
+                .or_insert_with(|| (noqa::extract_noqa_directive(lines[noqa_lineno]), vec![]));
+
+            let check = Check::new(
+                CheckKind::NoNewLineAtEndOfFile,
+                Range {
+                    location: Location::new(lines.len(), line.len() + 1),
+                    end_location: Location::new(lines.len(), line.len() + 1),
+                },
+            );
+
+            match noqa {
+                (Directive::All(_, _), matches) => {
+                    matches.push(check.kind.code().as_str());
+                }
+                (Directive::Codes(_, _, codes), matches) => {
+                    if codes.contains(&check.kind.code().as_str()) {
+                        matches.push(check.kind.code().as_str());
+                    } else {
+                        line_checks.push(check);
+                    }
+                }
+                (Directive::None, _) => line_checks.push(check),
+            }
+        }
+    }
+
    // Enforce that the noqa directive was actually used.
    if enforce_noqa {
        for (row, (directive, matches)) in noqa_directives {
--- a/src/checks.rs
+++ b/src/checks.rs
@@ -1,13 +1,15 @@
 use std::str::FromStr;

-use crate::ast::types::Range;
+use crate::ast::checks::Primitive;
 use anyhow::Result;
 use itertools::Itertools;
 use rustpython_parser::ast::Location;
 use serde::{Deserialize, Serialize};

-pub const DEFAULT_CHECK_CODES: [CheckCode; 42] = [
-    // pycodestyle
+use crate::ast::types::Range;
+
+pub const DEFAULT_CHECK_CODES: [CheckCode; 43] = [
+    // pycodestyle errors
    CheckCode::E402,
    CheckCode::E501,
    CheckCode::E711,
@@ -22,6 +24,8 @@ pub const DEFAULT_CHECK_CODES: [CheckCode; 42] = [
    CheckCode::E743,
    CheckCode::E902,
    CheckCode::E999,
+    // pycodestyle warnings
+    CheckCode::W292,
    // pyflakes
    CheckCode::F401,
    CheckCode::F402,
@@ -53,8 +57,8 @@ pub const DEFAULT_CHECK_CODES: [CheckCode; 42] = [
    CheckCode::F901,
 ];

-pub const ALL_CHECK_CODES: [CheckCode; 52] = [
-    // pycodestyle
+pub const ALL_CHECK_CODES: [CheckCode; 63] = [
+    // pycodestyle errors
    CheckCode::E402,
    CheckCode::E501,
    CheckCode::E711,
@@ -69,6 +73,8 @@ pub const ALL_CHECK_CODES: [CheckCode; 52] = [
    CheckCode::E743,
    CheckCode::E902,
    CheckCode::E999,
+    // pycodestyle warnings
+    CheckCode::W292,
    // pyflakes
    CheckCode::F401,
    CheckCode::F402,
@@ -102,6 +108,15 @@ pub const ALL_CHECK_CODES: [CheckCode; 52] = [
    CheckCode::A001,
    CheckCode::A002,
    CheckCode::A003,
+    // flake8-comprehensions
+    CheckCode::C400,
+    CheckCode::C401,
+    CheckCode::C402,
+    CheckCode::C403,
+    CheckCode::C404,
+    CheckCode::C405,
+    CheckCode::C406,
+    CheckCode::C408,
    // flake8-super
    CheckCode::SPR001,
    // flake8-print
@@ -109,16 +124,17 @@ pub const ALL_CHECK_CODES: [CheckCode; 52] = [
    CheckCode::T203,
    // pyupgrade
    CheckCode::U001,
-    // Refactor
-    CheckCode::R001,
-    CheckCode::R002,
+    CheckCode::U002,
+    CheckCode::U003,
+    CheckCode::U004,
+    CheckCode::U005,
    // Meta
    CheckCode::M001,
 ];

 #[derive(Debug, PartialEq, Eq, Clone, Serialize, Deserialize, Hash, PartialOrd, Ord)]
 pub enum CheckCode {
-    // pycodestyle
+    // pycodestyle errors
    E402,
    E501,
    E711,
@@ -133,6 +149,8 @@ pub enum CheckCode {
    E743,
    E902,
    E999,
+    // pycodestyle warnings
+    W292,
    // pyflakes
    F401,
    F402,
@@ -166,6 +184,15 @@ pub enum CheckCode {
    A001,
    A002,
    A003,
+    // flake8-comprehensions
+    C400,
+    C401,
+    C402,
+    C403,
+    C404,
+    C405,
+    C406,
+    C408,
    // flake8-super
    SPR001,
    // flake8-print
@@ -173,9 +200,10 @@ pub enum CheckCode {
    T203,
    // pyupgrade
    U001,
-    // Refactor
-    R001,
-    R002,
+    U002,
+    U003,
+    U004,
+    U005,
    // Meta
    M001,
 }
@@ -185,7 +213,7 @@ impl FromStr for CheckCode {

    fn from_str(s: &str) -> Result<Self> {
        match s {
-            // pycodestyle
+            // pycodestyle errors
            "E402" => Ok(CheckCode::E402),
            "E501" => Ok(CheckCode::E501),
            "E711" => Ok(CheckCode::E711),
@@ -200,6 +228,8 @@ impl FromStr for CheckCode {
            "E743" => Ok(CheckCode::E743),
            "E902" => Ok(CheckCode::E902),
            "E999" => Ok(CheckCode::E999),
+            // pycodestyle warnings
+            "W292" => Ok(CheckCode::W292),
            // pyflakes
            "F401" => Ok(CheckCode::F401),
            "F402" => Ok(CheckCode::F402),
@@ -233,13 +263,26 @@ impl FromStr for CheckCode {
            "A001" => Ok(CheckCode::A001),
            "A002" => Ok(CheckCode::A002),
            "A003" => Ok(CheckCode::A003),
+            // flake8-comprehensions
+            "C400" => Ok(CheckCode::C400),
+            "C401" => Ok(CheckCode::C401),
+            "C402" => Ok(CheckCode::C402),
+            "C403" => Ok(CheckCode::C403),
+            "C404" => Ok(CheckCode::C404),
+            "C405" => Ok(CheckCode::C405),
+            "C406" => Ok(CheckCode::C406),
+            "C408" => Ok(CheckCode::C408),
            // flake8-super
            "SPR001" => Ok(CheckCode::SPR001),
+            // flake8-print
+            "T201" => Ok(CheckCode::T201),
+            "T203" => Ok(CheckCode::T203),
            // pyupgrade
            "U001" => Ok(CheckCode::U001),
-            // Refactor
-            "R001" => Ok(CheckCode::R001),
-            "R002" => Ok(CheckCode::R002),
+            "U002" => Ok(CheckCode::U002),
+            "U003" => Ok(CheckCode::U003),
+            "U004" => Ok(CheckCode::U004),
+            "U005" => Ok(CheckCode::U005),
            // Meta
            "M001" => Ok(CheckCode::M001),
            _ => Err(anyhow::anyhow!("Unknown check code: {s}")),
@@ -250,7 +293,7 @@ impl FromStr for CheckCode {
 impl CheckCode {
    pub fn as_str(&self) -> &str {
        match self {
-            // pycodestyle
+            // pycodestyle errors
            CheckCode::E402 => "E402",
            CheckCode::E501 => "E501",
            CheckCode::E711 => "E711",
@@ -265,6 +308,8 @@ impl CheckCode {
            CheckCode::E743 => "E743",
            CheckCode::E902 => "E902",
            CheckCode::E999 => "E999",
+            // pycodestyle warnings
+            CheckCode::W292 => "W292",
            // pyflakes
            CheckCode::F401 => "F401",
            CheckCode::F402 => "F402",
@@ -298,6 +343,15 @@ impl CheckCode {
            CheckCode::A001 => "A001",
            CheckCode::A002 => "A002",
            CheckCode::A003 => "A003",
+            // flake8-comprehensions
+            CheckCode::C400 => "C400",
+            CheckCode::C401 => "C401",
+            CheckCode::C402 => "C402",
+            CheckCode::C403 => "C403",
+            CheckCode::C404 => "C404",
+            CheckCode::C405 => "C405",
+            CheckCode::C406 => "C406",
+            CheckCode::C408 => "C408",
            // flake8-super
            CheckCode::SPR001 => "SPR001",
            // flake8-print
@@ -305,9 +359,10 @@ impl CheckCode {
            CheckCode::T203 => "T203",
            // pyupgrade
            CheckCode::U001 => "U001",
-            // Refactor
-            CheckCode::R001 => "R001",
-            CheckCode::R002 => "R002",
+            CheckCode::U002 => "U002",
+            CheckCode::U003 => "U003",
+            CheckCode::U004 => "U004",
+            CheckCode::U005 => "U005",
            // Meta
            CheckCode::M001 => "M001",
        }
@@ -325,7 +380,7 @@ impl CheckCode {
    /// A placeholder representation of the CheckKind for the check.
    pub fn kind(&self) -> CheckKind {
        match self {
-            // pycodestyle
+            // pycodestyle errors
            CheckCode::E402 => CheckKind::ModuleImportNotAtTopOfFile,
            CheckCode::E501 => CheckKind::LineTooLong(89, 88),
            CheckCode::E711 => CheckKind::NoneComparison(RejectedCmpop::Eq),
@@ -340,8 +395,10 @@ impl CheckCode {
            CheckCode::E743 => CheckKind::AmbiguousFunctionName("...".to_string()),
            CheckCode::E902 => CheckKind::IOError("IOError: `...`".to_string()),
            CheckCode::E999 => CheckKind::SyntaxError("`...`".to_string()),
+            // pycodestyle warnings
+            CheckCode::W292 => CheckKind::NoNewLineAtEndOfFile,
            // pyflakes
-            CheckCode::F401 => CheckKind::UnusedImport("...".to_string()),
+            CheckCode::F401 => CheckKind::UnusedImport(vec!["...".to_string()]),
            CheckCode::F402 => CheckKind::ImportShadowedByLoopVar("...".to_string(), 1),
            CheckCode::F403 => CheckKind::ImportStarUsed("...".to_string()),
            CheckCode::F404 => CheckKind::LateFutureImport,
@@ -375,6 +432,17 @@ impl CheckCode {
            CheckCode::A001 => CheckKind::BuiltinVariableShadowing("...".to_string()),
            CheckCode::A002 => CheckKind::BuiltinArgumentShadowing("...".to_string()),
            CheckCode::A003 => CheckKind::BuiltinAttributeShadowing("...".to_string()),
+            // flake8-comprehensions
+            CheckCode::C400 => CheckKind::UnnecessaryGeneratorList,
+            CheckCode::C401 => CheckKind::UnnecessaryGeneratorSet,
+            CheckCode::C402 => CheckKind::UnnecessaryGeneratorDict,
+            CheckCode::C403 => CheckKind::UnnecessaryListComprehensionSet,
+            CheckCode::C404 => CheckKind::UnnecessaryListComprehensionDict,
+            CheckCode::C405 => CheckKind::UnnecessaryLiteralSet("<list/tuple>".to_string()),
+            CheckCode::C406 => CheckKind::UnnecessaryLiteralDict("<list/tuple>".to_string()),
+            CheckCode::C408 => {
+                CheckKind::UnnecessaryCollectionCall("<dict/list/tuple>".to_string())
+            }
            // flake8-super
            CheckCode::SPR001 => CheckKind::SuperCallWithParameters,
            // flake8-print
@@ -382,9 +450,10 @@ impl CheckCode {
            CheckCode::T203 => CheckKind::PPrintFound,
            // pyupgrade
            CheckCode::U001 => CheckKind::UselessMetaclassType,
-            // Refactor
-            CheckCode::R001 => CheckKind::UselessObjectInheritance("...".to_string()),
-            CheckCode::R002 => CheckKind::NoAssertEquals,
+            CheckCode::U002 => CheckKind::UnnecessaryAbspath,
+            CheckCode::U003 => CheckKind::TypeOfPrimitive(Primitive::Str),
+            CheckCode::U004 => CheckKind::UselessObjectInheritance("...".to_string()),
+            CheckCode::U005 => CheckKind::NoAssertEquals,
            // Meta
            CheckCode::M001 => CheckKind::UnusedNOQA(None),
        }
@@ -433,7 +502,6 @@ pub enum CheckKind {
    ModuleImportNotAtTopOfFile,
    MultiValueRepeatedKeyLiteral,
    MultiValueRepeatedKeyVariable(String),
-    NoAssertEquals,
    NoneComparison(RejectedCmpop),
    NotInTest,
    NotIsTest,
@@ -446,21 +514,37 @@ pub enum CheckKind {
    UndefinedExport(String),
    UndefinedLocal(String),
    UndefinedName(String),
-    UnusedImport(String),
-    UnusedNOQA(Option<String>),
+    UnusedImport(Vec<String>),
    UnusedVariable(String),
-    UselessMetaclassType,
-    UselessObjectInheritance(String),
    YieldOutsideFunction,
+    // More style
+    NoNewLineAtEndOfFile,
    // flake8-builtin
    BuiltinVariableShadowing(String),
    BuiltinArgumentShadowing(String),
    BuiltinAttributeShadowing(String),
+    // flakes8-comprehensions
+    UnnecessaryGeneratorList,
+    UnnecessaryGeneratorSet,
+    UnnecessaryGeneratorDict,
+    UnnecessaryListComprehensionSet,
+    UnnecessaryListComprehensionDict,
+    UnnecessaryLiteralSet(String),
+    UnnecessaryLiteralDict(String),
+    UnnecessaryCollectionCall(String),
    // flake8-super
    SuperCallWithParameters,
    // flake8-print
    PrintFound,
    PPrintFound,
+    // pyupgrade
+    TypeOfPrimitive(Primitive),
+    UnnecessaryAbspath,
+    UselessMetaclassType,
+    NoAssertEquals,
+    UselessObjectInheritance(String),
+    // Meta
+    UnusedNOQA(Option<String>),
 }

 impl CheckKind {
@@ -509,18 +593,30 @@ impl CheckKind {
            CheckKind::UnusedImport(_) => "UnusedImport",
            CheckKind::UnusedVariable(_) => "UnusedVariable",
            CheckKind::YieldOutsideFunction => "YieldOutsideFunction",
+            // More style
+            CheckKind::NoNewLineAtEndOfFile => "NoNewLineAtEndOfFile",
            // flake8-builtins
            CheckKind::BuiltinVariableShadowing(_) => "BuiltinVariableShadowing",
            CheckKind::BuiltinArgumentShadowing(_) => "BuiltinArgumentShadowing",
            CheckKind::BuiltinAttributeShadowing(_) => "BuiltinAttributeShadowing",
+            // flake8-comprehensions
+            CheckKind::UnnecessaryGeneratorList => "UnnecessaryGeneratorList",
+            CheckKind::UnnecessaryGeneratorSet => "UnnecessaryGeneratorSet",
+            CheckKind::UnnecessaryGeneratorDict => "UnnecessaryGeneratorDict",
+            CheckKind::UnnecessaryListComprehensionSet => "UnnecessaryListComprehensionSet",
+            CheckKind::UnnecessaryListComprehensionDict => "UnnecessaryListComprehensionDict",
+            CheckKind::UnnecessaryLiteralSet(_) => "UnnecessaryLiteralSet",
+            CheckKind::UnnecessaryLiteralDict(_) => "UnnecessaryLiteralDict",
+            CheckKind::UnnecessaryCollectionCall(_) => "UnnecessaryCollectionCall",
            // flake8-super
            CheckKind::SuperCallWithParameters => "SuperCallWithParameters",
            // flake8-print
            CheckKind::PrintFound => "PrintFound",
            CheckKind::PPrintFound => "PPrintFound",
            // pyupgrade
+            CheckKind::TypeOfPrimitive(_) => "TypeOfPrimitive",
+            CheckKind::UnnecessaryAbspath => "UnnecessaryAbspath",
            CheckKind::UselessMetaclassType => "UselessMetaclassType",
-            // Refactor
            CheckKind::NoAssertEquals => "NoAssertEquals",
            CheckKind::UselessObjectInheritance(_) => "UselessObjectInheritance",
            // Meta
@@ -573,20 +669,32 @@ impl CheckKind {
            CheckKind::UnusedImport(_) => &CheckCode::F401,
            CheckKind::UnusedVariable(_) => &CheckCode::F841,
            CheckKind::YieldOutsideFunction => &CheckCode::F704,
+            // More style
+            CheckKind::NoNewLineAtEndOfFile => &CheckCode::W292,
            // flake8-builtins
            CheckKind::BuiltinVariableShadowing(_) => &CheckCode::A001,
            CheckKind::BuiltinArgumentShadowing(_) => &CheckCode::A002,
            CheckKind::BuiltinAttributeShadowing(_) => &CheckCode::A003,
+            // flake8-comprehensions
+            CheckKind::UnnecessaryGeneratorList => &CheckCode::C400,
+            CheckKind::UnnecessaryGeneratorSet => &CheckCode::C401,
+            CheckKind::UnnecessaryGeneratorDict => &CheckCode::C402,
+            CheckKind::UnnecessaryListComprehensionSet => &CheckCode::C403,
+            CheckKind::UnnecessaryListComprehensionDict => &CheckCode::C404,
+            CheckKind::UnnecessaryLiteralSet(_) => &CheckCode::C405,
+            CheckKind::UnnecessaryLiteralDict(_) => &CheckCode::C406,
+            CheckKind::UnnecessaryCollectionCall(_) => &CheckCode::C408,
            // flake8-super
            CheckKind::SuperCallWithParameters => &CheckCode::SPR001,
            // flake8-print
            CheckKind::PrintFound => &CheckCode::T201,
            CheckKind::PPrintFound => &CheckCode::T203,
            // pyupgrade
+            CheckKind::TypeOfPrimitive(_) => &CheckCode::U003,
+            CheckKind::UnnecessaryAbspath => &CheckCode::U002,
            CheckKind::UselessMetaclassType => &CheckCode::U001,
-            // Refactor
-            CheckKind::NoAssertEquals => &CheckCode::R002,
-            CheckKind::UselessObjectInheritance(_) => &CheckCode::R001,
+            CheckKind::NoAssertEquals => &CheckCode::U005,
+            CheckKind::UselessObjectInheritance(_) => &CheckCode::U004,
            // Meta
            CheckKind::UnusedNOQA(_) => &CheckCode::M001,
        }
@@ -712,14 +820,18 @@ impl CheckKind {
            CheckKind::UndefinedName(name) => {
                format!("Undefined name `{name}`")
            }
-            CheckKind::UnusedImport(name) => format!("`{name}` imported but unused"),
+            CheckKind::UnusedImport(names) => {
+                let names = names.iter().map(|name| format!("`{name}`")).join(", ");
+                format!("{names} imported but unused")
+            }
            CheckKind::UnusedVariable(name) => {
                format!("Local variable `{name}` is assigned to but never used")
            }
            CheckKind::YieldOutsideFunction => {
                "`yield` or `yield from` statement outside of a function/method".to_string()
            }
-
+            // More style
+            CheckKind::NoNewLineAtEndOfFile => "No newline at end of file".to_string(),
            // flake8-builtins
            CheckKind::BuiltinVariableShadowing(name) => {
                format!("Variable `{name}` is shadowing a python builtin")
@@ -730,6 +842,31 @@ impl CheckKind {
            CheckKind::BuiltinAttributeShadowing(name) => {
                format!("Class attribute `{name}` is shadowing a python builtin")
            }
+            // flake8-comprehensions
+            CheckKind::UnnecessaryGeneratorList => {
+                "Unnecessary generator - rewrite as a list comprehension".to_string()
+            }
+            CheckKind::UnnecessaryGeneratorSet => {
+                "Unnecessary generator - rewrite as a set comprehension".to_string()
+            }
+            CheckKind::UnnecessaryGeneratorDict => {
+                "Unnecessary generator - rewrite as a dict comprehension".to_string()
+            }
+            CheckKind::UnnecessaryListComprehensionSet => {
+                "Unnecessary list comprehension - rewrite as a set comprehension".to_string()
+            }
+            CheckKind::UnnecessaryListComprehensionDict => {
+                "Unnecessary list comprehension - rewrite as a dict comprehension".to_string()
+            }
+            CheckKind::UnnecessaryLiteralSet(obj_type) => {
+                format!("Unnecessary {obj_type} literal - rewrite as a set literal")
+            }
+            CheckKind::UnnecessaryLiteralDict(obj_type) => {
+                format!("Unnecessary {obj_type} literal - rewrite as a dict literal")
+            }
+            CheckKind::UnnecessaryCollectionCall(obj_type) => {
+                format!("Unnecessary {obj_type} call - rewrite as a literal")
+            }
            // flake8-super
            CheckKind::SuperCallWithParameters => {
                "Use `super()` instead of `super(__class__, self)`".to_string()
@@ -738,8 +875,13 @@ impl CheckKind {
            CheckKind::PrintFound => "`print` found".to_string(),
            CheckKind::PPrintFound => "`pprint` found".to_string(),
            // pyupgrade
+            CheckKind::TypeOfPrimitive(primitive) => {
+                format!("Use `{}` instead of `type(...)`", primitive.builtin())
+            }
+            CheckKind::UnnecessaryAbspath => {
+                "`abspath(__file__)` is unnecessary in Python 3.9 and later".to_string()
+            }
            CheckKind::UselessMetaclassType => "`__metaclass__ = type` is implied".to_string(),
-            // Refactor
            CheckKind::NoAssertEquals => {
                "`assertEquals` is deprecated, use `assertEqual` instead".to_string()
            }
@@ -762,6 +904,8 @@ impl CheckKind {
                | CheckKind::PPrintFound
                | CheckKind::PrintFound
                | CheckKind::SuperCallWithParameters
+                | CheckKind::TypeOfPrimitive(_)
+                | CheckKind::UnnecessaryAbspath
                | CheckKind::UnusedImport(_)
                | CheckKind::UnusedNOQA(_)
                | CheckKind::UselessMetaclassType
--- a/src/cli.rs
+++ b/src/cli.rs
@@ -0,0 +1,136 @@
+use std::fmt;
+use std::path::PathBuf;
+
+use clap::{command, Parser};
+use log::warn;
+use regex::Regex;
+
+use crate::checks::CheckCode;
+use crate::printer::SerializationFormat;
+use crate::pyproject::StrCheckCodePair;
+use crate::settings::PythonVersion;
+use crate::RawSettings;
+
+#[derive(Debug, Parser)]
+#[command(author, about = "ruff: An extremely fast Python linter.")]
+#[command(version)]
+pub struct Cli {
+    #[arg(required = true)]
+    pub files: Vec<PathBuf>,
+    /// Enable verbose logging.
+    #[arg(short, long)]
+    pub verbose: bool,
+    /// Disable all logging (but still exit with status code "1" upon detecting errors).
+    #[arg(short, long)]
+    pub quiet: bool,
+    /// Exit with status code "0", even upon detecting errors.
+    #[arg(short, long)]
+    pub exit_zero: bool,
+    /// Run in watch mode by re-running whenever files change.
+    #[arg(short, long)]
+    pub watch: bool,
+    /// Attempt to automatically fix lint errors.
+    #[arg(short, long)]
+    pub fix: bool,
+    /// Disable cache reads.
+    #[arg(short, long)]
+    pub no_cache: bool,
+    /// List of error codes to enable.
+    #[arg(long, value_delimiter = ',')]
+    pub select: Vec<CheckCode>,
+    /// Like --select, but adds additional error codes on top of the selected ones.
+    #[arg(long, value_delimiter = ',')]
+    pub extend_select: Vec<CheckCode>,
+    /// List of error codes to ignore.
+    #[arg(long, value_delimiter = ',')]
+    pub ignore: Vec<CheckCode>,
+    /// Like --ignore, but adds additional error codes on top of the ignored ones.
+    #[arg(long, value_delimiter = ',')]
+    pub extend_ignore: Vec<CheckCode>,
+    /// List of paths, used to exclude files and/or directories from checks.
+    #[arg(long, value_delimiter = ',')]
+    pub exclude: Vec<String>,
+    /// Like --exclude, but adds additional files and directories on top of the excluded ones.
+    #[arg(long, value_delimiter = ',')]
+    pub extend_exclude: Vec<String>,
+    /// List of mappings from file pattern to code to exclude
+    #[arg(long, value_delimiter = ',')]
+    pub per_file_ignores: Vec<StrCheckCodePair>,
+    /// Output serialization format for error messages.
+    #[arg(long, value_enum, default_value_t=SerializationFormat::Text)]
+    pub format: SerializationFormat,
+    /// See the files ruff will be run against with the current settings.
+    #[arg(long)]
+    pub show_files: bool,
+    /// See ruff's settings.
+    #[arg(long)]
+    pub show_settings: bool,
+    /// Enable automatic additions of noqa directives to failing lines.
+    #[arg(long)]
+    pub add_noqa: bool,
+    /// Regular expression matching the name of dummy variables.
+    #[arg(long)]
+    pub dummy_variable_rgx: Option<Regex>,
+    /// The minimum Python version that should be supported.
+    #[arg(long)]
+    pub target_version: Option<PythonVersion>,
+    /// Round-trip auto-formatting.
+    // TODO(charlie): This should be a sub-command.
+    #[arg(long, hide = true)]
+    pub autoformat: bool,
+}
+
+pub enum Warnable {
+    Select,
+    ExtendSelect,
+}
+
+impl fmt::Display for Warnable {
+    fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
+        match self {
+            Warnable::Select => fmt.write_str("--select"),
+            Warnable::ExtendSelect => fmt.write_str("--extend-select"),
+        }
+    }
+}
+
+/// Warn the user if they attempt to enable a code that won't be respected.
+pub fn warn_on(
+    flag: Warnable,
+    codes: &Vec<CheckCode>,
+    cli_ignore: &Vec<CheckCode>,
+    cli_extend_ignore: &Vec<CheckCode>,
+    pyproject_settings: &RawSettings,
+    pyproject_path: &Option<PathBuf>,
+) {
+    for code in codes {
+        if !cli_ignore.is_empty() {
+            if cli_ignore.contains(code) {
+                warn!("{code:?} was passed to {flag}, but ignored via --ignore")
+            }
+        } else if pyproject_settings.ignore.contains(code) {
+            if let Some(path) = pyproject_path {
+                warn!(
+                    "{code:?} was passed to {flag}, but ignored by the `ignore` field in {}",
+                    path.to_string_lossy()
+                )
+            } else {
+                warn!("{code:?} was passed to {flag}, but ignored by the default `ignore` field",)
+            }
+        }
+        if !cli_extend_ignore.is_empty() {
+            if cli_extend_ignore.contains(code) {
+                warn!("{code:?} was passed to {flag}, but ignored via --extend-ignore")
+            }
+        } else if pyproject_settings.extend_ignore.contains(code) {
+            if let Some(path) = pyproject_path {
+                warn!(
+                    "{code:?} was passed to {flag}, but ignored by the `extend_ignore` field in {}",
+                    path.to_string_lossy()
+                )
+            } else {
+                warn!("{code:?} was passed to {flag}, but ignored by the default `extend_ignore` field")
+            }
+        }
+    }
+}
--- a/src/code_gen.rs
+++ b/src/code_gen.rs
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -7,7 +7,7 @@ use rustpython_parser::lexer::LexResult;
 use crate::autofix::fixer::Mode;
 use crate::linter::{check_path, tokenize};
 use crate::message::Message;
-use crate::settings::Settings;
+use crate::settings::{RawSettings, Settings};

 mod ast;
 mod autofix;
@@ -15,11 +15,14 @@ pub mod cache;
 pub mod check_ast;
 mod check_lines;
 pub mod checks;
+pub mod cli;
+pub mod code_gen;
 pub mod fs;
 pub mod linter;
 pub mod logging;
 pub mod message;
 mod noqa;
+mod plugins;
 pub mod printer;
 pub mod pyproject;
 mod python;
@@ -39,7 +42,7 @@ pub fn check(path: &Path, contents: &str) -> Result<Vec<Message>> {
        None => debug!("Unable to find pyproject.toml; using default settings..."),
    };

-    let settings = Settings::from_pyproject(pyproject, project_root)?;
+    let settings = Settings::from_raw(RawSettings::from_pyproject(&pyproject, &project_root)?);

    // Tokenize once.
    let tokens: Vec<LexResult> = tokenize(contents);
--- a/src/linter.rs
+++ b/src/linter.rs
@@ -1,3 +1,4 @@
+use std::fs::write;
 use std::path::Path;

 use anyhow::Result;
@@ -11,6 +12,7 @@ use crate::autofix::fixer::fix_file;
 use crate::check_ast::check_ast;
 use crate::check_lines::check_lines;
 use crate::checks::{Check, CheckCode, CheckKind, LintSource};
+use crate::code_gen::SourceGenerator;
 use crate::message::Message;
 use crate::noqa::add_noqa;
 use crate::settings::Settings;
@@ -42,7 +44,7 @@ pub(crate) fn check_path(

    // Run the AST-based checks.
    if settings
-        .select
+        .enabled
        .iter()
        .any(|check_code| matches!(check_code.lint_source(), LintSource::AST))
    {
@@ -51,7 +53,7 @@ pub(crate) fn check_path(
                checks.extend(check_ast(&python_ast, contents, settings, autofix, path))
            }
            Err(parse_error) => {
-                if settings.select.contains(&CheckCode::E999) {
+                if settings.enabled.contains(&CheckCode::E999) {
                    checks.push(Check::new(
                        CheckKind::SyntaxError(parse_error.error.to_string()),
                        Range {
@@ -151,6 +153,22 @@ pub fn add_noqa_to_path(path: &Path, settings: &Settings) -> Result<usize> {
    add_noqa(&checks, &contents, &noqa_line_for, path)
 }

+pub fn autoformat_path(path: &Path) -> Result<()> {
+    // Read the file from disk.
+    let contents = fs::read_file(path)?;
+
+    // Tokenize once.
+    let tokens: Vec<LexResult> = tokenize(&contents);
+
+    // Generate the AST.
+    let python_ast = parser::parse_program_tokens(tokens, "<filename>")?;
+    let mut generator: SourceGenerator = Default::default();
+    generator.unparse_suite(&python_ast)?;
+    write(path, generator.generate()?)?;
+
+    Ok(())
+}
+
 #[cfg(test)]
 mod tests {
    use std::path::Path;
@@ -321,6 +339,42 @@ mod tests {
        Ok(())
    }

+    #[test]
+    fn w292_0() -> Result<()> {
+        let mut checks = check_path(
+            Path::new("./resources/test/fixtures/W292_0.py"),
+            &settings::Settings::for_rule(CheckCode::W292),
+            &fixer::Mode::Generate,
+        )?;
+        checks.sort_by_key(|check| check.location);
+        insta::assert_yaml_snapshot!(checks);
+        Ok(())
+    }
+
+    #[test]
+    fn w292_1() -> Result<()> {
+        let mut checks = check_path(
+            Path::new("./resources/test/fixtures/W292_1.py"),
+            &settings::Settings::for_rule(CheckCode::W292),
+            &fixer::Mode::Generate,
+        )?;
+        checks.sort_by_key(|check| check.location);
+        insta::assert_yaml_snapshot!(checks);
+        Ok(())
+    }
+
+    #[test]
+    fn w292_2() -> Result<()> {
+        let mut checks = check_path(
+            Path::new("./resources/test/fixtures/W292_2.py"),
+            &settings::Settings::for_rule(CheckCode::W292),
+            &fixer::Mode::Generate,
+        )?;
+        checks.sort_by_key(|check| check.location);
+        insta::assert_yaml_snapshot!(checks);
+        Ok(())
+    }
+
    #[test]
    fn f401() -> Result<()> {
        let mut checks = check_path(
@@ -672,30 +726,6 @@ mod tests {
        Ok(())
    }

-    #[test]
-    fn r001() -> Result<()> {
-        let mut checks = check_path(
-            Path::new("./resources/test/fixtures/R001.py"),
-            &settings::Settings::for_rule(CheckCode::R001),
-            &fixer::Mode::Generate,
-        )?;
-        checks.sort_by_key(|check| check.location);
-        insta::assert_yaml_snapshot!(checks);
-        Ok(())
-    }
-
-    #[test]
-    fn r002() -> Result<()> {
-        let mut checks = check_path(
-            Path::new("./resources/test/fixtures/R002.py"),
-            &settings::Settings::for_rule(CheckCode::R002),
-            &fixer::Mode::Generate,
-        )?;
-        checks.sort_by_key(|check| check.location);
-        insta::assert_yaml_snapshot!(checks);
-        Ok(())
-    }
-
    #[test]
    fn init() -> Result<()> {
        let mut checks = check_path(
@@ -768,6 +798,102 @@ mod tests {
        Ok(())
    }

+    #[test]
+    fn c400() -> Result<()> {
+        let mut checks = check_path(
+            Path::new("./resources/test/fixtures/C400.py"),
+            &settings::Settings::for_rule(CheckCode::C400),
+            &fixer::Mode::Generate,
+        )?;
+        checks.sort_by_key(|check| check.location);
+        insta::assert_yaml_snapshot!(checks);
+        Ok(())
+    }
+
+    #[test]
+    fn c401() -> Result<()> {
+        let mut checks = check_path(
+            Path::new("./resources/test/fixtures/C401.py"),
+            &settings::Settings::for_rule(CheckCode::C401),
+            &fixer::Mode::Generate,
+        )?;
+        checks.sort_by_key(|check| check.location);
+        insta::assert_yaml_snapshot!(checks);
+        Ok(())
+    }
+
+    #[test]
+    fn c402() -> Result<()> {
+        let mut checks = check_path(
+            Path::new("./resources/test/fixtures/C402.py"),
+            &settings::Settings::for_rule(CheckCode::C402),
+            &fixer::Mode::Generate,
+        )?;
+        checks.sort_by_key(|check| check.location);
+        insta::assert_yaml_snapshot!(checks);
+        Ok(())
+    }
+
+    #[test]
+    fn c403() -> Result<()> {
+        let mut checks = check_path(
+            Path::new("./resources/test/fixtures/C403.py"),
+            &settings::Settings::for_rule(CheckCode::C403),
+            &fixer::Mode::Generate,
+        )?;
+        checks.sort_by_key(|check| check.location);
+        insta::assert_yaml_snapshot!(checks);
+        Ok(())
+    }
+
+    #[test]
+    fn c404() -> Result<()> {
+        let mut checks = check_path(
+            Path::new("./resources/test/fixtures/C404.py"),
+            &settings::Settings::for_rule(CheckCode::C404),
+            &fixer::Mode::Generate,
+        )?;
+        checks.sort_by_key(|check| check.location);
+        insta::assert_yaml_snapshot!(checks);
+        Ok(())
+    }
+
+    #[test]
+    fn c405() -> Result<()> {
+        let mut checks = check_path(
+            Path::new("./resources/test/fixtures/C405.py"),
+            &settings::Settings::for_rule(CheckCode::C405),
+            &fixer::Mode::Generate,
+        )?;
+        checks.sort_by_key(|check| check.location);
+        insta::assert_yaml_snapshot!(checks);
+        Ok(())
+    }
+
+    #[test]
+    fn c406() -> Result<()> {
+        let mut checks = check_path(
+            Path::new("./resources/test/fixtures/C406.py"),
+            &settings::Settings::for_rule(CheckCode::C406),
+            &fixer::Mode::Generate,
+        )?;
+        checks.sort_by_key(|check| check.location);
+        insta::assert_yaml_snapshot!(checks);
+        Ok(())
+    }
+
+    #[test]
+    fn c408() -> Result<()> {
+        let mut checks = check_path(
+            Path::new("./resources/test/fixtures/C408.py"),
+            &settings::Settings::for_rule(CheckCode::C408),
+            &fixer::Mode::Generate,
+        )?;
+        checks.sort_by_key(|check| check.location);
+        insta::assert_yaml_snapshot!(checks);
+        Ok(())
+    }
+
    #[test]
    fn spr001() -> Result<()> {
        let mut checks = check_path(
@@ -815,4 +941,52 @@ mod tests {
        insta::assert_yaml_snapshot!(checks);
        Ok(())
    }
+
+    #[test]
+    fn u002() -> Result<()> {
+        let mut checks = check_path(
+            Path::new("./resources/test/fixtures/U002.py"),
+            &settings::Settings::for_rule(CheckCode::U002),
+            &fixer::Mode::Generate,
+        )?;
+        checks.sort_by_key(|check| check.location);
+        insta::assert_yaml_snapshot!(checks);
+        Ok(())
+    }
+
+    #[test]
+    fn u003() -> Result<()> {
+        let mut checks = check_path(
+            Path::new("./resources/test/fixtures/U003.py"),
+            &settings::Settings::for_rule(CheckCode::U003),
+            &fixer::Mode::Generate,
+        )?;
+        checks.sort_by_key(|check| check.location);
+        insta::assert_yaml_snapshot!(checks);
+        Ok(())
+    }
+
+    #[test]
+    fn u004() -> Result<()> {
+        let mut checks = check_path(
+            Path::new("./resources/test/fixtures/U004.py"),
+            &settings::Settings::for_rule(CheckCode::U004),
+            &fixer::Mode::Generate,
+        )?;
+        checks.sort_by_key(|check| check.location);
+        insta::assert_yaml_snapshot!(checks);
+        Ok(())
+    }
+
+    #[test]
+    fn u005() -> Result<()> {
+        let mut checks = check_path(
+            Path::new("./resources/test/fixtures/U005.py"),
+            &settings::Settings::for_rule(CheckCode::U005),
+            &fixer::Mode::Generate,
+        )?;
+        checks.sort_by_key(|check| check.location);
+        insta::assert_yaml_snapshot!(checks);
+        Ok(())
+    }
 }
--- a/src/main.rs
+++ b/src/main.rs
@@ -5,93 +5,33 @@ use std::sync::mpsc::channel;
 use std::time::Instant;

 use anyhow::Result;
-use clap::{command, Parser};
+use clap::Parser;
 use colored::Colorize;
 use log::{debug, error};
 use notify::{raw_watcher, RecursiveMode, Watcher};
 use rayon::prelude::*;
-use regex::Regex;
 use walkdir::DirEntry;

-use ::ruff::cache;
-use ::ruff::checks::CheckCode;
-use ::ruff::checks::CheckKind;
-use ::ruff::fs::iter_python_files;
-use ::ruff::linter::add_noqa_to_path;
-use ::ruff::linter::lint_path;
-use ::ruff::logging::set_up_logging;
-use ::ruff::message::Message;
-use ::ruff::printer::{Printer, SerializationFormat};
-use ::ruff::pyproject::{self, StrCheckCodePair};
-use ::ruff::settings::CurrentSettings;
-use ::ruff::settings::{FilePattern, PerFileIgnore, Settings};
-use ::ruff::tell_user;
+use ruff::cache;
+use ruff::checks::CheckCode;
+use ruff::checks::CheckKind;
+use ruff::cli::{warn_on, Cli, Warnable};
+use ruff::fs::iter_python_files;
+use ruff::linter::add_noqa_to_path;
+use ruff::linter::autoformat_path;
+use ruff::linter::lint_path;
+use ruff::logging::set_up_logging;
+use ruff::message::Message;
+use ruff::printer::{Printer, SerializationFormat};
+use ruff::pyproject::{self};
+use ruff::settings::CurrentSettings;
+use ruff::settings::RawSettings;
+use ruff::settings::{FilePattern, PerFileIgnore, Settings};
+use ruff::tell_user;

 const CARGO_PKG_NAME: &str = env!("CARGO_PKG_NAME");
 const CARGO_PKG_VERSION: &str = env!("CARGO_PKG_VERSION");

-#[derive(Debug, Parser)]
-#[command(author, about = "ruff: An extremely fast Python linter.")]
-#[command(version)]
-struct Cli {
-    #[arg(required = true)]
-    files: Vec<PathBuf>,
-    /// Enable verbose logging.
-    #[arg(short, long)]
-    verbose: bool,
-    /// Disable all logging (but still exit with status code "1" upon detecting errors).
-    #[arg(short, long)]
-    quiet: bool,
-    /// Exit with status code "0", even upon detecting errors.
-    #[arg(short, long)]
-    exit_zero: bool,
-    /// Run in watch mode by re-running whenever files change.
-    #[arg(short, long)]
-    watch: bool,
-    /// Attempt to automatically fix lint errors.
-    #[arg(short, long)]
-    fix: bool,
-    /// Disable cache reads.
-    #[arg(short, long)]
-    no_cache: bool,
-    /// List of error codes to enable.
-    #[arg(long, value_delimiter = ',')]
-    select: Vec<CheckCode>,
-    /// Like --select, but adds additional error codes on top of the selected ones.
-    #[arg(long, value_delimiter = ',')]
-    extend_select: Vec<CheckCode>,
-    /// List of error codes to ignore.
-    #[arg(long, value_delimiter = ',')]
-    ignore: Vec<CheckCode>,
-    /// Like --ignore, but adds additional error codes on top of the ignored ones.
-    #[arg(long, value_delimiter = ',')]
-    extend_ignore: Vec<CheckCode>,
-    /// List of paths, used to exclude files and/or directories from checks.
-    #[arg(long, value_delimiter = ',')]
-    exclude: Vec<String>,
-    /// Like --exclude, but adds additional files and directories on top of the excluded ones.
-    #[arg(long, value_delimiter = ',')]
-    extend_exclude: Vec<String>,
-    /// List of mappings from file pattern to code to exclude
-    #[arg(long, value_delimiter = ',')]
-    per_file_ignores: Vec<StrCheckCodePair>,
-    /// Output serialization format for error messages.
-    #[arg(long, value_enum, default_value_t=SerializationFormat::Text)]
-    format: SerializationFormat,
-    /// See the files ruff will be run against with the current settings.
-    #[arg(long)]
-    show_files: bool,
-    /// See ruff's settings.
-    #[arg(long)]
-    show_settings: bool,
-    /// Enable automatic additions of noqa directives to failing lines.
-    #[arg(long)]
-    add_noqa: bool,
-    /// Regular expression matching the name of dummy variables.
-    #[arg(long)]
-    dummy_variable_rgx: Option<Regex>,
-}
-
 #[cfg(feature = "update-informer")]
 fn check_for_updates() {
    use update_informer::{registry, Check};
@@ -116,8 +56,11 @@ fn check_for_updates() {
    }
 }

-fn show_settings(settings: Settings) {
-    println!("{:#?}", CurrentSettings::from_settings(settings));
+fn show_settings(settings: RawSettings, project_root: Option<PathBuf>, pyproject: Option<PathBuf>) {
+    println!(
+        "{:#?}",
+        CurrentSettings::from_settings(settings, project_root, pyproject)
+    );
 }

 fn show_files(files: &[PathBuf], settings: &Settings) {
@@ -165,7 +108,7 @@ fn run_once(
            }
            .unwrap_or_else(|(path, message)| {
                if let Some(path) = path {
-                    if settings.select.contains(&CheckCode::E902) {
+                    if settings.enabled.contains(&CheckCode::E902) {
                        vec![Message {
                            kind: CheckKind::IOError(message),
                            fixed: false,
@@ -222,6 +165,33 @@ fn add_noqa(files: &[PathBuf], settings: &Settings) -> Result<usize> {
    Ok(modifications)
 }

+fn autoformat(files: &[PathBuf], settings: &Settings) -> Result<usize> {
+    // Collect all the files to format.
+    let start = Instant::now();
+    let paths: Vec<DirEntry> = files
+        .iter()
+        .flat_map(|path| iter_python_files(path, &settings.exclude, &settings.extend_exclude))
+        .flatten()
+        .collect();
+    let duration = start.elapsed();
+    debug!("Identified files to lint in: {:?}", duration);
+
+    let start = Instant::now();
+    let modifications = paths
+        .par_iter()
+        .map(|entry| {
+            let path = entry.path();
+            autoformat_path(path)
+        })
+        .flatten()
+        .count();
+
+    let duration = start.elapsed();
+    debug!("Auto-formatted files in: {:?}", duration);
+
+    Ok(modifications)
+}
+
 fn inner_main() -> Result<ExitCode> {
    let cli = Cli::parse();

@@ -256,7 +226,7 @@ fn inner_main() -> Result<ExitCode> {
        .map(|pair| PerFileIgnore::new(pair, &project_root))
        .collect();

-    let mut settings = Settings::from_pyproject(pyproject, project_root)?;
+    let mut settings = RawSettings::from_pyproject(&pyproject, &project_root)?;
    if !exclude.is_empty() {
        settings.exclude = exclude;
    }
@@ -267,17 +237,35 @@ fn inner_main() -> Result<ExitCode> {
        settings.per_file_ignores = per_file_ignores;
    }
    if !cli.select.is_empty() {
-        settings.clear();
-        settings.select(cli.select);
+        warn_on(
+            Warnable::Select,
+            &cli.select,
+            &cli.ignore,
+            &cli.extend_ignore,
+            &settings,
+            &pyproject,
+        );
+        settings.select = cli.select;
    }
    if !cli.extend_select.is_empty() {
-        settings.select(cli.extend_select);
+        warn_on(
+            Warnable::ExtendSelect,
+            &cli.extend_select,
+            &cli.ignore,
+            &cli.extend_ignore,
+            &settings,
+            &pyproject,
+        );
+        settings.extend_select = cli.extend_select;
    }
    if !cli.ignore.is_empty() {
-        settings.ignore(&cli.ignore);
+        settings.ignore = cli.ignore;
    }
    if !cli.extend_ignore.is_empty() {
-        settings.ignore(&cli.extend_ignore);
+        settings.extend_ignore = cli.extend_ignore;
+    }
+    if let Some(target_version) = cli.target_version {
+        settings.target_version = target_version;
    }
    if let Some(dummy_variable_rgx) = cli.dummy_variable_rgx {
        settings.dummy_variable_rgx = dummy_variable_rgx;
@@ -287,12 +275,15 @@ fn inner_main() -> Result<ExitCode> {
        eprintln!("Error: specify --show-settings or show-files (not both).");
        return Ok(ExitCode::FAILURE);
    }
-    if cli.show_files {
-        show_files(&cli.files, &settings);
+    if cli.show_settings {
+        show_settings(settings, project_root, pyproject);
        return Ok(ExitCode::SUCCESS);
    }
-    if cli.show_settings {
-        show_settings(settings);
+
+    let settings = Settings::from_raw(settings);
+
+    if cli.show_files {
+        show_files(&cli.files, &settings);
        return Ok(ExitCode::SUCCESS);
    }

@@ -308,6 +299,10 @@ fn inner_main() -> Result<ExitCode> {
            eprintln!("Warning: --no-qa is not enabled in watch mode.");
        }

+        if cli.autoformat {
+            eprintln!("Warning: --autoformat is not enabled in watch mode.");
+        }
+
        if cli.format != SerializationFormat::Text {
            eprintln!("Warning: --format 'text' is used in watch mode.");
        }
@@ -351,6 +346,11 @@ fn inner_main() -> Result<ExitCode> {
        if modifications > 0 {
            println!("Added {modifications} noqa directives.");
        }
+    } else if cli.autoformat {
+        let modifications = autoformat(&cli.files, &settings)?;
+        if modifications > 0 {
+            println!("Formatted {modifications} files.");
+        }
    } else {
        let messages = run_once(&cli.files, &settings, !cli.no_cache, cli.fix)?;
        if !cli.quiet {
@@ -360,7 +360,7 @@ fn inner_main() -> Result<ExitCode> {
        #[cfg(feature = "update-informer")]
        check_for_updates();

-        if !messages.is_empty() && !cli.exit_zero {
+        if messages.iter().any(|message| !message.fixed) && !cli.exit_zero {
            return Ok(ExitCode::FAILURE);
        }
    }
--- a/src/noqa.rs
+++ b/src/noqa.rs
@@ -104,9 +104,7 @@ fn add_noqa_inner(
            .unwrap_or(lineno);

        if !codes.is_empty() {
-            let matches = matches_by_line
-                .entry(noqa_lineno)
-                .or_insert_with(BTreeSet::new);
+            let matches = matches_by_line.entry(noqa_lineno).or_default();
            matches.append(&mut codes);
        }
    }
--- a/src/plugins.rs
+++ b/src/plugins.rs
@@ -0,0 +1,21 @@
+mod assert_equals;
+mod assert_tuple;
+mod if_tuple;
+mod invalid_print_syntax;
+mod print_call;
+mod super_call_with_parameters;
+mod type_of_primitive;
+mod unnecessary_abspath;
+mod useless_metaclass_type;
+mod useless_object_inheritance;
+
+pub use assert_equals::assert_equals;
+pub use assert_tuple::assert_tuple;
+pub use if_tuple::if_tuple;
+pub use invalid_print_syntax::invalid_print_syntax;
+pub use print_call::print_call;
+pub use super_call_with_parameters::super_call_with_parameters;
+pub use type_of_primitive::type_of_primitive;
+pub use unnecessary_abspath::unnecessary_abspath;
+pub use useless_metaclass_type::useless_metaclass_type;
+pub use useless_object_inheritance::useless_object_inheritance;
--- a/src/plugins/assert_equals.rs
+++ b/src/plugins/assert_equals.rs
@@ -0,0 +1,23 @@
+use rustpython_ast::{Expr, Location};
+
+use crate::ast::checks;
+use crate::autofix::fixer;
+use crate::check_ast::Checker;
+use crate::checks::Fix;
+
+pub fn assert_equals(checker: &mut Checker, expr: &Expr) {
+    if let Some(mut check) = checks::check_assert_equals(expr) {
+        if matches!(checker.autofix, fixer::Mode::Generate | fixer::Mode::Apply) {
+            check.amend(Fix {
+                content: "assertEqual".to_string(),
+                location: Location::new(expr.location.row(), expr.location.column() + 1),
+                end_location: Location::new(
+                    expr.location.row(),
+                    expr.location.column() + 1 + "assertEquals".len(),
+                ),
+                applied: false,
+            });
+        }
+        checker.add_check(check);
+    }
+}
--- a/src/plugins/assert_tuple.rs
+++ b/src/plugins/assert_tuple.rs
@@ -0,0 +1,13 @@
+use rustpython_ast::{Expr, Stmt};
+
+use crate::ast::checks;
+use crate::ast::types::{CheckLocator, Range};
+use crate::check_ast::Checker;
+
+pub fn assert_tuple(checker: &mut Checker, stmt: &Stmt, test: &Expr) {
+    if let Some(check) =
+        checks::check_assert_tuple(test, checker.locate_check(Range::from_located(stmt)))
+    {
+        checker.add_check(check);
+    }
+}
--- a/src/plugins/if_tuple.rs
+++ b/src/plugins/if_tuple.rs
@@ -0,0 +1,13 @@
+use rustpython_ast::{Expr, Stmt};
+
+use crate::ast::checks;
+use crate::ast::types::{CheckLocator, Range};
+use crate::check_ast::Checker;
+
+pub fn if_tuple(checker: &mut Checker, stmt: &Stmt, test: &Expr) {
+    if let Some(check) =
+        checks::check_if_tuple(test, checker.locate_check(Range::from_located(stmt)))
+    {
+        checker.add_check(check);
+    }
+}
--- a/src/plugins/invalid_print_syntax.rs
+++ b/src/plugins/invalid_print_syntax.rs
@@ -0,0 +1,23 @@
+use rustpython_ast::{Expr, ExprKind};
+
+use crate::ast::types::{Binding, BindingKind, Range};
+use crate::check_ast::Checker;
+use crate::checks::{Check, CheckKind};
+
+pub fn invalid_print_syntax(checker: &mut Checker, left: &Expr) {
+    if let ExprKind::Name { id, .. } = &left.node {
+        if id == "print" {
+            let scope = checker.current_scope();
+            if let Some(Binding {
+                kind: BindingKind::Builtin,
+                ..
+            }) = scope.values.get("print")
+            {
+                checker.add_check(Check::new(
+                    CheckKind::InvalidPrintSyntax,
+                    Range::from_located(left),
+                ));
+            }
+        }
+    }
+}
--- a/src/plugins/print_call.rs
+++ b/src/plugins/print_call.rs
@@ -0,0 +1,46 @@
+use log::error;
+use rustpython_ast::{Expr, Stmt, StmtKind};
+
+use crate::ast::checks;
+use crate::autofix::{fixer, fixes};
+use crate::check_ast::Checker;
+use crate::checks::CheckCode;
+
+pub fn print_call(checker: &mut Checker, expr: &Expr, func: &Expr) {
+    if let Some(mut check) = checks::check_print_call(
+        expr,
+        func,
+        checker.settings.enabled.contains(&CheckCode::T201),
+        checker.settings.enabled.contains(&CheckCode::T203),
+    ) {
+        if matches!(checker.autofix, fixer::Mode::Generate | fixer::Mode::Apply) {
+            let context = checker.binding_context();
+            if matches!(
+                checker.parents[context.defined_by].node,
+                StmtKind::Expr { .. }
+            ) {
+                let deleted: Vec<&Stmt> = checker
+                    .deletions
+                    .iter()
+                    .map(|index| checker.parents[*index])
+                    .collect();
+
+                match fixes::remove_stmt(
+                    checker.parents[context.defined_by],
+                    context.defined_in.map(|index| checker.parents[index]),
+                    &deleted,
+                ) {
+                    Ok(fix) => {
+                        if fix.content.is_empty() || fix.content == "pass" {
+                            checker.deletions.insert(context.defined_by);
+                        }
+                        check.amend(fix)
+                    }
+                    Err(e) => error!("Failed to fix unused imports: {}", e),
+                }
+            }
+        }
+
+        checker.add_check(check);
+    }
+}
--- a/src/plugins/super_call_with_parameters.rs
+++ b/src/plugins/super_call_with_parameters.rs
@@ -0,0 +1,31 @@
+use rustpython_ast::{Expr, Stmt};
+
+use crate::ast::checks;
+use crate::autofix::{fixer, fixes};
+use crate::check_ast::Checker;
+
+pub fn super_call_with_parameters(
+    checker: &mut Checker,
+    expr: &Expr,
+    func: &Expr,
+    args: &Vec<Expr>,
+) {
+    // Only bother going through the super check at all if we're in a `super` call.
+    // (We check this in `check_super_args` too, so this is just an optimization.)
+    if checks::is_super_call_with_arguments(func, args) {
+        let scope = checker.current_scope();
+        let parents: Vec<&Stmt> = checker
+            .parent_stack
+            .iter()
+            .map(|index| checker.parents[*index])
+            .collect();
+        if let Some(mut check) = checks::check_super_args(scope, &parents, expr, func, args) {
+            if matches!(checker.autofix, fixer::Mode::Generate | fixer::Mode::Apply) {
+                if let Some(fix) = fixes::remove_super_arguments(&mut checker.locator, expr) {
+                    check.amend(fix);
+                }
+            }
+            checker.add_check(check)
+        }
+    }
+}
--- a/src/plugins/type_of_primitive.rs
+++ b/src/plugins/type_of_primitive.rs
@@ -0,0 +1,25 @@
+use rustpython_ast::Expr;
+
+use crate::ast::checks;
+use crate::ast::types::{CheckLocator, Range};
+use crate::autofix::fixer;
+use crate::check_ast::Checker;
+use crate::checks::{CheckKind, Fix};
+
+pub fn type_of_primitive(checker: &mut Checker, expr: &Expr, func: &Expr, args: &Vec<Expr>) {
+    if let Some(mut check) =
+        checks::check_type_of_primitive(func, args, checker.locate_check(Range::from_located(expr)))
+    {
+        if matches!(checker.autofix, fixer::Mode::Generate | fixer::Mode::Apply) {
+            if let CheckKind::TypeOfPrimitive(primitive) = &check.kind {
+                check.amend(Fix {
+                    content: primitive.builtin(),
+                    location: expr.location,
+                    end_location: expr.end_location,
+                    applied: false,
+                });
+            }
+        }
+        checker.add_check(check);
+    }
+}
--- a/src/plugins/unnecessary_abspath.rs
+++ b/src/plugins/unnecessary_abspath.rs
@@ -0,0 +1,25 @@
+use rustpython_ast::Expr;
+
+use crate::ast::checks;
+use crate::ast::types::{CheckLocator, Range};
+use crate::autofix::fixer;
+use crate::check_ast::Checker;
+use crate::checks::Fix;
+
+pub fn unnecessary_abspath(checker: &mut Checker, expr: &Expr, func: &Expr, args: &Vec<Expr>) {
+    if let Some(mut check) = checks::check_unnecessary_abspath(
+        func,
+        args,
+        checker.locate_check(Range::from_located(expr)),
+    ) {
+        if matches!(checker.autofix, fixer::Mode::Generate | fixer::Mode::Apply) {
+            check.amend(Fix {
+                content: "__file__".to_string(),
+                location: expr.location,
+                end_location: expr.end_location,
+                applied: false,
+            });
+        }
+        checker.add_check(check);
+    }
+}
--- a/src/plugins/useless_metaclass_type.rs
+++ b/src/plugins/useless_metaclass_type.rs
@@ -0,0 +1,44 @@
+use log::error;
+use rustpython_ast::{Expr, Stmt};
+
+use crate::ast::checks;
+use crate::ast::types::{CheckLocator, Range};
+use crate::autofix::{fixer, fixes};
+use crate::check_ast::Checker;
+
+pub fn useless_metaclass_type(
+    checker: &mut Checker,
+    stmt: &Stmt,
+    value: &Expr,
+    targets: &Vec<Expr>,
+) {
+    if let Some(mut check) = checks::check_useless_metaclass_type(
+        targets,
+        value,
+        checker.locate_check(Range::from_located(stmt)),
+    ) {
+        if matches!(checker.autofix, fixer::Mode::Generate | fixer::Mode::Apply) {
+            let context = checker.binding_context();
+            let deleted: Vec<&Stmt> = checker
+                .deletions
+                .iter()
+                .map(|index| checker.parents[*index])
+                .collect();
+
+            match fixes::remove_stmt(
+                checker.parents[context.defined_by],
+                context.defined_in.map(|index| checker.parents[index]),
+                &deleted,
+            ) {
+                Ok(fix) => {
+                    if fix.content.is_empty() || fix.content == "pass" {
+                        checker.deletions.insert(context.defined_by);
+                    }
+                    check.amend(fix)
+                }
+                Err(e) => error!("Failed to fix unused imports: {}", e),
+            }
+        }
+        checker.add_check(check);
+    }
+}
--- a/src/plugins/useless_object_inheritance.rs
+++ b/src/plugins/useless_object_inheritance.rs
@@ -0,0 +1,29 @@
+use rustpython_ast::{Expr, Keyword, Stmt};
+
+use crate::ast::checks;
+use crate::autofix::{fixer, fixes};
+use crate::check_ast::Checker;
+
+pub fn useless_object_inheritance(
+    checker: &mut Checker,
+    stmt: &Stmt,
+    name: &str,
+    bases: &[Expr],
+    keywords: &[Keyword],
+) {
+    let scope = checker.current_scope();
+    if let Some(mut check) = checks::check_useless_object_inheritance(name, bases, scope) {
+        if matches!(checker.autofix, fixer::Mode::Generate | fixer::Mode::Apply) {
+            if let Some(fix) = fixes::remove_class_def_base(
+                &mut checker.locator,
+                &stmt.location,
+                check.location,
+                bases,
+                keywords,
+            ) {
+                check.amend(fix);
+            }
+        }
+        checker.add_check(check);
+    }
+}
--- a/src/pyproject.rs
+++ b/src/pyproject.rs
@@ -9,6 +9,7 @@ use serde::{Deserialize, Deserializer};

 use crate::checks::CheckCode;
 use crate::fs;
+use crate::settings::PythonVersion;

 pub fn load_config(pyproject: &Option<PathBuf>) -> Result<Config> {
    match pyproject {
@@ -29,11 +30,19 @@ pub fn load_config(pyproject: &Option<PathBuf>) -> Result<Config> {
 pub struct Config {
    pub line_length: Option<usize>,
    pub exclude: Option<Vec<String>>,
-    pub extend_exclude: Option<Vec<String>>,
+    #[serde(default)]
+    pub extend_exclude: Vec<String>,
    pub select: Option<Vec<CheckCode>>,
-    pub ignore: Option<Vec<CheckCode>>,
-    pub per_file_ignores: Option<Vec<StrCheckCodePair>>,
+    #[serde(default)]
+    pub extend_select: Vec<CheckCode>,
+    #[serde(default)]
+    pub ignore: Vec<CheckCode>,
+    #[serde(default)]
+    pub extend_ignore: Vec<CheckCode>,
+    #[serde(default)]
+    pub per_file_ignores: Vec<StrCheckCodePair>,
    pub dummy_variable_rgx: Option<String>,
+    pub target_version: Option<PythonVersion>,
 }

 #[derive(Clone, Debug, PartialEq, Eq)]
@@ -175,11 +184,14 @@ mod tests {
                ruff: Some(Config {
                    line_length: None,
                    exclude: None,
-                    extend_exclude: None,
+                    extend_exclude: vec![],
                    select: None,
-                    ignore: None,
-                    per_file_ignores: None,
+                    extend_select: vec![],
+                    ignore: vec![],
+                    extend_ignore: vec![],
+                    per_file_ignores: vec![],
                    dummy_variable_rgx: None,
+                    target_version: None,
                })
            })
        );
@@ -197,11 +209,14 @@ line-length = 79
                ruff: Some(Config {
                    line_length: Some(79),
                    exclude: None,
-                    extend_exclude: None,
+                    extend_exclude: vec![],
                    select: None,
-                    ignore: None,
-                    per_file_ignores: None,
+                    extend_select: vec![],
+                    ignore: vec![],
+                    extend_ignore: vec![],
+                    per_file_ignores: vec![],
                    dummy_variable_rgx: None,
+                    target_version: None,
                })
            })
        );
@@ -219,11 +234,14 @@ exclude = ["foo.py"]
                ruff: Some(Config {
                    line_length: None,
                    exclude: Some(vec!["foo.py".to_string()]),
-                    extend_exclude: None,
+                    extend_exclude: vec![],
                    select: None,
-                    ignore: None,
-                    per_file_ignores: None,
+                    extend_select: vec![],
+                    ignore: vec![],
+                    extend_ignore: vec![],
+                    per_file_ignores: vec![],
                    dummy_variable_rgx: None,
+                    target_version: None,
                })
            })
        );
@@ -241,11 +259,14 @@ select = ["E501"]
                ruff: Some(Config {
                    line_length: None,
                    exclude: None,
-                    extend_exclude: None,
+                    extend_exclude: vec![],
                    select: Some(vec![CheckCode::E501]),
-                    ignore: None,
-                    per_file_ignores: None,
+                    extend_select: vec![],
+                    ignore: vec![],
+                    extend_ignore: vec![],
+                    per_file_ignores: vec![],
                    dummy_variable_rgx: None,
+                    target_version: None,
                })
            })
        );
@@ -254,6 +275,7 @@ select = ["E501"]
            r#"
 [tool.black]
 [tool.ruff]
+extend-select = ["M001"]
 ignore = ["E501"]
 "#,
        )?;
@@ -263,11 +285,14 @@ ignore = ["E501"]
                ruff: Some(Config {
                    line_length: None,
                    exclude: None,
-                    extend_exclude: None,
+                    extend_exclude: vec![],
                    select: None,
-                    ignore: Some(vec![CheckCode::E501]),
-                    per_file_ignores: None,
+                    extend_select: vec![CheckCode::M001],
+                    ignore: vec![CheckCode::E501],
+                    extend_ignore: vec![],
+                    per_file_ignores: vec![],
                    dummy_variable_rgx: None,
+                    target_version: None,
                })
            })
        );
@@ -325,15 +350,18 @@ other-attribute = 1
            Config {
                line_length: Some(88),
                exclude: None,
-                extend_exclude: Some(vec![
+                extend_exclude: vec![
                    "excluded.py".to_string(),
                    "migrations".to_string(),
                    "directory/also_excluded.py".to_string(),
-                ]),
+                ],
                select: None,
-                ignore: None,
-                per_file_ignores: None,
+                extend_select: vec![],
+                ignore: vec![],
+                extend_ignore: vec![],
+                per_file_ignores: vec![],
                dummy_variable_rgx: None,
+                target_version: None,
            }
        );

--- a/src/python/typing.rs
+++ b/src/python/typing.rs
@@ -7,6 +7,7 @@ static ANNOTATED_SUBSCRIPTS: Lazy<BTreeSet<&'static str>> = Lazy::new(|| {
        "AbstractAsyncContextManager",
        "AbstractContextManager",
        "AbstractSet",
+        // "Annotated",
        "AsyncContextManager",
        "AsyncGenerator",
        "AsyncIterable",
@@ -87,3 +88,7 @@ static ANNOTATED_SUBSCRIPTS: Lazy<BTreeSet<&'static str>> = Lazy::new(|| {
 pub fn is_annotated_subscript(name: &str) -> bool {
    ANNOTATED_SUBSCRIPTS.contains(name)
 }
+
+pub fn is_pep593_annotated_subscript(name: &str) -> bool {
+    name == "Annotated"
+}
--- a/src/settings.rs
+++ b/src/settings.rs
@@ -1,16 +1,50 @@
 use std::collections::BTreeSet;
 use std::hash::{Hash, Hasher};
 use std::path::{Path, PathBuf};
+use std::str::FromStr;

 use anyhow::{anyhow, Result};
 use glob::Pattern;
 use once_cell::sync::Lazy;
 use regex::Regex;
+use serde::{Deserialize, Serialize};

 use crate::checks::{CheckCode, DEFAULT_CHECK_CODES};
 use crate::fs;
 use crate::pyproject::{load_config, StrCheckCodePair};

+#[derive(Clone, Debug, PartialOrd, PartialEq, Eq, Serialize, Deserialize)]
+pub enum PythonVersion {
+    Py33,
+    Py34,
+    Py35,
+    Py36,
+    Py37,
+    Py38,
+    Py39,
+    Py310,
+    Py311,
+}
+
+impl FromStr for PythonVersion {
+    type Err = anyhow::Error;
+
+    fn from_str(string: &str) -> Result<Self, Self::Err> {
+        match string {
+            "py33" => Ok(PythonVersion::Py33),
+            "py34" => Ok(PythonVersion::Py34),
+            "py35" => Ok(PythonVersion::Py35),
+            "py36" => Ok(PythonVersion::Py36),
+            "py37" => Ok(PythonVersion::Py37),
+            "py38" => Ok(PythonVersion::Py38),
+            "py39" => Ok(PythonVersion::Py39),
+            "py310" => Ok(PythonVersion::Py310),
+            "py311" => Ok(PythonVersion::Py311),
+            _ => Err(anyhow!("Unknown version: {}", string)),
+        }
+    }
+}
+
 #[derive(Debug, Clone, Hash)]
 pub enum FilePattern {
    Simple(&'static str),
@@ -51,56 +85,17 @@ impl PerFileIgnore {
 }

 #[derive(Debug)]
-pub struct Settings {
-    pub pyproject: Option<PathBuf>,
-    pub project_root: Option<PathBuf>,
-    pub line_length: usize,
+pub struct RawSettings {
+    pub dummy_variable_rgx: Regex,
    pub exclude: Vec<FilePattern>,
    pub extend_exclude: Vec<FilePattern>,
-    pub select: BTreeSet<CheckCode>,
+    pub extend_ignore: Vec<CheckCode>,
+    pub extend_select: Vec<CheckCode>,
+    pub ignore: Vec<CheckCode>,
+    pub line_length: usize,
    pub per_file_ignores: Vec<PerFileIgnore>,
-    pub dummy_variable_rgx: Regex,
-}
-
-impl Settings {
-    pub fn for_rule(check_code: CheckCode) -> Self {
-        Self {
-            pyproject: None,
-            project_root: None,
-            line_length: 88,
-            exclude: vec![],
-            extend_exclude: vec![],
-            select: BTreeSet::from([check_code]),
-            per_file_ignores: vec![],
-            dummy_variable_rgx: DEFAULT_DUMMY_VARIABLE_RGX.clone(),
-        }
-    }
-
-    pub fn for_rules(check_codes: Vec<CheckCode>) -> Self {
-        Self {
-            pyproject: None,
-            project_root: None,
-            line_length: 88,
-            exclude: vec![],
-            extend_exclude: vec![],
-            select: BTreeSet::from_iter(check_codes),
-            per_file_ignores: vec![],
-            dummy_variable_rgx: DEFAULT_DUMMY_VARIABLE_RGX.clone(),
-        }
-    }
-}
-
-impl Hash for Settings {
-    fn hash<H: Hasher>(&self, state: &mut H) {
-        self.line_length.hash(state);
-        self.dummy_variable_rgx.as_str().hash(state);
-        for value in self.select.iter() {
-            value.hash(state);
-        }
-        for value in self.per_file_ignores.iter() {
-            value.hash(state);
-        }
-    }
+    pub select: Vec<CheckCode>,
+    pub target_version: PythonVersion,
 }

 static DEFAULT_EXCLUDE: Lazy<Vec<FilePattern>> = Lazy::new(|| {
@@ -130,73 +125,117 @@ static DEFAULT_EXCLUDE: Lazy<Vec<FilePattern>> = Lazy::new(|| {
 static DEFAULT_DUMMY_VARIABLE_RGX: Lazy<Regex> =
    Lazy::new(|| Regex::new("^(_+|(_+[a-zA-Z0-9_]*[a-zA-Z0-9]+?))$").unwrap());

-impl Settings {
+impl RawSettings {
    pub fn from_pyproject(
-        pyproject: Option<PathBuf>,
-        project_root: Option<PathBuf>,
+        pyproject: &Option<PathBuf>,
+        project_root: &Option<PathBuf>,
    ) -> Result<Self> {
-        let config = load_config(&pyproject)?;
-        let mut settings = Settings {
-            line_length: config.line_length.unwrap_or(88),
-            exclude: config
-                .exclude
-                .map(|paths| {
-                    paths
-                        .iter()
-                        .map(|path| FilePattern::from_user(path, &project_root))
-                        .collect()
-                })
-                .unwrap_or_else(|| DEFAULT_EXCLUDE.clone()),
-            extend_exclude: config
-                .extend_exclude
-                .map(|paths| {
-                    paths
-                        .iter()
-                        .map(|path| FilePattern::from_user(path, &project_root))
-                        .collect()
-                })
-                .unwrap_or_default(),
-            select: if let Some(select) = config.select {
-                BTreeSet::from_iter(select)
-            } else {
-                BTreeSet::from_iter(DEFAULT_CHECK_CODES)
-            },
-            per_file_ignores: config
-                .per_file_ignores
-                .map(|ignore_strings| {
-                    ignore_strings
-                        .into_iter()
-                        .map(|pair| PerFileIgnore::new(pair, &project_root))
-                        .collect()
-                })
-                .unwrap_or_default(),
+        let config = load_config(pyproject)?;
+        Ok(RawSettings {
            dummy_variable_rgx: match config.dummy_variable_rgx {
                Some(pattern) => Regex::new(&pattern)
                    .map_err(|e| anyhow!("Invalid dummy-variable-rgx value: {e}"))?,
                None => DEFAULT_DUMMY_VARIABLE_RGX.clone(),
            },
-            pyproject,
-            project_root,
-        };
-        if let Some(ignore) = &config.ignore {
-            settings.ignore(ignore);
+            target_version: config.target_version.unwrap_or(PythonVersion::Py310),
+            exclude: config
+                .exclude
+                .map(|paths| {
+                    paths
+                        .iter()
+                        .map(|path| FilePattern::from_user(path, project_root))
+                        .collect()
+                })
+                .unwrap_or_else(|| DEFAULT_EXCLUDE.clone()),
+            extend_exclude: config
+                .extend_exclude
+                .iter()
+                .map(|path| FilePattern::from_user(path, project_root))
+                .collect(),
+            extend_ignore: config.extend_ignore,
+            select: config
+                .select
+                .unwrap_or_else(|| DEFAULT_CHECK_CODES.to_vec()),
+            extend_select: config.extend_select,
+            ignore: config.ignore,
+            line_length: config.line_length.unwrap_or(88),
+            per_file_ignores: config
+                .per_file_ignores
+                .into_iter()
+                .map(|pair| PerFileIgnore::new(pair, project_root))
+                .collect(),
+        })
+    }
+}
+
+#[derive(Debug)]
+pub struct Settings {
+    pub dummy_variable_rgx: Regex,
+    pub enabled: BTreeSet<CheckCode>,
+    pub exclude: Vec<FilePattern>,
+    pub extend_exclude: Vec<FilePattern>,
+    pub line_length: usize,
+    pub per_file_ignores: Vec<PerFileIgnore>,
+    pub target_version: PythonVersion,
+}
+
+impl Settings {
+    pub fn from_raw(settings: RawSettings) -> Self {
+        // Materialize the set of enabled CheckCodes.
+        let mut enabled: BTreeSet<CheckCode> = BTreeSet::new();
+        enabled.extend(settings.select);
+        enabled.extend(settings.extend_select);
+        for code in &settings.ignore {
+            enabled.remove(code);
        }
-        Ok(settings)
-    }
-
-    pub fn clear(&mut self) {
-        self.select.clear();
-    }
-
-    pub fn select(&mut self, codes: Vec<CheckCode>) {
-        for code in codes {
-            self.select.insert(code);
+        for code in &settings.extend_ignore {
+            enabled.remove(code);
+        }
+        Self {
+            dummy_variable_rgx: settings.dummy_variable_rgx,
+            enabled,
+            exclude: settings.exclude,
+            extend_exclude: settings.extend_exclude,
+            line_length: settings.line_length,
+            per_file_ignores: settings.per_file_ignores,
+            target_version: PythonVersion::Py310,
        }
    }

-    pub fn ignore(&mut self, codes: &[CheckCode]) {
-        for code in codes {
-            self.select.remove(code);
+    pub fn for_rule(check_code: CheckCode) -> Self {
+        Self {
+            dummy_variable_rgx: DEFAULT_DUMMY_VARIABLE_RGX.clone(),
+            enabled: BTreeSet::from([check_code]),
+            exclude: vec![],
+            extend_exclude: vec![],
+            line_length: 88,
+            per_file_ignores: vec![],
+            target_version: PythonVersion::Py310,
+        }
+    }
+
+    pub fn for_rules(check_codes: Vec<CheckCode>) -> Self {
+        Self {
+            dummy_variable_rgx: DEFAULT_DUMMY_VARIABLE_RGX.clone(),
+            enabled: BTreeSet::from_iter(check_codes),
+            exclude: vec![],
+            extend_exclude: vec![],
+            line_length: 88,
+            per_file_ignores: vec![],
+            target_version: PythonVersion::Py310,
+        }
+    }
+}
+
+impl Hash for Settings {
+    fn hash<H: Hasher>(&self, state: &mut H) {
+        self.line_length.hash(state);
+        self.dummy_variable_rgx.as_str().hash(state);
+        for value in self.enabled.iter() {
+            value.hash(state);
+        }
+        for value in self.per_file_ignores.iter() {
+            value.hash(state);
        }
    }
 }
@@ -227,22 +266,28 @@ impl Exclusion {
 /// Struct to render user-facing Settings.
 #[derive(Debug)]
 pub struct CurrentSettings {
-    pub pyproject: Option<PathBuf>,
-    pub project_root: Option<PathBuf>,
-    pub line_length: usize,
+    pub dummy_variable_rgx: Regex,
    pub exclude: Vec<Exclusion>,
    pub extend_exclude: Vec<Exclusion>,
-    pub select: BTreeSet<CheckCode>,
+    pub extend_ignore: Vec<CheckCode>,
+    pub extend_select: Vec<CheckCode>,
+    pub ignore: Vec<CheckCode>,
+    pub line_length: usize,
    pub per_file_ignores: Vec<PerFileIgnore>,
-    pub dummy_variable_rgx: Regex,
+    pub select: Vec<CheckCode>,
+    pub target_version: PythonVersion,
+    pub project_root: Option<PathBuf>,
+    pub pyproject: Option<PathBuf>,
 }

 impl CurrentSettings {
-    pub fn from_settings(settings: Settings) -> Self {
+    pub fn from_settings(
+        settings: RawSettings,
+        project_root: Option<PathBuf>,
+        pyproject: Option<PathBuf>,
+    ) -> Self {
        Self {
-            pyproject: settings.pyproject,
-            project_root: settings.project_root,
-            line_length: settings.line_length,
+            dummy_variable_rgx: settings.dummy_variable_rgx,
            exclude: settings
                .exclude
                .into_iter()
@@ -253,9 +298,15 @@ impl CurrentSettings {
                .into_iter()
                .map(Exclusion::from_file_pattern)
                .collect(),
-            select: settings.select,
+            extend_ignore: settings.extend_ignore,
+            extend_select: settings.extend_select,
+            ignore: settings.ignore,
+            line_length: settings.line_length,
            per_file_ignores: settings.per_file_ignores,
-            dummy_variable_rgx: settings.dummy_variable_rgx,
+            select: settings.select,
+            target_version: settings.target_version,
+            project_root,
+            pyproject,
        }
    }
 }
--- a/src/snapshots/rufflintertests__c400.snap
+++ b/src/snapshots/rufflintertests__c400.snap
@@ -0,0 +1,13 @@
+---
+source: src/linter.rs
+expression: checks
+---
+- kind: UnnecessaryGeneratorList
+  location:
+    row: 1
+    column: 5
+  end_location:
+    row: 1
+    column: 30
+  fix: ~
+
--- a/src/snapshots/rufflintertests__c401.snap
+++ b/src/snapshots/rufflintertests__c401.snap
@@ -0,0 +1,13 @@
+---
+source: src/linter.rs
+expression: checks
+---
+- kind: UnnecessaryGeneratorList
+  location:
+    row: 1
+    column: 5
+  end_location:
+    row: 1
+    column: 29
+  fix: ~
+
--- a/src/snapshots/rufflintertests__c402.snap
+++ b/src/snapshots/rufflintertests__c402.snap
@@ -0,0 +1,13 @@
+---
+source: src/linter.rs
+expression: checks
+---
+- kind: UnnecessaryListComprehensionDict
+  location:
+    row: 1
+    column: 5
+  end_location:
+    row: 1
+    column: 35
+  fix: ~
+
--- a/src/snapshots/rufflintertests__c403.snap
+++ b/src/snapshots/rufflintertests__c403.snap
@@ -0,0 +1,13 @@
+---
+source: src/linter.rs
+expression: checks
+---
+- kind: UnnecessaryListComprehensionSet
+  location:
+    row: 1
+    column: 5
+  end_location:
+    row: 1
+    column: 31
+  fix: ~
+
--- a/src/snapshots/rufflintertests__c404.snap
+++ b/src/snapshots/rufflintertests__c404.snap
@@ -0,0 +1,13 @@
+---
+source: src/linter.rs
+expression: checks
+---
+- kind: UnnecessaryListComprehensionDict
+  location:
+    row: 1
+    column: 5
+  end_location:
+    row: 1
+    column: 37
+  fix: ~
+
--- a/src/snapshots/rufflintertests__c405.snap
+++ b/src/snapshots/rufflintertests__c405.snap
@@ -0,0 +1,41 @@
+---
+source: src/linter.rs
+expression: checks
+---
+- kind:
+    UnnecessaryLiteralSet: list
+  location:
+    row: 1
+    column: 6
+  end_location:
+    row: 1
+    column: 17
+  fix: ~
+- kind:
+    UnnecessaryLiteralSet: tuple
+  location:
+    row: 2
+    column: 6
+  end_location:
+    row: 2
+    column: 17
+  fix: ~
+- kind:
+    UnnecessaryLiteralSet: list
+  location:
+    row: 3
+    column: 6
+  end_location:
+    row: 3
+    column: 13
+  fix: ~
+- kind:
+    UnnecessaryLiteralSet: tuple
+  location:
+    row: 4
+    column: 6
+  end_location:
+    row: 4
+    column: 13
+  fix: ~
+
--- a/src/snapshots/rufflintertests__c406.snap
+++ b/src/snapshots/rufflintertests__c406.snap
@@ -0,0 +1,41 @@
+---
+source: src/linter.rs
+expression: checks
+---
+- kind:
+    UnnecessaryLiteralDict: list
+  location:
+    row: 1
+    column: 6
+  end_location:
+    row: 1
+    column: 20
+  fix: ~
+- kind:
+    UnnecessaryLiteralDict: tuple
+  location:
+    row: 2
+    column: 6
+  end_location:
+    row: 2
+    column: 21
+  fix: ~
+- kind:
+    UnnecessaryLiteralDict: list
+  location:
+    row: 3
+    column: 6
+  end_location:
+    row: 3
+    column: 14
+  fix: ~
+- kind:
+    UnnecessaryLiteralDict: tuple
+  location:
+    row: 4
+    column: 6
+  end_location:
+    row: 4
+    column: 14
+  fix: ~
+
--- a/src/snapshots/rufflintertests__c408.snap
+++ b/src/snapshots/rufflintertests__c408.snap
@@ -0,0 +1,41 @@
+---
+source: src/linter.rs
+expression: checks
+---
+- kind:
+    UnnecessaryCollectionCall: tuple
+  location:
+    row: 1
+    column: 5
+  end_location:
+    row: 1
+    column: 12
+  fix: ~
+- kind:
+    UnnecessaryCollectionCall: list
+  location:
+    row: 2
+    column: 5
+  end_location:
+    row: 2
+    column: 11
+  fix: ~
+- kind:
+    UnnecessaryCollectionCall: dict
+  location:
+    row: 3
+    column: 6
+  end_location:
+    row: 3
+    column: 12
+  fix: ~
+- kind:
+    UnnecessaryCollectionCall: dict
+  location:
+    row: 4
+    column: 6
+  end_location:
+    row: 4
+    column: 15
+  fix: ~
+
--- a/src/snapshots/rufflintertests__f401.snap
+++ b/src/snapshots/rufflintertests__f401.snap
@@ -3,7 +3,8 @@ source: src/linter.rs
 expression: checks
 ---
 - kind:
-    UnusedImport: functools
+    UnusedImport:
+      - functools
  location:
    row: 2
    column: 1
@@ -20,7 +21,8 @@ expression: checks
      column: 21
    applied: false
 - kind:
-    UnusedImport: collections.OrderedDict
+    UnusedImport:
+      - collections.OrderedDict
  location:
    row: 4
    column: 1
@@ -37,7 +39,8 @@ expression: checks
      column: 2
    applied: false
 - kind:
-    UnusedImport: logging.handlers
+    UnusedImport:
+      - logging.handlers
  location:
    row: 12
    column: 1
@@ -54,7 +57,8 @@ expression: checks
      column: 24
    applied: false
 - kind:
-    UnusedImport: shelve
+    UnusedImport:
+      - shelve
  location:
    row: 33
    column: 5
@@ -71,7 +75,8 @@ expression: checks
      column: 1
    applied: false
 - kind:
-    UnusedImport: importlib
+    UnusedImport:
+      - importlib
  location:
    row: 34
    column: 5
@@ -79,16 +84,17 @@ expression: checks
    row: 34
    column: 21
  fix:
-    content: pass
+    content: ""
    location:
      row: 34
-      column: 5
+      column: 1
    end_location:
-      row: 34
-      column: 21
+      row: 35
+      column: 1
    applied: false
 - kind:
-    UnusedImport: pathlib
+    UnusedImport:
+      - pathlib
  location:
    row: 38
    column: 5
@@ -105,7 +111,8 @@ expression: checks
      column: 1
    applied: false
 - kind:
-    UnusedImport: pickle
+    UnusedImport:
+      - pickle
  location:
    row: 53
    column: 9
--- a/src/snapshots/rufflintertests__f821.snap
+++ b/src/snapshots/rufflintertests__f821.snap
@@ -74,4 +74,31 @@ expression: checks
    row: 89
    column: 9
  fix: ~
+- kind:
+    UndefinedName: PEP593Test123
+  location:
+    row: 114
+    column: 10
+  end_location:
+    row: 114
+    column: 24
+  fix: ~
+- kind:
+    UndefinedName: foo
+  location:
+    row: 122
+    column: 15
+  end_location:
+    row: 122
+    column: 19
+  fix: ~
+- kind:
+    UndefinedName: bar
+  location:
+    row: 122
+    column: 22
+  end_location:
+    row: 122
+    column: 26
+  fix: ~

--- a/src/snapshots/rufflintertests__future_annotations.snap
+++ b/src/snapshots/rufflintertests__future_annotations.snap
@@ -3,7 +3,8 @@ source: src/linter.rs
 expression: checks
 ---
 - kind:
-    UnusedImport: models.Nut
+    UnusedImport:
+      - models.Nut
  location:
    row: 5
    column: 1
--- a/src/snapshots/rufflintertests__u002.snap
+++ b/src/snapshots/rufflintertests__u002.snap
@@ -0,0 +1,53 @@
+---
+source: src/linter.rs
+expression: checks
+---
+- kind: UnnecessaryAbspath
+  location:
+    row: 3
+    column: 5
+  end_location:
+    row: 3
+    column: 22
+  fix:
+    content: __file__
+    location:
+      row: 3
+      column: 5
+    end_location:
+      row: 3
+      column: 22
+    applied: false
+- kind: UnnecessaryAbspath
+  location:
+    row: 9
+    column: 5
+  end_location:
+    row: 9
+    column: 30
+  fix:
+    content: __file__
+    location:
+      row: 9
+      column: 5
+    end_location:
+      row: 9
+      column: 30
+    applied: false
+- kind: UnnecessaryAbspath
+  location:
+    row: 15
+    column: 5
+  end_location:
+    row: 15
+    column: 27
+  fix:
+    content: __file__
+    location:
+      row: 15
+      column: 5
+    end_location:
+      row: 15
+      column: 27
+    applied: false
+
--- a/src/snapshots/rufflintertests__u003.snap
+++ b/src/snapshots/rufflintertests__u003.snap
@@ -0,0 +1,90 @@
+---
+source: src/linter.rs
+expression: checks
+---
+- kind:
+    TypeOfPrimitive: Str
+  location:
+    row: 1
+    column: 1
+  end_location:
+    row: 1
+    column: 9
+  fix:
+    content: str
+    location:
+      row: 1
+      column: 1
+    end_location:
+      row: 1
+      column: 9
+    applied: false
+- kind:
+    TypeOfPrimitive: Bytes
+  location:
+    row: 2
+    column: 1
+  end_location:
+    row: 2
+    column: 10
+  fix:
+    content: bytes
+    location:
+      row: 2
+      column: 1
+    end_location:
+      row: 2
+      column: 10
+    applied: false
+- kind:
+    TypeOfPrimitive: Int
+  location:
+    row: 3
+    column: 1
+  end_location:
+    row: 3
+    column: 8
+  fix:
+    content: int
+    location:
+      row: 3
+      column: 1
+    end_location:
+      row: 3
+      column: 8
+    applied: false
+- kind:
+    TypeOfPrimitive: Float
+  location:
+    row: 4
+    column: 1
+  end_location:
+    row: 4
+    column: 9
+  fix:
+    content: float
+    location:
+      row: 4
+      column: 1
+    end_location:
+      row: 4
+      column: 9
+    applied: false
+- kind:
+    TypeOfPrimitive: Complex
+  location:
+    row: 5
+    column: 1
+  end_location:
+    row: 5
+    column: 9
+  fix:
+    content: complex
+    location:
+      row: 5
+      column: 1
+    end_location:
+      row: 5
+      column: 9
+    applied: false
+
--- a/src/snapshots/rufflintertestsu004.snap
+++ b/src/snapshots/rufflintertestsu004.snap
--- a/src/snapshots/rufflintertestsu005.snap
+++ b/src/snapshots/rufflintertestsu005.snap
--- a/src/snapshots/rufflintertests__w292.snap
+++ b/src/snapshots/rufflintertests__w292.snap
@@ -0,0 +1,13 @@
+---
+source: src/linter.rs
+expression: checks
+---
+- kind: NoNewLineAtEndOfFile
+  location:
+    row: 2
+    column: 9
+  end_location:
+    row: 2
+    column: 9
+  fix: ~
+
--- a/src/snapshots/rufflintertests__w292_0.snap
+++ b/src/snapshots/rufflintertests__w292_0.snap
@@ -0,0 +1,13 @@
+---
+source: src/linter.rs
+expression: checks
+---
+- kind: NoNewLineAtEndOfFile
+  location:
+    row: 2
+    column: 9
+  end_location:
+    row: 2
+    column: 9
+  fix: ~
+
--- a/src/snapshots/rufflintertests__w292_1.snap
+++ b/src/snapshots/rufflintertests__w292_1.snap
@@ -0,0 +1,6 @@
+---
+source: src/linter.rs
+expression: checks
+---
+[]
+
--- a/src/snapshots/rufflintertests__w292_2.snap
+++ b/src/snapshots/rufflintertests__w292_2.snap
@@ -0,0 +1,6 @@
+---
+source: src/linter.rs
+expression: checks
+---
+[]
+
Author	SHA1	Message	Date
Charlie Marsh	c62727db42	Bump version to 0.0.61	2022-10-08 17:25:36 -04:00
Charlie Marsh	d0e1612507	Check newline ending on contents directly (#365 )	2022-10-08 17:25:22 -04:00
Harutaka Kawamura	5ccd907398	Implement C408 (#364 )	2022-10-08 17:17:34 -04:00
Harutaka Kawamura	346610c2e3	Implement C406 (#363 )	2022-10-08 11:15:41 -04:00
Harutaka Kawamura	307fa26515	Implement C405 (#362 )	2022-10-08 09:03:21 -04:00
Harutaka Kawamura	136d412edd	Add missing C400,C401, and C402 to `CheckCode.from_str` (#361 )	2022-10-08 09:02:03 -04:00
Harutaka Kawamura	d9edec0ac9	Implement C402 (#359 )	2022-10-07 22:57:04 -04:00
Chris Pryer	473675fffb	Add check for W292 (#339 )	2022-10-07 21:10:16 -04:00
Steven Maude	95dfc61315	Update GitHub Actions versions in README (#358 )	2022-10-07 20:24:00 -04:00
Charlie Marsh	dd496c7b52	Bump version to 0.0.60	2022-10-07 17:36:33 -04:00
Charlie Marsh	78aafb4b34	Warn the user if an explicitly selected check code is ignored (#356 )	2022-10-07 17:36:17 -04:00
Charlie Marsh	99c66d513a	Rename refactor checks to upgrade checks (#354 )	2022-10-07 16:54:55 -04:00
Charlie Marsh	04ade6a2f3	Update README.md	2022-10-07 16:50:17 -04:00
Charlie Marsh	4cf2682cda	Implement type(primitive) (#353 )	2022-10-07 16:47:06 -04:00
Charlie Marsh	e3a7357187	Wrap each import in its own backticks (#346 )	2022-10-07 15:58:30 -04:00
Charlie Marsh	b60768debb	Remove erroneous output.py file	2022-10-07 15:04:23 -04:00
Charlie Marsh	25e476639f	Use or_default in lieu of or_insert	2022-10-07 14:56:56 -04:00
Charlie Marsh	4645788205	Bump version to 0.0.59	2022-10-07 14:55:23 -04:00
Charlie Marsh	0b9eda8836	Add target Python version as a configurable setting (#344 )	2022-10-07 14:54:50 -04:00
Charlie Marsh	ad23d6acee	Remove :: prefix for ruff imports	2022-10-07 14:24:51 -04:00
Harutaka Kawamura	e3d1d01a1f	Implement C401 (#343 )	2022-10-07 13:00:22 -04:00
Harutaka Kawamura	6dfdd21a7c	Implement C400 (#340 )	2022-10-07 12:16:23 -04:00
Charlie Marsh	f17d3b3c44	Bump version to 0.0.58	2022-10-07 12:14:03 -04:00
Charlie Marsh	da6b913317	Exit 0 if all errors are fixed (#342 )	2022-10-07 12:13:15 -04:00
Harutaka Kawamura	bd34850f98	Implement C404 (#338 )	2022-10-07 08:53:18 -04:00
Charlie Marsh	d5b33cdb40	Add missing snapshot for U002	2022-10-07 08:48:59 -04:00
Charlie Marsh	3fb4cf7009	Hide autoformat argument	2022-10-06 22:56:01 -04:00
Charlie Marsh	6e19539e28	Enable abspath(__file__) removal (#336 )	2022-10-06 22:49:06 -04:00
Charlie Marsh	4eac7a07f5	Mention flake8-comprehensions in README	2022-10-06 16:26:21 -04:00
Harutaka Kawamura	5141285c8e	Implement C403 (#335 )	2022-10-06 16:24:23 -04:00
Charlie Marsh	82cc139d2d	Bump version to 0.0.57	2022-10-06 09:16:56 -04:00
Adrian Garcia Badaracco	df438ba051	Support PEP 593 annotations (#333 )	2022-10-06 09:16:07 -04:00
Adrian Garcia Badaracco	a70624cd47	add instructions for setting up cargo insta (#334 )	2022-10-06 08:01:11 -04:00
Charlie Marsh	b307afc00c	Move some accesses behind a shared function	2022-10-05 14:54:31 -04:00
Charlie Marsh	3d5bc1f51f	Migrate Checker logic to independent plugins (#331 )	2022-10-05 14:08:40 -04:00
Charlie Marsh	aba01745f5	Bump version to 0.0.56	2022-10-05 11:58:54 -04:00
Charlie Marsh	1eeeffab66	Add T201 and T203 to string conversion match (#332 )	2022-10-05 11:58:33 -04:00
Charlie Marsh	9b564c9cf4	Bump version to 0.0.55	2022-10-04 20:07:31 -04:00
Charlie Marsh	5bf8b13644	Properly combine CLI and pyproject.toml ignores and selects (#329 )	2022-10-04 20:07:17 -04:00
Anders Kaseorg	f80d5e70dd	Support extend-select in pyproject.toml (#327 )	2022-10-04 17:24:30 -04:00
Charlie Marsh	44897b2a5b	Enable AST-to-source code generation (#292 )	2022-10-04 16:27:57 -04:00
Anders Kaseorg	d1bcc919a2	Remove unnecessary Option wrapper from some pyproject::Config fields (#326 )	2022-10-04 16:27:40 -04:00