Fix invalid reference to ruff_options.rs (#1409 )

Bump version to 0.0.196
Pyupgrade: converts universal_newlines to text in subprocess.run (#1403 )
2022-12-27 12:12:28 -05:00 · 2022-12-27 12:02:02 -05:00 · 2022-12-27 12:01:27 -05:00 · 2022-12-27 11:50:28 -05:00 · 2022-12-27 10:07:18 -05:00 · 2022-12-27 10:07:03 -05:00
112 changed files with 9754 additions and 754 deletions
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -12,7 +12,7 @@ env:
  RUSTUP_MAX_RETRIES: 10

 jobs:
-  cargo_build:
+  cargo-build:
    name: "cargo build"
    runs-on: ubuntu-latest
    steps:
@@ -36,17 +36,14 @@ jobs:
            ${{ runner.os }}-build-
            ${{ runner.os }}-
      - run: cargo build --all --release
-      - run: ./target/release/ruff_dev generate-rules-table
-      - run: ./target/release/ruff_dev generate-options
-      - run: git diff --quiet README.md || echo "::error file=README.md::This file is outdated. You may have to rerun 'cargo dev generate-options' and/or 'cargo dev generate-rules-table'."
-      - run: ./target/release/ruff_dev generate-check-code-prefix
-      - run: git diff --quiet src/checks_gen.rs || echo "::error file=src/checks_gen.rs::This file is outdated. You may have to rerun 'cargo dev generate-check-code-prefix'."
-      - run: git diff --exit-code -- README.md src/checks_gen.rs
-      - run: ./target/release/ruff_dev generate-json-schema
-      - run: git diff --quiet ruff.schema.json || echo "::error file=ruff.schema.json::This file is outdated. You may have to rerun 'cargo dev generate-json-schema'."
-      - run: git diff --exit-code -- ruff.schema.json
+      - run: ./target/release/ruff_dev generate-all
+      - run: git diff --quiet README.md || echo "::error file=README.md::This file is outdated. Run 'cargo +nightly dev generate-all'."
+      - run: git diff --quiet src/checks_gen.rs || echo "::error file=src/checks_gen.rs::This file is outdated. Run 'cargo +nightly dev generate-all'."
+      - run: git diff --quiet ruff.schema.json || echo "::error file=ruff.schema.json::This file is outdated. Run 'cargo +nightly dev generate-all'."
+      - run: git diff --quiet playground/src/ruff_options.ts || echo "::error file=playground/src/ruff_options.ts::This file is outdated. Run 'cargo +nightly dev generate-all'."
+      - run: git diff --exit-code -- README.md src/checks_gen.rs ruff.schema.json playground/src/ruff_options.ts

-  cargo_fmt:
+  cargo-fmt:
    name: "cargo fmt"
    runs-on: ubuntu-latest
    steps:
@@ -82,6 +79,7 @@ jobs:
          toolchain: nightly-2022-11-01
          override: true
          components: clippy
+          target: wasm32-unknown-unknown
      - uses: actions/cache@v3
        env:
          cache-name: cache-cargo
@@ -95,8 +93,9 @@ jobs:
            ${{ runner.os }}-build-
            ${{ runner.os }}-
      - run: cargo clippy --workspace --all-targets --all-features -- -D warnings -W clippy::pedantic
+      - run: cargo clippy --workspace --target wasm32-unknown-unknown --all-features -- -D warnings -W clippy::pedantic

-  cargo_test:
+  cargo-test:
    name: "cargo test"
    runs-on: ubuntu-latest
    steps:
@@ -122,7 +121,33 @@ jobs:
      - run: cargo test --all
      - run: cargo test --package ruff --test black_compatibility_test -- --ignored

-  maturin_build:
+  wasm-pack-test:
+    name: "wasm-pack test"
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions-rs/toolchain@v1
+        with:
+          profile: minimal
+          toolchain: nightly-2022-11-01
+          override: true
+      - uses: actions/cache@v3
+        env:
+          cache-name: cache-cargo
+        with:
+          path: |
+            ~/.cargo/registry
+            ~/.cargo/git
+          key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/Cargo.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-build-${{ env.cache-name }}-
+            ${{ runner.os }}-build-
+            ${{ runner.os }}-
+      - uses: jetli/wasm-pack-action@v0.4.0
+      - uses: jetli/wasm-bindgen-action@v0.2.0
+      - run: wasm-pack test --node
+
+  maturin-build:
    name: "maturin build"
    runs-on: ubuntu-latest
    steps:
--- a/.github/workflows/playground.yaml
+++ b/.github/workflows/playground.yaml
@@ -0,0 +1,50 @@
+name: "[Playground] Release"
+
+on:
+  workflow_dispatch:
+  push:
+    branches: [main]
+
+env:
+  CARGO_INCREMENTAL: 0
+  CARGO_NET_RETRY: 10
+  RUSTUP_MAX_RETRIES: 10
+
+jobs:
+  publish:
+    runs-on: ubuntu-latest
+    env:
+       CF_API_TOKEN_EXISTS: ${{ secrets.CF_API_TOKEN != '' }}
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions-rs/toolchain@v1
+        with:
+          profile: minimal
+          toolchain: nightly-2022-11-01
+          override: true
+          target: wasm32-unknown-unknown
+      - uses: actions/setup-node@v3
+        with:
+          node-version: 18
+          cache: "npm"
+          cache-dependency-path: playground/package-lock.json
+      - uses: jetli/wasm-pack-action@v0.4.0
+      - uses: jetli/wasm-bindgen-action@v0.2.0
+      - name: "Run wasm-pack"
+        run: wasm-pack build --target web --out-dir playground/src/pkg
+      - name: "Install Node dependencies"
+        run: npm ci
+        working-directory: playground
+      - name: "Run TypeScript checks"
+        run: npm run check
+        working-directory: playground
+      - name: "Build JavaScript bundle"
+        run: npm run build
+        working-directory: playground
+      - name: "Deploy to Cloudflare Pages"
+        if: ${{ env.CF_API_TOKEN_EXISTS == 'true' }}
+        uses: cloudflare/wrangler-action@2.0.0
+        with:
+          apiToken: ${{ secrets.CF_API_TOKEN }}
+          accountId: ${{ secrets.CF_ACCOUNT_ID }}
+          command: pages publish playground/dist --project-name=ruff --branch ${GITHUB_HEAD_REF} --commit-hash ${GITHUB_SHA}
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -1,6 +1,6 @@
 repos:
  - repo: https://github.com/charliermarsh/ruff-pre-commit
-    rev: v0.0.193
+    rev: v0.0.196
    hooks:
      - id: ruff

--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -59,9 +59,9 @@ pattern implemented therein.

 To trigger the rule, you'll likely want to augment the logic in `src/check_ast.rs`, which defines
 the Python AST visitor, responsible for iterating over the abstract syntax tree and collecting
-lint-rule violations as it goes. If you need to inspect the AST, you can run `cargo dev print-ast`
-with a Python file. Grep for the `Check::new` invocations to understand how other, similar rules
-are implemented.
+lint-rule violations as it goes. If you need to inspect the AST, you can run
+`cargo +nightly dev print-ast` with a Python file. Grep for the `Check::new` invocations to
+understand how other, 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
@@ -79,9 +79,7 @@ Then, run `cargo test`. Your test will fail, but you'll be prompted to follow-up
 `cargo insta review`. Accept the generated snapshot, then commit the snapshot file alongside the
 rest of your changes.

-Finally, to update the documentation, run `cargo dev generate-rules-table` from the repo root. To
-update the generated prefix map, run `cargo dev generate-check-code-prefix`. Both of these commands
-should be run whenever a new check is added to the codebase.
+Finally, regenerate the documentation and generated code with `cargo +nightly dev generate-all`.

 ### Example: Adding a new configuration option

@@ -105,8 +103,7 @@ You may also want to add the new configuration option to the `flake8-to-ruff` to
 responsible for converting `flake8` configuration files to Ruff's TOML format. This logic
 lives in `flake8_to_ruff/src/converter.rs`.

-Run `cargo dev generate-options` to update the documentation for supported configuration options,
-and `cargo dev generate-json-schema` to update the JSON schema for `tool.ruff` in `pyproject.toml`.
+Finally, regenerate the documentation and generated code with `cargo +nightly dev generate-all`.

 ## Release process

--- a/Cargo.lock
+++ b/Cargo.lock
@@ -61,9 +61,9 @@ dependencies = [

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

 [[package]]
 name = "ascii"
@@ -86,7 +86,7 @@ version = "2.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fa3d466004a8b4cb1bc34044240a2fd29d17607e2e3bd613eb44fd48e8100da3"
 dependencies = [
- "bstr 1.0.1",
+ "bstr 1.1.0",
 "doc-comment",
 "predicates",
 "predicates-core",
@@ -160,9 +160,9 @@ dependencies = [

 [[package]]
 name = "bstr"
-version = "1.0.1"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fca0852af221f458706eb0725c03e4ed6c46af9ac98e6a689d5e634215d594dd"
+checksum = "b45ea9b00a7b3f2988e9a65ad3917e62123c38dba709b666506207be96d1790b"
 dependencies = [
 "memchr",
 "once_cell",
@@ -193,9 +193,9 @@ checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5"

 [[package]]
 name = "cc"
-version = "1.0.77"
+version = "1.0.78"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e9f73505338f7d905b19d18738976aae232eb46b8efc15554ffc56deb5d9ebe4"
+checksum = "a20104e2335ce8a659d6dd92a51a767a0c062599c73b343fd152cb401e828c3d"

 [[package]]
 name = "cfg-if"
@@ -280,9 +280,9 @@ dependencies = [

 [[package]]
 name = "clap"
-version = "4.0.29"
+version = "4.0.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4d63b9e9c07271b9957ad22c173bae2a4d9a81127680962039296abcd2f8251d"
+checksum = "a7db700bc935f9e43e88d00b0850dae18a63773cfbec6d8e070fccf7fef89a39"
 dependencies = [
 "bitflags",
 "clap_derive",
@@ -295,11 +295,11 @@ dependencies = [

 [[package]]
 name = "clap_complete"
-version = "4.0.6"
+version = "4.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b7b3c9eae0de7bf8e3f904a5e40612b21fb2e2e566456d177809a48b892d24da"
+checksum = "10861370d2ba66b0f5989f83ebf35db6421713fd92351790e7fdd6c36774c56b"
 dependencies = [
- "clap 4.0.29",
+ "clap 4.0.32",
 ]

 [[package]]
@@ -308,7 +308,7 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4160b4a4f72ef58bd766bad27c09e6ef1cc9d82a22f6a0f55d152985a4a48e31"
 dependencies = [
- "clap 4.0.29",
+ "clap 4.0.32",
 "clap_complete",
 "clap_complete_fig",
 ]
@@ -319,7 +319,7 @@ version = "4.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "46b30e010e669cd021e5004f3be26cff6b7c08d2a8a0d65b48d43a8cc0efd6c3"
 dependencies = [
- "clap 4.0.29",
+ "clap 4.0.32",
 "clap_complete",
 ]

@@ -422,6 +422,26 @@ dependencies = [
 "winapi",
 ]

+[[package]]
+name = "console_error_panic_hook"
+version = "0.1.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a06aeb73f470f66dcdbf7223caeebb85984942f22f1adb2a088cf9668146bbbc"
+dependencies = [
+ "cfg-if 1.0.0",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "console_log"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "501a375961cef1a0d44767200e66e4a559283097e91d0730b1d75dfb2f8a1494"
+dependencies = [
+ "log",
+ "web-sys",
+]
+
 [[package]]
 name = "core-foundation-sys"
 version = "0.8.3"
@@ -524,9 +544,9 @@ checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7"

 [[package]]
 name = "cxx"
-version = "1.0.83"
+version = "1.0.85"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bdf07d07d6531bfcdbe9b8b739b104610c6508dcc4d63b410585faf338241daf"
+checksum = "5add3fc1717409d029b20c5b6903fc0c0b02fa6741d820054f4a2efa5e5816fd"
 dependencies = [
 "cc",
 "cxxbridge-flags",
@@ -536,9 +556,9 @@ dependencies = [

 [[package]]
 name = "cxx-build"
-version = "1.0.83"
+version = "1.0.85"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2eb5b96ecdc99f72657332953d4d9c50135af1bac34277801cc3937906ebd39"
+checksum = "b4c87959ba14bc6fbc61df77c3fcfe180fc32b93538c4f1031dd802ccb5f2ff0"
 dependencies = [
 "cc",
 "codespan-reporting",
@@ -551,15 +571,15 @@ dependencies = [

 [[package]]
 name = "cxxbridge-flags"
-version = "1.0.83"
+version = "1.0.85"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac040a39517fd1674e0f32177648334b0f4074625b5588a64519804ba0553b12"
+checksum = "69a3e162fde4e594ed2b07d0f83c6c67b745e7f28ce58c6df5e6b6bef99dfb59"

 [[package]]
 name = "cxxbridge-macro"
-version = "1.0.83"
+version = "1.0.85"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1362b0ddcfc4eb0a1f57b68bd77dd99f0e826958a96abd0ae9bd092e114ffed6"
+checksum = "3e7e2adeb6a0d4a282e581096b06e1791532b7d576dcde5ccd9382acf55db8e6"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -712,9 +732,9 @@ dependencies = [

 [[package]]
 name = "filetime"
-version = "0.2.18"
+version = "0.2.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b9663d381d07ae25dc88dbdf27df458faa83a9b25336bcac83d5e452b5fc9d3"
+checksum = "4e884668cd0c7480504233e951174ddc3b382f7c2666e3b7310b5c4e7b0c37f9"
 dependencies = [
 "cfg-if 1.0.0",
 "libc",
@@ -730,10 +750,10 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80"

 [[package]]
 name = "flake8-to-ruff"
-version = "0.0.193-dev.0"
+version = "0.0.196-dev.0"
 dependencies = [
 "anyhow",
- "clap 4.0.29",
+ "clap 4.0.32",
 "configparser",
 "once_cell",
 "regex",
@@ -952,9 +972,9 @@ dependencies = [

 [[package]]
 name = "insta"
-version = "1.22.0"
+version = "1.23.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "197f4e300af8b23664d4077bf5c40e0afa9ba66a567bb5a51d3def3c7b287d1c"
+checksum = "e48b08a091dfe5b09a6a9688c468fdd5b4396e92ce09e2eb932f0884b02788a4"
 dependencies = [
 "console",
 "lazy_static",
@@ -985,9 +1005,9 @@ dependencies = [

 [[package]]
 name = "is-terminal"
-version = "0.4.1"
+version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "927609f78c2913a6f6ac3c27a4fe87f43e2a35367c0c4b0f8265e8f49a104330"
+checksum = "28dfb6c8100ccc63462345b67d1bbc3679177c75ee4bf59bf29c8b1d110b8189"
 dependencies = [
 "hermit-abi 0.2.6",
 "io-lifetimes",
@@ -1006,9 +1026,9 @@ dependencies = [

 [[package]]
 name = "itoa"
-version = "1.0.4"
+version = "1.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4217ad341ebadf8d8e724e264f13e593e0648f5b3e94b3896a5df283be015ecc"
+checksum = "fad582f4b9e86b6caa621cabeb0963332d92eea04729ab12892c2533951e6440"

 [[package]]
 name = "joinery"
@@ -1115,9 +1135,9 @@ dependencies = [

 [[package]]
 name = "libc"
-version = "0.2.138"
+version = "0.2.139"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db6d7e329c562c5dfab7a46a2afabc8b987ab9a4834c9d1ca04dc54c1546cef8"
+checksum = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79"

 [[package]]
 name = "libcst"
@@ -1145,9 +1165,9 @@ dependencies = [

 [[package]]
 name = "link-cplusplus"
-version = "1.0.7"
+version = "1.0.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9272ab7b96c9046fbc5bc56c06c117cb639fe2d509df0c421cad82d2915cf369"
+checksum = "ecd207c9c713c34f95a097a5b029ac2ce6010530c7b49d7fea24d977dede04f5"
 dependencies = [
 "cc",
 ]
@@ -1160,9 +1180,9 @@ checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f"

 [[package]]
 name = "linux-raw-sys"
-version = "0.1.3"
+version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f9f08d8963a6c613f4b1a78f4f4a4dbfadf8e6545b2d72861731e4858b8b47f"
+checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4"

 [[package]]
 name = "lock_api"
@@ -1234,6 +1254,12 @@ dependencies = [
 "windows-sys",
 ]

+[[package]]
+name = "natord"
+version = "1.0.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "308d96db8debc727c3fd9744aac51751243420e46edf401010908da7f8d5e57c"
+
 [[package]]
 name = "new_debug_unreachable"
 version = "1.0.4"
@@ -1334,11 +1360,11 @@ dependencies = [

 [[package]]
 name = "num_cpus"
-version = "1.14.0"
+version = "1.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6058e64324c71e02bc2b150e4f3bc8286db6c83092132ffa3f6b1eab0f9def5"
+checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b"
 dependencies = [
- "hermit-abi 0.1.19",
+ "hermit-abi 0.2.6",
 "libc",
 ]

@@ -1385,9 +1411,9 @@ dependencies = [

 [[package]]
 name = "paste"
-version = "1.0.9"
+version = "1.0.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1de2e551fb905ac83f73f7aedf2f0cb4a0da7e35efa24a202a936269f1f18e1"
+checksum = "d01a5bd0424d00070b0098dd17ebca6f961a959dead1dbcbbbc1d1cd8d3deeba"

 [[package]]
 name = "path-absolutize"
@@ -1625,9 +1651,9 @@ dependencies = [

 [[package]]
 name = "proc-macro2"
-version = "1.0.47"
+version = "1.0.49"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ea3d908b0e36316caf9e9e2c4625cdde190a7e6f440d794667ed17a1855e725"
+checksum = "57a8eca9f9c4ffde41714334dee777596264c7825420f521abc92b5b5deb63a5"
 dependencies = [
 "unicode-ident",
 ]
@@ -1657,9 +1683,9 @@ dependencies = [

 [[package]]
 name = "quote"
-version = "1.0.21"
+version = "1.0.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbe448f377a7d6961e30f5955f9b8d106c3f5e449d493ee1b125c1d43c2b5179"
+checksum = "8856d8364d252a14d474036ea1358d63c9e6965c8e5c1885c18f73d70bff9c7b"
 dependencies = [
 "proc-macro2",
 ]
@@ -1753,11 +1779,10 @@ dependencies = [

 [[package]]
 name = "rayon"
-version = "1.6.0"
+version = "1.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e060280438193c554f654141c9ea9417886713b7acd75974c85b18a69a88e0b"
+checksum = "6db3a213adf02b3bcfd2d3846bb41cb22857d131789e01df434fb7e7bc0759b7"
 dependencies = [
- "crossbeam-deque",
 "either",
 "rayon-core",
 ]
@@ -1853,7 +1878,7 @@ dependencies = [

 [[package]]
 name = "ruff"
-version = "0.0.193"
+version = "0.0.196"
 dependencies = [
 "annotate-snippets 0.9.1",
 "anyhow",
@@ -1862,12 +1887,15 @@ dependencies = [
 "bincode",
 "bitflags",
 "cachedir",
+ "cfg-if 1.0.0",
 "chrono",
- "clap 4.0.29",
+ "clap 4.0.32",
 "clap_complete_command",
 "clearscreen",
 "colored",
 "common-path",
+ "console_error_panic_hook",
+ "console_log",
 "criterion",
 "dirs 4.0.0",
 "fern",
@@ -1878,8 +1906,10 @@ dependencies = [
 "ignore",
 "insta",
 "itertools",
+ "js-sys",
 "libcst",
 "log",
+ "natord",
 "nohash-hasher",
 "notify",
 "num-bigint",
@@ -1895,7 +1925,9 @@ dependencies = [
 "rustpython-common",
 "rustpython-parser",
 "schemars",
+ "semver",
 "serde",
+ "serde-wasm-bindgen",
 "serde_json",
 "shellexpand",
 "strum",
@@ -1907,14 +1939,16 @@ dependencies = [
 "update-informer",
 "ureq",
 "walkdir",
+ "wasm-bindgen",
+ "wasm-bindgen-test",
 ]

 [[package]]
 name = "ruff_dev"
-version = "0.0.193"
+version = "0.0.196"
 dependencies = [
 "anyhow",
- "clap 4.0.29",
+ "clap 4.0.32",
 "codegen",
 "itertools",
 "libcst",
@@ -1927,11 +1961,12 @@ dependencies = [
 "serde_json",
 "strum",
 "strum_macros",
+ "textwrap",
 ]

 [[package]]
 name = "ruff_macros"
-version = "0.0.193"
+version = "0.0.196"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -1947,9 +1982,9 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"

 [[package]]
 name = "rustix"
-version = "0.36.4"
+version = "0.36.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cb93e85278e08bb5788653183213d3a60fc242b10cb9be96586f5a73dcb67c23"
+checksum = "a3807b5d10909833d3e9acd1eb5fb988f79376ff10fce42937de71a449c4c588"
 dependencies = [
 "bitflags",
 "errno",
@@ -1974,7 +2009,7 @@ dependencies = [
 [[package]]
 name = "rustpython-ast"
 version = "0.1.0"
-source = "git+https://github.com/RustPython/RustPython.git?rev=1b6cb170e925a43d605b3fed9f6b878e63e47744#1b6cb170e925a43d605b3fed9f6b878e63e47744"
+source = "git+https://github.com/RustPython/RustPython.git?rev=68d26955b3e24198a150315e7959719b03709dee#68d26955b3e24198a150315e7959719b03709dee"
 dependencies = [
 "num-bigint",
 "rustpython-common",
@@ -1984,7 +2019,7 @@ dependencies = [
 [[package]]
 name = "rustpython-common"
 version = "0.0.0"
-source = "git+https://github.com/RustPython/RustPython.git?rev=1b6cb170e925a43d605b3fed9f6b878e63e47744#1b6cb170e925a43d605b3fed9f6b878e63e47744"
+source = "git+https://github.com/RustPython/RustPython.git?rev=68d26955b3e24198a150315e7959719b03709dee#68d26955b3e24198a150315e7959719b03709dee"
 dependencies = [
 "ascii",
 "cfg-if 1.0.0",
@@ -2007,7 +2042,7 @@ dependencies = [
 [[package]]
 name = "rustpython-compiler-core"
 version = "0.1.2"
-source = "git+https://github.com/RustPython/RustPython.git?rev=1b6cb170e925a43d605b3fed9f6b878e63e47744#1b6cb170e925a43d605b3fed9f6b878e63e47744"
+source = "git+https://github.com/RustPython/RustPython.git?rev=68d26955b3e24198a150315e7959719b03709dee#68d26955b3e24198a150315e7959719b03709dee"
 dependencies = [
 "bincode",
 "bitflags",
@@ -2024,7 +2059,7 @@ dependencies = [
 [[package]]
 name = "rustpython-parser"
 version = "0.1.2"
-source = "git+https://github.com/RustPython/RustPython.git?rev=1b6cb170e925a43d605b3fed9f6b878e63e47744#1b6cb170e925a43d605b3fed9f6b878e63e47744"
+source = "git+https://github.com/RustPython/RustPython.git?rev=68d26955b3e24198a150315e7959719b03709dee#68d26955b3e24198a150315e7959719b03709dee"
 dependencies = [
 "ahash",
 "anyhow",
@@ -2048,15 +2083,15 @@ dependencies = [

 [[package]]
 name = "rustversion"
-version = "1.0.9"
+version = "1.0.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97477e48b4cf8603ad5f7aaf897467cf42ab4218a38ef76fb14c2d6773a6d6a8"
+checksum = "5583e89e108996506031660fe09baa5011b9dd0341b89029313006d1fb508d70"

 [[package]]
 name = "ryu"
-version = "1.0.11"
+version = "1.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4501abdff3ae82a1c1b477a17252eb69cee9e66eb915c1abaa4f44d873df9f09"
+checksum = "7b4b9743ed687d4b4bcedf9ff5eaa7398495ae14e61cba0a295704edbc7decde"

 [[package]]
 name = "same-file"
@@ -2091,6 +2126,12 @@ dependencies = [
 "syn",
 ]

+[[package]]
+name = "scoped-tls"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294"
+
 [[package]]
 name = "scopeguard"
 version = "1.1.0"
@@ -2099,9 +2140,9 @@ checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"

 [[package]]
 name = "scratch"
-version = "1.0.2"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c8132065adcfd6e02db789d9285a0deb2f3fcb04002865ab67d5fb103533898"
+checksum = "ddccb15bcce173023b3fedd9436f882a0739b8dfb45e4f6b6002bee5929f61b2"

 [[package]]
 name = "sct"
@@ -2115,24 +2156,35 @@ dependencies = [

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

 [[package]]
 name = "serde"
-version = "1.0.148"
+version = "1.0.151"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e53f64bb4ba0191d6d0676e1b141ca55047d83b74f5607e6d8eb88126c52c2dc"
+checksum = "97fed41fc1a24994d044e6db6935e69511a1153b52c15eb42493b26fa87feba0"
 dependencies = [
 "serde_derive",
 ]

 [[package]]
-name = "serde_derive"
-version = "1.0.148"
+name = "serde-wasm-bindgen"
+version = "0.4.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a55492425aa53521babf6137309e7d34c20bbfbbfcfe2c7f3a047fd1f6b92c0c"
+checksum = "e3b4c031cd0d9014307d82b8abf653c0290fbdaeb4c02d00c63cf52f728628bf"
+dependencies = [
+ "js-sys",
+ "serde",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "serde_derive"
+version = "1.0.151"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "255abe9a125a985c05190d687b320c12f9b1f0b99445e608c21ba0782c719ad8"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -2208,9 +2260,9 @@ checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"

 [[package]]
 name = "str_indices"
-version = "0.4.0"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d9199fa80c817e074620be84374a520062ebac833f358d74b37060ce4a0f2c0"
+checksum = "5f026164926842ec52deb1938fae44f83dfdb82d0a5b0270c5bd5935ab74d6dd"

 [[package]]
 name = "string_cache"
@@ -2255,9 +2307,9 @@ dependencies = [

 [[package]]
 name = "syn"
-version = "1.0.105"
+version = "1.0.107"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "60b9b43d45702de4c839cb9b51d9f529c5dd26a4aff255b42b1ebc03e88ee908"
+checksum = "1f4064b5b16e03ae50984a5a8ed5d4f8803e6bc1fd170a3cda91a1be4b18e3f5"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -2362,18 +2414,18 @@ dependencies = [

 [[package]]
 name = "thiserror"
-version = "1.0.37"
+version = "1.0.38"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "10deb33631e3c9018b9baf9dcbbc4f737320d2b576bac10f6aefa048fa407e3e"
+checksum = "6a9cd18aa97d5c45c6603caea1da6628790b37f7a34b6ca89522331c5180fed0"
 dependencies = [
 "thiserror-impl",
 ]

 [[package]]
 name = "thiserror-impl"
-version = "1.0.37"
+version = "1.0.38"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "982d17546b47146b28f7c22e3d08465f6b8903d0ea13c1660d9d84a6e7adcdbb"
+checksum = "1fb327af4685e4d03fa8cbcf1716380da910eeb2bb8be417e7f9fd3fb164f36f"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -2447,9 +2499,9 @@ dependencies = [

 [[package]]
 name = "toml"
-version = "0.5.9"
+version = "0.5.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d82e1a7758622a465f8cee077614c73484dac5b836c02ff6a40d5d1010324d7"
+checksum = "1333c76748e868a4d9d1017b5ab53171dfd095f70c712fdb4653a406547f598f"
 dependencies = [
 "serde",
 ]
@@ -2536,9 +2588,9 @@ checksum = "099b7128301d285f79ddd55b9a83d5e6b9e97c92e0ea0daebee7263e932de992"

 [[package]]
 name = "unicode-ident"
-version = "1.0.5"
+version = "1.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ceab39d59e4c9499d4e5a8ee0e2735b891bb7308ac83dfb4e80cad195c9f6f3"
+checksum = "84a22b9f218b40614adcb3f4ff08b703773ad44fa9423e4e0d346d5db86e4ebc"

 [[package]]
 name = "unicode-linebreak"
@@ -2707,6 +2759,18 @@ dependencies = [
 "wasm-bindgen-shared",
 ]

+[[package]]
+name = "wasm-bindgen-futures"
+version = "0.4.33"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "23639446165ca5a5de86ae1d8896b737ae80319560fbaa4c2887b7da6e7ebd7d"
+dependencies = [
+ "cfg-if 1.0.0",
+ "js-sys",
+ "wasm-bindgen",
+ "web-sys",
+]
+
 [[package]]
 name = "wasm-bindgen-macro"
 version = "0.2.83"
@@ -2736,6 +2800,30 @@ version = "0.2.83"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1c38c045535d93ec4f0b4defec448e4291638ee608530863b1e2ba115d4fff7f"

+[[package]]
+name = "wasm-bindgen-test"
+version = "0.3.33"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "09d2fff962180c3fadf677438054b1db62bee4aa32af26a45388af07d1287e1d"
+dependencies = [
+ "console_error_panic_hook",
+ "js-sys",
+ "scoped-tls",
+ "wasm-bindgen",
+ "wasm-bindgen-futures",
+ "wasm-bindgen-test-macro",
+]
+
+[[package]]
+name = "wasm-bindgen-test-macro"
+version = "0.3.33"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4683da3dfc016f704c9f82cf401520c4f1cb3ee440f7f52b3d6ac29506a49ca7"
+dependencies = [
+ "proc-macro2",
+ "quote",
+]
+
 [[package]]
 name = "web-sys"
 version = "0.3.60"
@@ -2758,9 +2846,9 @@ dependencies = [

 [[package]]
 name = "webpki-roots"
-version = "0.22.5"
+version = "0.22.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "368bfe657969fb01238bb756d351dcade285e0f6fcbd36dcb23359a5169975be"
+checksum = "b6c71e40d7d2c34a5106301fb632274ca37242cd0c9d3e64dbece371a40a2d87"
 dependencies = [
 "webpki",
 ]
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -6,12 +6,13 @@ members = [

 [package]
 name = "ruff"
-version = "0.0.193"
+version = "0.0.196"
 edition = "2021"
 rust-version = "1.65.0"

 [lib]
 name = "ruff"
+crate-type = ["cdylib", "rlib"]

 [dependencies]
 annotate-snippets = { version = "0.9.1", features = ["color"] }
@@ -20,9 +21,10 @@ atty = { version = "0.2.14" }
 bincode = { version = "1.3.3" }
 bitflags = { version = "1.3.2" }
 cachedir = { version = "0.3.0" }
+cfg-if = { version = "1.0.0" }
 chrono = { version = "0.4.21", default-features = false, features = ["clock"] }
 clap = { version = "4.0.1", features = ["derive"] }
-clap_complete_command = "0.4.0"
+clap_complete_command = { version = "0.4.0" }
 colored = { version = "2.0.0" }
 common-path = { version = "1.0.0" }
 dirs = { version = "4.0.0" }
@@ -34,21 +36,22 @@ ignore = { version = "0.4.18" }
 itertools = { version = "0.10.5" }
 libcst = { git = "https://github.com/charliermarsh/LibCST", rev = "f2f0b7a487a8725d161fe8b3ed73a6758b21e177" }
 log = { version = "0.4.17" }
+natord = { version = "1.0.9" }
 nohash-hasher = { version = "0.2.0" }
 notify = { version = "5.0.0" }
 num-bigint = { version = "0.4.3" }
 once_cell = { version = "1.16.0" }
 path-absolutize = { version = "3.0.14", features = ["once_cell_cache", "use_unix_paths_on_wasm"] }
 quick-junit = { version = "0.3.2" }
-rayon = { version = "1.5.3" }
 regex = { version = "1.6.0" }
 ropey = { version = "1.5.0", features = ["cr_lines", "simd"], default-features = false }
-ruff_macros = { version = "0.0.193", path = "ruff_macros" }
+ruff_macros = { version = "0.0.196", path = "ruff_macros" }
 rustc-hash = { version = "1.1.0" }
-rustpython-ast = { features = ["unparse"], git = "https://github.com/RustPython/RustPython.git", rev = "1b6cb170e925a43d605b3fed9f6b878e63e47744" }
-rustpython-common = { git = "https://github.com/RustPython/RustPython.git", rev = "1b6cb170e925a43d605b3fed9f6b878e63e47744" }
-rustpython-parser = { features = ["lalrpop"], git = "https://github.com/RustPython/RustPython.git", rev = "1b6cb170e925a43d605b3fed9f6b878e63e47744" }
+rustpython-ast = { features = ["unparse"], git = "https://github.com/RustPython/RustPython.git", rev = "68d26955b3e24198a150315e7959719b03709dee" }
+rustpython-common = { git = "https://github.com/RustPython/RustPython.git", rev = "68d26955b3e24198a150315e7959719b03709dee" }
+rustpython-parser = { features = ["lalrpop"], git = "https://github.com/RustPython/RustPython.git", rev = "68d26955b3e24198a150315e7959719b03709dee" }
 schemars = { version = "0.8.11" }
+semver = { version = "1.0.16" }
 serde = { version = "1.0.147", features = ["derive"] }
 serde_json = { version = "1.0.87" }
 shellexpand = { version = "3.0.0" }
@@ -57,23 +60,32 @@ strum_macros = { version = "0.24.3" }
 textwrap = { version = "0.16.0" }
 titlecase = { version = "2.2.1" }
 toml = { version = "0.5.9" }
-update-informer = { version = "0.5.0", default-features = false, features = ["pypi"], optional = true }
 walkdir = { version = "2.3.2" }

 [target.'cfg(not(target_family = "wasm"))'.dependencies]
-clearscreen = { version = "1.0.10" } # uses which
+clearscreen = { version = "1.0.10" }
+rayon = { version = "1.5.3" }
+update-informer = { version = "0.5.0", default-features = false, features = ["pypi"], optional = true }

 # https://docs.rs/getrandom/0.2.7/getrandom/#webassembly-support
 # For (future) wasm-pack support
 [target.'cfg(all(target_family = "wasm", target_os = "unknown"))'.dependencies]
 getrandom = { version = "0.2.7", features = ["js"] }
+console_error_panic_hook = { version = "0.1.7" }
+console_log = { version = "0.2.0" }
+serde-wasm-bindgen = { version = "0.4" }
+js-sys = { version = "0.3.60" }
+wasm-bindgen = { version = "0.2.83" }

 [dev-dependencies]
-assert_cmd = { version = "2.0.4" }
-criterion = { version = "0.4.0" }
 insta = { version = "1.19.1", features = ["yaml"] }
 test-case = { version = "2.2.2" }
 ureq = { version = "2.5.0", features = [] }
+wasm-bindgen-test = { version = "0.3.33" }
+
+[target.'cfg(not(target_family = "wasm"))'.dev-dependencies]
+assert_cmd = { version = "2.0.4" }
+criterion = { version = "0.4.0" }

 [features]
 default = ["update-informer"]
@@ -91,6 +103,11 @@ opt-level = 3
 [profile.dev.package.similar]
 opt-level = 3

+# Reduce complexity of a parser function that would trigger a locals limit in a wasm tool.
+# https://github.com/bytecodealliance/wasm-tools/blob/b5c3d98e40590512a3b12470ef358d5c7b983b15/crates/wasmparser/src/limits.rs#L29
+[profile.dev.package.rustpython-parser]
+opt-level = 1
+
 [[bench]]
 name = "source_code_locator"
 harness = false
--- a/README.md
+++ b/README.md
@@ -23,15 +23,20 @@ An extremely fast Python linter, written in Rust.
 - 🔧  Autofix support, for automatic error correction (e.g., automatically remove unused imports)
 - ⚖️  [Near-parity](#how-does-ruff-compare-to-flake8) with the built-in Flake8 rule set
 - 🔌  Native re-implementations of popular Flake8 plugins, like [`flake8-bugbear`](https://pypi.org/project/flake8-bugbear/)
+- 🌎  Monorepo-friendly configuration via hierarchical and cascading settings

 Ruff aims to be orders of magnitude faster than alternative tools while integrating more
-functionality behind a single, common interface. Ruff can be used to replace Flake8 (plus a variety
-of plugins), [`isort`](https://pypi.org/project/isort/), [`pydocstyle`](https://pypi.org/project/pydocstyle/),
-[`yesqa`](https://github.com/asottile/yesqa), [`eradicate`](https://pypi.org/project/eradicate/),
-and even a subset of [`pyupgrade`](https://pypi.org/project/pyupgrade/) and [`autoflake`](https://pypi.org/project/autoflake/)
-all while executing tens or hundreds of times faster than any individual tool. Ruff goes beyond the
-responsibilities of a traditional linter, instead functioning as an advanced code transformation
-tool capable of upgrading type annotations, rewriting class definitions, sorting imports, and more.
+functionality behind a single, common interface.
+
+Ruff can be used to replace Flake8 (plus a variety of plugins), [`isort`](https://pypi.org/project/isort/),
+[`pydocstyle`](https://pypi.org/project/pydocstyle/), [`yesqa`](https://github.com/asottile/yesqa),
+[`eradicate`](https://pypi.org/project/eradicate/), [`pyupgrade`](https://pypi.org/project/pyupgrade/),
+and [`autoflake`](https://pypi.org/project/autoflake/), all while executing tens or hundreds of
+times faster than any individual tool.
+
+Ruff goes beyond the responsibilities of a traditional linter, instead functioning as an advanced
+code transformation tool capable of upgrading type annotations, rewriting class definitions, sorting
+imports, and more.

 Ruff is extremely actively developed and used in major open-source projects like:

@@ -162,7 +167,7 @@ Ruff also works with [pre-commit](https://pre-commit.com):
 ```yaml
 - repo: https://github.com/charliermarsh/ruff-pre-commit
  # Ruff version.
-  rev: 'v0.0.193'
+  rev: 'v0.0.196'
  hooks:
    - id: ruff
      # Respect `exclude` and `extend-exclude` settings.
@@ -214,13 +219,6 @@ dummy-variable-rgx = "^(_+|(_+[a-zA-Z0-9_]*[a-zA-Z0-9]+?))$"
 # Assume Python 3.10.
 target-version = "py310"

-[tool.ruff.flake8-import-conventions.aliases]
-altair = "alt"
-"matplotlib.pyplot" = "plt"
-numpy = "np"
-pandas = "pd"
-seaborn = "sns"
-
 [tool.ruff.mccabe]
 # Unlike Flake8, default to a complexity level of 10.
 max-complexity = 10
@@ -259,6 +257,27 @@ select = ["E", "F", "Q"]
 docstring-quotes = "double"
 ```

+As an alternative to `pyproject.toml`, Ruff will also respect a `ruff.toml` file, which implements
+an equivalent schema (though the `[tool.ruff]` hierarchy can be omitted). For example, the above
+`pyproject.toml` described above would be represented via the following `ruff.toml`:
+
+```toml
+# Enable Pyflakes and pycodestyle rules.
+select = ["E", "F"]
+
+# Never enforce `E501` (line length violations).
+ignore = ["E501"]
+
+# Always autofix, but never try to fix `F401` (unused imports).
+fix = true
+unfixable = ["F401"]
+
+# Ignore `E402` (import violations) in all `__init__.py` files, and in `path/to/file.py`.
+[per-file-ignores]
+"__init__.py" = ["E402"]
+"path/to/file.py" = ["E402"]
+```
+
 For a full list of configurable options, see the [API reference](#reference).

 Some common configuration settings can be provided via the command-line:
@@ -279,7 +298,7 @@ Arguments:

 Options:
      --config <CONFIG>
-          Path to the `pyproject.toml` file to use for configuration
+          Path to the `pyproject.toml` or `ruff.toml` file to use for configuration
  -v, --verbose
          Enable verbose logging
  -q, --quiet
@@ -292,6 +311,8 @@ Options:
          Run in watch mode by re-running whenever files change
      --fix
          Attempt to automatically fix lint errors
+      --fix-only
+          Fix any fixable lint errors, but don't report on leftover violations. Implies `--fix`
  -n, --no-cache
          Disable cache reads
      --select <SELECT>
@@ -383,6 +404,9 @@ extend = "../pyproject.toml"
 line-length = 100
 ```

+All of the above rules apply equivalently to `ruff.toml` files. If Ruff detects both a `ruff.toml`
+and `pyproject.toml` file, it will defer to the `ruff.toml`.
+
 ### Python file discovery

 When passed a path on the command-line, Ruff will automatically discover all Python files in that
@@ -620,7 +644,7 @@ For more, see [pyupgrade](https://pypi.org/project/pyupgrade/3.2.0/) on PyPI.
 | UP001 | UselessMetaclassType | `__metaclass__ = type` is implied | 🛠 |
 | UP003 | TypeOfPrimitive | Use `str` instead of `type(...)` | 🛠 |
 | UP004 | UselessObjectInheritance | Class `...` inherits from object | 🛠 |
-| UP005 | DeprecatedUnittestAlias | `assertEquals` is deprecated, use `assertEqual` instead | 🛠 |
+| UP005 | DeprecatedUnittestAlias | `assertEquals` is deprecated, use `assertEqual` | 🛠 |
 | UP006 | UsePEP585Annotation | Use `list` instead of `List` for type annotations | 🛠 |
 | UP007 | UsePEP604Annotation | Use `X \| Y` for type annotations | 🛠 |
 | UP008 | SuperCallWithParameters | Use `super()` instead of `super(__class__, self)` | 🛠 |
@@ -634,6 +658,9 @@ For more, see [pyupgrade](https://pypi.org/project/pyupgrade/3.2.0/) on PyPI.
 | UP016 | RemoveSixCompat | Unnecessary `six` compatibility usage | 🛠 |
 | UP017 | DatetimeTimezoneUTC | Use `datetime.UTC` alias | 🛠 |
 | UP018 | NativeLiterals | Unnecessary call to `str` and `bytes` | 🛠 |
+| UP019 | TypingTextStrAlias | `typing.Text` is deprecated, use `str` | 🛠 |
+| UP020 | OpenAlias | Use builtin `open` | 🛠 |
+| UP021 | ReplaceUniversalNewlines | `universal_newlines` is deprecated, use `text` | 🛠 |

 ### pep8-naming (N)

@@ -1237,7 +1264,7 @@ natively, including:
 - [`pep8-naming`](https://pypi.org/project/pep8-naming/)
 - [`pydocstyle`](https://pypi.org/project/pydocstyle/)
 - [`pygrep-hooks`](https://github.com/pre-commit/pygrep-hooks) (3/10)
- [`pyupgrade`](https://pypi.org/project/pyupgrade/) (18/33)
+- [`pyupgrade`](https://pypi.org/project/pyupgrade/) (20/33)
 - [`yesqa`](https://github.com/asottile/yesqa)

 Note that, in some cases, Ruff uses different error code prefixes than would be found in the
@@ -1294,7 +1321,7 @@ Today, Ruff can be used to replace Flake8 when used with any of the following pl
 Ruff can also replace [`isort`](https://pypi.org/project/isort/),
 [`yesqa`](https://github.com/asottile/yesqa), [`eradicate`](https://pypi.org/project/eradicate/),
 [`pygrep-hooks`](https://github.com/pre-commit/pygrep-hooks) (3/10), and a subset of the rules
-implemented in [`pyupgrade`](https://pypi.org/project/pyupgrade/) (17/33).
+implemented in [`pyupgrade`](https://pypi.org/project/pyupgrade/) (20/33).

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

@@ -1411,6 +1438,18 @@ extend-ignore = [
 ]
 ```

+Note that Ruff _also_ supports a [`convention`](#convention) setting:
+
+```toml
+[tool.ruff.pydocstyle]
+convention = "google"
+```
+
+However, this setting is purely used to implement robust detection of Google and NumPy-style
+sections, and thus avoid the [false negatives](https://github.com/PyCQA/pydocstyle/issues/459) seen
+in `pydocstyle`; it does not affect which errors are enabled, which is driven by the `select` and
+`ignore` settings, as described above.
+
 ## Development

 Ruff is written in Rust (1.65.0). You'll need to install the [Rust toolchain](https://www.rust-lang.org/tools/install)
@@ -1426,8 +1465,8 @@ For development, we use [nightly Rust](https://rust-lang.github.io/rustup/concep

 ```shell
 cargo +nightly fmt
-cargo +nightly clippy
-cargo +nightly test
+cargo +nightly clippy --fix --workspace --all-targets --all-features -- -W clippy::pedantic
+cargo +nightly test --all
 ```

 ## Releases
@@ -1798,6 +1837,23 @@ fix = true

 ---

+#### [`fix-only`](#fix-only)
+
+Like `fix`, but disables reporting on leftover violation. Implies `fix`.
+
+**Default value**: `false`
+
+**Type**: `bool`
+
+**Example usage**:
+
+```toml
+[tool.ruff]
+fix-only = true
+```
+
+---
+
 #### [`fixable`](#fixable)

 A list of check code prefixes to consider autofix-able.
@@ -1948,6 +2004,25 @@ when considering any matching files.

 ---

+#### [`required-version`](#required-version)
+
+Require a specific version of Ruff to be running (useful for unifying
+results across many environments, e.g., with a `pyproject.toml`
+file).
+
+**Default value**: `None`
+
+**Type**: `String`
+
+**Example usage**:
+
+```toml
+[tool.ruff]
+required-version = "0.0.193"
+```
+
+---
+
 #### [`respect-gitignore`](#respect-gitignore)

 Whether to automatically exclude files that are ignored by `.ignore`,
@@ -2406,6 +2481,23 @@ extra-standard-library = ["path"]

 ---

+#### [`force-single-line`](#force-single-line)
+
+Forces all from imports to appear on their own line.
+
+**Default value**: `false`
+
+**Type**: `bool`
+
+**Example usage**:
+
+```toml
+[tool.ruff.isort]
+force-single-line = true
+```
+
+---
+
 #### [`force-wrap-aliases`](#force-wrap-aliases)

 Force `import from` statements with multiple members and at least one
@@ -2475,6 +2567,43 @@ known-third-party = ["src"]

 ---

+#### [`single-line-exclusions`](#single-line-exclusions)
+
+One or more modules to exclude from the single line rule.
+
+**Default value**: `[]`
+
+**Type**: `Vec<String>`
+
+**Example usage**:
+
+```toml
+[tool.ruff.isort]
+single-line-exclusions = ["os", "json"]
+```
+
+---
+
+#### [`split-on-trailing-comma`](#split-on-trailing-comma)
+
+If a comma is placed after the last member in a multi-line import, then
+the imports will never be folded into one line.
+
+See isort's [`split-on-trailing-comma`](https://pycqa.github.io/isort/docs/configuration/options.html#split-on-trailing-comma) option.
+
+**Default value**: `true`
+
+**Type**: `bool`
+
+**Example usage**:
+
+```toml
+[tool.ruff.isort]
+split-on-trailing-comma = false
+```
+
+---
+
 ### `mccabe`

 #### [`max-complexity`](#max-complexity)
@@ -2556,6 +2685,28 @@ staticmethod-decorators = ["staticmethod", "stcmthd"]

 ---

+### `pydocstyle`
+
+#### [`convention`](#convention)
+
+Whether to use Google-style or Numpy-style conventions when detecting
+docstring sections. By default, conventions will be inferred from
+the available sections.
+
+**Default value**: `"convention"`
+
+**Type**: `Convention`
+
+**Example usage**:
+
+```toml
+[tool.ruff.pydocstyle]
+# Use Google-style docstrings.
+convention = "google"
+```
+
+---
+
 ### `pyupgrade`

 #### [`keep-runtime-typing`](#keep-runtime-typing)
--- a/flake8_to_ruff/Cargo.lock
+++ b/flake8_to_ruff/Cargo.lock
@@ -771,7 +771,7 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80"

 [[package]]
 name = "flake8_to_ruff"
-version = "0.0.193"
+version = "0.0.196"
 dependencies = [
 "anyhow",
 "clap",
@@ -1975,7 +1975,7 @@ dependencies = [

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

 [lib]
--- a/flake8_to_ruff/src/converter.rs
+++ b/flake8_to_ruff/src/converter.rs
@@ -295,6 +295,7 @@ mod tests {
            extend_select: None,
            external: None,
            fix: None,
+            fix_only: None,
            fixable: None,
            format: None,
            force_exclude: None,
@@ -302,6 +303,7 @@ mod tests {
            ignore_init_module_imports: None,
            line_length: None,
            per_file_ignores: None,
+            required_version: None,
            respect_gitignore: None,
            select: Some(vec![
                CheckCodePrefix::E,
@@ -323,6 +325,7 @@ mod tests {
            isort: None,
            mccabe: None,
            pep8_naming: None,
+            pydocstyle: None,
            pyupgrade: None,
        });
        assert_eq!(actual, expected);
@@ -350,6 +353,7 @@ mod tests {
            extend_select: None,
            external: None,
            fix: None,
+            fix_only: None,
            fixable: None,
            format: None,
            force_exclude: None,
@@ -357,6 +361,7 @@ mod tests {
            ignore_init_module_imports: None,
            line_length: Some(100),
            per_file_ignores: None,
+            required_version: None,
            respect_gitignore: None,
            select: Some(vec![
                CheckCodePrefix::E,
@@ -378,6 +383,7 @@ mod tests {
            isort: None,
            mccabe: None,
            pep8_naming: None,
+            pydocstyle: None,
            pyupgrade: None,
        });
        assert_eq!(actual, expected);
@@ -405,6 +411,7 @@ mod tests {
            extend_select: None,
            external: None,
            fix: None,
+            fix_only: None,
            fixable: None,
            format: None,
            force_exclude: None,
@@ -412,6 +419,7 @@ mod tests {
            ignore_init_module_imports: None,
            line_length: Some(100),
            per_file_ignores: None,
+            required_version: None,
            respect_gitignore: None,
            select: Some(vec![
                CheckCodePrefix::E,
@@ -433,6 +441,7 @@ mod tests {
            isort: None,
            mccabe: None,
            pep8_naming: None,
+            pydocstyle: None,
            pyupgrade: None,
        });
        assert_eq!(actual, expected);
@@ -460,6 +469,7 @@ mod tests {
            extend_select: None,
            external: None,
            fix: None,
+            fix_only: None,
            fixable: None,
            format: None,
            force_exclude: None,
@@ -467,6 +477,7 @@ mod tests {
            ignore_init_module_imports: None,
            line_length: None,
            per_file_ignores: None,
+            required_version: None,
            respect_gitignore: None,
            select: Some(vec![
                CheckCodePrefix::E,
@@ -488,6 +499,7 @@ mod tests {
            isort: None,
            mccabe: None,
            pep8_naming: None,
+            pydocstyle: None,
            pyupgrade: None,
        });
        assert_eq!(actual, expected);
@@ -515,6 +527,7 @@ mod tests {
            extend_select: None,
            external: None,
            fix: None,
+            fix_only: None,
            fixable: None,
            format: None,
            force_exclude: None,
@@ -522,6 +535,7 @@ mod tests {
            ignore_init_module_imports: None,
            line_length: None,
            per_file_ignores: None,
+            required_version: None,
            respect_gitignore: None,
            select: Some(vec![
                CheckCodePrefix::E,
@@ -548,6 +562,7 @@ mod tests {
            isort: None,
            mccabe: None,
            pep8_naming: None,
+            pydocstyle: None,
            pyupgrade: None,
        });
        assert_eq!(actual, expected);
@@ -578,6 +593,7 @@ mod tests {
            extend_select: None,
            external: None,
            fix: None,
+            fix_only: None,
            fixable: None,
            format: None,
            force_exclude: None,
@@ -585,6 +601,7 @@ mod tests {
            ignore_init_module_imports: None,
            line_length: None,
            per_file_ignores: None,
+            required_version: None,
            respect_gitignore: None,
            select: Some(vec![
                CheckCodePrefix::D100,
@@ -642,6 +659,7 @@ mod tests {
            isort: None,
            mccabe: None,
            pep8_naming: None,
+            pydocstyle: None,
            pyupgrade: None,
        });
        assert_eq!(actual, expected);
@@ -669,6 +687,7 @@ mod tests {
            extend_select: None,
            external: None,
            fix: None,
+            fix_only: None,
            fixable: None,
            format: None,
            force_exclude: None,
@@ -676,6 +695,7 @@ mod tests {
            ignore_init_module_imports: None,
            line_length: None,
            per_file_ignores: None,
+            required_version: None,
            respect_gitignore: None,
            select: Some(vec![
                CheckCodePrefix::E,
@@ -703,6 +723,7 @@ mod tests {
            isort: None,
            mccabe: None,
            pep8_naming: None,
+            pydocstyle: None,
            pyupgrade: None,
        });
        assert_eq!(actual, expected);
--- a/playground/.eslintrc
+++ b/playground/.eslintrc
@@ -0,0 +1,25 @@
+{
+  "parser": "@typescript-eslint/parser",
+  "plugins": ["@typescript-eslint", "prettier"],
+  "extends": [
+    "eslint:recommended",
+    "plugin:@typescript-eslint/eslint-recommended",
+    "plugin:@typescript-eslint/recommended",
+    "plugin:react/recommended",
+    "plugin:react/jsx-runtime",
+    "plugin:react-hooks/recommended",
+    "plugin:import/recommended",
+    "plugin:import/typescript",
+    "plugin:prettier/recommended"
+  ],
+  "rules": {
+    // Disable some recommended rules that we don't want to enforce.
+    "@typescript-eslint/no-explicit-any": "off",
+    "@typescript-eslint/no-empty-function": "off"
+  },
+  "settings": {
+    "react": {
+      "version": "detect"
+    }
+  }
+}
--- a/playground/.gitignore
+++ b/playground/.gitignore
@@ -0,0 +1,130 @@
+# Logs
+logs
+*.log
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+lerna-debug.log*
+.pnpm-debug.log*
+
+# Diagnostic reports (https://nodejs.org/api/report.html)
+report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json
+
+# Runtime data
+pids
+*.pid
+*.seed
+*.pid.lock
+
+# Directory for instrumented libs generated by jscoverage/JSCover
+lib-cov
+
+# Coverage directory used by tools like istanbul
+coverage
+*.lcov
+
+# nyc test coverage
+.nyc_output
+
+# Grunt intermediate storage (https://gruntjs.com/creating-plugins#storing-task-files)
+.grunt
+
+# Bower dependency directory (https://bower.io/)
+bower_components
+
+# node-waf configuration
+.lock-wscript
+
+# Compiled binary addons (https://nodejs.org/api/addons.html)
+build/Release
+
+# Dependency directories
+node_modules/
+jspm_packages/
+
+# Snowpack dependency directory (https://snowpack.dev/)
+web_modules/
+
+# TypeScript cache
+*.tsbuildinfo
+
+# Optional npm cache directory
+.npm
+
+# Optional eslint cache
+.eslintcache
+
+# Optional stylelint cache
+.stylelintcache
+
+# Microbundle cache
+.rpt2_cache/
+.rts2_cache_cjs/
+.rts2_cache_es/
+.rts2_cache_umd/
+
+# Optional REPL history
+.node_repl_history
+
+# Output of 'npm pack'
+*.tgz
+
+# Yarn Integrity file
+.yarn-integrity
+
+# dotenv environment variable files
+.env
+.env.development.local
+.env.test.local
+.env.production.local
+.env.local
+
+# parcel-bundler cache (https://parceljs.org/)
+.cache
+.parcel-cache
+
+# Next.js build output
+.next
+out
+
+# Nuxt.js build / generate output
+.nuxt
+dist
+
+# Gatsby files
+.cache/
+# Comment in the public line in if your project uses Gatsby and not Next.js
+# https://nextjs.org/blog/next-9-1#public-directory-support
+# public
+
+# vuepress build output
+.vuepress/dist
+
+# vuepress v2.x temp and cache directory
+.temp
+.cache
+
+# Docusaurus cache and generated files
+.docusaurus
+
+# Serverless directories
+.serverless/
+
+# FuseBox cache
+.fusebox/
+
+# DynamoDB Local files
+.dynamodb/
+
+# TernJS port file
+.tern-port
+
+# Stores VSCode versions used for testing VSCode extensions
+.vscode-test
+
+# yarn v2
+.yarn/cache
+.yarn/unplugged
+.yarn/build-state.yml
+.yarn/install-state.gz
+.pnp.*
--- a/playground/.prettierignore
+++ b/playground/.prettierignore
@@ -0,0 +1 @@
+src/ruff_options.ts
--- a/playground/README.md
+++ b/playground/README.md
@@ -0,0 +1,10 @@
+# playground
+
+In-browser playground for Ruff. Available [https://ruff.pages.dev/](https://ruff.pages.dev/).
+
+## Getting started
+
+- To build the WASM module, run `wasm-pack build --target web --out-dir playground/src/pkg` from the
+  root directory.
+- Install TypeScript dependencies with: `npm install`.
+- Start the development server with: `npm run dev`.
--- a/playground/index.html
+++ b/playground/index.html
@@ -0,0 +1,29 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <meta
+      name="description"
+      content="An in-browser playground for Ruff, an extremely fast Python linter written in Rust."
+    />
+    <meta name="keywords" content="ruff, python, rust, webassembly, wasm" />
+    <title>Ruff Playground</title>
+    <link
+      rel="icon"
+      href="data:image/svg+xml,<svg xmlns=%22http://www.w3.org/2000/svg%22 viewBox=%220 0 100 100%22><text y=%22.9em%22 font-size=%2290%22>🛠️</text></svg>"
+    />
+  </head>
+  <body>
+    <div id="root"></div>
+    <div style="display: flex; position: fixed; right: 16px; top: 16px">
+      <a href="https://GitHub.com/charliermarsh/ruff"
+        ><img
+          src="https://img.shields.io/github/stars/charliermarsh/ruff.svg?style=social&label=GitHub&maxAge=2592000&?logoWidth=100"
+          alt="GitHub stars"
+          style="width: 120px"
+      /></a>
+    </div>
+    <script type="module" src="/src/main.tsx"></script>
+  </body>
+</html>
--- a/playground/package-lock.json
+++ b/playground/package-lock.json
--- a/playground/package.json
+++ b/playground/package.json
@@ -0,0 +1,38 @@
+{
+  "name": "playground",
+  "private": true,
+  "version": "0.0.0",
+  "type": "module",
+  "scripts": {
+    "build": "tsc && vite build",
+    "check": "npm run lint && npm run tsc",
+    "dev": "vite",
+    "fmt": "prettier --cache -w .",
+    "lint": "eslint --cache --ext .ts,.tsx src",
+    "preview": "vite preview",
+    "tsc": "tsc"
+  },
+  "dependencies": {
+    "@monaco-editor/react": "^4.4.6",
+    "lz-string": "^1.4.4",
+    "monaco-editor": "^0.34.1",
+    "react": "^18.2.0",
+    "react-dom": "^18.2.0"
+  },
+  "devDependencies": {
+    "@types/react": "^18.0.26",
+    "@types/react-dom": "^18.0.9",
+    "@typescript-eslint/eslint-plugin": "^5.47.1",
+    "@typescript-eslint/parser": "^5.47.1",
+    "@vitejs/plugin-react-swc": "^3.0.0",
+    "eslint": "^8.30.0",
+    "eslint-config-prettier": "^8.5.0",
+    "eslint-plugin-import": "^2.26.0",
+    "eslint-plugin-prettier": "^4.2.1",
+    "eslint-plugin-react": "^7.31.11",
+    "eslint-plugin-react-hooks": "^4.6.0",
+    "prettier": "^2.8.1",
+    "typescript": "^4.9.3",
+    "vite": "^4.0.0"
+  }
+}
--- a/playground/src/App.tsx
+++ b/playground/src/App.tsx
@@ -0,0 +1,200 @@
+import lzstring from "lz-string";
+import Editor, { useMonaco } from "@monaco-editor/react";
+import { MarkerSeverity } from "monaco-editor/esm/vs/editor/editor.api";
+import { useEffect, useState, useCallback } from "react";
+
+import init, { Check, check } from "./pkg/ruff.js";
+import { AVAILABLE_OPTIONS } from "./ruff_options";
+import { Config, getDefaultConfig, toRuffConfig } from "./config";
+import { Options } from "./Options";
+
+const DEFAULT_SOURCE =
+  "# Define a function that takes an integer n and returns the nth number in the Fibonacci\n" +
+  "# sequence.\n" +
+  "def fibonacci(n):\n" +
+  "  if n == 0:\n" +
+  "    return 0\n" +
+  "  elif n == 1:\n" +
+  "    return 1\n" +
+  "  else:\n" +
+  "    return fibonacci(n-1) + fibonacci(n-2)\n" +
+  "\n" +
+  "# Use a for loop to generate and print the first 10 numbers in the Fibonacci sequence.\n" +
+  "for i in range(10):\n" +
+  "  print(fibonacci(i))\n" +
+  "\n" +
+  "# Output:\n" +
+  "# 0\n" +
+  "# 1\n" +
+  "# 1\n" +
+  "# 2\n" +
+  "# 3\n" +
+  "# 5\n" +
+  "# 8\n" +
+  "# 13\n" +
+  "# 21\n" +
+  "# 34\n";
+
+function restoreConfigAndSource(): [Config, string] {
+  const value = lzstring.decompressFromEncodedURIComponent(
+    window.location.hash.slice(1)
+  );
+  let config = {};
+  let source = DEFAULT_SOURCE;
+
+  if (value) {
+    const parts = value.split("$$$");
+    config = JSON.parse(parts[0]);
+    source = parts[1];
+  }
+
+  return [config, source];
+}
+
+function persistConfigAndSource(config: Config, source: string) {
+  window.location.hash = lzstring.compressToEncodedURIComponent(
+    JSON.stringify(config) + "$$$" + source
+  );
+}
+
+const defaultConfig = getDefaultConfig(AVAILABLE_OPTIONS);
+
+export default function App() {
+  const monaco = useMonaco();
+  const [initialized, setInitialized] = useState<boolean>(false);
+  const [config, setConfig] = useState<Config | null>(null);
+  const [source, setSource] = useState<string | null>(null);
+  const [error, setError] = useState<string | null>(null);
+
+  useEffect(() => {
+    init().then(() => setInitialized(true));
+  }, []);
+
+  useEffect(() => {
+    if (source == null && config == null && monaco) {
+      const [config, source] = restoreConfigAndSource();
+      setConfig(config);
+      setSource(source);
+    }
+  }, [monaco, source, config]);
+
+  useEffect(() => {
+    if (config != null && source != null) {
+      persistConfigAndSource(config, source);
+    }
+  }, [config, source]);
+
+  useEffect(() => {
+    const editor = monaco?.editor;
+    const model = editor?.getModels()[0];
+    if (!editor || !model || !initialized || source == null || config == null) {
+      return;
+    }
+
+    let checks: Check[];
+    try {
+      checks = check(source, toRuffConfig(config));
+      setError(null);
+    } catch (e) {
+      setError(String(e));
+      return;
+    }
+
+    editor.setModelMarkers(
+      model,
+      "owner",
+      checks.map((check) => ({
+        startLineNumber: check.location.row,
+        startColumn: check.location.column + 1,
+        endLineNumber: check.end_location.row,
+        endColumn: check.end_location.column + 1,
+        message: `${check.code}: ${check.message}`,
+        severity: MarkerSeverity.Error,
+      }))
+    );
+
+    const codeActionProvider = monaco?.languages.registerCodeActionProvider(
+      "python",
+      {
+        // @ts-expect-error: The type definition is wrong.
+        provideCodeActions: function (model, position) {
+          const actions = checks
+            .filter((check) => position.startLineNumber === check.location.row)
+            .filter((check) => check.fix)
+            .map((check) => ({
+              title: `Fix ${check.code}`,
+              id: `fix-${check.code}`,
+              kind: "quickfix",
+              edit: check.fix
+                ? {
+                    edits: [
+                      {
+                        resource: model.uri,
+                        versionId: model.getVersionId(),
+                        edit: {
+                          range: {
+                            startLineNumber: check.fix.location.row,
+                            startColumn: check.fix.location.column + 1,
+                            endLineNumber: check.fix.end_location.row,
+                            endColumn: check.fix.end_location.column + 1,
+                          },
+                          text: check.fix.content,
+                        },
+                      },
+                    ],
+                  }
+                : undefined,
+            }));
+          return { actions, dispose: () => {} };
+        },
+      }
+    );
+
+    return () => {
+      codeActionProvider?.dispose();
+    };
+  }, [config, source, monaco, initialized]);
+
+  const handleEditorChange = useCallback(
+    (value: string | undefined) => {
+      setSource(value || "");
+    },
+    [setSource]
+  );
+
+  const handleOptionChange = useCallback(
+    (groupName: string, fieldName: string, value: string) => {
+      const group = Object.assign({}, (config || {})[groupName]);
+      if (value === defaultConfig[groupName][fieldName] || value === "") {
+        delete group[fieldName];
+      } else {
+        group[fieldName] = value;
+      }
+
+      setConfig({
+        ...config,
+        [groupName]: group,
+      });
+    },
+    [config]
+  );
+
+  return (
+    <div id="app">
+      <Options
+        config={config}
+        defaultConfig={defaultConfig}
+        onChange={handleOptionChange}
+      />
+      <Editor
+        options={{ readOnly: false, minimap: { enabled: false } }}
+        wrapperProps={{ className: "editor" }}
+        defaultLanguage="python"
+        value={source || ""}
+        theme={"light"}
+        onChange={handleEditorChange}
+      />
+      {error && <div id="error">{error}</div>}
+    </div>
+  );
+}
--- a/playground/src/Options.tsx
+++ b/playground/src/Options.tsx
@@ -0,0 +1,72 @@
+import { Config } from "./config";
+import { AVAILABLE_OPTIONS } from "./ruff_options";
+
+function OptionEntry({
+  config,
+  defaultConfig,
+  groupName,
+  fieldName,
+  onChange,
+}: {
+  config: Config | null;
+  defaultConfig: Config;
+  groupName: string;
+  fieldName: string;
+  onChange: (groupName: string, fieldName: string, value: string) => void;
+}) {
+  const value =
+    config && config[groupName] && config[groupName][fieldName]
+      ? config[groupName][fieldName]
+      : "";
+
+  return (
+    <span>
+      <label>
+        {fieldName}
+        <input
+          value={value}
+          placeholder={defaultConfig[groupName][fieldName]}
+          type="text"
+          onChange={(event) => {
+            onChange(groupName, fieldName, event.target.value);
+          }}
+        />
+      </label>
+    </span>
+  );
+}
+
+export function Options({
+  config,
+  defaultConfig,
+  onChange,
+}: {
+  config: Config | null;
+  defaultConfig: Config;
+  onChange: (groupName: string, fieldName: string, value: string) => void;
+}) {
+  return (
+    <div className="options">
+      {AVAILABLE_OPTIONS.map((group) => (
+        <details key={group.name}>
+          <summary>{group.name}</summary>
+          <div>
+            <ul>
+              {group.fields.map((field) => (
+                <li key={field.name}>
+                  <OptionEntry
+                    config={config}
+                    defaultConfig={defaultConfig}
+                    groupName={group.name}
+                    fieldName={field.name}
+                    onChange={onChange}
+                  />
+                </li>
+              ))}
+            </ul>
+          </div>
+        </details>
+      ))}
+    </div>
+  );
+}
--- a/playground/src/config.ts
+++ b/playground/src/config.ts
@@ -0,0 +1,52 @@
+import { OptionGroup } from "./ruff_options";
+
+export type Config = { [key: string]: { [key: string]: string } };
+
+export function getDefaultConfig(availableOptions: OptionGroup[]): Config {
+  const config: Config = {};
+  availableOptions.forEach((group) => {
+    config[group.name] = {};
+    group.fields.forEach((f) => {
+      config[group.name][f.name] = f.default;
+    });
+  });
+  return config;
+}
+
+/**
+ * Convert the config in the application to something Ruff accepts.
+ *
+ * Application config is always nested one level. Ruff allows for some
+ * top-level options.
+ *
+ * Any option value is parsed as JSON to convert it to a native JS object.
+ * If that fails, e.g. while a user is typing, we let the application handle that
+ * and show an error.
+ */
+export function toRuffConfig(config: Config): any {
+  const convertValue = (value: string): any => {
+    return value === "None" ? null : JSON.parse(value);
+  };
+
+  const result: any = {};
+  Object.keys(config).forEach((group_name) => {
+    const fields = config[group_name];
+    if (!fields || Object.keys(fields).length === 0) {
+      return;
+    }
+
+    if (group_name === "globals") {
+      Object.keys(fields).forEach((field_name) => {
+        result[field_name] = convertValue(fields[field_name]);
+      });
+    } else {
+      result[group_name] = {};
+
+      Object.keys(fields).forEach((field_name) => {
+        result[group_name][field_name] = convertValue(fields[field_name]);
+      });
+    }
+  });
+
+  return result;
+}
--- a/playground/src/custom.d.ts
+++ b/playground/src/custom.d.ts
@@ -0,0 +1,6 @@
+declare module "lz-string" {
+  function decompressFromEncodedURIComponent(
+    input: string | null
+  ): string | null;
+  function compressToEncodedURIComponent(input: string | null): string;
+}
--- a/playground/src/main.tsx
+++ b/playground/src/main.tsx
@@ -0,0 +1,10 @@
+import React from "react";
+import ReactDOM from "react-dom/client";
+import App from "./App";
+import "./style.css";
+
+ReactDOM.createRoot(document.getElementById("root") as HTMLElement).render(
+  <React.StrictMode>
+    <App />
+  </React.StrictMode>
+);
--- a/playground/src/ruff_options.ts
+++ b/playground/src/ruff_options.ts
@@ -0,0 +1,239 @@
+
+// This file is auto-generated by `cargo dev generate-playground-options`.
+export interface OptionGroup {
+    name: string;
+    fields: {
+        name: string;
+        default: string;
+        type: string;
+    }[];
+};
+
+export const AVAILABLE_OPTIONS: OptionGroup[] = [
+    {"name": "globals", "fields": [
+        {
+            "name": "allowed-confusables",
+            "default": '[]',
+            "type": 'Vec<char>',
+        },
+        {
+            "name": "dummy-variable-rgx",
+            "default": '"^(_+|(_+[a-zA-Z0-9_]*[a-zA-Z0-9]+?))$"',
+            "type": 'Regex',
+        },
+        {
+            "name": "extend-ignore",
+            "default": '[]',
+            "type": 'Vec<CheckCodePrefix>',
+        },
+        {
+            "name": "extend-select",
+            "default": '[]',
+            "type": 'Vec<CheckCodePrefix>',
+        },
+        {
+            "name": "external",
+            "default": '[]',
+            "type": 'Vec<String>',
+        },
+        {
+            "name": "fix-only",
+            "default": 'false',
+            "type": 'bool',
+        },
+        {
+            "name": "ignore",
+            "default": '[]',
+            "type": 'Vec<CheckCodePrefix>',
+        },
+        {
+            "name": "line-length",
+            "default": '88',
+            "type": 'usize',
+        },
+        {
+            "name": "required-version",
+            "default": 'None',
+            "type": 'String',
+        },
+        {
+            "name": "select",
+            "default": '["E", "F"]',
+            "type": 'Vec<CheckCodePrefix>',
+        },
+        {
+            "name": "target-version",
+            "default": '"py310"',
+            "type": 'PythonVersion',
+        },
+        {
+            "name": "unfixable",
+            "default": '[]',
+            "type": 'Vec<CheckCodePrefix>',
+        },
+    ]},
+    {"name": "flake8-annotations", "fields": [
+        {
+            "name": "allow-star-arg-any",
+            "default": 'false',
+            "type": 'bool',
+        },
+        {
+            "name": "mypy-init-return",
+            "default": 'false',
+            "type": 'bool',
+        },
+        {
+            "name": "suppress-dummy-args",
+            "default": 'false',
+            "type": 'bool',
+        },
+        {
+            "name": "suppress-none-returning",
+            "default": 'false',
+            "type": 'bool',
+        },
+    ]},
+    {"name": "flake8-bugbear", "fields": [
+        {
+            "name": "extend-immutable-calls",
+            "default": '[]',
+            "type": 'Vec<String>',
+        },
+    ]},
+    {"name": "flake8-errmsg", "fields": [
+        {
+            "name": "max-string-length",
+            "default": '0',
+            "type": 'usize',
+        },
+    ]},
+    {"name": "flake8-import-conventions", "fields": [
+        {
+            "name": "aliases",
+            "default": '{"altair": "alt", "matplotlib.pyplot": "plt", "numpy": "np", "pandas": "pd", "seaborn": "sns"}',
+            "type": 'FxHashMap<String, String>',
+        },
+        {
+            "name": "extend-aliases",
+            "default": '{}',
+            "type": 'FxHashMap<String, String>',
+        },
+    ]},
+    {"name": "flake8-quotes", "fields": [
+        {
+            "name": "avoid-escape",
+            "default": 'true',
+            "type": 'bool',
+        },
+        {
+            "name": "docstring-quotes",
+            "default": '"double"',
+            "type": 'Quote',
+        },
+        {
+            "name": "inline-quotes",
+            "default": '"double"',
+            "type": 'Quote',
+        },
+        {
+            "name": "multiline-quotes",
+            "default": '"double"',
+            "type": 'Quote',
+        },
+    ]},
+    {"name": "flake8-tidy-imports", "fields": [
+        {
+            "name": "ban-relative-imports",
+            "default": '"parents"',
+            "type": 'Strictness',
+        },
+    ]},
+    {"name": "flake8-unused-arguments", "fields": [
+        {
+            "name": "ignore-variadic-names",
+            "default": 'false',
+            "type": 'bool',
+        },
+    ]},
+    {"name": "isort", "fields": [
+        {
+            "name": "combine-as-imports",
+            "default": 'false',
+            "type": 'bool',
+        },
+        {
+            "name": "extra-standard-library",
+            "default": '[]',
+            "type": 'Vec<String>',
+        },
+        {
+            "name": "force-single-line",
+            "default": 'false',
+            "type": 'bool',
+        },
+        {
+            "name": "force-wrap-aliases",
+            "default": 'false',
+            "type": 'bool',
+        },
+        {
+            "name": "known-first-party",
+            "default": '[]',
+            "type": 'Vec<String>',
+        },
+        {
+            "name": "known-third-party",
+            "default": '[]',
+            "type": 'Vec<String>',
+        },
+        {
+            "name": "single-line-exclusions",
+            "default": '[]',
+            "type": 'Vec<String>',
+        },
+        {
+            "name": "split-on-trailing-comma",
+            "default": 'true',
+            "type": 'bool',
+        },
+    ]},
+    {"name": "mccabe", "fields": [
+        {
+            "name": "max-complexity",
+            "default": '10',
+            "type": 'usize',
+        },
+    ]},
+    {"name": "pep8-naming", "fields": [
+        {
+            "name": "classmethod-decorators",
+            "default": '["classmethod"]',
+            "type": 'Vec<String>',
+        },
+        {
+            "name": "ignore-names",
+            "default": '["setUp", "tearDown", "setUpClass", "tearDownClass", "setUpModule", "tearDownModule", "asyncSetUp", "asyncTearDown", "setUpTestData", "failureException", "longMessage", "maxDiff"]',
+            "type": 'Vec<String>',
+        },
+        {
+            "name": "staticmethod-decorators",
+            "default": '["staticmethod"]',
+            "type": 'Vec<String>',
+        },
+    ]},
+    {"name": "pydocstyle", "fields": [
+        {
+            "name": "convention",
+            "default": '"convention"',
+            "type": 'Convention',
+        },
+    ]},
+    {"name": "pyupgrade", "fields": [
+        {
+            "name": "keep-runtime-typing",
+            "default": 'false',
+            "type": 'bool',
+        },
+    ]},
+];
--- a/playground/src/style.css
+++ b/playground/src/style.css
@@ -0,0 +1,60 @@
+* {
+  box-sizing: border-box;
+}
+
+body,
+html,
+#root,
+#app {
+  margin: 0;
+  height: 100%;
+  width: 100%;
+}
+
+#app {
+  display: flex;
+}
+
+.options {
+  height: 100vh;
+  overflow-y: scroll;
+  padding: 1em;
+  min-width: 300px;
+  border-right: 1px solid lightgray;
+}
+
+.options ul {
+  padding-left: 1em;
+  list-style-type: none;
+}
+
+.options li {
+  margin-bottom: 0.3em;
+}
+
+.options details {
+  margin-bottom: 1em;
+}
+
+.options summary {
+  font-size: 1.3rem;
+}
+
+.options input {
+  display: block;
+  width: 100%;
+}
+
+.editor {
+  padding: 1em;
+}
+
+#error {
+  position: fixed;
+  bottom: 0;
+  width: 100%;
+  min-height: 1em;
+  padding: 1em;
+  background: darkred;
+  color: white;
+}
--- a/playground/src/vite-env.d.ts
+++ b/playground/src/vite-env.d.ts
@@ -0,0 +1 @@
+/// <reference types="vite/client" />
--- a/playground/tsconfig.json
+++ b/playground/tsconfig.json
@@ -0,0 +1,21 @@
+{
+  "compilerOptions": {
+    "target": "ESNext",
+    "useDefineForClassFields": true,
+    "lib": ["DOM", "DOM.Iterable", "ESNext"],
+    "allowJs": false,
+    "skipLibCheck": true,
+    "esModuleInterop": false,
+    "allowSyntheticDefaultImports": true,
+    "strict": true,
+    "forceConsistentCasingInFileNames": true,
+    "module": "ESNext",
+    "moduleResolution": "Node",
+    "resolveJsonModule": true,
+    "isolatedModules": true,
+    "noEmit": true,
+    "jsx": "react-jsx"
+  },
+  "include": ["src"],
+  "references": [{ "path": "./tsconfig.node.json" }]
+}
--- a/playground/tsconfig.node.json
+++ b/playground/tsconfig.node.json
@@ -0,0 +1,9 @@
+{
+  "compilerOptions": {
+    "composite": true,
+    "module": "ESNext",
+    "moduleResolution": "Node",
+    "allowSyntheticDefaultImports": true
+  },
+  "include": ["vite.config.ts"]
+}
--- a/playground/vite.config.ts
+++ b/playground/vite.config.ts
@@ -0,0 +1,7 @@
+import { defineConfig } from "vite";
+import react from "@vitejs/plugin-react-swc";
+
+// https://vitejs.dev/config/
+export default defineConfig({
+  plugins: [react()],
+});
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -38,3 +38,8 @@ strip = true
 [tool.ruff.isort]
 force-wrap-aliases = true
 combine-as-imports = true
+force-single-line = true
+single-line-exclusions = ["os", "logging.handlers"]
+
+[tool.ruff.pydocstyle]
+convention = "google"
--- a/resources/test/fixtures/flake8_unused_arguments/ARG.py
+++ b/resources/test/fixtures/flake8_unused_arguments/ARG.py
@@ -1,4 +1,5 @@
 from abc import abstractmethod
+from typing import overload
 from typing_extensions import override


@@ -135,3 +136,20 @@ class C:
    @override
    def f(x):
        print("Hello, world!")
+
+
+###
+# Unused arguments attached to overloads (OK).
+###
+@overload
+def f(a: str, b: str) -> str:
+    ...
+
+
+@overload
+def f(a: int, b: int) -> str:
+    ...
+
+
+def f(a, b):
+    return f"{a}{b}"
--- a/resources/test/fixtures/isort/comments.py
+++ b/resources/test/fixtures/isort/comments.py
@@ -23,3 +23,6 @@ from A import (
    b,  # Comment 10
    c,  # Comment 11
 )
+
+from D import a_long_name_to_force_multiple_lines # Comment 12
+from D import another_long_name_to_force_multiple_lines # Comment 13
--- a/resources/test/fixtures/isort/force_single_line.py
+++ b/resources/test/fixtures/isort/force_single_line.py
@@ -0,0 +1,18 @@
+import sys, math
+from os import path, uname
+from logging.handlers import StreamHandler, FileHandler
+
+# comment 1
+from third_party import lib1, lib2, \
+     lib3, lib7, lib5, lib6
+# comment 2
+from third_party import lib4
+
+from foo import bar  # comment 3
+from foo2 import bar2  # comment 4
+
+# comment 5
+from bar import (
+     a, # comment 6
+     b, # comment 7
+)
--- a/resources/test/fixtures/isort/magic_trailing_comma.py
+++ b/resources/test/fixtures/isort/magic_trailing_comma.py
@@ -0,0 +1,38 @@
+# This has a magic trailing comma, will be sorted, but not rolled into one line
+from sys import (
+    stderr,
+    argv,
+    stdout,
+    exit,
+)
+
+# No magic comma, this will be rolled into one line.
+from os import (
+    path,
+    environ,
+    execl,
+    execv
+)
+
+from glob import (
+    glob,
+    iglob,
+    escape,  # Ends with a comment, should still treat as magic trailing comma.
+)
+
+# These will be combined, but without a trailing comma.
+from foo import bar
+from foo import baz
+
+# These will be combined, _with_ a trailing comma.
+from module1 import member1
+from module1 import (
+    member2,
+    member3,
+)
+
+# These will be combined, _with_ a trailing comma.
+from module2 import member1, member2
+from module2 import (
+    member3,
+)
--- a/resources/test/fixtures/isort/natural_order.py
+++ b/resources/test/fixtures/isort/natural_order.py
@@ -0,0 +1,16 @@
+import numpy1
+import numpy10
+import numpy2
+from numpy import (
+    cos,
+    int8,
+    sin,
+    int32,
+    int64,
+    tan,
+    uint8,
+    uint16,
+    int16,
+    uint32,
+    uint64,
+)
--- a/resources/test/fixtures/pydocstyle/D417.py
+++ b/resources/test/fixtures/pydocstyle/D417.py
@@ -0,0 +1,84 @@
+def f(x, y, z):
+    """Do f.
+
+    Args:
+        x: the value
+            with a hanging indent
+
+    Returns:
+        the value
+    """
+    return x
+
+
+def f(x, y, z):
+    """Do f.
+
+    Args:
+        x:
+            The whole thing has a hanging indent.
+
+    Returns:
+        the value
+    """
+    return x
+
+
+def f(x, y, z):
+    """Do f.
+
+    Args:
+        x:
+            The whole thing has a hanging indent.
+
+    Returns: the value
+    """
+    return x
+
+
+def f(x, y, z):
+    """Do f.
+
+    Args:
+        x: the value def
+            ghi
+
+    Returns:
+        the value
+    """
+    return x
+
+
+def f(x, y, z):
+    """Do f.
+
+    Args:
+        x: the value
+        z: A final argument
+
+    Returns:
+        the value
+    """
+    return x
+
+
+def f(x, y, z):
+    """Do g.
+
+    Args:
+        x: the value
+        z: A final argument
+
+    Returns: the value
+    """
+    return x
+
+
+def f(x, y, z):
+    """Do h.
+
+    Args:
+        x: the value
+        z: A final argument
+    """
+    return x
--- a/resources/test/fixtures/pyupgrade/UP019.py
+++ b/resources/test/fixtures/pyupgrade/UP019.py
@@ -0,0 +1,20 @@
+import typing
+import typing as Hello
+from typing import Text
+from typing import Text as Goodbye
+
+
+def print_word(word: Text) -> None:
+    print(word)
+
+
+def print_second_word(word: typing.Text) -> None:
+    print(word)
+
+
+def print_third_word(word: Hello.Text) -> None:
+    print(word)
+
+
+def print_fourth_word(word: Goodbye) -> None:
+    print(word)
--- a/resources/test/fixtures/pyupgrade/UP020.py
+++ b/resources/test/fixtures/pyupgrade/UP020.py
@@ -0,0 +1,9 @@
+from io import open
+
+with open("f.txt") as f:
+    print(f.read())
+
+import io
+
+with io.open("f.txt", mode="r", buffering=-1, **kwargs) as f:
+    print(f.read())
--- a/resources/test/fixtures/pyupgrade/UP021.py
+++ b/resources/test/fixtures/pyupgrade/UP021.py
@@ -0,0 +1,12 @@
+import subprocess
+import subprocess as somename
+from subprocess import run
+from subprocess import run as anothername
+
+subprocess.run(["foo"], universal_newlines=True, check=True)
+somename.run(["foo"], universal_newlines=True)
+
+run(["foo"], universal_newlines=True, check=False)
+anothername(["foo"], universal_newlines=True)
+
+subprocess.run(["foo"], check=True)
--- a/resources/test/project/examples/docs/pyproject.toml
+++ b/resources/test/project/examples/docs/pyproject.toml
@@ -1,4 +1,3 @@
-[tool.ruff]
 extend = "../../pyproject.toml"
 src = ["."]
 # Enable I001, and re-enable F841, to test extension priority.
--- a/ruff.schema.json
+++ b/ruff.schema.json
@@ -93,6 +93,13 @@
        "null"
      ]
    },
+    "fix-only": {
+      "description": "Like `fix`, but disables reporting on leftover violation. Implies `fix`.",
+      "type": [
+        "boolean",
+        "null"
+      ]
+    },
    "fixable": {
      "description": "A list of check code prefixes to consider autofix-able.",
      "type": [
@@ -270,6 +277,17 @@
        }
      }
    },
+    "pydocstyle": {
+      "description": "Options for the `pydocstyle` plugin.",
+      "anyOf": [
+        {
+          "$ref": "#/definitions/Pydocstyle"
+        },
+        {
+          "type": "null"
+        }
+      ]
+    },
    "pyupgrade": {
      "description": "Options for the `pyupgrade` plugin.",
      "anyOf": [
@@ -281,6 +299,17 @@
        }
      ]
    },
+    "required-version": {
+      "description": "Require a specific version of Ruff to be running (useful for unifying results across many environments, e.g., with a `pyproject.toml` file).",
+      "anyOf": [
+        {
+          "$ref": "#/definitions/Version"
+        },
+        {
+          "type": "null"
+        }
+      ]
+    },
    "respect-gitignore": {
      "description": "Whether to automatically exclude files that are ignored by `.ignore`, `.gitignore`, `.git/info/exclude`, and global `gitignore` files. Enabled by default.",
      "type": [
@@ -824,6 +853,7 @@
        "U015",
        "U016",
        "U017",
+        "U019",
        "UP",
        "UP0",
        "UP00",
@@ -845,6 +875,10 @@
        "UP016",
        "UP017",
        "UP018",
+        "UP019",
+        "UP02",
+        "UP020",
+        "UP021",
        "W",
        "W2",
        "W29",
@@ -871,6 +905,13 @@
        "YTT303"
      ]
    },
+    "Convention": {
+      "type": "string",
+      "enum": [
+        "google",
+        "numpy"
+      ]
+    },
    "Flake8AnnotationsOptions": {
      "type": "object",
      "properties": {
@@ -1058,6 +1099,13 @@
            "type": "string"
          }
        },
+        "force-single-line": {
+          "description": "Forces all from imports to appear on their own line.",
+          "type": [
+            "boolean",
+            "null"
+          ]
+        },
        "force-wrap-aliases": {
          "description": "Force `import from` statements with multiple members and at least one alias (e.g., `import A as B`) to wrap such that every line contains exactly one member. For example, this formatting would be retained, rather than condensing to a single line:\n\n```py from .utils import ( test_directory as test_directory, test_id as test_id ) ```\n\nNote that this setting is only effective when combined with `combine-as-imports = true`. When `combine-as-imports` isn't enabled, every aliased `import from` will be given its own line, in which case, wrapping is not necessary.",
          "type": [
@@ -1084,6 +1132,23 @@
          "items": {
            "type": "string"
          }
+        },
+        "single-line-exclusions": {
+          "description": "One or more modules to exclude from the single line rule.",
+          "type": [
+            "array",
+            "null"
+          ],
+          "items": {
+            "type": "string"
+          }
+        },
+        "split-on-trailing-comma": {
+          "description": "If a comma is placed after the last member in a multi-line import, then the imports will never be folded into one line.\n\nSee isort's [`split-on-trailing-comma`](https://pycqa.github.io/isort/docs/configuration/options.html#split-on-trailing-comma) option.",
+          "type": [
+            "boolean",
+            "null"
+          ]
        }
      },
      "additionalProperties": false
@@ -1152,6 +1217,23 @@
      },
      "additionalProperties": false
    },
+    "Pydocstyle": {
+      "type": "object",
+      "properties": {
+        "convention": {
+          "description": "Whether to use Google-style or Numpy-style conventions when detecting docstring sections. By default, conventions will be inferred from the available sections.",
+          "anyOf": [
+            {
+              "$ref": "#/definitions/Convention"
+            },
+            {
+              "type": "null"
+            }
+          ]
+        }
+      },
+      "additionalProperties": false
+    },
    "PythonVersion": {
      "type": "string",
      "enum": [
@@ -1189,6 +1271,9 @@
        "parents",
        "all"
      ]
+    },
+    "Version": {
+      "type": "string"
    }
  }
 }
--- a/ruff_dev/Cargo.toml
+++ b/ruff_dev/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "ruff_dev"
-version = "0.0.193"
+version = "0.0.196"
 edition = "2021"

 [dependencies]
@@ -11,10 +11,11 @@ itertools = { version = "0.10.5" }
 libcst = { git = "https://github.com/charliermarsh/LibCST", rev = "f2f0b7a487a8725d161fe8b3ed73a6758b21e177" }
 once_cell = { version = "1.16.0" }
 ruff = { path = ".." }
-rustpython-ast = { features = ["unparse"], git = "https://github.com/RustPython/RustPython.git", rev = "1b6cb170e925a43d605b3fed9f6b878e63e47744" }
-rustpython-common = { git = "https://github.com/RustPython/RustPython.git", rev = "1b6cb170e925a43d605b3fed9f6b878e63e47744" }
-rustpython-parser = { features = ["lalrpop"], git = "https://github.com/RustPython/RustPython.git", rev = "1b6cb170e925a43d605b3fed9f6b878e63e47744" }
+rustpython-ast = { features = ["unparse"], git = "https://github.com/RustPython/RustPython.git", rev = "68d26955b3e24198a150315e7959719b03709dee" }
+rustpython-common = { git = "https://github.com/RustPython/RustPython.git", rev = "68d26955b3e24198a150315e7959719b03709dee" }
+rustpython-parser = { features = ["lalrpop"], git = "https://github.com/RustPython/RustPython.git", rev = "68d26955b3e24198a150315e7959719b03709dee" }
 schemars = { version = "0.8.11" }
 serde_json = {version="1.0.91"}
 strum = { version = "0.24.1", features = ["strum_macros"] }
 strum_macros = { version = "0.24.3" }
+textwrap = { version = "0.16.0" }
--- a/ruff_dev/src/generate_all.rs
+++ b/ruff_dev/src/generate_all.rs
@@ -0,0 +1,35 @@
+//! Run all code and documentation generation steps.
+
+use anyhow::Result;
+use clap::Args;
+
+use crate::{
+    generate_check_code_prefix, generate_json_schema, generate_options,
+    generate_playground_options, generate_rules_table,
+};
+
+#[derive(Args)]
+pub struct Cli {
+    /// Write the generated artifacts to stdout (rather than to the filesystem).
+    #[arg(long)]
+    dry_run: bool,
+}
+
+pub fn main(cli: &Cli) -> Result<()> {
+    generate_check_code_prefix::main(&generate_check_code_prefix::Cli {
+        dry_run: cli.dry_run,
+    })?;
+    generate_json_schema::main(&generate_json_schema::Cli {
+        dry_run: cli.dry_run,
+    })?;
+    generate_rules_table::main(&generate_rules_table::Cli {
+        dry_run: cli.dry_run,
+    })?;
+    generate_options::main(&generate_options::Cli {
+        dry_run: cli.dry_run,
+    })?;
+    generate_playground_options::main(&generate_playground_options::Cli {
+        dry_run: cli.dry_run,
+    })?;
+    Ok(())
+}
--- a/ruff_dev/src/generate_check_code_prefix.rs
+++ b/ruff_dev/src/generate_check_code_prefix.rs
@@ -19,7 +19,7 @@ pub struct Cli {
    /// Write the generated source code to stdout (rather than to
    /// `src/checks_gen.rs`).
    #[arg(long)]
-    dry_run: bool,
+    pub(crate) dry_run: bool,
 }

 pub fn main(cli: &Cli) -> Result<()> {
--- a/ruff_dev/src/generate_json_schema.rs
+++ b/ruff_dev/src/generate_json_schema.rs
@@ -10,7 +10,7 @@ use schemars::schema_for;
 pub struct Cli {
    /// Write the generated table to stdout (rather than to `ruff.schema.json`).
    #[arg(long)]
-    dry_run: bool,
+    pub(crate) dry_run: bool,
 }

 pub fn main(cli: &Cli) -> Result<()> {
--- a/ruff_dev/src/generate_options.rs
+++ b/ruff_dev/src/generate_options.rs
@@ -18,7 +18,7 @@ const END_PRAGMA: &str = "<!-- End auto-generated options sections. -->";
 pub struct Cli {
    /// Write the generated table to stdout (rather than to `README.md`).
    #[arg(long)]
-    dry_run: bool,
+    pub(crate) dry_run: bool,
 }

 fn emit_field(output: &mut String, field: &OptionField, group_name: Option<&str>) {
--- a/ruff_dev/src/generate_playground_options.rs
+++ b/ruff_dev/src/generate_playground_options.rs
@@ -0,0 +1,142 @@
+//! Generate typescript file defining options to be used by the web playground.
+
+use std::fs::OpenOptions;
+use std::io::Write;
+use std::path::PathBuf;
+
+use anyhow::Result;
+use clap::Args;
+use itertools::Itertools;
+use ruff::settings::options::Options;
+use ruff::settings::options_base::{ConfigurationOptions, OptionEntry, OptionField};
+
+#[derive(Args)]
+pub struct Cli {
+    /// Write the generated table to stdout (rather than to `TODO`).
+    #[arg(long)]
+    pub(crate) dry_run: bool,
+}
+
+fn emit_field(output: &mut String, field: &OptionField) {
+    output.push_str(&textwrap::indent(
+        &textwrap::dedent(&format!(
+            "
+        {{
+            \"name\": \"{}\",
+            \"default\": '{}',
+            \"type\": '{}',
+        }},",
+            field.name, field.default, field.value_type
+        )),
+        "    ",
+    ));
+}
+
+pub fn main(cli: &Cli) -> Result<()> {
+    let mut output = String::new();
+
+    // Generate all the top-level fields.
+    output.push_str(&format!("{{\"name\": \"{}\", \"fields\": [", "globals"));
+    for field in Options::get_available_options()
+        .into_iter()
+        .filter_map(|entry| {
+            if let OptionEntry::Field(field) = entry {
+                Some(field)
+            } else {
+                None
+            }
+        })
+        // Filter out options that don't make sense in the playground.
+        .filter(|field| {
+            !matches!(
+                field.name,
+                "src"
+                    | "fix"
+                    | "format"
+                    | "exclude"
+                    | "extend"
+                    | "extend-exclude"
+                    | "fixable"
+                    | "force-exclude"
+                    | "ignore-init-module-imports"
+                    | "respect-gitignore"
+                    | "show-source"
+                    | "cache-dir"
+                    | "per-file-ignores"
+            )
+        })
+        .sorted_by_key(|field| field.name)
+    {
+        emit_field(&mut output, &field);
+    }
+    output.push_str("\n]},\n");
+
+    // Generate all the sub-groups.
+    for group in Options::get_available_options()
+        .into_iter()
+        .filter_map(|entry| {
+            if let OptionEntry::Group(group) = entry {
+                Some(group)
+            } else {
+                None
+            }
+        })
+        .sorted_by_key(|group| group.name)
+    {
+        output.push_str(&format!("{{\"name\": \"{}\", \"fields\": [", group.name));
+        for field in group
+            .fields
+            .iter()
+            .filter_map(|entry| {
+                if let OptionEntry::Field(field) = entry {
+                    Some(field)
+                } else {
+                    None
+                }
+            })
+            .sorted_by_key(|field| field.name)
+        {
+            emit_field(&mut output, field);
+        }
+        output.push_str("\n]},\n");
+    }
+
+    let prefix = textwrap::dedent(
+        r"
+        // This file is auto-generated by `cargo dev generate-playground-options`.
+        export interface OptionGroup {
+            name: string;
+            fields: {
+                name: string;
+                default: string;
+                type: string;
+            }[];
+        };
+
+        export const AVAILABLE_OPTIONS: OptionGroup[] = [
+    ",
+    );
+    let postfix = "];";
+
+    if cli.dry_run {
+        print!("{output}");
+    } else {
+        let file = PathBuf::from(env!("CARGO_MANIFEST_DIR"))
+            .parent()
+            .expect("Failed to find root directory")
+            .join("playground")
+            .join("src")
+            .join("ruff_options.ts");
+
+        let mut f = OpenOptions::new()
+            .create(true)
+            .write(true)
+            .truncate(true)
+            .open(file)?;
+        write!(f, "{prefix}")?;
+        write!(f, "{}", textwrap::indent(&output, "    "))?;
+        write!(f, "{postfix}")?;
+    }
+
+    Ok(())
+}
--- a/ruff_dev/src/generate_rules_table.rs
+++ b/ruff_dev/src/generate_rules_table.rs
@@ -21,7 +21,7 @@ const TOC_END_PRAGMA: &str = "<!-- End auto-generated table of contents. -->";
 pub struct Cli {
    /// Write the generated table to stdout (rather than to `README.md`).
    #[arg(long)]
-    dry_run: bool,
+    pub(crate) dry_run: bool,
 }

 pub fn main(cli: &Cli) -> Result<()> {
--- a/ruff_dev/src/lib.rs
+++ b/ruff_dev/src/lib.rs
@@ -11,11 +11,13 @@
    clippy::too_many_lines
 )]

+pub mod generate_all;
 pub mod generate_check_code_prefix;
 pub mod generate_json_schema;
 pub mod generate_options;
+pub mod generate_playground_options;
 pub mod generate_rules_table;
-pub mod generate_source_code;
 pub mod print_ast;
 pub mod print_cst;
 pub mod print_tokens;
+pub mod round_trip;
--- a/ruff_dev/src/main.rs
+++ b/ruff_dev/src/main.rs
@@ -14,8 +14,9 @@
 use anyhow::Result;
 use clap::{Parser, Subcommand};
 use ruff_dev::{
-    generate_check_code_prefix, generate_json_schema, generate_options, generate_rules_table,
-    generate_source_code, print_ast, print_cst, print_tokens,
+    generate_all, generate_check_code_prefix, generate_json_schema, generate_options,
+    generate_playground_options, generate_rules_table, print_ast, print_cst, print_tokens,
+    round_trip,
 };

 #[derive(Parser)]
@@ -28,6 +29,8 @@ struct Cli {

 #[derive(Subcommand)]
 enum Commands {
+    /// Run all code and documentation generation steps.
+    GenerateAll(generate_all::Cli),
    /// Generate the `CheckCodePrefix` enum.
    GenerateCheckCodePrefix(generate_check_code_prefix::Cli),
    /// Generate JSON schema for the TOML configuration file.
@@ -36,27 +39,32 @@ enum Commands {
    GenerateRulesTable(generate_rules_table::Cli),
    /// Generate a Markdown-compatible listing of configuration options.
    GenerateOptions(generate_options::Cli),
-    /// Run round-trip source code generation on a given Python file.
-    GenerateSourceCode(generate_source_code::Cli),
+    /// Generate typescript file defining options to be used by the web
+    /// playground.
+    GeneratePlaygroundOptions(generate_playground_options::Cli),
    /// Print the AST for a given Python file.
    PrintAST(print_ast::Cli),
    /// Print the LibCST CST for a given Python file.
    PrintCST(print_cst::Cli),
    /// Print the token stream for a given Python file.
    PrintTokens(print_tokens::Cli),
+    /// Run round-trip source code generation on a given Python file.
+    RoundTrip(round_trip::Cli),
 }

 fn main() -> Result<()> {
    let cli = Cli::parse();
    match &cli.command {
+        Commands::GenerateAll(args) => generate_all::main(args)?,
        Commands::GenerateCheckCodePrefix(args) => generate_check_code_prefix::main(args)?,
        Commands::GenerateJSONSchema(args) => generate_json_schema::main(args)?,
        Commands::GenerateRulesTable(args) => generate_rules_table::main(args)?,
-        Commands::GenerateSourceCode(args) => generate_source_code::main(args)?,
        Commands::GenerateOptions(args) => generate_options::main(args)?,
+        Commands::GeneratePlaygroundOptions(args) => generate_playground_options::main(args)?,
        Commands::PrintAST(args) => print_ast::main(args)?,
        Commands::PrintCST(args) => print_cst::main(args)?,
        Commands::PrintTokens(args) => print_tokens::main(args)?,
+        Commands::RoundTrip(args) => round_trip::main(args)?,
    }
    Ok(())
 }
--- a/ruff_dev/src/generate_source_code.rs
+++ b/ruff_dev/src/generate_source_code.rs
--- a/ruff_macros/Cargo.toml
+++ b/ruff_macros/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "ruff_macros"
-version = "0.0.193"
+version = "0.0.196"
 edition = "2021"

 [lib]
--- a/src/ast/helpers.rs
+++ b/src/ast/helpers.rs
@@ -1,3 +1,4 @@
+use itertools::Itertools;
 use log::error;
 use once_cell::sync::Lazy;
 use regex::Regex;
@@ -381,10 +382,8 @@ pub fn identifier_range(stmt: &Stmt, locator: &SourceCodeLocator) -> Range {
            | StmtKind::AsyncFunctionDef { .. }
    ) {
        let contents = locator.slice_source_code_range(&Range::from_located(stmt));
-        for (start, tok, end) in lexer::make_tokenizer(&contents).flatten() {
+        for (start, tok, end) in lexer::make_tokenizer_located(&contents, stmt.location).flatten() {
            if matches!(tok, Tok::Name { .. }) {
-                let start = to_absolute(start, stmt.location);
-                let end = to_absolute(end, stmt.location);
                return Range {
                    location: start,
                    end_location: end,
@@ -396,6 +395,37 @@ pub fn identifier_range(stmt: &Stmt, locator: &SourceCodeLocator) -> Range {
    Range::from_located(stmt)
 }

+/// Return the `Range` of `name` in `Excepthandler`.
+pub fn excepthandler_name_range(
+    handler: &Excepthandler,
+    locator: &SourceCodeLocator,
+) -> Option<Range> {
+    let ExcepthandlerKind::ExceptHandler {
+        name, type_, body, ..
+    } = &handler.node;
+    match (name, type_) {
+        (Some(_), Some(type_)) => {
+            let type_end_location = type_.end_location.unwrap();
+            let contents = locator.slice_source_code_range(&Range {
+                location: type_end_location,
+                end_location: body[0].location,
+            });
+            let range = lexer::make_tokenizer_located(&contents, type_end_location)
+                .flatten()
+                .tuple_windows()
+                .find(|(tok, next_tok)| {
+                    matches!(tok.1, Tok::As) && matches!(next_tok.1, Tok::Name { .. })
+                })
+                .map(|((..), (location, _, end_location))| Range {
+                    location,
+                    end_location,
+                });
+            range
+        }
+        _ => None,
+    }
+}
+
 /// Return `true` if a `Stmt` appears to be part of a multi-statement line, with
 /// other statements preceding it.
 pub fn preceded_by_continuation(stmt: &Stmt, locator: &SourceCodeLocator) -> bool {
--- a/src/checkers/ast.rs
+++ b/src/checkers/ast.rs
@@ -1487,6 +1487,10 @@ where
            ExprKind::Name { id, ctx } => {
                match ctx {
                    ExprContext::Load => {
+                        if self.settings.enabled.contains(&CheckCode::UP019) {
+                            pyupgrade::plugins::typing_text_str_alias(self, expr);
+                        }
+
                        // Ex) List[...]
                        if !self.in_deferred_string_type_definition
                            && self.settings.enabled.contains(&CheckCode::UP006)
@@ -1543,6 +1547,9 @@ where
                    pyupgrade::plugins::use_pep585_annotation(self, expr, attr);
                }

+                if self.settings.enabled.contains(&CheckCode::UP019) {
+                    pyupgrade::plugins::typing_text_str_alias(self, expr);
+                }
                if self.settings.enabled.contains(&CheckCode::UP016) {
                    pyupgrade::plugins::remove_six_compat(self, expr);
                }
@@ -1647,6 +1654,9 @@ where
                if self.settings.enabled.contains(&CheckCode::UP018) {
                    pyupgrade::plugins::native_literals(self, expr, func, args, keywords);
                }
+                if self.settings.enabled.contains(&CheckCode::UP021) {
+                    pyupgrade::plugins::replace_universal_newlines(self, expr, keywords);
+                }

                // flake8-super
                if self.settings.enabled.contains(&CheckCode::UP008) {
@@ -1919,6 +1929,10 @@ where
                    pyupgrade::plugins::redundant_open_modes(self, expr);
                }

+                if self.settings.enabled.contains(&CheckCode::UP020) {
+                    pyupgrade::plugins::open_alias(self, expr, func);
+                }
+
                // flake8-boolean-trap
                if self.settings.enabled.contains(&CheckCode::FBT003) {
                    flake8_boolean_trap::plugins::check_boolean_positional_value_in_function_call(
@@ -2664,12 +2678,15 @@ where

                        self.check_builtin_shadowing(name, excepthandler, false);

+                        let name_range =
+                            helpers::excepthandler_name_range(excepthandler, self.locator).unwrap();
+
                        if self.current_scope().values.contains_key(&name.as_str()) {
                            self.handle_node_store(
                                name,
                                &Expr::new(
-                                    excepthandler.location,
-                                    excepthandler.end_location.unwrap(),
+                                    name_range.location,
+                                    name_range.end_location,
                                    ExprKind::Name {
                                        id: name.to_string(),
                                        ctx: ExprContext::Store,
@@ -2682,8 +2699,8 @@ where
                        self.handle_node_store(
                            name,
                            &Expr::new(
-                                excepthandler.location,
-                                excepthandler.end_location.unwrap(),
+                                name_range.location,
+                                name_range.end_location,
                                ExprKind::Name {
                                    id: name.to_string(),
                                    ctx: ExprContext::Store,
@@ -2702,7 +2719,7 @@ where
                                if self.settings.enabled.contains(&CheckCode::F841) {
                                    self.add_check(Check::new(
                                        CheckKind::UnusedVariable(name.to_string()),
-                                        Range::from_located(excepthandler),
+                                        name_range,
                                    ));
                                }
                            }
@@ -3862,7 +3879,11 @@ impl<'a> Checker<'a> {
                    || self.settings.enabled.contains(&CheckCode::D416)
                    || self.settings.enabled.contains(&CheckCode::D417)
                {
-                    pydocstyle::plugins::sections(self, &docstring);
+                    pydocstyle::plugins::sections(
+                        self,
+                        &docstring,
+                        self.settings.pydocstyle.convention.as_ref(),
+                    );
                }
            }
        }
--- a/src/checks.rs
+++ b/src/checks.rs
@@ -226,6 +226,9 @@ pub enum CheckCode {
    UP016,
    UP017,
    UP018,
+    UP019,
+    UP020,
+    UP021,
    // pydocstyle
    D100,
    D101,
@@ -822,6 +825,7 @@ pub enum CheckKind {
    // pyupgrade
    TypeOfPrimitive(Primitive),
    UselessMetaclassType,
+    TypingTextStrAlias,
    DeprecatedUnittestAlias(String, String),
    UselessObjectInheritance(String),
    UsePEP585Annotation(String),
@@ -837,6 +841,8 @@ pub enum CheckKind {
    RemoveSixCompat,
    DatetimeTimezoneUTC,
    NativeLiterals,
+    OpenAlias,
+    ReplaceUniversalNewlines,
    // pydocstyle
    BlankLineAfterLastSection(String),
    BlankLineAfterSection(String),
@@ -1212,6 +1218,9 @@ impl CheckCode {
            CheckCode::UP016 => CheckKind::RemoveSixCompat,
            CheckCode::UP017 => CheckKind::DatetimeTimezoneUTC,
            CheckCode::UP018 => CheckKind::NativeLiterals,
+            CheckCode::UP019 => CheckKind::TypingTextStrAlias,
+            CheckCode::UP020 => CheckKind::OpenAlias,
+            CheckCode::UP021 => CheckKind::ReplaceUniversalNewlines,
            // pydocstyle
            CheckCode::D100 => CheckKind::PublicModule,
            CheckCode::D101 => CheckKind::PublicClass,
@@ -1631,6 +1640,9 @@ impl CheckCode {
            CheckCode::UP016 => CheckCategory::Pyupgrade,
            CheckCode::UP017 => CheckCategory::Pyupgrade,
            CheckCode::UP018 => CheckCategory::Pyupgrade,
+            CheckCode::UP019 => CheckCategory::Pyupgrade,
+            CheckCode::UP020 => CheckCategory::Pyupgrade,
+            CheckCode::UP021 => CheckCategory::Pyupgrade,
            CheckCode::W292 => CheckCategory::Pycodestyle,
            CheckCode::W605 => CheckCategory::Pycodestyle,
            CheckCode::YTT101 => CheckCategory::Flake82020,
@@ -1843,6 +1855,9 @@ impl CheckKind {
            CheckKind::RemoveSixCompat => &CheckCode::UP016,
            CheckKind::DatetimeTimezoneUTC => &CheckCode::UP017,
            CheckKind::NativeLiterals => &CheckCode::UP018,
+            CheckKind::TypingTextStrAlias => &CheckCode::UP019,
+            CheckKind::OpenAlias => &CheckCode::UP020,
+            CheckKind::ReplaceUniversalNewlines => &CheckCode::UP021,
            // pydocstyle
            CheckKind::BlankLineAfterLastSection(..) => &CheckCode::D413,
            CheckKind::BlankLineAfterSection(..) => &CheckCode::D410,
@@ -2533,8 +2548,9 @@ impl CheckKind {
                format!("Use `{}` instead of `type(...)`", primitive.builtin())
            }
            CheckKind::UselessMetaclassType => "`__metaclass__ = type` is implied".to_string(),
+            CheckKind::TypingTextStrAlias => "`typing.Text` is deprecated, use `str`".to_string(),
            CheckKind::DeprecatedUnittestAlias(alias, target) => {
-                format!("`{alias}` is deprecated, use `{target}` instead")
+                format!("`{alias}` is deprecated, use `{target}`")
            }
            CheckKind::UselessObjectInheritance(name) => {
                format!("Class `{name}` inherits from object")
@@ -2567,9 +2583,13 @@ impl CheckKind {
            CheckKind::RemoveSixCompat => "Unnecessary `six` compatibility usage".to_string(),
            CheckKind::DatetimeTimezoneUTC => "Use `datetime.UTC` alias".to_string(),
            CheckKind::NativeLiterals => "Unnecessary call to `str` and `bytes`".to_string(),
+            CheckKind::OpenAlias => "Use builtin `open`".to_string(),
            CheckKind::ConvertTypedDictFunctionalToClass(name) => {
                format!("Convert `{name}` from `TypedDict` functional to class syntax")
            }
+            CheckKind::ReplaceUniversalNewlines => {
+                "`universal_newlines` is deprecated, use `text`".to_string()
+            }
            CheckKind::ConvertNamedTupleFunctionalToClass(name) => {
                format!("Convert `{name}` from `NamedTuple` functional to class syntax")
            }
@@ -3009,7 +3029,9 @@ impl CheckKind {
                | CheckKind::MisplacedComparisonConstant(..)
                | CheckKind::MissingReturnTypeSpecialMethod(..)
                | CheckKind::NativeLiterals
+                | CheckKind::OpenAlias
                | CheckKind::NewLineAfterLastParagraph
+                | CheckKind::ReplaceUniversalNewlines
                | CheckKind::NewLineAfterSectionName(..)
                | CheckKind::NoBlankLineAfterFunction(..)
                | CheckKind::NoBlankLineBeforeClass(..)
@@ -3042,6 +3064,7 @@ impl CheckKind {
                | CheckKind::SuperCallWithParameters
                | CheckKind::TrueFalseComparison(..)
                | CheckKind::TypeOfPrimitive(..)
+                | CheckKind::TypingTextStrAlias
                | CheckKind::UnnecessaryCallAroundSorted(..)
                | CheckKind::UnnecessaryCollectionCall(..)
                | CheckKind::UnnecessaryComprehension(..)
@@ -3116,6 +3139,7 @@ pub static PREFIX_REDIRECTS: Lazy<FxHashMap<&'static str, CheckCodePrefix>> = La
        ("U015", CheckCodePrefix::UP015),
        ("U016", CheckCodePrefix::UP016),
        ("U017", CheckCodePrefix::UP017),
+        ("U019", CheckCodePrefix::UP019),
        // TODO(charlie): Remove by 2023-02-01.
        ("I252", CheckCodePrefix::TID252),
        ("M001", CheckCodePrefix::RUF100),
@@ -3191,6 +3215,7 @@ pub static CODE_REDIRECTS: Lazy<FxHashMap<&'static str, CheckCode>> = Lazy::new(
        ("U015", CheckCode::UP015),
        ("U016", CheckCode::UP016),
        ("U017", CheckCode::UP017),
+        ("U019", CheckCode::UP019),
        // TODO(charlie): Remove by 2023-02-01.
        ("I252", CheckCode::TID252),
        ("M001", CheckCode::RUF100),
--- a/src/checks_gen.rs
+++ b/src/checks_gen.rs
@@ -504,6 +504,7 @@ pub enum CheckCodePrefix {
    U015,
    U016,
    U017,
+    U019,
    UP,
    UP0,
    UP00,
@@ -525,6 +526,10 @@ pub enum CheckCodePrefix {
    UP016,
    UP017,
    UP018,
+    UP019,
+    UP02,
+    UP020,
+    UP021,
    W,
    W2,
    W29,
@@ -2101,6 +2106,9 @@ impl CheckCodePrefix {
                    CheckCode::UP016,
                    CheckCode::UP017,
                    CheckCode::UP018,
+                    CheckCode::UP019,
+                    CheckCode::UP020,
+                    CheckCode::UP021,
                ]
            }
            CheckCodePrefix::U0 => {
@@ -2128,6 +2136,9 @@ impl CheckCodePrefix {
                    CheckCode::UP016,
                    CheckCode::UP017,
                    CheckCode::UP018,
+                    CheckCode::UP019,
+                    CheckCode::UP020,
+                    CheckCode::UP021,
                ]
            }
            CheckCodePrefix::U00 => {
@@ -2237,6 +2248,7 @@ impl CheckCodePrefix {
                    CheckCode::UP016,
                    CheckCode::UP017,
                    CheckCode::UP018,
+                    CheckCode::UP019,
                ]
            }
            CheckCodePrefix::U010 => {
@@ -2311,6 +2323,15 @@ impl CheckCodePrefix {
                );
                vec![CheckCode::UP017]
            }
+            CheckCodePrefix::U019 => {
+                one_time_warning!(
+                    "{}{} {}",
+                    "warning".yellow().bold(),
+                    ":".bold(),
+                    "`U019` has been remapped to `UP019`".bold()
+                );
+                vec![CheckCode::UP019]
+            }
            CheckCodePrefix::UP => vec![
                CheckCode::UP001,
                CheckCode::UP003,
@@ -2329,6 +2350,9 @@ impl CheckCodePrefix {
                CheckCode::UP016,
                CheckCode::UP017,
                CheckCode::UP018,
+                CheckCode::UP019,
+                CheckCode::UP020,
+                CheckCode::UP021,
            ],
            CheckCodePrefix::UP0 => vec![
                CheckCode::UP001,
@@ -2348,6 +2372,9 @@ impl CheckCodePrefix {
                CheckCode::UP016,
                CheckCode::UP017,
                CheckCode::UP018,
+                CheckCode::UP019,
+                CheckCode::UP020,
+                CheckCode::UP021,
            ],
            CheckCodePrefix::UP00 => vec![
                CheckCode::UP001,
@@ -2377,6 +2404,7 @@ impl CheckCodePrefix {
                CheckCode::UP016,
                CheckCode::UP017,
                CheckCode::UP018,
+                CheckCode::UP019,
            ],
            CheckCodePrefix::UP010 => vec![CheckCode::UP010],
            CheckCodePrefix::UP011 => vec![CheckCode::UP011],
@@ -2387,6 +2415,10 @@ impl CheckCodePrefix {
            CheckCodePrefix::UP016 => vec![CheckCode::UP016],
            CheckCodePrefix::UP017 => vec![CheckCode::UP017],
            CheckCodePrefix::UP018 => vec![CheckCode::UP018],
+            CheckCodePrefix::UP019 => vec![CheckCode::UP019],
+            CheckCodePrefix::UP02 => vec![CheckCode::UP020, CheckCode::UP021],
+            CheckCodePrefix::UP020 => vec![CheckCode::UP020],
+            CheckCodePrefix::UP021 => vec![CheckCode::UP021],
            CheckCodePrefix::W => vec![CheckCode::W292, CheckCode::W605],
            CheckCodePrefix::W2 => vec![CheckCode::W292],
            CheckCodePrefix::W29 => vec![CheckCode::W292],
@@ -2922,6 +2954,7 @@ impl CheckCodePrefix {
            CheckCodePrefix::U015 => SuffixLength::Three,
            CheckCodePrefix::U016 => SuffixLength::Three,
            CheckCodePrefix::U017 => SuffixLength::Three,
+            CheckCodePrefix::U019 => SuffixLength::Three,
            CheckCodePrefix::UP => SuffixLength::Zero,
            CheckCodePrefix::UP0 => SuffixLength::One,
            CheckCodePrefix::UP00 => SuffixLength::Two,
@@ -2943,6 +2976,10 @@ impl CheckCodePrefix {
            CheckCodePrefix::UP016 => SuffixLength::Three,
            CheckCodePrefix::UP017 => SuffixLength::Three,
            CheckCodePrefix::UP018 => SuffixLength::Three,
+            CheckCodePrefix::UP019 => SuffixLength::Three,
+            CheckCodePrefix::UP02 => SuffixLength::Two,
+            CheckCodePrefix::UP020 => SuffixLength::Three,
+            CheckCodePrefix::UP021 => SuffixLength::Three,
            CheckCodePrefix::W => SuffixLength::Zero,
            CheckCodePrefix::W2 => SuffixLength::One,
            CheckCodePrefix::W29 => SuffixLength::Two,
--- a/src/cli.rs
+++ b/src/cli.rs
@@ -19,7 +19,8 @@ use crate::settings::types::{
 pub struct Cli {
    #[arg(required_unless_present_any = ["explain", "generate_shell_completion"])]
    pub files: Vec<PathBuf>,
-    /// Path to the `pyproject.toml` file to use for configuration.
+    /// Path to the `pyproject.toml` or `ruff.toml` file to use for
+    /// configuration.
    #[arg(long)]
    pub config: Option<PathBuf>,
    /// Enable verbose logging.
@@ -43,6 +44,12 @@ pub struct Cli {
    fix: bool,
    #[clap(long, overrides_with("fix"), hide = true)]
    no_fix: bool,
+    /// Fix any fixable lint errors, but don't report on leftover violations.
+    /// Implies `--fix`.
+    #[arg(long, overrides_with("no_fix_only"))]
+    fix_only: bool,
+    #[clap(long, overrides_with("fix_only"), hide = true)]
+    no_fix_only: bool,
    /// Disable cache reads.
    #[arg(short, long)]
    pub no_cache: bool,
@@ -181,6 +188,7 @@ impl Cli {
                unfixable: self.unfixable,
                // TODO(charlie): Included in `pyproject.toml`, but not inherited.
                fix: resolve_bool_arg(self.fix, self.no_fix),
+                fix_only: resolve_bool_arg(self.fix_only, self.no_fix_only),
                format: self.format,
                force_exclude: resolve_bool_arg(self.force_exclude, self.no_force_exclude),
                cache_dir: self.cache_dir,
@@ -240,6 +248,7 @@ pub struct Overrides {
    pub unfixable: Option<Vec<CheckCodePrefix>>,
    // TODO(charlie): Captured in pyproject.toml as a default, but not part of `Settings`.
    pub fix: Option<bool>,
+    pub fix_only: Option<bool>,
    pub format: Option<SerializationFormat>,
    pub force_exclude: Option<bool>,
    pub cache_dir: Option<PathBuf>,
--- a/src/commands.rs
+++ b/src/commands.rs
@@ -38,14 +38,8 @@ pub fn run(
    let duration = start.elapsed();
    debug!("Identified files to lint in: {:?}", duration);

-    // Discover the package root for each Python file.
-    let package_roots = packages::detect_package_roots(
-        &paths
-            .iter()
-            .flatten()
-            .map(ignore::DirEntry::path)
-            .collect::<Vec<_>>(),
-    );
+    // Validate the `Settings` and return any errors.
+    resolver.validate(pyproject_strategy)?;

    // Initialize the cache.
    if matches!(cache, flags::Cache::Enabled) {
@@ -71,6 +65,15 @@ pub fn run(
        }
    };

+    // Discover the package root for each Python file.
+    let package_roots = packages::detect_package_roots(
+        &paths
+            .iter()
+            .flatten()
+            .map(ignore::DirEntry::path)
+            .collect::<Vec<_>>(),
+    );
+
    let start = Instant::now();
    let mut diagnostics: Diagnostics = par_iter(&paths)
        .map(|entry| {
@@ -176,6 +179,9 @@ pub fn add_noqa(
    let duration = start.elapsed();
    debug!("Identified files to lint in: {:?}", duration);

+    // Validate the `Settings` and return any errors.
+    resolver.validate(pyproject_strategy)?;
+
    let start = Instant::now();
    let modifications: usize = par_iter(&paths)
        .flatten()
@@ -212,6 +218,9 @@ pub fn autoformat(
    let duration = start.elapsed();
    debug!("Identified files to lint in: {:?}", duration);

+    // Validate the `Settings` and return any errors.
+    resolver.validate(pyproject_strategy)?;
+
    let start = Instant::now();
    let modifications = par_iter(&paths)
        .flatten()
@@ -245,6 +254,9 @@ pub fn show_settings(
    let (paths, resolver) =
        resolver::python_files_in_path(files, pyproject_strategy, file_strategy, overrides)?;

+    // Validate the `Settings` and return any errors.
+    resolver.validate(pyproject_strategy)?;
+
    // Print the list of files.
    let Some(entry) = paths
        .iter()
@@ -268,9 +280,12 @@ pub fn show_files(
    overrides: &Overrides,
 ) -> Result<()> {
    // Collect all files in the hierarchy.
-    let (paths, _resolver) =
+    let (paths, resolver) =
        resolver::python_files_in_path(files, pyproject_strategy, file_strategy, overrides)?;

+    // Validate the `Settings` and return any errors.
+    resolver.validate(pyproject_strategy)?;
+
    // Print the list of files.
    for entry in paths
        .iter()
--- a/src/flake8_annotations/fixes.rs
+++ b/src/flake8_annotations/fixes.rs
@@ -3,7 +3,6 @@ use rustpython_ast::Stmt;
 use rustpython_parser::lexer;
 use rustpython_parser::lexer::Tok;

-use crate::ast::helpers;
 use crate::ast::types::Range;
 use crate::autofix::Fix;
 use crate::source_code_locator::SourceCodeLocator;
@@ -17,13 +16,10 @@ pub fn add_return_none_annotation(locator: &SourceCodeLocator, stmt: &Stmt) -> R
    let mut seen_lpar = false;
    let mut seen_rpar = false;
    let mut count: usize = 0;
-    for (start, tok, ..) in lexer::make_tokenizer(&contents).flatten() {
+    for (start, tok, ..) in lexer::make_tokenizer_located(&contents, range.location).flatten() {
        if seen_lpar && seen_rpar {
            if matches!(tok, Tok::Colon) {
-                return Ok(Fix::insertion(
-                    " -> None".to_string(),
-                    helpers::to_absolute(start, range.location),
-                ));
+                return Ok(Fix::insertion(" -> None".to_string(), start));
            }
        }

--- a/src/flake8_unused_arguments/plugins.rs
+++ b/src/flake8_unused_arguments/plugins.rs
@@ -130,6 +130,7 @@ pub fn unused_arguments(
                        .settings
                        .enabled
                        .contains(Argumentable::Function.check_code())
+                        && !visibility::is_overload(checker, decorator_list)
                    {
                        function(
                            &Argumentable::Function,
@@ -154,6 +155,7 @@ pub fn unused_arguments(
                        && !helpers::is_empty(body)
                        && !visibility::is_abstract(checker, decorator_list)
                        && !visibility::is_override(checker, decorator_list)
+                        && !visibility::is_overload(checker, decorator_list)
                    {
                        method(
                            &Argumentable::Method,
@@ -178,6 +180,7 @@ pub fn unused_arguments(
                        && !helpers::is_empty(body)
                        && !visibility::is_abstract(checker, decorator_list)
                        && !visibility::is_override(checker, decorator_list)
+                        && !visibility::is_overload(checker, decorator_list)
                    {
                        method(
                            &Argumentable::ClassMethod,
@@ -202,6 +205,7 @@ pub fn unused_arguments(
                        && !helpers::is_empty(body)
                        && !visibility::is_abstract(checker, decorator_list)
                        && !visibility::is_override(checker, decorator_list)
+                        && !visibility::is_overload(checker, decorator_list)
                    {
                        function(
                            &Argumentable::StaticMethod,
--- a/src/flake8_unused_arguments/snapshots/ruff__flake8_unused_argumentstestsARG001_ARG.py.snap
+++ b/src/flake8_unused_arguments/snapshots/ruff__flake8_unused_argumentstestsARG001_ARG.py.snap
@@ -5,73 +5,73 @@ expression: checks
 - kind:
    UnusedFunctionArgument: self
  location:
-    row: 8
+    row: 9
    column: 6
  end_location:
-    row: 8
+    row: 9
    column: 10
  fix: ~
 - kind:
    UnusedFunctionArgument: x
  location:
-    row: 8
+    row: 9
    column: 12
  end_location:
-    row: 8
+    row: 9
    column: 13
  fix: ~
 - kind:
    UnusedFunctionArgument: cls
  location:
-    row: 12
+    row: 13
    column: 6
  end_location:
-    row: 12
+    row: 13
    column: 9
  fix: ~
 - kind:
    UnusedFunctionArgument: x
  location:
-    row: 12
+    row: 13
    column: 11
  end_location:
-    row: 12
+    row: 13
    column: 12
  fix: ~
 - kind:
    UnusedFunctionArgument: self
  location:
-    row: 16
+    row: 17
    column: 6
  end_location:
-    row: 16
+    row: 17
    column: 10
  fix: ~
 - kind:
    UnusedFunctionArgument: x
  location:
-    row: 16
+    row: 17
    column: 12
  end_location:
-    row: 16
+    row: 17
    column: 13
  fix: ~
 - kind:
    UnusedFunctionArgument: cls
  location:
-    row: 20
+    row: 21
    column: 6
  end_location:
-    row: 20
+    row: 21
    column: 9
  fix: ~
 - kind:
    UnusedFunctionArgument: x
  location:
-    row: 20
+    row: 21
    column: 11
  end_location:
-    row: 20
+    row: 21
    column: 12
  fix: ~

--- a/src/flake8_unused_arguments/snapshots/ruff__flake8_unused_argumentstestsARG002_ARG.py.snap
+++ b/src/flake8_unused_arguments/snapshots/ruff__flake8_unused_argumentstestsARG002_ARG.py.snap
@@ -5,28 +5,28 @@ expression: checks
 - kind:
    UnusedMethodArgument: x
  location:
-    row: 34
+    row: 35
    column: 16
  end_location:
-    row: 34
+    row: 35
    column: 17
  fix: ~
 - kind:
    UnusedMethodArgument: x
  location:
-    row: 37
+    row: 38
    column: 19
  end_location:
-    row: 37
+    row: 38
    column: 20
  fix: ~
 - kind:
    UnusedMethodArgument: x
  location:
-    row: 40
+    row: 41
    column: 15
  end_location:
-    row: 40
+    row: 41
    column: 16
  fix: ~

--- a/src/flake8_unused_arguments/snapshots/ruff__flake8_unused_argumentstestsARG003_ARG.py.snap
+++ b/src/flake8_unused_arguments/snapshots/ruff__flake8_unused_argumentstestsARG003_ARG.py.snap
@@ -5,10 +5,10 @@ expression: checks
 - kind:
    UnusedClassMethodArgument: x
  location:
-    row: 44
+    row: 45
    column: 15
  end_location:
-    row: 44
+    row: 45
    column: 16
  fix: ~

--- a/src/flake8_unused_arguments/snapshots/ruff__flake8_unused_argumentstestsARG004_ARG.py.snap
+++ b/src/flake8_unused_arguments/snapshots/ruff__flake8_unused_argumentstestsARG004_ARG.py.snap
@@ -5,28 +5,28 @@ expression: checks
 - kind:
    UnusedStaticMethodArgument: cls
  location:
-    row: 48
+    row: 49
    column: 10
  end_location:
-    row: 48
+    row: 49
    column: 13
  fix: ~
 - kind:
    UnusedStaticMethodArgument: x
  location:
-    row: 48
+    row: 49
    column: 15
  end_location:
-    row: 48
+    row: 49
    column: 16
  fix: ~
 - kind:
    UnusedStaticMethodArgument: x
  location:
-    row: 52
+    row: 53
    column: 10
  end_location:
-    row: 52
+    row: 53
    column: 11
  fix: ~

--- a/src/flake8_unused_arguments/snapshots/ruff__flake8_unused_argumentstestsARG005_ARG.py.snap
+++ b/src/flake8_unused_arguments/snapshots/ruff__flake8_unused_argumentstestsARG005_ARG.py.snap
@@ -5,10 +5,10 @@ expression: checks
 - kind:
    UnusedLambdaArgument: x
  location:
-    row: 27
+    row: 28
    column: 7
  end_location:
-    row: 27
+    row: 28
    column: 8
  fix: ~

--- a/src/isort/comments.rs
+++ b/src/isort/comments.rs
@@ -4,7 +4,6 @@ use rustpython_ast::Location;
 use rustpython_parser::lexer;
 use rustpython_parser::lexer::Tok;

-use crate::ast::helpers;
 use crate::ast::types::Range;
 use crate::SourceCodeLocator;

@@ -18,12 +17,10 @@ pub struct Comment<'a> {
 /// Collect all comments in an import block.
 pub fn collect_comments<'a>(range: &Range, locator: &'a SourceCodeLocator) -> Vec<Comment<'a>> {
    let contents = locator.slice_source_code_range(range);
-    lexer::make_tokenizer(&contents)
+    lexer::make_tokenizer_located(&contents, range.location)
        .flatten()
        .filter_map(|(start, tok, end)| {
            if matches!(tok, Tok::Comment) {
-                let start = helpers::to_absolute(start, range.location);
-                let end = helpers::to_absolute(end, range.location);
                Some(Comment {
                    value: locator.slice_source_code_range(&Range {
                        location: start,
--- a/src/isort/format.rs
+++ b/src/isort/format.rs
@@ -41,6 +41,7 @@ pub fn format_import_from(
    line_length: usize,
    force_wrap_aliases: bool,
    is_first: bool,
+    trailing_comma: bool,
 ) -> String {
    if aliases.len() == 1
        && aliases
@@ -53,9 +54,10 @@ pub fn format_import_from(

    // We can only inline if: (1) none of the aliases have atop comments, and (3)
    // only the last alias (if any) has inline comments.
-    if aliases
-        .iter()
-        .all(|(_, CommentSet { atop, .. })| atop.is_empty())
+    if !trailing_comma
+        && aliases
+            .iter()
+            .all(|(_, CommentSet { atop, .. })| atop.is_empty())
        && aliases
            .iter()
            .rev()
--- a/src/isort/helpers.rs
+++ b/src/isort/helpers.rs
@@ -1,7 +1,37 @@
 use rustpython_ast::Stmt;
+use rustpython_parser::lexer;
+use rustpython_parser::lexer::Tok;

+use crate::ast::types::Range;
+use crate::isort::types::TrailingComma;
 use crate::source_code_locator::SourceCodeLocator;

+/// Return `true` if a `StmtKind::ImportFrom` statement ends with a magic
+/// trailing comma.
+pub fn trailing_comma(stmt: &Stmt, locator: &SourceCodeLocator) -> TrailingComma {
+    let contents = locator.slice_source_code_range(&Range::from_located(stmt));
+    let mut count: usize = 0;
+    let mut trailing_comma = TrailingComma::Absent;
+    for (_, tok, _) in lexer::make_tokenizer(&contents).flatten() {
+        if matches!(tok, Tok::Lpar) {
+            count += 1;
+        }
+        if matches!(tok, Tok::Rpar) {
+            count -= 1;
+        }
+        if count == 1 {
+            if matches!(tok, Tok::Newline | Tok::Indent | Tok::Dedent | Tok::Comment) {
+                continue;
+            } else if matches!(tok, Tok::Comma) {
+                trailing_comma = TrailingComma::Present;
+            } else {
+                trailing_comma = TrailingComma::Absent;
+            }
+        }
+    }
+    trailing_comma
+}
+
 /// Return `true` if a `Stmt` is preceded by a "comment break"
 pub fn has_comment_break(stmt: &Stmt, locator: &SourceCodeLocator) -> bool {
    // Starting from the `Stmt` (`def f(): pass`), we want to detect patterns like
--- a/src/isort/mod.rs
+++ b/src/isort/mod.rs
@@ -1,7 +1,8 @@
-use std::cmp::Reverse;
+use std::cmp::Ordering;
 use std::collections::{BTreeMap, BTreeSet};
 use std::path::{Path, PathBuf};

+use itertools::Either::{Left, Right};
 use itertools::Itertools;
 use ropey::RopeBuilder;
 use rustc_hash::FxHashMap;
@@ -9,11 +10,14 @@ use rustpython_ast::{Stmt, StmtKind};

 use crate::isort::categorize::{categorize, ImportType};
 use crate::isort::comments::Comment;
-use crate::isort::sorting::{member_key, module_key};
+use crate::isort::helpers::trailing_comma;
+use crate::isort::sorting::{cmp_import_froms, cmp_members, cmp_modules};
 use crate::isort::track::{Block, Trailer};
 use crate::isort::types::{
    AliasData, CommentSet, ImportBlock, ImportFromData, Importable, OrderedImportBlock,
+    TrailingComma,
 };
+use crate::SourceCodeLocator;

 mod categorize;
 mod comments;
@@ -32,6 +36,7 @@ pub struct AnnotatedAliasData<'a> {
    pub atop: Vec<Comment<'a>>,
    pub inline: Vec<Comment<'a>>,
 }
+
 #[derive(Debug)]
 pub enum AnnotatedImport<'a> {
    Import {
@@ -45,12 +50,15 @@ pub enum AnnotatedImport<'a> {
        level: Option<&'a usize>,
        atop: Vec<Comment<'a>>,
        inline: Vec<Comment<'a>>,
+        trailing_comma: TrailingComma,
    },
 }

 fn annotate_imports<'a>(
    imports: &'a [&'a Stmt],
    comments: Vec<Comment<'a>>,
+    locator: &SourceCodeLocator,
+    split_on_trailing_comma: bool,
 ) -> Vec<AnnotatedImport<'a>> {
    let mut annotated = vec![];
    let mut comments_iter = comments.into_iter().peekable();
@@ -137,6 +145,11 @@ fn annotate_imports<'a>(
                    module: module.as_ref(),
                    names: aliases,
                    level: level.as_ref(),
+                    trailing_comma: if split_on_trailing_comma {
+                        trailing_comma(import, locator)
+                    } else {
+                        TrailingComma::default()
+                    },
                    atop,
                    inline,
                });
@@ -190,34 +203,27 @@ fn normalize_imports(imports: Vec<AnnotatedImport>, combine_as_imports: bool) ->
                level,
                atop,
                inline,
+                trailing_comma,
            } => {
-                // Associate the comments with the first alias (best effort).
+                let single_import = names.len() == 1;
+
+                // If we're dealing with a multi-import block (i.e., a non-star, non-aliased
+                // import), associate the comments with the first alias (best
+                // effort).
                if let Some(alias) = names.first() {
-                    if alias.name == "*" {
-                        let entry = block
+                    let entry = if alias.name == "*" {
+                        block
                            .import_from_star
                            .entry(ImportFromData { module, level })
-                            .or_default();
-                        for comment in atop {
-                            entry.atop.push(comment.value);
-                        }
-                        for comment in inline {
-                            entry.inline.push(comment.value);
-                        }
+                            .or_default()
                    } else if alias.asname.is_none() || combine_as_imports {
-                        let entry = &mut block
+                        &mut block
                            .import_from
                            .entry(ImportFromData { module, level })
                            .or_default()
-                            .0;
-                        for comment in atop {
-                            entry.atop.push(comment.value);
-                        }
-                        for comment in inline {
-                            entry.inline.push(comment.value);
-                        }
+                            .0
                    } else {
-                        let entry = block
+                        block
                            .import_from_as
                            .entry((
                                ImportFromData { module, level },
@@ -226,30 +232,19 @@ fn normalize_imports(imports: Vec<AnnotatedImport>, combine_as_imports: bool) ->
                                    asname: alias.asname,
                                },
                            ))
-                            .or_default();
-                        for comment in atop {
-                            entry.atop.push(comment.value);
-                        }
-                        for comment in inline {
-                            entry.inline.push(comment.value);
-                        }
-                    }
-                }
+                            .or_default()
+                    };

-                // Create an entry for every alias.
-                for alias in names {
-                    if alias.name == "*" {
-                        let entry = block
-                            .import_from_star
-                            .entry(ImportFromData { module, level })
-                            .or_default();
-                        for comment in alias.atop {
-                            entry.atop.push(comment.value);
-                        }
-                        for comment in alias.inline {
-                            entry.inline.push(comment.value);
-                        }
-                    } else if alias.asname.is_none() || combine_as_imports {
+                    for comment in atop {
+                        entry.atop.push(comment.value);
+                    }
+
+                    // Associate inline comments with first alias if multiple names have been
+                    // imported, i.e., the comment applies to all names; otherwise, associate
+                    // with the alias.
+                    if single_import
+                        && (alias.name != "*" && (alias.asname.is_none() || combine_as_imports))
+                    {
                        let entry = block
                            .import_from
                            .entry(ImportFromData { module, level })
@@ -260,14 +255,36 @@ fn normalize_imports(imports: Vec<AnnotatedImport>, combine_as_imports: bool) ->
                                asname: alias.asname,
                            })
                            .or_default();
-                        for comment in alias.atop {
-                            entry.atop.push(comment.value);
-                        }
-                        for comment in alias.inline {
+                        for comment in inline {
                            entry.inline.push(comment.value);
                        }
                    } else {
-                        let entry = block
+                        for comment in inline {
+                            entry.inline.push(comment.value);
+                        }
+                    }
+                }
+
+                // Create an entry for every alias.
+                for alias in names {
+                    let entry = if alias.name == "*" {
+                        block
+                            .import_from_star
+                            .entry(ImportFromData { module, level })
+                            .or_default()
+                    } else if alias.asname.is_none() || combine_as_imports {
+                        block
+                            .import_from
+                            .entry(ImportFromData { module, level })
+                            .or_default()
+                            .1
+                            .entry(AliasData {
+                                name: alias.name,
+                                asname: alias.asname,
+                            })
+                            .or_default()
+                    } else {
+                        block
                            .import_from_as
                            .entry((
                                ImportFromData { module, level },
@@ -276,13 +293,23 @@ fn normalize_imports(imports: Vec<AnnotatedImport>, combine_as_imports: bool) ->
                                    asname: alias.asname,
                                },
                            ))
-                            .or_default();
-                        entry
-                            .atop
-                            .extend(alias.atop.into_iter().map(|comment| comment.value));
-                        for comment in alias.inline {
-                            entry.inline.push(comment.value);
-                        }
+                            .or_default()
+                    };
+
+                    for comment in alias.atop {
+                        entry.atop.push(comment.value);
+                    }
+                    for comment in alias.inline {
+                        entry.inline.push(comment.value);
+                    }
+                }
+
+                // Propagate trailing commas.
+                if matches!(trailing_comma, TrailingComma::Present) {
+                    if let Some(entry) =
+                        block.import_from.get_mut(&ImportFromData { module, level })
+                    {
+                        entry.2 = trailing_comma;
                    }
                }
            }
@@ -379,7 +406,7 @@ fn sort_imports(block: ImportBlock) -> OrderedImportBlock {
        block
            .import
            .into_iter()
-            .sorted_by_cached_key(|(alias, _)| module_key(alias.name, alias.asname)),
+            .sorted_by(|(alias1, _), (alias2, _)| cmp_modules(alias1, alias2)),
    );

    // Sort `StmtKind::ImportFrom`.
@@ -408,6 +435,7 @@ fn sort_imports(block: ImportBlock) -> OrderedImportBlock {
                                        inline: comments.inline,
                                    },
                                )]),
+                                TrailingComma::Absent,
                            ),
                        )
                    }),
@@ -435,44 +463,91 @@ fn sort_imports(block: ImportBlock) -> OrderedImportBlock {
                                        inline: comments.inline,
                                    },
                                )]),
+                                TrailingComma::Absent,
                            ),
                        )
                    }),
            )
-            .map(|(import_from, (comments, aliases))| {
+            .map(|(import_from, (comments, aliases, locations))| {
                // Within each `StmtKind::ImportFrom`, sort the members.
                (
                    import_from,
                    comments,
+                    locations,
                    aliases
                        .into_iter()
-                        .sorted_by_cached_key(|(alias, _)| member_key(alias.name, alias.asname))
+                        .sorted_by(|(alias1, _), (alias2, _)| cmp_members(alias1, alias2))
                        .collect::<Vec<(AliasData, CommentSet)>>(),
                )
            })
-            .sorted_by_cached_key(|(import_from, _, aliases)| {
-                // Sort each `StmtKind::ImportFrom` by module key, breaking ties based on
-                // members.
-                (
-                    Reverse(import_from.level),
-                    import_from
-                        .module
-                        .as_ref()
-                        .map(|module| module_key(module, None)),
-                    aliases
-                        .first()
-                        .map(|(alias, _)| member_key(alias.name, alias.asname)),
-                )
-            }),
+            .sorted_by(
+                |(import_from1, _, _, aliases1), (import_from2, _, _, aliases2)| {
+                    cmp_import_froms(import_from1, import_from2).then_with(|| {
+                        match (aliases1.first(), aliases2.first()) {
+                            (None, None) => Ordering::Equal,
+                            (None, Some(_)) => Ordering::Less,
+                            (Some(_), None) => Ordering::Greater,
+                            (Some((alias1, _)), Some((alias2, _))) => cmp_members(alias1, alias2),
+                        }
+                    })
+                },
+            ),
    );
-
    ordered
 }

-#[allow(clippy::too_many_arguments)]
+fn force_single_line_imports<'a>(
+    block: OrderedImportBlock<'a>,
+    single_line_exclusions: &BTreeSet<String>,
+) -> OrderedImportBlock<'a> {
+    OrderedImportBlock {
+        import: block.import,
+        import_from: block
+            .import_from
+            .into_iter()
+            .flat_map(|(from_data, comment_set, trailing_comma, alias_data)| {
+                if from_data
+                    .module
+                    .map_or(false, |module| single_line_exclusions.contains(module))
+                {
+                    Left(std::iter::once((
+                        from_data,
+                        comment_set,
+                        trailing_comma,
+                        alias_data,
+                    )))
+                } else {
+                    Right(
+                        alias_data
+                            .into_iter()
+                            .enumerate()
+                            .map(move |(index, alias_data)| {
+                                (
+                                    from_data.clone(),
+                                    if index == 0 {
+                                        comment_set.clone()
+                                    } else {
+                                        CommentSet {
+                                            atop: vec![],
+                                            inline: vec![],
+                                        }
+                                    },
+                                    TrailingComma::Absent,
+                                    vec![alias_data],
+                                )
+                            }),
+                    )
+                }
+            })
+            .collect(),
+    }
+}
+
+#[allow(clippy::too_many_arguments, clippy::fn_params_excessive_bools)]
 pub fn format_imports(
    block: &Block,
    comments: Vec<Comment>,
+    locator: &SourceCodeLocator,
    line_length: usize,
    src: &[PathBuf],
    package: Option<&Path>,
@@ -481,9 +556,12 @@ pub fn format_imports(
    extra_standard_library: &BTreeSet<String>,
    combine_as_imports: bool,
    force_wrap_aliases: bool,
+    split_on_trailing_comma: bool,
+    force_single_line: bool,
+    single_line_exclusions: &BTreeSet<String>,
 ) -> String {
    let trailer = &block.trailer;
-    let block = annotate_imports(&block.imports, comments);
+    let block = annotate_imports(&block.imports, comments, locator, split_on_trailing_comma);

    // Normalize imports (i.e., deduplicate, aggregate `from` imports).
    let block = normalize_imports(block, combine_as_imports);
@@ -503,7 +581,10 @@ pub fn format_imports(
    // Generate replacement source code.
    let mut is_first_block = true;
    for import_block in block_by_type.into_values() {
-        let import_block = sort_imports(import_block);
+        let mut import_block = sort_imports(import_block);
+        if force_single_line {
+            import_block = force_single_line_imports(import_block, single_line_exclusions);
+        }

        // Add a blank line between every section.
        if is_first_block {
@@ -521,7 +602,7 @@ pub fn format_imports(
        }

        // Format `StmtKind::ImportFrom` statements.
-        for (import_from, comments, aliases) in &import_block.import_from {
+        for (import_from, comments, trailing_comma, aliases) in &import_block.import_from {
            output.append(&format::format_import_from(
                import_from,
                comments,
@@ -529,6 +610,7 @@ pub fn format_imports(
                line_length,
                force_wrap_aliases,
                is_first_statement,
+                split_on_trailing_comma && matches!(trailing_comma, TrailingComma::Present),
            ));
            is_first_statement = false;
        }
@@ -548,6 +630,7 @@ pub fn format_imports(

 #[cfg(test)]
 mod tests {
+    use std::collections::BTreeSet;
    use std::path::Path;

    use anyhow::Result;
@@ -569,6 +652,7 @@ mod tests {
    #[test_case(Path::new("insert_empty_lines.py"))]
    #[test_case(Path::new("insert_empty_lines.pyi"))]
    #[test_case(Path::new("leading_prefix.py"))]
+    #[test_case(Path::new("natural_order.py"))]
    #[test_case(Path::new("no_reorder_within_section.py"))]
    #[test_case(Path::new("no_wrap_star.py"))]
    #[test_case(Path::new("order_by_type.py"))]
@@ -587,6 +671,7 @@ mod tests {
    #[test_case(Path::new("split.py"))]
    #[test_case(Path::new("trailing_suffix.py"))]
    #[test_case(Path::new("type_comments.py"))]
+    #[test_case(Path::new("magic_trailing_comma.py"))]
    fn default(path: &Path) -> Result<()> {
        let snapshot = format!("{}", path.to_string_lossy());
        let mut checks = test_path(
@@ -645,4 +730,49 @@ mod tests {
        insta::assert_yaml_snapshot!(snapshot, checks);
        Ok(())
    }
+
+    #[test_case(Path::new("magic_trailing_comma.py"))]
+    fn no_split_on_trailing_comma(path: &Path) -> Result<()> {
+        let snapshot = format!("split_on_trailing_comma_{}", path.to_string_lossy());
+        let mut checks = test_path(
+            Path::new("./resources/test/fixtures/isort")
+                .join(path)
+                .as_path(),
+            &Settings {
+                isort: isort::settings::Settings {
+                    split_on_trailing_comma: false,
+                    ..isort::settings::Settings::default()
+                },
+                src: vec![Path::new("resources/test/fixtures/isort").to_path_buf()],
+                ..Settings::for_rule(CheckCode::I001)
+            },
+        )?;
+        checks.sort_by_key(|check| check.location);
+        insta::assert_yaml_snapshot!(snapshot, checks);
+        Ok(())
+    }
+
+    #[test_case(Path::new("force_single_line.py"))]
+    fn force_single_line(path: &Path) -> Result<()> {
+        let snapshot = format!("force_single_line_{}", path.to_string_lossy());
+        let mut checks = test_path(
+            Path::new("./resources/test/fixtures/isort")
+                .join(path)
+                .as_path(),
+            &Settings {
+                isort: isort::settings::Settings {
+                    force_single_line: true,
+                    single_line_exclusions: vec!["os".to_string(), "logging.handlers".to_string()]
+                        .into_iter()
+                        .collect::<BTreeSet<_>>(),
+                    ..isort::settings::Settings::default()
+                },
+                src: vec![Path::new("resources/test/fixtures/isort").to_path_buf()],
+                ..Settings::for_rule(CheckCode::I001)
+            },
+        )?;
+        checks.sort_by_key(|check| check.location);
+        insta::assert_yaml_snapshot!(snapshot, checks);
+        Ok(())
+    }
 }
--- a/src/isort/plugins.rs
+++ b/src/isort/plugins.rs
@@ -72,6 +72,7 @@ pub fn check_imports(
    let expected = format_imports(
        block,
        comments,
+        locator,
        settings.line_length - indentation.len(),
        &settings.src,
        package,
@@ -80,6 +81,9 @@ pub fn check_imports(
        &settings.isort.extra_standard_library,
        settings.isort.combine_as_imports,
        settings.isort.force_wrap_aliases,
+        settings.isort.split_on_trailing_comma,
+        settings.isort.force_single_line,
+        &settings.isort.single_line_exclusions,
    );

    // Expand the span the entire range, including leading and trailing space.
--- a/src/isort/settings.rs
+++ b/src/isort/settings.rs
@@ -40,6 +40,22 @@ pub struct Options {
    /// enabled, every aliased `import from` will be given its own line, in
    /// which case, wrapping is not necessary.
    pub force_wrap_aliases: Option<bool>,
+    #[option(
+        default = r#"false"#,
+        value_type = "bool",
+        example = r#"force-single-line = true"#
+    )]
+    /// Forces all from imports to appear on their own line.
+    pub force_single_line: Option<bool>,
+    #[option(
+        default = r#"[]"#,
+        value_type = "Vec<String>",
+        example = r#"
+            single-line-exclusions = ["os", "json"]
+        "#
+    )]
+    /// One or more modules to exclude from the single line rule.
+    pub single_line_exclusions: Option<Vec<String>>,
    #[option(
        default = r#"false"#,
        value_type = "bool",
@@ -50,6 +66,18 @@ pub struct Options {
    /// Combines as imports on the same line. See isort's [`combine-as-imports`](https://pycqa.github.io/isort/docs/configuration/options.html#combine-as-imports)
    /// option.
    pub combine_as_imports: Option<bool>,
+    #[option(
+        default = r#"true"#,
+        value_type = "bool",
+        example = r#"
+            split-on-trailing-comma = false
+        "#
+    )]
+    /// If a comma is placed after the last member in a multi-line import, then
+    /// the imports will never be folded into one line.
+    ///
+    /// See isort's [`split-on-trailing-comma`](https://pycqa.github.io/isort/docs/configuration/options.html#split-on-trailing-comma) option.
+    pub split_on_trailing_comma: Option<bool>,
    #[option(
        default = r#"[]"#,
        value_type = "Vec<String>",
@@ -82,10 +110,14 @@ pub struct Options {
    pub extra_standard_library: Option<Vec<String>>,
 }

-#[derive(Debug, Hash, Default)]
+#[derive(Debug, Hash)]
+#[allow(clippy::struct_excessive_bools)]
 pub struct Settings {
    pub combine_as_imports: bool,
    pub force_wrap_aliases: bool,
+    pub split_on_trailing_comma: bool,
+    pub force_single_line: bool,
+    pub single_line_exclusions: BTreeSet<String>,
    pub known_first_party: BTreeSet<String>,
    pub known_third_party: BTreeSet<String>,
    pub extra_standard_library: BTreeSet<String>,
@@ -94,8 +126,13 @@ pub struct Settings {
 impl Settings {
    pub fn from_options(options: Options) -> Self {
        Self {
-            combine_as_imports: options.combine_as_imports.unwrap_or_default(),
-            force_wrap_aliases: options.force_wrap_aliases.unwrap_or_default(),
+            combine_as_imports: options.combine_as_imports.unwrap_or(false),
+            force_wrap_aliases: options.force_wrap_aliases.unwrap_or(false),
+            split_on_trailing_comma: options.split_on_trailing_comma.unwrap_or(true),
+            force_single_line: options.force_single_line.unwrap_or(false),
+            single_line_exclusions: BTreeSet::from_iter(
+                options.single_line_exclusions.unwrap_or_default(),
+            ),
            known_first_party: BTreeSet::from_iter(options.known_first_party.unwrap_or_default()),
            known_third_party: BTreeSet::from_iter(options.known_third_party.unwrap_or_default()),
            extra_standard_library: BTreeSet::from_iter(
@@ -104,3 +141,18 @@ impl Settings {
        }
    }
 }
+
+impl Default for Settings {
+    fn default() -> Self {
+        Self {
+            combine_as_imports: false,
+            force_wrap_aliases: false,
+            split_on_trailing_comma: true,
+            force_single_line: false,
+            single_line_exclusions: BTreeSet::new(),
+            known_first_party: BTreeSet::new(),
+            known_third_party: BTreeSet::new(),
+            extra_standard_library: BTreeSet::new(),
+        }
+    }
+}
--- a/src/isort/snapshots/ruffisorttests__comments.py.snap
+++ b/src/isort/snapshots/ruffisorttests__comments.py.snap
@@ -7,14 +7,14 @@ expression: checks
    row: 3
    column: 0
  end_location:
-    row: 26
+    row: 29
    column: 0
  fix:
-    content: "import B  # Comment 4\n\n# Comment 3a\n# Comment 3b\nimport C\nimport D\n\n# Comment 5\n# Comment 6\nfrom A import (\n    a,  # Comment 7  # Comment 9\n    b,  # Comment 10\n    c,  # Comment 8  # Comment 11\n)\n"
+    content: "import B  # Comment 4\n\n# Comment 3a\n# Comment 3b\nimport C\nimport D\n\n# Comment 5\n# Comment 6\nfrom A import (\n    a,  # Comment 7  # Comment 9\n    b,  # Comment 10\n    c,  # Comment 8  # Comment 11\n)\nfrom D import (\n    a_long_name_to_force_multiple_lines,  # Comment 12\n    another_long_name_to_force_multiple_lines,  # Comment 13\n)\n"
    location:
      row: 3
      column: 0
    end_location:
-      row: 26
+      row: 29
      column: 0

--- a/src/isort/snapshots/ruffisorttests__fit_line_length_comment.py.snap
+++ b/src/isort/snapshots/ruffisorttests__fit_line_length_comment.py.snap
@@ -10,7 +10,7 @@ expression: checks
    row: 5
    column: 0
  fix:
-    content: "import a\n\n# Don't take this comment into account when determining whether the next import can fit on one line.\nfrom b import c\nfrom d import (  # Do take this comment into account when determining whether the next import can fit on one line.\n    e,\n)\n"
+    content: "import a\n\n# Don't take this comment into account when determining whether the next import can fit on one line.\nfrom b import c\nfrom d import (\n    e,  # Do take this comment into account when determining whether the next import can fit on one line.\n)\n"
    location:
      row: 1
      column: 0
--- a/src/isort/snapshots/ruffisorttests__force_single_line_force_single_line.py.snap
+++ b/src/isort/snapshots/ruffisorttests__force_single_line_force_single_line.py.snap
@@ -0,0 +1,20 @@
+---
+source: src/isort/mod.rs
+expression: checks
+---
+- kind: UnsortedImports
+  location:
+    row: 1
+    column: 0
+  end_location:
+    row: 19
+    column: 0
+  fix:
+    content: "import math\nimport sys\nfrom logging.handlers import FileHandler, StreamHandler\nfrom os import path, uname\n\n# comment 5\nfrom bar import a  # comment 6\nfrom bar import b  # comment 7\nfrom foo import bar  # comment 3\nfrom foo2 import bar2  # comment 4\n\n# comment 1\n# comment 2\nfrom third_party import lib1\nfrom third_party import lib2\nfrom third_party import lib3\nfrom third_party import lib4\nfrom third_party import lib5\nfrom third_party import lib6\nfrom third_party import lib7\n"
+    location:
+      row: 1
+      column: 0
+    end_location:
+      row: 19
+      column: 0
+
--- a/src/isort/snapshots/ruffisorttests__magic_trailing_comma.py.snap
+++ b/src/isort/snapshots/ruffisorttests__magic_trailing_comma.py.snap
@@ -0,0 +1,20 @@
+---
+source: src/isort/mod.rs
+expression: checks
+---
+- kind: UnsortedImports
+  location:
+    row: 2
+    column: 0
+  end_location:
+    row: 39
+    column: 0
+  fix:
+    content: "from glob import (\n    escape,  # Ends with a comment, should still treat as magic trailing comma.\n    glob,\n    iglob,\n)\n\n# No magic comma, this will be rolled into one line.\nfrom os import environ, execl, execv, path\nfrom sys import (\n    argv,\n    exit,\n    stderr,\n    stdout,\n)\n\n# These will be combined, but without a trailing comma.\nfrom foo import bar, baz\n\n# These will be combined, _with_ a trailing comma.\nfrom module1 import (\n    member1,\n    member2,\n    member3,\n)\n\n# These will be combined, _with_ a trailing comma.\nfrom module2 import (\n    member1,\n    member2,\n    member3,\n)\n"
+    location:
+      row: 2
+      column: 0
+    end_location:
+      row: 39
+      column: 0
+
--- a/src/isort/snapshots/ruffisorttests__natural_order.py.snap
+++ b/src/isort/snapshots/ruffisorttests__natural_order.py.snap
@@ -0,0 +1,20 @@
+---
+source: src/isort/mod.rs
+expression: checks
+---
+- kind: UnsortedImports
+  location:
+    row: 1
+    column: 0
+  end_location:
+    row: 17
+    column: 0
+  fix:
+    content: "import numpy1\nimport numpy2\nimport numpy10\nfrom numpy import (\n    cos,\n    int8,\n    int16,\n    int32,\n    int64,\n    sin,\n    tan,\n    uint8,\n    uint16,\n    uint32,\n    uint64,\n)\n"
+    location:
+      row: 1
+      column: 0
+    end_location:
+      row: 17
+      column: 0
+
--- a/src/isort/snapshots/ruffisorttests__split_on_trailing_comma_magic_trailing_comma.py.snap
+++ b/src/isort/snapshots/ruffisorttests__split_on_trailing_comma_magic_trailing_comma.py.snap
@@ -0,0 +1,20 @@
+---
+source: src/isort/mod.rs
+expression: checks
+---
+- kind: UnsortedImports
+  location:
+    row: 2
+    column: 0
+  end_location:
+    row: 39
+    column: 0
+  fix:
+    content: "from glob import (\n    escape,  # Ends with a comment, should still treat as magic trailing comma.\n    glob,\n    iglob,\n)\n\n# No magic comma, this will be rolled into one line.\nfrom os import environ, execl, execv, path\nfrom sys import argv, exit, stderr, stdout\n\n# These will be combined, but without a trailing comma.\nfrom foo import bar, baz\n\n# These will be combined, _with_ a trailing comma.\nfrom module1 import member1, member2, member3\n\n# These will be combined, _with_ a trailing comma.\nfrom module2 import member1, member2, member3\n"
+    location:
+      row: 2
+      column: 0
+    end_location:
+      row: 39
+      column: 0
+
--- a/src/isort/sorting.rs
+++ b/src/isort/sorting.rs
@@ -1,4 +1,7 @@
 /// See: <https://github.com/PyCQA/isort/blob/12cc5fbd67eebf92eb2213b03c07b138ae1fb448/isort/sorting.py#L13>
+use std::cmp::Ordering;
+
+use crate::isort::types::{AliasData, ImportFromData};
 use crate::python::string;

 #[derive(PartialOrd, Ord, PartialEq, Eq)]
@@ -8,29 +11,57 @@ pub enum Prefix {
    Variables,
 }

-pub fn module_key<'a>(
-    name: &'a str,
-    asname: Option<&'a String>,
-) -> (String, &'a str, Option<&'a String>) {
-    (name.to_lowercase(), name, asname)
+fn prefix(name: &str) -> Prefix {
+    if name.len() > 1 && string::is_upper(name) {
+        // Ex) `CONSTANT`
+        Prefix::Constants
+    } else if name.chars().next().map_or(false, char::is_uppercase) {
+        // Ex) `Class`
+        Prefix::Classes
+    } else {
+        // Ex) `variable`
+        Prefix::Variables
+    }
 }

-pub fn member_key<'a>(
-    name: &'a str,
-    asname: Option<&'a String>,
-) -> (Prefix, String, Option<&'a String>) {
-    (
-        if name.len() > 1 && string::is_upper(name) {
-            // Ex) `CONSTANT`
-            Prefix::Constants
-        } else if name.chars().next().map_or(false, char::is_uppercase) {
-            // Ex) `Class`
-            Prefix::Classes
-        } else {
-            // Ex) `variable`
-            Prefix::Variables
-        },
-        name.to_lowercase(),
-        asname,
-    )
+/// Compare two top-level modules.
+pub fn cmp_modules(alias1: &AliasData, alias2: &AliasData) -> Ordering {
+    natord::compare_ignore_case(alias1.name, alias2.name)
+        .then_with(|| natord::compare(alias1.name, alias2.name))
+        .then_with(|| match (alias1.asname, alias2.asname) {
+            (None, None) => Ordering::Equal,
+            (None, Some(_)) => Ordering::Less,
+            (Some(_), None) => Ordering::Greater,
+            (Some(asname1), Some(asname2)) => natord::compare(asname1, asname2),
+        })
+}
+
+/// Compare two member imports within `StmtKind::ImportFrom` blocks.
+pub fn cmp_members(alias1: &AliasData, alias2: &AliasData) -> Ordering {
+    prefix(alias1.name)
+        .cmp(&prefix(alias2.name))
+        .then_with(|| cmp_modules(alias1, alias2))
+}
+
+/// Compare two relative import levels.
+pub fn cmp_levels(level1: Option<&usize>, level2: Option<&usize>) -> Ordering {
+    match (level1, level2) {
+        (None, None) => Ordering::Equal,
+        (None, Some(_)) => Ordering::Less,
+        (Some(_), None) => Ordering::Greater,
+        (Some(level1), Some(level2)) => level2.cmp(level1),
+    }
+}
+
+/// Compare two `StmtKind::ImportFrom` blocks.
+pub fn cmp_import_froms(import_from1: &ImportFromData, import_from2: &ImportFromData) -> Ordering {
+    cmp_levels(import_from1.level, import_from2.level).then_with(|| {
+        match (&import_from1.module, import_from2.module) {
+            (None, None) => Ordering::Equal,
+            (None, Some(_)) => Ordering::Less,
+            (Some(_), None) => Ordering::Greater,
+            (Some(module1), Some(module2)) => natord::compare_ignore_case(module1, module2)
+                .then_with(|| natord::compare(module1, module2)),
+        }
+    })
 }
--- a/src/isort/types.rs
+++ b/src/isort/types.rs
@@ -4,7 +4,19 @@ use rustc_hash::FxHashMap;

 use crate::ast;

-#[derive(Debug, Hash, Ord, PartialOrd, Eq, PartialEq)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+pub enum TrailingComma {
+    Present,
+    Absent,
+}
+
+impl Default for TrailingComma {
+    fn default() -> Self {
+        TrailingComma::Absent
+    }
+}
+
+#[derive(Debug, Hash, Ord, PartialOrd, Eq, PartialEq, Clone)]
 pub struct ImportFromData<'a> {
    pub module: Option<&'a String>,
    pub level: Option<&'a usize>,
@@ -16,7 +28,7 @@ pub struct AliasData<'a> {
    pub asname: Option<&'a String>,
 }

-#[derive(Debug, Default)]
+#[derive(Debug, Default, Clone)]
 pub struct CommentSet<'a> {
    pub atop: Vec<Cow<'a, str>>,
    pub inline: Vec<Cow<'a, str>>,
@@ -54,8 +66,14 @@ pub struct ImportBlock<'a> {
    pub import: FxHashMap<AliasData<'a>, CommentSet<'a>>,
    // Map from (module, level) to `AliasData`, used to track 'from' imports.
    // Ex) `from module import member`
-    pub import_from:
-        FxHashMap<ImportFromData<'a>, (CommentSet<'a>, FxHashMap<AliasData<'a>, CommentSet<'a>>)>,
+    pub import_from: FxHashMap<
+        ImportFromData<'a>,
+        (
+            CommentSet<'a>,
+            FxHashMap<AliasData<'a>, CommentSet<'a>>,
+            TrailingComma,
+        ),
+    >,
    // Set of (module, level, name, asname), used to track re-exported 'from' imports.
    // Ex) `from module import member as member`
    pub import_from_as: FxHashMap<(ImportFromData<'a>, AliasData<'a>), CommentSet<'a>>,
@@ -72,6 +90,7 @@ pub struct OrderedImportBlock<'a> {
    pub import_from: Vec<(
        ImportFromData<'a>,
        CommentSet<'a>,
+        TrailingComma,
        Vec<AliasDataWithComments<'a>>,
    )>,
 }
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -11,19 +11,10 @@
    clippy::too_many_lines
 )]

-use std::path::Path;
-
-use anyhow::Result;
-use path_absolutize::path_dedot;
-use rustpython_helpers::tokenize;
-use rustpython_parser::lexer::LexResult;
-use settings::{pyproject, Settings};
+use cfg_if::cfg_if;

 use crate::checks::Check;
-use crate::linter::check_path;
-use crate::resolver::Relativity;
-use crate::settings::configuration::Configuration;
-use crate::settings::flags;
+use crate::settings::Settings;
 use crate::source_code_locator::SourceCodeLocator;

 mod ast;
@@ -34,7 +25,6 @@ pub mod checks;
 pub mod checks_gen;
 pub mod cli;
 pub mod code_gen;
-pub mod commands;
 mod cst;
 mod directives;
 mod docstrings;
@@ -66,7 +56,6 @@ pub mod logging;
 pub mod mccabe;
 pub mod message;
 mod noqa;
-mod packages;
 mod pandas_vet;
 pub mod pep8_naming;
 pub mod printer;
@@ -82,55 +71,20 @@ mod ruff;
 mod rustpython_helpers;
 pub mod settings;
 pub mod source_code_locator;
-#[cfg(feature = "update-informer")]
-pub mod updates;
 mod vendored;
 pub mod visibility;

-/// Load the relevant `Settings` for a given `Path`.
-fn resolve(path: &Path) -> Result<Settings> {
-    if let Some(pyproject) = pyproject::find_pyproject_toml(path)? {
-        // First priority: `pyproject.toml` in the current `Path`.
-        resolver::resolve_settings(&pyproject, &Relativity::Parent, None)
-    } else if let Some(pyproject) = pyproject::find_user_pyproject_toml() {
-        // Second priority: user-specific `pyproject.toml`.
-        resolver::resolve_settings(&pyproject, &Relativity::Cwd, None)
+cfg_if! {
+    if #[cfg(not(target_family = "wasm"))] {
+        pub mod commands;
+        mod packages;
+        #[cfg(all(feature = "update-informer"))]
+        pub mod updates;
+
+        mod lib_native;
+        pub use lib_native::check;
    } else {
-        // Fallback: default settings.
-        Settings::from_configuration(Configuration::default(), &path_dedot::CWD)
+        mod lib_wasm;
+        pub use lib_wasm::check;
    }
 }
-
-/// Run Ruff over Python source code directly.
-pub fn check(path: &Path, contents: &str, autofix: bool) -> Result<Vec<Check>> {
-    // Load the relevant `Settings` for the given `Path`.
-    let settings = resolve(path)?;
-
-    // Tokenize once.
-    let tokens: Vec<LexResult> = tokenize(contents);
-
-    // Initialize the SourceCodeLocator (which computes offsets lazily).
-    let locator = SourceCodeLocator::new(contents);
-
-    // Extract the `# noqa` and `# isort: skip` directives from the source.
-    let directives = directives::extract_directives(
-        &tokens,
-        &locator,
-        directives::Flags::from_settings(&settings),
-    );
-
-    // Generate checks.
-    let checks = check_path(
-        path,
-        packages::detect_package_root(path),
-        contents,
-        tokens,
-        &locator,
-        &directives,
-        &settings,
-        autofix.into(),
-        flags::Noqa::Enabled,
-    )?;
-
-    Ok(checks)
-}
--- a/src/lib_native.rs
+++ b/src/lib_native.rs
@@ -0,0 +1,65 @@
+use std::path::Path;
+
+use anyhow::Result;
+use path_absolutize::path_dedot;
+use rustpython_parser::lexer::LexResult;
+
+use crate::checks::Check;
+use crate::linter::check_path;
+use crate::resolver::Relativity;
+use crate::rustpython_helpers::tokenize;
+use crate::settings::configuration::Configuration;
+use crate::settings::{flags, pyproject, Settings};
+use crate::source_code_locator::SourceCodeLocator;
+use crate::{directives, packages, resolver};
+
+/// Load the relevant `Settings` for a given `Path`.
+fn resolve(path: &Path) -> Result<Settings> {
+    if let Some(pyproject) = pyproject::find_settings_toml(path)? {
+        // First priority: `pyproject.toml` in the current `Path`.
+        resolver::resolve_settings(&pyproject, &Relativity::Parent, None)
+    } else if let Some(pyproject) = pyproject::find_user_settings_toml() {
+        // Second priority: user-specific `pyproject.toml`.
+        resolver::resolve_settings(&pyproject, &Relativity::Cwd, None)
+    } else {
+        // Fallback: default settings.
+        Settings::from_configuration(Configuration::default(), &path_dedot::CWD)
+    }
+}
+
+/// Run Ruff over Python source code directly.
+pub fn check(path: &Path, contents: &str, autofix: bool) -> Result<Vec<Check>> {
+    // Load the relevant `Settings` for the given `Path`.
+    let settings = resolve(path)?;
+
+    // Validate the `Settings` and return any errors.
+    settings.validate()?;
+
+    // Tokenize once.
+    let tokens: Vec<LexResult> = tokenize(contents);
+
+    // Initialize the SourceCodeLocator (which computes offsets lazily).
+    let locator = SourceCodeLocator::new(contents);
+
+    // Extract the `# noqa` and `# isort: skip` directives from the source.
+    let directives = directives::extract_directives(
+        &tokens,
+        &locator,
+        directives::Flags::from_settings(&settings),
+    );
+
+    // Generate checks.
+    let checks = check_path(
+        path,
+        packages::detect_package_root(path),
+        contents,
+        tokens,
+        &locator,
+        &directives,
+        &settings,
+        autofix.into(),
+        flags::Noqa::Enabled,
+    )?;
+
+    Ok(checks)
+}
--- a/src/lib_wasm.rs
+++ b/src/lib_wasm.rs
@@ -0,0 +1,156 @@
+use std::path::Path;
+
+use rustpython_ast::Location;
+use rustpython_parser::lexer::LexResult;
+use serde::{Deserialize, Serialize};
+use wasm_bindgen::prelude::*;
+
+use crate::autofix::Fix;
+use crate::checks::CheckCode;
+use crate::directives;
+use crate::linter::check_path;
+use crate::rustpython_helpers::tokenize;
+use crate::settings::configuration::Configuration;
+use crate::settings::options::Options;
+use crate::settings::{flags, Settings};
+use crate::source_code_locator::SourceCodeLocator;
+
+#[wasm_bindgen(typescript_custom_section)]
+const TYPES: &'static str = r#"
+export interface Check {
+    code: string;
+    message: string;
+    location: {
+        row: number;
+        column: number;
+    };
+    end_location: {
+        row: number;
+        column: number;
+    };
+    fix: {
+        content: string;
+        location: {
+            row: number;
+            column: number;
+        };
+        end_location: {
+            row: number;
+            column: number;
+        };
+    } | null;
+};
+"#;
+
+#[derive(Debug, PartialEq, Eq, Serialize, Deserialize)]
+struct Message {
+    code: CheckCode,
+    message: String,
+    location: Location,
+    end_location: Location,
+    fix: Option<Fix>,
+}
+
+#[wasm_bindgen(start)]
+pub fn run() {
+    use log::Level;
+    console_error_panic_hook::set_once();
+    console_log::init_with_level(Level::Debug).expect("Initializing logger went wrong.");
+}
+
+#[wasm_bindgen]
+pub fn check(contents: &str, options: JsValue) -> Result<JsValue, JsValue> {
+    let options: Options = serde_wasm_bindgen::from_value(options).map_err(|e| e.to_string())?;
+    let configuration =
+        Configuration::from_options(options, Path::new(".")).map_err(|e| e.to_string())?;
+    let settings =
+        Settings::from_configuration(configuration, Path::new(".")).map_err(|e| e.to_string())?;
+
+    // Tokenize once.
+    let tokens: Vec<LexResult> = tokenize(contents);
+
+    // Initialize the SourceCodeLocator (which computes offsets lazily).
+    let locator = SourceCodeLocator::new(contents);
+
+    // Extract the `# noqa` and `# isort: skip` directives from the source.
+    let directives = directives::extract_directives(&tokens, &locator, directives::Flags::empty());
+
+    // Generate checks.
+    let checks = check_path(
+        Path::new("<filename>"),
+        None,
+        contents,
+        tokens,
+        &locator,
+        &directives,
+        &settings,
+        flags::Autofix::Enabled,
+        flags::Noqa::Enabled,
+    )
+    .map_err(|e| e.to_string())?;
+
+    let messages: Vec<Message> = checks
+        .into_iter()
+        .map(|check| Message {
+            code: check.kind.code().clone(),
+            message: check.kind.body(),
+            location: check.location,
+            end_location: check.end_location,
+            fix: check.fix,
+        })
+        .collect();
+
+    Ok(serde_wasm_bindgen::to_value(&messages)?)
+}
+
+#[cfg(test)]
+mod test {
+    use js_sys;
+    use wasm_bindgen_test::*;
+
+    use super::*;
+
+    macro_rules! check {
+        ($source:expr, $config:expr, $expected:expr) => {{
+            let foo = js_sys::JSON::parse($config).unwrap();
+            match check($source, foo) {
+                Ok(output) => {
+                    let result: Vec<Message> = serde_wasm_bindgen::from_value(output).unwrap();
+                    assert_eq!(result, $expected);
+                }
+                Err(e) => assert!(false, "{:#?}", e),
+            }
+        }};
+    }
+
+    #[wasm_bindgen_test]
+    fn empty_config() {
+        check!(
+            "if (1, 2): pass",
+            r#"{}"#,
+            [Message {
+                code: CheckCode::F634,
+                message: "If test is a tuple, which is always `True`".to_string(),
+                location: Location::new(1, 0),
+                end_location: Location::new(1, 15),
+                fix: None,
+            }]
+        );
+    }
+
+    #[wasm_bindgen_test]
+    fn partial_config() {
+        check!("if (1, 2): pass", r#"{"ignore": ["F"]}"#, []);
+    }
+
+    #[wasm_bindgen_test]
+    fn partial_nested_config() {
+        let config = r#"{
+          "select": ["Q"],
+          "flake8-quotes": {
+            "inline-quotes": "single"
+          }
+        }"#;
+        check!(r#"print('hello world')"#, config, []);
+    }
+}
--- a/src/linter.rs
+++ b/src/linter.rs
@@ -5,7 +5,6 @@ use std::ops::AddAssign;
 use std::path::Path;

 use anyhow::Result;
-#[cfg(not(target_family = "wasm"))]
 use log::debug;
 use rustpython_parser::lexer::LexResult;

@@ -59,6 +58,9 @@ pub(crate) fn check_path(
    autofix: flags::Autofix,
    noqa: flags::Noqa,
 ) -> Result<Vec<Check>> {
+    // Validate the `Settings` and return any errors.
+    settings.validate()?;
+
    // Aggregate all checks.
    let mut checks: Vec<Check> = vec![];

@@ -175,6 +177,9 @@ pub fn lint_path(
    cache: flags::Cache,
    autofix: fixer::Mode,
 ) -> Result<Diagnostics> {
+    // Validate the `Settings` and return any errors.
+    settings.validate()?;
+
    let metadata = path.metadata()?;

    // Check the cache.
@@ -202,6 +207,9 @@ pub fn lint_path(

 /// Add any missing `#noqa` pragmas to the source code at the given `Path`.
 pub fn add_noqa_to_path(path: &Path, settings: &Settings) -> Result<usize> {
+    // Validate the `Settings` and return any errors.
+    settings.validate()?;
+
    // Read the file from disk.
    let contents = fs::read_file(path)?;

@@ -241,7 +249,10 @@ pub fn add_noqa_to_path(path: &Path, settings: &Settings) -> Result<usize> {
 }

 /// Apply autoformatting to the source code at the given `Path`.
-pub fn autoformat_path(path: &Path, _settings: &Settings) -> Result<()> {
+pub fn autoformat_path(path: &Path, settings: &Settings) -> Result<()> {
+    // Validate the `Settings` and return any errors.
+    settings.validate()?;
+
    // Read the file from disk.
    let contents = fs::read_file(path)?;

@@ -266,6 +277,9 @@ pub fn lint_stdin(
    settings: &Settings,
    autofix: fixer::Mode,
 ) -> Result<Diagnostics> {
+    // Validate the `Settings` and return any errors.
+    settings.validate()?;
+
    // Read the file from disk.
    let contents = stdin.to_string();

--- a/src/main.rs
+++ b/src/main.rs
@@ -11,250 +11,23 @@
    clippy::too_many_lines
 )]

-use std::io::{self};
-use std::path::{Path, PathBuf};
 use std::process::ExitCode;
-use std::sync::mpsc::channel;

-use ::ruff::autofix::fixer;
-use ::ruff::cli::{extract_log_level, Cli, Overrides};
-use ::ruff::commands;
-use ::ruff::logging::{set_up_logging, LogLevel};
-use ::ruff::printer::Printer;
-use ::ruff::resolver::{resolve_settings, FileDiscovery, PyprojectDiscovery, Relativity};
-use ::ruff::settings::configuration::Configuration;
-use ::ruff::settings::types::SerializationFormat;
-use ::ruff::settings::{pyproject, Settings};
-#[cfg(feature = "update-informer")]
-use ::ruff::updates;
-use anyhow::Result;
-use clap::{CommandFactory, Parser};
+use cfg_if::cfg_if;
 use colored::Colorize;
-use notify::{recommended_watcher, RecursiveMode, Watcher};
-use path_absolutize::path_dedot;

-/// Resolve the relevant settings strategy and defaults for the current
-/// invocation.
-fn resolve(
-    config: Option<&Path>,
-    overrides: &Overrides,
-    stdin_filename: Option<&Path>,
-) -> Result<PyprojectDiscovery> {
-    if let Some(pyproject) = config {
-        // First priority: the user specified a `pyproject.toml` file. Use that
-        // `pyproject.toml` for _all_ configuration, and resolve paths relative to the
-        // current working directory. (This matches ESLint's behavior.)
-        let settings = resolve_settings(pyproject, &Relativity::Cwd, Some(overrides))?;
-        Ok(PyprojectDiscovery::Fixed(settings))
-    } else if let Some(pyproject) = pyproject::find_pyproject_toml(
-        stdin_filename
-            .as_ref()
-            .unwrap_or(&path_dedot::CWD.as_path()),
-    )? {
-        // Second priority: find a `pyproject.toml` file in either an ancestor of
-        // `stdin_filename` (if set) or the current working path all paths relative to
-        // that directory. (With `Strategy::Hierarchical`, we'll end up finding
-        // the "closest" `pyproject.toml` file for every Python file later on,
-        // so these act as the "default" settings.)
-        let settings = resolve_settings(&pyproject, &Relativity::Parent, Some(overrides))?;
-        Ok(PyprojectDiscovery::Hierarchical(settings))
-    } else if let Some(pyproject) = pyproject::find_user_pyproject_toml() {
-        // Third priority: find a user-specific `pyproject.toml`, but resolve all paths
-        // relative the current working directory. (With `Strategy::Hierarchical`, we'll
-        // end up the "closest" `pyproject.toml` file for every Python file later on, so
-        // these act as the "default" settings.)
-        let settings = resolve_settings(&pyproject, &Relativity::Cwd, Some(overrides))?;
-        Ok(PyprojectDiscovery::Hierarchical(settings))
+cfg_if! {
+    if #[cfg(not(target_family = "wasm"))] {
+        mod main_native;
+        use main_native::inner_main;
    } else {
-        // Fallback: load Ruff's default settings, and resolve all paths relative to the
-        // current working directory. (With `Strategy::Hierarchical`, we'll end up the
-        // "closest" `pyproject.toml` file for every Python file later on, so these act
-        // as the "default" settings.)
-        let mut config = Configuration::default();
-        // Apply command-line options that override defaults.
-        config.apply(overrides.clone());
-        let settings = Settings::from_configuration(config, &path_dedot::CWD)?;
-        Ok(PyprojectDiscovery::Hierarchical(settings))
-    }
-}
+        use anyhow::Result;

-fn inner_main() -> Result<ExitCode> {
-    // Extract command-line arguments.
-    let (cli, overrides) = Cli::parse().partition();
-    let log_level = extract_log_level(&cli);
-    set_up_logging(&log_level)?;
-
-    if cli.show_settings && cli.show_files {
-        anyhow::bail!("specify --show-settings or show-files (not both)")
-    }
-    if let Some(shell) = cli.generate_shell_completion {
-        shell.generate(&mut Cli::command(), &mut io::stdout());
-        return Ok(ExitCode::SUCCESS);
-    }
-
-    // Construct the "default" settings. These are used when no `pyproject.toml`
-    // files are present, or files are injected from outside of the hierarchy.
-    let pyproject_strategy = resolve(
-        cli.config.as_deref(),
-        &overrides,
-        cli.stdin_filename.as_deref(),
-    )?;
-
-    // Extract options that are included in `Settings`, but only apply at the top
-    // level.
-    let file_strategy = FileDiscovery {
-        force_exclude: match &pyproject_strategy {
-            PyprojectDiscovery::Fixed(settings) => settings.force_exclude,
-            PyprojectDiscovery::Hierarchical(settings) => settings.force_exclude,
-        },
-        respect_gitignore: match &pyproject_strategy {
-            PyprojectDiscovery::Fixed(settings) => settings.respect_gitignore,
-            PyprojectDiscovery::Hierarchical(settings) => settings.respect_gitignore,
-        },
-    };
-    let (fix, format) = match &pyproject_strategy {
-        PyprojectDiscovery::Fixed(settings) => (settings.fix, settings.format),
-        PyprojectDiscovery::Hierarchical(settings) => (settings.fix, settings.format),
-    };
-    let autofix = if fix {
-        fixer::Mode::Apply
-    } else if matches!(format, SerializationFormat::Json) {
-        fixer::Mode::Generate
-    } else {
-        fixer::Mode::None
-    };
-    let cache = !cli.no_cache;
-
-    if let Some(code) = cli.explain {
-        commands::explain(&code, &format)?;
-        return Ok(ExitCode::SUCCESS);
-    }
-    if cli.show_settings {
-        commands::show_settings(&cli.files, &pyproject_strategy, &file_strategy, &overrides)?;
-        return Ok(ExitCode::SUCCESS);
-    }
-    if cli.show_files {
-        commands::show_files(&cli.files, &pyproject_strategy, &file_strategy, &overrides)?;
-        return Ok(ExitCode::SUCCESS);
-    }
-
-    let printer = Printer::new(&format, &log_level);
-    if cli.watch {
-        if matches!(autofix, fixer::Mode::Generate | fixer::Mode::Apply) {
-            eprintln!("Warning: --fix is not enabled in watch mode.");
-        }
-        if cli.add_noqa {
-            eprintln!("Warning: --no-qa is not enabled in watch mode.");
-        }
-        if cli.autoformat {
-            eprintln!("Warning: --autoformat is not enabled in watch mode.");
-        }
-        if format != SerializationFormat::Text {
-            eprintln!("Warning: --format 'text' is used in watch mode.");
-        }
-
-        // Perform an initial run instantly.
-        printer.clear_screen()?;
-        printer.write_to_user("Starting linter in watch mode...\n");
-
-        let messages = commands::run(
-            &cli.files,
-            &pyproject_strategy,
-            &file_strategy,
-            &overrides,
-            cache.into(),
-            fixer::Mode::None,
-        )?;
-        printer.write_continuously(&messages)?;
-
-        // Configure the file watcher.
-        let (tx, rx) = channel();
-        let mut watcher = recommended_watcher(tx)?;
-        for file in &cli.files {
-            watcher.watch(file, RecursiveMode::Recursive)?;
-        }
-
-        loop {
-            match rx.recv() {
-                Ok(event) => {
-                    let paths = event?.paths;
-                    let py_changed = paths.iter().any(|path| {
-                        path.extension()
-                            .map(|ext| ext == "py" || ext == "pyi")
-                            .unwrap_or_default()
-                    });
-                    if py_changed {
-                        printer.clear_screen()?;
-                        printer.write_to_user("File change detected...\n");
-
-                        let messages = commands::run(
-                            &cli.files,
-                            &pyproject_strategy,
-                            &file_strategy,
-                            &overrides,
-                            cache.into(),
-                            fixer::Mode::None,
-                        )?;
-                        printer.write_continuously(&messages)?;
-                    }
-                }
-                Err(err) => return Err(err.into()),
-            }
-        }
-    } else if cli.add_noqa {
-        let modifications =
-            commands::add_noqa(&cli.files, &pyproject_strategy, &file_strategy, &overrides)?;
-        if modifications > 0 && log_level >= LogLevel::Default {
-            println!("Added {modifications} noqa directives.");
-        }
-    } else if cli.autoformat {
-        let modifications =
-            commands::autoformat(&cli.files, &pyproject_strategy, &file_strategy, &overrides)?;
-        if modifications > 0 && log_level >= LogLevel::Default {
-            println!("Formatted {modifications} files.");
-        }
-    } else {
-        let is_stdin = cli.files == vec![PathBuf::from("-")];
-
-        // Generate lint violations.
-        let diagnostics = if is_stdin {
-            commands::run_stdin(
-                cli.stdin_filename.as_deref(),
-                &pyproject_strategy,
-                &file_strategy,
-                &overrides,
-                autofix,
-            )?
-        } else {
-            commands::run(
-                &cli.files,
-                &pyproject_strategy,
-                &file_strategy,
-                &overrides,
-                cache.into(),
-                autofix,
-            )?
-        };
-
-        // Always try to print violations (the printer itself may suppress output),
-        // unless we're writing fixes via stdin (in which case, the transformed
-        // source code goes to stdout).
-        if !(is_stdin && matches!(autofix, fixer::Mode::Apply)) {
-            printer.write_once(&diagnostics, autofix)?;
-        }
-
-        // Check for updates if we're in a non-silent log level.
-        #[cfg(feature = "update-informer")]
-        if !is_stdin && log_level >= LogLevel::Default && atty::is(atty::Stream::Stdout) {
-            drop(updates::check_for_updates());
-        }
-
-        if !diagnostics.messages.is_empty() && !cli.exit_zero {
-            return Ok(ExitCode::FAILURE);
+        #[allow(clippy::unnecessary_wraps)]
+        fn inner_main() -> Result<ExitCode> {
+            Ok(ExitCode::FAILURE)
        }
    }
-
-    Ok(ExitCode::SUCCESS)
 }

 fn main() -> ExitCode {
--- a/src/main_native.rs
+++ b/src/main_native.rs
@@ -0,0 +1,270 @@
+#![allow(
+    clippy::collapsible_else_if,
+    clippy::collapsible_if,
+    clippy::implicit_hasher,
+    clippy::match_same_arms,
+    clippy::missing_errors_doc,
+    clippy::missing_panics_doc,
+    clippy::module_name_repetitions,
+    clippy::must_use_candidate,
+    clippy::similar_names,
+    clippy::too_many_lines
+)]
+
+use std::io::{self};
+use std::path::{Path, PathBuf};
+use std::process::ExitCode;
+use std::sync::mpsc::channel;
+
+use ::ruff::autofix::fixer;
+use ::ruff::cli::{extract_log_level, Cli, Overrides};
+use ::ruff::commands;
+use ::ruff::logging::{set_up_logging, LogLevel};
+use ::ruff::printer::{Printer, Violations};
+use ::ruff::resolver::{resolve_settings, FileDiscovery, PyprojectDiscovery, Relativity};
+use ::ruff::settings::configuration::Configuration;
+use ::ruff::settings::types::SerializationFormat;
+use ::ruff::settings::{pyproject, Settings};
+#[cfg(feature = "update-informer")]
+use ::ruff::updates;
+use anyhow::Result;
+use clap::{CommandFactory, Parser};
+use notify::{recommended_watcher, RecursiveMode, Watcher};
+use path_absolutize::path_dedot;
+
+/// Resolve the relevant settings strategy and defaults for the current
+/// invocation.
+fn resolve(
+    config: Option<&Path>,
+    overrides: &Overrides,
+    stdin_filename: Option<&Path>,
+) -> Result<PyprojectDiscovery> {
+    if let Some(pyproject) = config {
+        // First priority: the user specified a `pyproject.toml` file. Use that
+        // `pyproject.toml` for _all_ configuration, and resolve paths relative to the
+        // current working directory. (This matches ESLint's behavior.)
+        let settings = resolve_settings(pyproject, &Relativity::Cwd, Some(overrides))?;
+        Ok(PyprojectDiscovery::Fixed(settings))
+    } else if let Some(pyproject) = pyproject::find_settings_toml(
+        stdin_filename
+            .as_ref()
+            .unwrap_or(&path_dedot::CWD.as_path()),
+    )? {
+        // Second priority: find a `pyproject.toml` file in either an ancestor of
+        // `stdin_filename` (if set) or the current working path all paths relative to
+        // that directory. (With `Strategy::Hierarchical`, we'll end up finding
+        // the "closest" `pyproject.toml` file for every Python file later on,
+        // so these act as the "default" settings.)
+        let settings = resolve_settings(&pyproject, &Relativity::Parent, Some(overrides))?;
+        Ok(PyprojectDiscovery::Hierarchical(settings))
+    } else if let Some(pyproject) = pyproject::find_user_settings_toml() {
+        // Third priority: find a user-specific `pyproject.toml`, but resolve all paths
+        // relative the current working directory. (With `Strategy::Hierarchical`, we'll
+        // end up the "closest" `pyproject.toml` file for every Python file later on, so
+        // these act as the "default" settings.)
+        let settings = resolve_settings(&pyproject, &Relativity::Cwd, Some(overrides))?;
+        Ok(PyprojectDiscovery::Hierarchical(settings))
+    } else {
+        // Fallback: load Ruff's default settings, and resolve all paths relative to the
+        // current working directory. (With `Strategy::Hierarchical`, we'll end up the
+        // "closest" `pyproject.toml` file for every Python file later on, so these act
+        // as the "default" settings.)
+        let mut config = Configuration::default();
+        // Apply command-line options that override defaults.
+        config.apply(overrides.clone());
+        let settings = Settings::from_configuration(config, &path_dedot::CWD)?;
+        Ok(PyprojectDiscovery::Hierarchical(settings))
+    }
+}
+
+pub(crate) fn inner_main() -> Result<ExitCode> {
+    // Extract command-line arguments.
+    let (cli, overrides) = Cli::parse().partition();
+    let log_level = extract_log_level(&cli);
+    set_up_logging(&log_level)?;
+
+    if cli.show_settings && cli.show_files {
+        anyhow::bail!("specify --show-settings or show-files (not both)")
+    }
+    if let Some(shell) = cli.generate_shell_completion {
+        shell.generate(&mut Cli::command(), &mut io::stdout());
+        return Ok(ExitCode::SUCCESS);
+    }
+
+    // Construct the "default" settings. These are used when no `pyproject.toml`
+    // files are present, or files are injected from outside of the hierarchy.
+    let pyproject_strategy = resolve(
+        cli.config.as_deref(),
+        &overrides,
+        cli.stdin_filename.as_deref(),
+    )?;
+
+    // Validate the `Settings` and return any errors.
+    match &pyproject_strategy {
+        PyprojectDiscovery::Fixed(settings) => settings.validate()?,
+        PyprojectDiscovery::Hierarchical(settings) => settings.validate()?,
+    };
+
+    // Extract options that are included in `Settings`, but only apply at the top
+    // level.
+    let file_strategy = FileDiscovery {
+        force_exclude: match &pyproject_strategy {
+            PyprojectDiscovery::Fixed(settings) => settings.force_exclude,
+            PyprojectDiscovery::Hierarchical(settings) => settings.force_exclude,
+        },
+        respect_gitignore: match &pyproject_strategy {
+            PyprojectDiscovery::Fixed(settings) => settings.respect_gitignore,
+            PyprojectDiscovery::Hierarchical(settings) => settings.respect_gitignore,
+        },
+    };
+    let (fix, fix_only, format) = match &pyproject_strategy {
+        PyprojectDiscovery::Fixed(settings) => (settings.fix, settings.fix_only, settings.format),
+        PyprojectDiscovery::Hierarchical(settings) => {
+            (settings.fix, settings.fix_only, settings.format)
+        }
+    };
+    let autofix = if fix || fix_only {
+        fixer::Mode::Apply
+    } else if matches!(format, SerializationFormat::Json) {
+        fixer::Mode::Generate
+    } else {
+        fixer::Mode::None
+    };
+    let violations = if fix_only {
+        Violations::Hide
+    } else {
+        Violations::Show
+    };
+    let cache = !cli.no_cache;
+
+    if let Some(code) = cli.explain {
+        commands::explain(&code, &format)?;
+        return Ok(ExitCode::SUCCESS);
+    }
+    if cli.show_settings {
+        commands::show_settings(&cli.files, &pyproject_strategy, &file_strategy, &overrides)?;
+        return Ok(ExitCode::SUCCESS);
+    }
+    if cli.show_files {
+        commands::show_files(&cli.files, &pyproject_strategy, &file_strategy, &overrides)?;
+        return Ok(ExitCode::SUCCESS);
+    }
+
+    let printer = Printer::new(&format, &log_level, &autofix, &violations);
+    if cli.watch {
+        if matches!(autofix, fixer::Mode::Generate | fixer::Mode::Apply) {
+            eprintln!("Warning: --fix is not enabled in watch mode.");
+        }
+        if cli.add_noqa {
+            eprintln!("Warning: --add-noqa is not enabled in watch mode.");
+        }
+        if cli.autoformat {
+            eprintln!("Warning: --autoformat is not enabled in watch mode.");
+        }
+        if format != SerializationFormat::Text {
+            eprintln!("Warning: --format 'text' is used in watch mode.");
+        }
+
+        // Perform an initial run instantly.
+        printer.clear_screen()?;
+        printer.write_to_user("Starting linter in watch mode...\n");
+
+        let messages = commands::run(
+            &cli.files,
+            &pyproject_strategy,
+            &file_strategy,
+            &overrides,
+            cache.into(),
+            fixer::Mode::None,
+        )?;
+        printer.write_continuously(&messages)?;
+
+        // Configure the file watcher.
+        let (tx, rx) = channel();
+        let mut watcher = recommended_watcher(tx)?;
+        for file in &cli.files {
+            watcher.watch(file, RecursiveMode::Recursive)?;
+        }
+
+        loop {
+            match rx.recv() {
+                Ok(event) => {
+                    let paths = event?.paths;
+                    let py_changed = paths.iter().any(|path| {
+                        path.extension()
+                            .map(|ext| ext == "py" || ext == "pyi")
+                            .unwrap_or_default()
+                    });
+                    if py_changed {
+                        printer.clear_screen()?;
+                        printer.write_to_user("File change detected...\n");
+
+                        let messages = commands::run(
+                            &cli.files,
+                            &pyproject_strategy,
+                            &file_strategy,
+                            &overrides,
+                            cache.into(),
+                            fixer::Mode::None,
+                        )?;
+                        printer.write_continuously(&messages)?;
+                    }
+                }
+                Err(err) => return Err(err.into()),
+            }
+        }
+    } else if cli.add_noqa {
+        let modifications =
+            commands::add_noqa(&cli.files, &pyproject_strategy, &file_strategy, &overrides)?;
+        if modifications > 0 && log_level >= LogLevel::Default {
+            println!("Added {modifications} noqa directives.");
+        }
+    } else if cli.autoformat {
+        let modifications =
+            commands::autoformat(&cli.files, &pyproject_strategy, &file_strategy, &overrides)?;
+        if modifications > 0 && log_level >= LogLevel::Default {
+            println!("Formatted {modifications} files.");
+        }
+    } else {
+        let is_stdin = cli.files == vec![PathBuf::from("-")];
+
+        // Generate lint violations.
+        let diagnostics = if is_stdin {
+            commands::run_stdin(
+                cli.stdin_filename.as_deref(),
+                &pyproject_strategy,
+                &file_strategy,
+                &overrides,
+                autofix,
+            )?
+        } else {
+            commands::run(
+                &cli.files,
+                &pyproject_strategy,
+                &file_strategy,
+                &overrides,
+                cache.into(),
+                autofix,
+            )?
+        };
+
+        // Always try to print violations (the printer itself may suppress output),
+        // unless we're writing fixes via stdin (in which case, the transformed
+        // source code goes to stdout).
+        if !(is_stdin && matches!(autofix, fixer::Mode::Apply)) {
+            printer.write_once(&diagnostics)?;
+        }
+
+        // Check for updates if we're in a non-silent log level.
+        #[cfg(feature = "update-informer")]
+        if !is_stdin && log_level >= LogLevel::Default && atty::is(atty::Stream::Stdout) {
+            drop(updates::check_for_updates());
+        }
+
+        if !diagnostics.messages.is_empty() && !cli.exit_zero && !fix_only {
+            return Ok(ExitCode::FAILURE);
+        }
+    }
+
+    Ok(ExitCode::SUCCESS)
+}
--- a/src/message.rs
+++ b/src/message.rs
@@ -57,7 +57,14 @@ impl Source {
    pub fn from_check(check: &Check, locator: &SourceCodeLocator) -> Self {
        let source = locator.slice_source_code_range(&Range {
            location: Location::new(check.location.row(), 0),
-            end_location: Location::new(check.end_location.row() + 1, 0),
+            // Checks can already extend one-past-the-end per Ropey's semantics. If they do, though,
+            // then they'll end at the start of a line. We need to avoid extending by yet another
+            // line past-the-end.
+            end_location: if check.end_location.column() == 0 {
+                check.end_location
+            } else {
+                Location::new(check.end_location.row() + 1, 0)
+            },
        });
        let num_chars_in_range = locator
            .slice_source_code_range(&Range {
--- a/src/printer.rs
+++ b/src/printer.rs
@@ -18,6 +18,12 @@ use crate::message::Message;
 use crate::settings::types::SerializationFormat;
 use crate::tell_user;

+/// Enum to control whether lint violations are shown to the user.
+pub enum Violations {
+    Show,
+    Hide,
+}
+
 #[derive(Serialize)]
 struct ExpandedMessage<'a> {
    code: &'a CheckCode,
@@ -31,11 +37,23 @@ struct ExpandedMessage<'a> {
 pub struct Printer<'a> {
    format: &'a SerializationFormat,
    log_level: &'a LogLevel,
+    autofix: &'a fixer::Mode,
+    violations: &'a Violations,
 }

 impl<'a> Printer<'a> {
-    pub fn new(format: &'a SerializationFormat, log_level: &'a LogLevel) -> Self {
-        Self { format, log_level }
+    pub fn new(
+        format: &'a SerializationFormat,
+        log_level: &'a LogLevel,
+        autofix: &'a fixer::Mode,
+        violations: &'a Violations,
+    ) -> Self {
+        Self {
+            format,
+            log_level,
+            autofix,
+            violations,
+        }
    }

    pub fn write_to_user(&self, message: &str) {
@@ -44,35 +62,55 @@ impl<'a> Printer<'a> {
        }
    }

-    fn post_text(&self, diagnostics: &Diagnostics, autofix: fixer::Mode) {
+    fn post_text(&self, diagnostics: &Diagnostics) {
        if self.log_level >= &LogLevel::Default {
-            let fixed = diagnostics.fixed;
-            let remaining = diagnostics.messages.len();
-            let total = fixed + remaining;
-            if fixed > 0 {
-                println!("Found {total} error(s) ({fixed} fixed, {remaining} remaining).");
-            } else if remaining > 0 {
-                println!("Found {remaining} error(s).");
-            }
+            match self.violations {
+                Violations::Show => {
+                    let fixed = diagnostics.fixed;
+                    let remaining = diagnostics.messages.len();
+                    let total = fixed + remaining;
+                    if fixed > 0 {
+                        println!("Found {total} error(s) ({fixed} fixed, {remaining} remaining).");
+                    } else if remaining > 0 {
+                        println!("Found {remaining} error(s).");
+                    }

-            if !matches!(autofix, fixer::Mode::Apply) {
-                let num_fixable = diagnostics
-                    .messages
-                    .iter()
-                    .filter(|message| message.kind.fixable())
-                    .count();
-                if num_fixable > 0 {
-                    println!("{num_fixable} potentially fixable with the --fix option.");
+                    if !matches!(self.autofix, fixer::Mode::Apply) {
+                        let num_fixable = diagnostics
+                            .messages
+                            .iter()
+                            .filter(|message| message.kind.fixable())
+                            .count();
+                        if num_fixable > 0 {
+                            println!("{num_fixable} potentially fixable with the --fix option.");
+                        }
+                    }
+                }
+                Violations::Hide => {
+                    let fixed = diagnostics.fixed;
+                    if fixed > 0 {
+                        println!("Fixed {fixed} error(s).");
+                    }
                }
            }
        }
    }

-    pub fn write_once(&self, diagnostics: &Diagnostics, autofix: fixer::Mode) -> Result<()> {
+    pub fn write_once(&self, diagnostics: &Diagnostics) -> Result<()> {
        if matches!(self.log_level, LogLevel::Silent) {
            return Ok(());
        }

+        if matches!(self.violations, Violations::Hide) {
+            if matches!(
+                self.format,
+                SerializationFormat::Text | SerializationFormat::Grouped
+            ) {
+                self.post_text(diagnostics);
+            }
+            return Ok(());
+        }
+
        match self.format {
            SerializationFormat::Json => {
                println!(
@@ -142,7 +180,7 @@ impl<'a> Printer<'a> {
                    print_message(message);
                }

-                self.post_text(diagnostics, autofix);
+                self.post_text(diagnostics);
            }
            SerializationFormat::Grouped => {
                // Group by filename.
@@ -182,7 +220,7 @@ impl<'a> Printer<'a> {
                    println!();
                }

-                self.post_text(diagnostics, autofix);
+                self.post_text(diagnostics);
            }
            SerializationFormat::Github => {
                // Generate error workflow command in GitHub Actions format
--- a/src/pydocstyle/mod.rs
+++ b/src/pydocstyle/mod.rs
@@ -1,5 +1,6 @@
 pub mod helpers;
 pub mod plugins;
+pub mod settings;

 #[cfg(test)]
 mod tests {
@@ -11,6 +12,7 @@ mod tests {

    use crate::checks::CheckCode;
    use crate::linter::test_path;
+    use crate::pydocstyle::settings::{Convention, Settings};
    use crate::settings;

    #[test_case(CheckCode::D100, Path::new("D.py"); "D100")]
@@ -72,4 +74,54 @@ mod tests {
        insta::assert_yaml_snapshot!(snapshot, checks);
        Ok(())
    }
+
+    #[test]
+    fn d417_unspecified() -> Result<()> {
+        let mut checks = test_path(
+            Path::new("./resources/test/fixtures/pydocstyle/D417.py"),
+            &settings::Settings {
+                // When inferring the convention, we'll see a few false negatives.
+                // See: https://github.com/PyCQA/pydocstyle/issues/459.
+                pydocstyle: Settings { convention: None },
+                ..settings::Settings::for_rule(CheckCode::D417)
+            },
+        )?;
+        checks.sort_by_key(|check| check.location);
+        insta::assert_yaml_snapshot!(checks);
+        Ok(())
+    }
+
+    #[test]
+    fn d417_google() -> Result<()> {
+        let mut checks = test_path(
+            Path::new("./resources/test/fixtures/pydocstyle/D417.py"),
+            &settings::Settings {
+                // With explicit Google convention, we should flag every function.
+                pydocstyle: Settings {
+                    convention: Some(Convention::Google),
+                },
+                ..settings::Settings::for_rule(CheckCode::D417)
+            },
+        )?;
+        checks.sort_by_key(|check| check.location);
+        insta::assert_yaml_snapshot!(checks);
+        Ok(())
+    }
+
+    #[test]
+    fn d417_numpy() -> Result<()> {
+        let mut checks = test_path(
+            Path::new("./resources/test/fixtures/pydocstyle/D417.py"),
+            &settings::Settings {
+                // With explicit Google convention, we shouldn't flag anything.
+                pydocstyle: Settings {
+                    convention: Some(Convention::Numpy),
+                },
+                ..settings::Settings::for_rule(CheckCode::D417)
+            },
+        )?;
+        checks.sort_by_key(|check| check.location);
+        insta::assert_yaml_snapshot!(checks);
+        Ok(())
+    }
 }
--- a/src/pydocstyle/plugins.rs
+++ b/src/pydocstyle/plugins.rs
@@ -15,6 +15,7 @@ use crate::docstrings::definition::{Definition, DefinitionKind, Docstring};
 use crate::docstrings::sections::{section_contexts, SectionContext};
 use crate::docstrings::styles::SectionStyle;
 use crate::pydocstyle::helpers::{leading_quote, logical_line};
+use crate::pydocstyle::settings::Convention;
 use crate::visibility::{is_init, is_magic, is_overload, is_override, is_staticmethod, Visibility};

 /// D100, D101, D102, D103, D104, D105, D106, D107
@@ -855,7 +856,7 @@ pub fn not_empty(checker: &mut Checker, docstring: &Docstring) -> bool {

 /// D212, D214, D215, D405, D406, D407, D408, D409, D410, D411, D412, D413,
 /// D414, D416, D417
-pub fn sections(checker: &mut Checker, docstring: &Docstring) {
+pub fn sections(checker: &mut Checker, docstring: &Docstring, convention: Option<&Convention>) {
    let body = docstring.body;

    let lines: Vec<&str> = LinesWithTrailingNewline::from(body).collect();
@@ -863,17 +864,31 @@ pub fn sections(checker: &mut Checker, docstring: &Docstring) {
        return;
    }

-    // First, interpret as NumPy-style sections.
-    let mut found_numpy_section = false;
-    for context in &section_contexts(&lines, &SectionStyle::NumPy) {
-        found_numpy_section = true;
-        numpy_section(checker, docstring, context);
-    }
+    match convention {
+        Some(Convention::Google) => {
+            for context in &section_contexts(&lines, &SectionStyle::Google) {
+                google_section(checker, docstring, context);
+            }
+        }
+        Some(Convention::Numpy) => {
+            for context in &section_contexts(&lines, &SectionStyle::NumPy) {
+                numpy_section(checker, docstring, context);
+            }
+        }
+        None => {
+            // First, interpret as NumPy-style sections.
+            let mut found_numpy_section = false;
+            for context in &section_contexts(&lines, &SectionStyle::NumPy) {
+                found_numpy_section = true;
+                numpy_section(checker, docstring, context);
+            }

-    // If no such sections were identified, interpret as Google-style sections.
-    if !found_numpy_section {
-        for context in &section_contexts(&lines, &SectionStyle::Google) {
-            google_section(checker, docstring, context);
+            // If no such sections were identified, interpret as Google-style sections.
+            if !found_numpy_section {
+                for context in &section_contexts(&lines, &SectionStyle::Google) {
+                    google_section(checker, docstring, context);
+                }
+            }
        }
    }
 }
--- a/src/pydocstyle/settings.rs
+++ b/src/pydocstyle/settings.rs
@@ -0,0 +1,44 @@
+//! Settings for the `pydocstyle` plugin.
+
+use ruff_macros::ConfigurationOptions;
+use schemars::JsonSchema;
+use serde::{Deserialize, Serialize};
+
+#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize, Hash, JsonSchema)]
+#[serde(deny_unknown_fields, rename_all = "kebab-case")]
+pub enum Convention {
+    Google,
+    Numpy,
+}
+
+#[derive(
+    Debug, PartialEq, Eq, Serialize, Deserialize, Default, ConfigurationOptions, JsonSchema,
+)]
+#[serde(deny_unknown_fields, rename_all = "kebab-case", rename = "Pydocstyle")]
+pub struct Options {
+    #[option(
+        default = r#""convention""#,
+        value_type = "Convention",
+        example = r#"
+            # Use Google-style docstrings.
+            convention = "google"
+        "#
+    )]
+    /// Whether to use Google-style or Numpy-style conventions when detecting
+    /// docstring sections. By default, conventions will be inferred from
+    /// the available sections.
+    pub convention: Option<Convention>,
+}
+
+#[derive(Debug, Default, Hash)]
+pub struct Settings {
+    pub convention: Option<Convention>,
+}
+
+impl Settings {
+    pub fn from_options(options: Options) -> Self {
+        Self {
+            convention: options.convention,
+        }
+    }
+}
--- a/src/pydocstyle/snapshots/ruffpydocstyletests__d417_google.snap
+++ b/src/pydocstyle/snapshots/ruffpydocstyletests__d417_google.snap
@@ -0,0 +1,81 @@
+---
+source: src/pydocstyle/mod.rs
+expression: checks
+---
+- kind:
+    DocumentAllArguments:
+      - y
+      - z
+  location:
+    row: 1
+    column: 0
+  end_location:
+    row: 11
+    column: 12
+  fix: ~
+- kind:
+    DocumentAllArguments:
+      - x
+      - y
+      - z
+  location:
+    row: 14
+    column: 0
+  end_location:
+    row: 24
+    column: 12
+  fix: ~
+- kind:
+    DocumentAllArguments:
+      - x
+      - y
+      - z
+  location:
+    row: 27
+    column: 0
+  end_location:
+    row: 36
+    column: 12
+  fix: ~
+- kind:
+    DocumentAllArguments:
+      - y
+      - z
+  location:
+    row: 39
+    column: 0
+  end_location:
+    row: 49
+    column: 12
+  fix: ~
+- kind:
+    DocumentAllArguments:
+      - y
+  location:
+    row: 52
+    column: 0
+  end_location:
+    row: 62
+    column: 12
+  fix: ~
+- kind:
+    DocumentAllArguments:
+      - y
+  location:
+    row: 65
+    column: 0
+  end_location:
+    row: 74
+    column: 12
+  fix: ~
+- kind:
+    DocumentAllArguments:
+      - y
+  location:
+    row: 77
+    column: 0
+  end_location:
+    row: 84
+    column: 12
+  fix: ~
+
--- a/src/pydocstyle/snapshots/ruffpydocstyletests__d417_numpy.snap
+++ b/src/pydocstyle/snapshots/ruffpydocstyletests__d417_numpy.snap
@@ -0,0 +1,6 @@
+---
+source: src/pydocstyle/mod.rs
+expression: checks
+---
+[]
+
--- a/src/pydocstyle/snapshots/ruffpydocstyletests__d417_unspecified.snap
+++ b/src/pydocstyle/snapshots/ruffpydocstyletests__d417_unspecified.snap
@@ -0,0 +1,37 @@
+---
+source: src/pydocstyle/mod.rs
+expression: checks
+---
+- kind:
+    DocumentAllArguments:
+      - x
+      - y
+      - z
+  location:
+    row: 27
+    column: 0
+  end_location:
+    row: 36
+    column: 12
+  fix: ~
+- kind:
+    DocumentAllArguments:
+      - y
+  location:
+    row: 65
+    column: 0
+  end_location:
+    row: 74
+    column: 12
+  fix: ~
+- kind:
+    DocumentAllArguments:
+      - y
+  location:
+    row: 77
+    column: 0
+  end_location:
+    row: 84
+    column: 12
+  fix: ~
+
--- a/src/pyflakes/snapshots/ruffpyflakestests__F841_F841_0.py.snap
+++ b/src/pyflakes/snapshots/ruffpyflakestests__F841_F841_0.py.snap
@@ -6,10 +6,10 @@ expression: checks
    UnusedVariable: e
  location:
    row: 3
-    column: 0
+    column: 21
  end_location:
-    row: 4
-    column: 8
+    row: 3
+    column: 22
  fix: ~
 - kind:
    UnusedVariable: z
--- a/src/pyflakes/snapshots/ruffpyflakestests__f841_dummy_variable_rgx.snap
+++ b/src/pyflakes/snapshots/ruffpyflakestests__f841_dummy_variable_rgx.snap
@@ -6,10 +6,10 @@ expression: checks
    UnusedVariable: e
  location:
    row: 3
-    column: 0
+    column: 21
  end_location:
-    row: 4
-    column: 8
+    row: 3
+    column: 22
  fix: ~
 - kind:
    UnusedVariable: foo
--- a/src/pyupgrade/checks.rs
+++ b/src/pyupgrade/checks.rs
@@ -4,7 +4,7 @@ use rustc_hash::{FxHashMap, FxHashSet};
 use rustpython_ast::{Constant, KeywordData, Location};
 use rustpython_parser::ast::{ArgData, Expr, ExprKind, Stmt, StmtKind};

-use crate::ast::helpers;
+use crate::ast::helpers::{self};
 use crate::ast::types::{Binding, BindingKind, Range, Scope, ScopeKind};
 use crate::autofix::Fix;
 use crate::checks::{Check, CheckKind};
--- a/src/pyupgrade/fixes.rs
+++ b/src/pyupgrade/fixes.rs
@@ -7,7 +7,6 @@ use rustpython_ast::{Expr, Keyword, Location, Stmt};
 use rustpython_parser::lexer;
 use rustpython_parser::lexer::Tok;

-use crate::ast::helpers;
 use crate::ast::types::Range;
 use crate::autofix::{self, Fix};
 use crate::cst::matchers::match_module;
@@ -28,10 +27,10 @@ pub fn remove_class_def_base(
        let mut fix_start = None;
        let mut fix_end = None;
        let mut count: usize = 0;
-        for (start, tok, end) in lexer::make_tokenizer(&contents).flatten() {
+        for (start, tok, end) in lexer::make_tokenizer_located(&contents, stmt_at).flatten() {
            if matches!(tok, Tok::Lpar) {
                if count == 0 {
-                    fix_start = Some(helpers::to_absolute(start, stmt_at));
+                    fix_start = Some(start);
                }
                count += 1;
            }
@@ -39,7 +38,7 @@ pub fn remove_class_def_base(
            if matches!(tok, Tok::Rpar) {
                count -= 1;
                if count == 0 {
-                    fix_end = Some(helpers::to_absolute(end, stmt_at));
+                    fix_end = Some(end);
                    break;
                }
            }
@@ -61,8 +60,7 @@ pub fn remove_class_def_base(
        let mut fix_start: Option<Location> = None;
        let mut fix_end: Option<Location> = None;
        let mut seen_comma = false;
-        for (start, tok, end) in lexer::make_tokenizer(&contents).flatten() {
-            let start = helpers::to_absolute(start, stmt_at);
+        for (start, tok, end) in lexer::make_tokenizer_located(&contents, stmt_at).flatten() {
            if seen_comma {
                if matches!(tok, Tok::Newline) {
                    fix_end = Some(end);
@@ -88,9 +86,7 @@ pub fn remove_class_def_base(
        // isn't a comma.
        let mut fix_start: Option<Location> = None;
        let mut fix_end: Option<Location> = None;
-        for (start, tok, end) in lexer::make_tokenizer(&contents).flatten() {
-            let start = helpers::to_absolute(start, stmt_at);
-            let end = helpers::to_absolute(end, stmt_at);
+        for (start, tok, end) in lexer::make_tokenizer_located(&contents, stmt_at).flatten() {
            if start == expr_at {
                fix_end = Some(end);
                break;
--- a/src/pyupgrade/mod.rs
+++ b/src/pyupgrade/mod.rs
@@ -38,6 +38,8 @@ mod tests {
    #[test_case(CheckCode::UP015, Path::new("UP015.py"); "UP015")]
    #[test_case(CheckCode::UP016, Path::new("UP016.py"); "UP016")]
    #[test_case(CheckCode::UP018, Path::new("UP018.py"); "UP018")]
+    #[test_case(CheckCode::UP019, Path::new("UP019.py"); "UP019")]
+    #[test_case(CheckCode::UP021, Path::new("UP021.py"); "UP021")]
    fn checks(check_code: CheckCode, path: &Path) -> Result<()> {
        let snapshot = format!("{}_{}", check_code.as_ref(), path.to_string_lossy());
        let mut checks = test_path(
--- a/src/pyupgrade/plugins/mod.rs
+++ b/src/pyupgrade/plugins/mod.rs
@@ -3,10 +3,13 @@ pub use convert_typed_dict_functional_to_class::convert_typed_dict_functional_to
 pub use datetime_utc_alias::datetime_utc_alias;
 pub use deprecated_unittest_alias::deprecated_unittest_alias;
 pub use native_literals::native_literals;
+pub use open_alias::open_alias;
 pub use redundant_open_modes::redundant_open_modes;
 pub use remove_six_compat::remove_six_compat;
+pub use replace_universal_newlines::replace_universal_newlines;
 pub use super_call_with_parameters::super_call_with_parameters;
 pub use type_of_primitive::type_of_primitive;
+pub use typing_text_str_alias::typing_text_str_alias;
 pub use unnecessary_encode_utf8::unnecessary_encode_utf8;
 pub use unnecessary_future_import::unnecessary_future_import;
 pub use unnecessary_lru_cache_params::unnecessary_lru_cache_params;
@@ -20,10 +23,13 @@ mod convert_typed_dict_functional_to_class;
 mod datetime_utc_alias;
 mod deprecated_unittest_alias;
 mod native_literals;
+mod open_alias;
 mod redundant_open_modes;
 mod remove_six_compat;
+mod replace_universal_newlines;
 mod super_call_with_parameters;
 mod type_of_primitive;
+mod typing_text_str_alias;
 mod unnecessary_encode_utf8;
 mod unnecessary_future_import;
 mod unnecessary_lru_cache_params;
--- a/src/pyupgrade/plugins/open_alias.rs
+++ b/src/pyupgrade/plugins/open_alias.rs
@@ -0,0 +1,24 @@
+use rustpython_ast::Expr;
+
+use crate::ast::helpers::{collect_call_paths, dealias_call_path, match_call_path};
+use crate::ast::types::Range;
+use crate::autofix::Fix;
+use crate::checkers::ast::Checker;
+use crate::checks::{Check, CheckCode, CheckKind};
+
+/// UP020
+pub fn open_alias(checker: &mut Checker, expr: &Expr, func: &Expr) {
+    let call_path = dealias_call_path(collect_call_paths(expr), &checker.import_aliases);
+
+    if match_call_path(&call_path, "io", "open", &checker.from_imports) {
+        let mut check = Check::new(CheckKind::OpenAlias, Range::from_located(expr));
+        if checker.patch(&CheckCode::UP020) {
+            check.amend(Fix::replacement(
+                "open".to_string(),
+                func.location,
+                func.end_location.unwrap(),
+            ));
+        }
+        checker.add_check(check);
+    }
+}
--- a/src/pyupgrade/plugins/redundant_open_modes.rs
+++ b/src/pyupgrade/plugins/redundant_open_modes.rs
@@ -6,7 +6,6 @@ use rustpython_ast::{Constant, Expr, ExprKind, Keyword, KeywordData, Location};
 use rustpython_parser::lexer;
 use rustpython_parser::token::Tok;

-use crate::ast::helpers;
 use crate::ast::types::Range;
 use crate::autofix::Fix;
 use crate::checkers::ast::Checker;
@@ -112,9 +111,7 @@ fn create_remove_param_fix(
    let mut fix_end: Option<Location> = None;
    let mut is_first_arg: bool = false;
    let mut delete_first_arg: bool = false;
-    for (start, tok, end) in lexer::make_tokenizer(&content).flatten() {
-        let start = helpers::to_absolute(start, expr.location);
-        let end = helpers::to_absolute(end, expr.location);
+    for (start, tok, end) in lexer::make_tokenizer_located(&content, expr.location).flatten() {
        if start == mode_param.location {
            if is_first_arg {
                delete_first_arg = true;
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Charlie Marsh	0a60eb0aca	Fix invalid reference to ruff_options.rs (#1409 )	2022-12-27 12:12:28 -05:00
Charlie Marsh	3e96803033	Bump version to 0.0.196	2022-12-27 12:02:02 -05:00
Colin Delahunty	c59035139c	Pyupgrade: converts `universal_newlines` to `text` in `subprocess.run` (#1403 )	2022-12-27 12:01:27 -05:00
Charlie Marsh	7632d7eda7	Allow specification of explicit docstring convention (#1408 )	2022-12-27 11:50:28 -05:00
Charlie Marsh	b4dbe62da0	Add cargo +nightly dev generate-all (#1404 )	2022-12-27 10:07:18 -05:00
Harutaka Kawamura	9106d5338b	Replace `make_tokenize` with `make_tokenizer_located` (#1405 )	2022-12-27 10:07:03 -05:00
Reiner Gerecke	534d8d049c	Support isort's force-single-line option (#1366 )	2022-12-27 08:51:32 -05:00
Charlie Marsh	e692c4a2cc	Tweak secret detection for playground releases (#1402 )	2022-12-27 08:41:53 -05:00
Reiner Gerecke	e0b39fa63e	Implement pyupgrade check for io.open alias (#1399 )	2022-12-27 07:47:40 -05:00
Charlie Marsh	320a48977b	Tweak README again	2022-12-26 21:17:18 -05:00
Charlie Marsh	0d05aaeb6e	Add monorepo note	2022-12-26 21:00:14 -05:00
Charlie Marsh	1e4b1533ad	Bump version to 0.0.195	2022-12-26 20:41:39 -05:00
Charlie Marsh	df4f5358f9	Bump pyupgrade implementation count	2022-12-26 19:56:12 -05:00
Colin Delahunty	58c383401c	Replace `typing.Text` with `str` (#1391 )	2022-12-26 19:55:41 -05:00
Charlie Marsh	018b9a2977	Only run playground release in main repo (#1396 )	2022-12-26 19:45:04 -05:00
Charlie Marsh	658cb87ddd	Enable Quick Fix in the playground (#1395 )	2022-12-26 19:25:50 -05:00
Charlie Marsh	0d35087bc6	Choose a more interesting example snippet (#1394 )	2022-12-26 15:19:17 -05:00
Charlie Marsh	b721125af9	Add badge to playground (#1393 )	2022-12-26 15:13:55 -05:00
Charlie Marsh	20d6b21d77	Add ESLint, Prettier, and TypeScript checks (#1384 )	2022-12-26 15:08:22 -05:00
Charlie Marsh	1a27992f47	Enable preview deployments for playground (#1383 )	2022-12-26 14:52:13 -05:00
Charlie Marsh	89cebe1ce2	Update name of Playground job	2022-12-26 12:10:22 -05:00
Reiner Gerecke	bdb1505262	Web playground with WASM (#1279 )	2022-12-26 12:09:17 -05:00
Charlie Marsh	8c018e8261	Add settings validation to lib.rs	2022-12-26 10:12:07 -05:00
Colin Delahunty	debd909b2c	Magic Trailing Commas in isort (#1363 )	2022-12-26 09:40:02 -05:00
Reiner Gerecke	fa54538bd1	Only re-associate inline comments during normalization when necessary (#1380 )	2022-12-26 07:52:13 -05:00
Reiner Gerecke	939f738a71	Update rust python to handle files with BOM (#1379 )	2022-12-26 07:03:13 -05:00
Charlie Marsh	b0f30bef8f	Add support for `ruff.toml` (#1378 )	2022-12-25 21:55:07 -05:00
Charlie Marsh	28c45eb2a3	Remove required versions from pyproject.toml	2022-12-25 20:21:01 -05:00
Charlie Marsh	4dc45912e8	Run cargo dev commands	2022-12-25 20:12:12 -05:00
Charlie Marsh	5ef8bff341	Bump version to 0.0.194	2022-12-25 19:54:45 -05:00
Charlie Marsh	2ab8f77223	Update command-line help text	2022-12-25 19:54:14 -05:00
Charlie Marsh	8b72f55a09	Add `--required-version` (#1376 )	2022-12-25 19:53:50 -05:00
Charlie Marsh	19121219fb	Avoid double-extending past the end when showing source (#1377 )	2022-12-25 19:52:42 -05:00
Charlie Marsh	d9355c989a	Add a `--fix-only` command-line and `pyproject.toml` option (#1375 )	2022-12-25 18:49:56 -05:00
Charlie Marsh	ec80d1cd85	Respect natural ordering for imports (#1374 )	2022-12-25 18:11:41 -05:00
Charlie Marsh	9bb470c7d4	Ignore unused arguments for @overload stubs (#1373 )	2022-12-25 17:22:31 -05:00
Harutaka Kawamura	dca3fcd8d1	Improve `excepthandler_name_range` (#1368 )	2022-12-25 00:12:12 -05:00
Harutaka Kawamura	10f75c9620	Fix F841 (`UnusedVariable`) range in except handler (#1367 )	2022-12-24 22:55:55 -05:00