use tuplespec for variadic param annotation

This is subtle, and the root cause became more apparent with #19604,
since we now have many more cases of superclasses and subclasses using
different typevars. The issue is easiest to see in the following:

```py
class C[T]:
    def __init__(self, t: T) -> None: ...

class D[U](C[T]):
    pass

reveal_type(C(1))  # revealed: C[int]
reveal_type(D(1))  # should be: D[int]
```

When instantiating a generic class, the `__init__` method inherits the
generic context of that class. This lets our call binding machinery
infer a specialization for that context.

Prior to this PR, the instantiation of `C` worked just fine. Its
`__init__` method would inherit the `[T]` generic context, and we would
infer `{T = int}` as the specialization based on the argument
parameters.

It didn't work for `D`. The issue is that the `__init__` method was
inheriting the generic context of the class where `__init__` was defined
(here, `C` and `[T]`). At the call site, we would then infer `{T = int}`
as the specialization — but that wouldn't help us specialize `D[U]`,
since `D` does not have `T` in its generic context!

Instead, the `__init__` method should inherit the generic context of the
class that we are performing the lookup on (here, `D` and `[U]`). That
lets us correctly infer `{U = int}` as the specialization, which we can
successfully apply to `D[U]`.

(Note that `__init__` refers to `C`'s typevars in its signature, but
that's okay; our member lookup logic already applies the `T = U`
specialization when returning a member of `C` while performing a lookup
on `D`, transforming its signature from `(Self, T) -> None` to `(Self,
U) -> None`.)

Closes https://github.com/astral-sh/ty/issues/588

CHANGELOG.md

@@ -1,5 +1,35 @@
 # Changelog
 
+## 0.12.7
+
+This is a follow-up release to 0.12.6. Because of an issue in the package metadata, 0.12.6 failed to publish fully to PyPI and has been yanked. Similarly, there is no GitHub release or Git tag for 0.12.6. The contents of the 0.12.7 release are identical to 0.12.6, except for the updated metadata.
+
+## 0.12.6
+
+### Preview features
+
+- \[`flake8-commas`\] Add support for trailing comma checks in type parameter lists (`COM812`, `COM819`) ([#19390](https://github.com/astral-sh/ruff/pull/19390))
+- \[`pylint`\] Implement auto-fix for `missing-maxsplit-arg` (`PLC0207`) ([#19387](https://github.com/astral-sh/ruff/pull/19387))
+- \[`ruff`\] Offer fixes for `RUF039` in more cases ([#19065](https://github.com/astral-sh/ruff/pull/19065))
+
+### Bug fixes
+
+- Support `.pyi` files in ruff analyze graph ([#19611](https://github.com/astral-sh/ruff/pull/19611))
+- \[`flake8-pyi`\] Preserve inline comment in ellipsis removal (`PYI013`) ([#19399](https://github.com/astral-sh/ruff/pull/19399))
+- \[`perflint`\] Ignore rule if target is `global` or `nonlocal` (`PERF401`) ([#19539](https://github.com/astral-sh/ruff/pull/19539))
+- \[`pyupgrade`\] Fix `UP030` to avoid modifying double curly braces in format strings ([#19378](https://github.com/astral-sh/ruff/pull/19378))
+- \[`refurb`\] Ignore decorated functions for `FURB118` ([#19339](https://github.com/astral-sh/ruff/pull/19339))
+- \[`refurb`\] Mark `int` and `bool` cases for `Decimal.from_float` as safe fixes (`FURB164`) ([#19468](https://github.com/astral-sh/ruff/pull/19468))
+- \[`ruff`\] Fix `RUF033` for named default expressions ([#19115](https://github.com/astral-sh/ruff/pull/19115))
+
+### Rule changes
+
+- \[`flake8-blind-except`\] Change `BLE001` to permit `logging.critical(..., exc_info=True)` ([#19520](https://github.com/astral-sh/ruff/pull/19520))
+
+### Performance
+
+- Add support for specifying minimum dots in detected string imports ([#19538](https://github.com/astral-sh/ruff/pull/19538))
+
 ## 0.12.5
 
 ### Preview features

Cargo.lock

@@ -4,9 +4,9 @@ version = 4
 
 [[package]]
 name = "adler2"
-version = "2.0.0"
+version = "2.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627"
+checksum = "320119579fcad9c21884f5c4861d16174d0e06250625266f50fe6898340abefa"
 
 [[package]]
 name = "aho-corasick"
@@ -77,52 +77,52 @@ checksum = "862ed96ca487e809f1c8e5a8447f6ee2cf102f846893800b20cebdf541fc6bbd"
 
 [[package]]
 name = "anstyle-lossy"
-version = "1.1.3"
+version = "1.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "934ff8719effd2023a48cf63e69536c1c3ced9d3895068f6f5cc9a4ff845e59b"
+checksum = "04d3a5dc826f84d0ea11882bb8054ff7f3d482602e11bb181101303a279ea01f"
 dependencies = [
  "anstyle",
 ]
 
 [[package]]
 name = "anstyle-parse"
-version = "0.2.6"
+version = "0.2.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b2d16507662817a6a20a9ea92df6652ee4f94f914589377d69f3b21bc5798a9"
+checksum = "4e7644824f0aa2c7b9384579234ef10eb7efb6a0deb83f9630a49594dd9c15c2"
 dependencies = [
  "utf8parse",
 ]
 
 [[package]]
 name = "anstyle-query"
-version = "1.1.2"
+version = "1.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "79947af37f4177cfead1110013d678905c37501914fba0efea834c3fe9a8d60c"
+checksum = "6c8bdeb6047d8983be085bab0ba1472e6dc604e7041dbf6fcd5e71523014fae9"
 dependencies = [
  "windows-sys 0.59.0",
 ]
 
 [[package]]
 name = "anstyle-svg"
-version = "0.1.7"
+version = "0.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3607949e9f6de49ea4bafe12f5e4fd73613ebf24795e48587302a8cc0e4bb35"
+checksum = "0a43964079ef399480603125d5afae2b219aceffb77478956e25f17b9bc3435c"
 dependencies = [
- "anstream",
  "anstyle",
  "anstyle-lossy",
+ "anstyle-parse",
  "html-escape",
  "unicode-width 0.2.1",
 ]
 
 [[package]]
 name = "anstyle-wincon"
-version = "3.0.7"
+version = "3.0.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca3534e77181a9cc07539ad51f2141fe32f6c3ffd4df76db8ad92346b003ae4e"
+checksum = "403f75924867bb1033c59fbf0797484329750cfbe3c4325cd33127941fabc882"
 dependencies = [
  "anstyle",
- "once_cell",
+ "once_cell_polyfill",
  "windows-sys 0.59.0",
 ]
 
@@ -210,9 +210,9 @@ dependencies = [
 
 [[package]]
 name = "autocfg"
-version = "1.4.0"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
+checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8"
 
 [[package]]
 name = "base64"
@@ -301,9 +301,9 @@ dependencies = [
 
 [[package]]
 name = "bumpalo"
-version = "3.17.0"
+version = "3.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1628fb46dfa0b37568d12e5edd512553eccf6a22a78e8bde00bb4aed84d5bdbf"
+checksum = "46c5e41b57b8bba42a04676d81cb89e9ee8e859a1a66f80a5a72e1cb76b34d43"
 
 [[package]]
 name = "byteorder"
@@ -337,18 +337,18 @@ checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5"
 
 [[package]]
 name = "castaway"
-version = "0.2.3"
+version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0abae9be0aaf9ea96a3b1b8b1b55c602ca751eba1b1500220cea4ecbafe7c0d5"
+checksum = "dec551ab6e7578819132c713a93c022a05d60159dc86e7a7050223577484c55a"
 dependencies = [
  "rustversion",
 ]
 
 [[package]]
 name = "cc"
-version = "1.2.23"
+version = "1.2.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f4ac86a9e5bc1e2b3449ab9d7d3a6a405e3d1bb28d7b9be8614f55846ae3766"
+checksum = "deec109607ca693028562ed836a5f1c4b8bd77755c4e132fc5ce11b0b6211ae7"
 dependencies = [
  "jobserver",
  "libc",
@@ -357,9 +357,9 @@ dependencies = [
 
 [[package]]
 name = "cfg-if"
-version = "1.0.0"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+checksum = "9555578bc9e57714c812a1f84e4fc5b4d21fcb063490c624de019f7464c91268"
 
 [[package]]
 name = "cfg_aliases"
@@ -408,9 +408,9 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "4.5.41"
+version = "4.5.42"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be92d32e80243a54711e5d7ce823c35c41c9d929dc4ab58e1276f625841aadf9"
+checksum = "ed87a9d530bb41a67537289bafcac159cb3ee28460e0a4571123d2a778a6a882"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -418,9 +418,9 @@ dependencies = [
 
 [[package]]
 name = "clap_builder"
-version = "4.5.41"
+version = "4.5.42"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "707eab41e9622f9139419d573eca0900137718000c517d47da73045f54331c3d"
+checksum = "64f4f3f3c77c94aff3c7e9aac9a2ca1974a5adf392a8bb751e827d6d127ab966"
 dependencies = [
  "anstream",
  "anstyle",
@@ -431,9 +431,9 @@ dependencies = [
 
 [[package]]
 name = "clap_complete"
-version = "4.5.50"
+version = "4.5.55"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c91d3baa3bcd889d60e6ef28874126a0b384fd225ab83aa6d8a801c519194ce1"
+checksum = "a5abde44486daf70c5be8b8f8f1b66c49f86236edf6fa2abadb4d961c4c6229a"
 dependencies = [
  "clap",
 ]
@@ -451,9 +451,9 @@ dependencies = [
 
 [[package]]
 name = "clap_complete_nushell"
-version = "4.5.5"
+version = "4.5.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c6a8b1593457dfc2fe539002b795710d022dc62a65bf15023f039f9760c7b18a"
+checksum = "0a0c951694691e65bf9d421d597d68416c22de9632e884c28412cb8cd8b73dce"
 dependencies = [
  "clap",
  "clap_complete",
@@ -473,9 +473,9 @@ dependencies = [
 
 [[package]]
 name = "clap_lex"
-version = "0.7.4"
+version = "0.7.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f46ad14479a25103f283c0f10005961cf086d8dc42205bb44c46ac563475dca6"
+checksum = "b94f61472cee1439c0b966b47e3aca9ae07e45d070759512cd390ea2bebc6675"
 
 [[package]]
 name = "clearscreen"
@@ -492,9 +492,9 @@ dependencies = [
 
 [[package]]
 name = "codspeed"
-version = "3.0.2"
+version = "3.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "922018102595f6668cdd09c03f4bff2d951ce2318c6dca4fe11bdcb24b65b2bf"
+checksum = "d29180405ab3b37bb020246ea66bf8ae233708766fd59581ae929feaef10ce91"
 dependencies = [
  "anyhow",
  "bincode 1.3.3",
@@ -510,9 +510,9 @@ dependencies = [
 
 [[package]]
 name = "codspeed-criterion-compat"
-version = "3.0.2"
+version = "3.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "24d8ad82d2383cb74995f58993cbdd2914aed57b2f91f46580310dd81dc3d05a"
+checksum = "2454d874ca820ffd71273565530ad318f413195bbc99dce6c958ca07db362c63"
 dependencies = [
  "codspeed",
  "codspeed-criterion-compat-walltime",
@@ -521,9 +521,9 @@ dependencies = [
 
 [[package]]
 name = "codspeed-criterion-compat-walltime"
-version = "3.0.2"
+version = "3.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61badaa6c452d192a29f8387147888f0ab358553597c3fe9bf8a162ef7c2fa64"
+checksum = "093a9383cdd1a5a0bd1a47cdafb49ae0c6dcd0793c8fb8f79768bab423128c9c"
 dependencies = [
  "anes",
  "cast",
@@ -546,9 +546,9 @@ dependencies = [
 
 [[package]]
 name = "codspeed-divan-compat"
-version = "3.0.2"
+version = "3.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3acf1d6fe367c2ff5ff136ca723f678490c3691d59d7f2b83d5e53b7b25ac91e"
+checksum = "e1c73bce1e3f47738bf74a6b58b72a49b4f40c837ce420d8d65a270298592aac"
 dependencies = [
  "codspeed",
  "codspeed-divan-compat-macros",
@@ -557,9 +557,9 @@ dependencies = [
 
 [[package]]
 name = "codspeed-divan-compat-macros"
-version = "3.0.2"
+version = "3.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bcfa2013d7bee54a497d0e1410751d5de690fd67a3e9eb728ca049b6a3d16d0b"
+checksum = "ea51dd8add7eba774cc24b4a98324252ac3ec092ccb5f07e52bbe1cb72a6d373"
 dependencies = [
  "divan-macros",
  "itertools 0.14.0",
@@ -571,9 +571,9 @@ dependencies = [
 
 [[package]]
 name = "codspeed-divan-compat-walltime"
-version = "3.0.2"
+version = "3.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e513100fb0e7ba02fb3824546ecd2abfb8f334262f0972225b463aad07f99ff0"
+checksum = "417e9edfc4b0289d4b9b48e62f98c6168d5e30c0e612b2935e394b0dd930fe83"
 dependencies = [
  "cfg-if",
  "clap",
@@ -586,15 +586,15 @@ dependencies = [
 
 [[package]]
 name = "collection_literals"
-version = "1.0.1"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "186dce98367766de751c42c4f03970fc60fc012296e706ccbb9d5df9b6c1e271"
+checksum = "26b3f65b8fb8e88ba339f7d23a390fe1b0896217da05e2a66c584c9b29a91df8"
 
 [[package]]
 name = "colorchoice"
-version = "1.0.3"
+version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990"
+checksum = "b05b61dc5112cbb17e4b6cd61790d9845d13888356391624cbe7e41efeac1e75"
 
 [[package]]
 name = "colored"
@@ -704,9 +704,9 @@ dependencies = [
 
 [[package]]
 name = "crc32fast"
-version = "1.4.2"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3"
+checksum = "9481c1c90cbf2ac953f07c8d4a58aa3945c425b7185c9154d67a65e4230da511"
 dependencies = [
  "cfg-if",
 ]
@@ -810,9 +810,9 @@ checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28"
 
 [[package]]
 name = "crunchy"
-version = "0.2.3"
+version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43da5946c66ffcc7745f48db692ffbb10a83bfe0afd96235c5c2a4fb23994929"
+checksum = "460fbee9c2c2f33933d720630a6a0bac33ba7053db5344fac858d4b8952d77d5"
 
 [[package]]
 name = "crypto-common"
@@ -1000,9 +1000,9 @@ checksum = "92773504d58c093f6de2459af4af33faa518c13451eb8f2b5698ed3d36e7c813"
 
 [[package]]
 name = "dyn-clone"
-version = "1.0.19"
+version = "1.0.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1c7a8fb8a9fbf66c1f703fe16184d10ca0ee9d23be5b4436400408ba54a95005"
+checksum = "d0881ea181b1df73ff77ffaaf9c7544ecc11e82fba9b5f27b262a3c73a332555"
 
 [[package]]
 name = "either"
@@ -1030,12 +1030,12 @@ checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f"
 
 [[package]]
 name = "errno"
-version = "0.3.12"
+version = "0.3.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cea14ef9355e3beab063703aa9dab15afd25f0667c341310c1e5274bb1d0da18"
+checksum = "778e2ac28f6c47af28e4907f13ffd1e1ddbd400980a9abd7c8df189bf578a5ad"
 dependencies = [
  "libc",
- "windows-sys 0.59.0",
+ "windows-sys 0.60.2",
 ]
 
 [[package]]
@@ -1096,9 +1096,9 @@ dependencies = [
 
 [[package]]
 name = "flate2"
-version = "1.1.1"
+version = "1.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ced92e76e966ca2fd84c8f7aa01a4aea65b0eb6648d72f7c8f3e2764a67fece"
+checksum = "4a3d7db9596fecd151c5f638c0ee5d5bd487b6e0ea232e5dc96d5250f6f94b1d"
 dependencies = [
  "crc32fast",
  "miniz_oxide",
@@ -1184,11 +1184,11 @@ dependencies = [
 
 [[package]]
 name = "getopts"
-version = "0.2.21"
+version = "0.2.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "14dbbfd5c71d70241ecf9e6f13737f7b5ce823821063188d7e46c41d371eebd5"
+checksum = "cba6ae63eb948698e300f645f87c70f76630d505f23b8907cf1e193ee85048c1"
 dependencies = [
- "unicode-width 0.1.14",
+ "unicode-width 0.2.1",
 ]
 
 [[package]]
@@ -1199,7 +1199,7 @@ checksum = "335ff9f135e4384c8150d6f27c6daed433577f86b4750418338c01a1a2528592"
 dependencies = [
  "cfg-if",
  "libc",
- "wasi 0.11.0+wasi-snapshot-preview1",
+ "wasi 0.11.1+wasi-snapshot-preview1",
 ]
 
 [[package]]
@@ -1290,15 +1290,9 @@ checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
 
 [[package]]
 name = "hermit-abi"
-version = "0.3.9"
+version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024"
-
-[[package]]
-name = "hermit-abi"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f154ce46856750ed433c8649605bf7ed2de3bc35fd9d2a9f30cddd873c80cb08"
+checksum = "fc0fef456e4baa96da950455cd02c081ca953b141298e41db3fc7e36b1da849c"
 
 [[package]]
 name = "home"
@@ -1391,9 +1385,9 @@ checksum = "00210d6893afc98edb752b664b8890f0ef174c8adbb8d0be9710fa66fbbf72d3"
 
 [[package]]
 name = "icu_properties"
-version = "2.0.0"
+version = "2.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2549ca8c7241c82f59c80ba2a6f415d931c5b58d24fb8412caa1a1f02c49139a"
+checksum = "016c619c1eeb94efb86809b015c58f479963de65bdb6253345c1a1276f22e32b"
 dependencies = [
  "displaydoc",
  "icu_collections",
@@ -1407,9 +1401,9 @@ dependencies = [
 
 [[package]]
 name = "icu_properties_data"
-version = "2.0.0"
+version = "2.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8197e866e47b68f8f7d95249e172903bec06004b18b2937f1095d40a0c57de04"
+checksum = "298459143998310acd25ffe6810ed544932242d3f07083eee1084d83a71bd632"
 
 [[package]]
 name = "icu_provider"
@@ -1621,7 +1615,7 @@ version = "0.4.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e04d7f318608d35d4b61ddd75cbdaee86b023ebe2bd5a66ee0915f0bf93095a9"
 dependencies = [
- "hermit-abi 0.5.1",
+ "hermit-abi",
  "libc",
  "windows-sys 0.59.0",
 ]
@@ -1811,9 +1805,9 @@ dependencies = [
 
 [[package]]
 name = "libredox"
-version = "0.1.3"
+version = "0.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d"
+checksum = "360e552c93fa0e8152ab463bc4c4837fce76a225df11dfaeea66c313de5e61f7"
 dependencies = [
  "bitflags 2.9.1",
  "libc",
@@ -1980,23 +1974,23 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
 
 [[package]]
 name = "miniz_oxide"
-version = "0.8.8"
+version = "0.8.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3be647b768db090acb35d5ec5db2b0e1f1de11133ca123b9eacf5137868f892a"
+checksum = "1fa76a2c86f704bdb222d66965fb3d63269ce38518b83cb0575fca855ebb6316"
 dependencies = [
  "adler2",
 ]
 
 [[package]]
 name = "mio"
-version = "1.0.3"
+version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2886843bf800fba2e3377cff24abf6379b4c4d5c6681eaf9ea5b0d15090450bd"
+checksum = "78bed444cc8a2160f01cbcf811ef18cac863ad68ae8ca62092e8db51d51c761c"
 dependencies = [
  "libc",
  "log",
- "wasi 0.11.0+wasi-snapshot-preview1",
- "windows-sys 0.52.0",
+ "wasi 0.11.1+wasi-snapshot-preview1",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -2007,9 +2001,9 @@ checksum = "308d96db8debc727c3fd9744aac51751243420e46edf401010908da7f8d5e57c"
 
 [[package]]
 name = "newtype-uuid"
-version = "1.2.1"
+version = "1.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ee3224f0e8be7c2a1ebc77ef9c3eecb90f55c6594399ee825de964526b3c9056"
+checksum = "a17d82edb1c8a6c20c238747ae7aae9181133e766bc92cd2556fdd764407d0d1"
 dependencies = [
  "uuid",
 ]
@@ -2099,11 +2093,11 @@ dependencies = [
 
 [[package]]
 name = "num_cpus"
-version = "1.16.0"
+version = "1.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43"
+checksum = "91df4bbde75afed763b708b7eee1e8e7651e02d97f6d5dd763e89367e957b23b"
 dependencies = [
- "hermit-abi 0.3.9",
+ "hermit-abi",
  "libc",
 ]
 
@@ -2113,6 +2107,12 @@ version = "1.21.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d"
 
+[[package]]
+name = "once_cell_polyfill"
+version = "1.70.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a4895175b425cb1f87721b59f0f286c2092bd4af812243672510e1ac53e2e0ad"
+
 [[package]]
 name = "oorandom"
 version = "11.1.5"
@@ -2137,9 +2137,9 @@ dependencies = [
 
 [[package]]
 name = "os_pipe"
-version = "1.2.1"
+version = "1.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ffd2b0a5634335b135d5728d84c5e0fd726954b87111f7506a61c502280d982"
+checksum = "db335f4760b14ead6290116f2427bf33a14d4f0617d49f78a246de10c1831224"
 dependencies = [
  "libc",
  "windows-sys 0.59.0",
@@ -2147,9 +2147,9 @@ dependencies = [
 
 [[package]]
 name = "os_str_bytes"
-version = "7.1.0"
+version = "7.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c86e2db86dd008b4c88c77a9bb83d9286bf77204e255bb3fda3b2eebcae66b62"
+checksum = "63eceb7b5d757011a87d08eb2123db15d87fb0c281f65d101ce30a1e96c3ad5c"
 dependencies = [
  "memchr",
 ]
@@ -2162,9 +2162,9 @@ checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39"
 
 [[package]]
 name = "parking_lot"
-version = "0.12.3"
+version = "0.12.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27"
+checksum = "70d58bf43669b5795d1576d0641cfb6fbb2057bf629506267a92807158584a13"
 dependencies = [
  "lock_api",
  "parking_lot_core",
@@ -2172,9 +2172,9 @@ dependencies = [
 
 [[package]]
 name = "parking_lot_core"
-version = "0.9.10"
+version = "0.9.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8"
+checksum = "bc838d2a56b5b1a6c25f55575dfc605fabb63bb2365f6c2353ef9159aa69e4a5"
 dependencies = [
  "cfg-if",
  "libc",
@@ -2289,9 +2289,9 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
 
 [[package]]
 name = "pest"
-version = "2.8.0"
+version = "2.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "198db74531d58c70a361c42201efde7e2591e976d518caf7662a47dc5720e7b6"
+checksum = "1db05f56d34358a8b1066f67cbb203ee3e7ed2ba674a6263a1d5ec6db2204323"
 dependencies = [
  "memchr",
  "thiserror 2.0.12",
@@ -2300,9 +2300,9 @@ dependencies = [
 
 [[package]]
 name = "pest_derive"
-version = "2.8.0"
+version = "2.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d725d9cfd79e87dccc9341a2ef39d1b6f6353d68c4b33c177febbe1a402c97c5"
+checksum = "bb056d9e8ea77922845ec74a1c4e8fb17e7c218cc4fc11a15c5d25e189aa40bc"
 dependencies = [
  "pest",
  "pest_generator",
@@ -2310,9 +2310,9 @@ dependencies = [
 
 [[package]]
 name = "pest_generator"
-version = "2.8.0"
+version = "2.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db7d01726be8ab66ab32f9df467ae8b1148906685bbe75c82d1e65d7f5b3f841"
+checksum = "87e404e638f781eb3202dc82db6760c8ae8a1eeef7fb3fa8264b2ef280504966"
 dependencies = [
  "pest",
  "pest_meta",
@@ -2323,11 +2323,10 @@ dependencies = [
 
 [[package]]
 name = "pest_meta"
-version = "2.8.0"
+version = "2.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f9f832470494906d1fca5329f8ab5791cc60beb230c74815dff541cbd2b5ca0"
+checksum = "edd1101f170f5903fde0914f899bb503d9ff5271d7ba76bbb70bea63690cc0d5"
 dependencies = [
- "once_cell",
  "pest",
  "sha2",
 ]
@@ -2384,9 +2383,9 @@ checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c"
 
 [[package]]
 name = "portable-atomic"
-version = "1.11.0"
+version = "1.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "350e9b48cbc6b0e028b0473b114454c6316e57336ee184ceab6e53f72c178b3e"
+checksum = "f84267b20a16ea918e43c6a88433c2d54fa145c92a811b5b047ccbe153674483"
 
 [[package]]
 name = "portable-atomic-util"
@@ -2572,9 +2571,9 @@ dependencies = [
 
 [[package]]
 name = "r-efi"
-version = "5.2.0"
+version = "5.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74765f6d916ee2faa39bc8e68e4f3ed8949b48cccdac59983d287a7cb71ce9c5"
+checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f"
 
 [[package]]
 name = "radium"
@@ -2663,9 +2662,9 @@ dependencies = [
 
 [[package]]
 name = "redox_syscall"
-version = "0.5.12"
+version = "0.5.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "928fca9cf2aa042393a8325b9ead81d2f0df4cb12e1e24cef072922ccd99c5af"
+checksum = "5407465600fb0548f1442edf71dd20683c6ed326200ace4b1ef0763521bb3b77"
 dependencies = [
  "bitflags 2.9.1",
 ]
@@ -2744,7 +2743,7 @@ dependencies = [
 
 [[package]]
 name = "ruff"
-version = "0.12.5"
+version = "0.12.7"
 dependencies = [
  "anyhow",
  "argfile",
@@ -2796,7 +2795,7 @@ dependencies = [
  "test-case",
  "thiserror 2.0.12",
  "tikv-jemallocator",
- "toml 0.9.2",
+ "toml 0.9.4",
  "tracing",
  "walkdir",
  "wild",
@@ -2812,7 +2811,7 @@ dependencies = [
  "ruff_annotate_snippets",
  "serde",
  "snapbox",
- "toml 0.9.2",
+ "toml 0.9.4",
  "tryfn",
  "unicode-width 0.2.1",
 ]
@@ -2891,7 +2890,6 @@ dependencies = [
  "tracing",
  "tracing-subscriber",
  "ty_static",
- "unicode-width 0.2.1",
  "web-time",
  "zip",
 ]
@@ -2929,7 +2927,7 @@ dependencies = [
  "similar",
  "strum",
  "tempfile",
- "toml 0.9.2",
+ "toml 0.9.4",
  "tracing",
  "tracing-indicatif",
  "tracing-subscriber",
@@ -2997,7 +2995,7 @@ dependencies = [
 
 [[package]]
 name = "ruff_linter"
-version = "0.12.5"
+version = "0.12.7"
 dependencies = [
  "aho-corasick",
  "anyhow",
@@ -3050,7 +3048,7 @@ dependencies = [
  "tempfile",
  "test-case",
  "thiserror 2.0.12",
- "toml 0.9.2",
+ "toml 0.9.4",
  "typed-arena",
  "unicode-normalization",
  "unicode-width 0.2.1",
@@ -3300,7 +3298,7 @@ dependencies = [
  "serde_json",
  "shellexpand",
  "thiserror 2.0.12",
- "toml 0.9.2",
+ "toml 0.9.4",
  "tracing",
  "tracing-log",
  "tracing-subscriber",
@@ -3329,7 +3327,7 @@ dependencies = [
 
 [[package]]
 name = "ruff_wasm"
-version = "0.12.5"
+version = "0.12.7"
 dependencies = [
  "console_error_panic_hook",
  "console_log",
@@ -3390,7 +3388,7 @@ dependencies = [
  "shellexpand",
  "strum",
  "tempfile",
- "toml 0.9.2",
+ "toml 0.9.4",
 ]
 
 [[package]]
@@ -3417,22 +3415,22 @@ checksum = "781442f29170c5c93b7185ad559492601acdc71d5bb0706f5868094f45cfcd08"
 
 [[package]]
 name = "rustix"
-version = "1.0.7"
+version = "1.0.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c71e83d6afe7ff64890ec6b71d6a69bb8a610ab78ce364b3352876bb4c801266"
+checksum = "11181fbabf243db407ef8df94a6ce0b2f9a733bd8be4ad02b4eda9602296cac8"
 dependencies = [
  "bitflags 2.9.1",
  "errno",
  "libc",
  "linux-raw-sys",
- "windows-sys 0.59.0",
+ "windows-sys 0.60.2",
 ]
 
 [[package]]
 name = "rustversion"
-version = "1.0.20"
+version = "1.0.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eded382c5f5f786b989652c49544c4877d9f015cc22e145a5ea8ea66c2921cd2"
+checksum = "8a0d197bd2c9dc6e53b84da9556a69ba4cdfab8619eb41a8bd1cc2027a0f6b1d"
 
 [[package]]
 name = "ryu"
@@ -3443,7 +3441,7 @@ checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f"
 [[package]]
 name = "salsa"
 version = "0.23.0"
-source = "git+https://github.com/salsa-rs/salsa?rev=dba66f1a37acca014c2402f231ed5b361bd7d8fe#dba66f1a37acca014c2402f231ed5b361bd7d8fe"
+source = "git+https://github.com/salsa-rs/salsa?rev=f3dc2f30f9a250618161e35600a00de7fe744953#f3dc2f30f9a250618161e35600a00de7fe744953"
 dependencies = [
  "boxcar",
  "compact_str",
@@ -3468,12 +3466,12 @@ dependencies = [
 [[package]]
 name = "salsa-macro-rules"
 version = "0.23.0"
-source = "git+https://github.com/salsa-rs/salsa?rev=dba66f1a37acca014c2402f231ed5b361bd7d8fe#dba66f1a37acca014c2402f231ed5b361bd7d8fe"
+source = "git+https://github.com/salsa-rs/salsa?rev=f3dc2f30f9a250618161e35600a00de7fe744953#f3dc2f30f9a250618161e35600a00de7fe744953"
 
 [[package]]
 name = "salsa-macros"
 version = "0.23.0"
-source = "git+https://github.com/salsa-rs/salsa?rev=dba66f1a37acca014c2402f231ed5b361bd7d8fe#dba66f1a37acca014c2402f231ed5b361bd7d8fe"
+source = "git+https://github.com/salsa-rs/salsa?rev=f3dc2f30f9a250618161e35600a00de7fe744953#f3dc2f30f9a250618161e35600a00de7fe744953"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3940,12 +3938,11 @@ dependencies = [
 
 [[package]]
 name = "thread_local"
-version = "1.1.8"
+version = "1.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c"
+checksum = "f60246a4944f24f6e018aa17cdeffb7818b76356965d03b07d6a9886e8962185"
 dependencies = [
  "cfg-if",
- "once_cell",
 ]
 
 [[package]]
@@ -4026,9 +4023,9 @@ dependencies = [
 
 [[package]]
 name = "toml"
-version = "0.9.2"
+version = "0.9.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed0aee96c12fa71097902e0bb061a5e1ebd766a6636bb605ba401c45c1650eac"
+checksum = "41ae868b5a0f67631c14589f7e250c1ea2c574ee5ba21c6c8dd4b1485705a5a1"
 dependencies = [
  "indexmap",
  "serde",
@@ -4099,9 +4096,9 @@ dependencies = [
 
 [[package]]
 name = "tracing-attributes"
-version = "0.1.28"
+version = "0.1.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "395ae124c09f9e6918a2310af6038fba074bcf474ac352496d5910dd59a2226d"
+checksum = "81383ab64e72a7a8b8e13130c49e3dab29def6d0c7d76a03087b3cf71c5c6903"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -4131,9 +4128,9 @@ dependencies = [
 
 [[package]]
 name = "tracing-indicatif"
-version = "0.3.11"
+version = "0.3.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c714cc8fc46db04fcfddbd274c6ef59bebb1b435155984e7c6e89c3ce66f200"
+checksum = "e1983afead46ff13a3c93581e0cec31d20b29efdd22cbdaa8b9f850eccf2c352"
 dependencies = [
  "indicatif",
  "tracing",
@@ -4206,7 +4203,7 @@ dependencies = [
  "ruff_python_trivia",
  "salsa",
  "tempfile",
- "toml 0.9.2",
+ "toml 0.9.4",
  "tracing",
  "tracing-flame",
  "tracing-subscriber",
@@ -4267,7 +4264,7 @@ dependencies = [
  "schemars",
  "serde",
  "thiserror 2.0.12",
- "toml 0.9.2",
+ "toml 0.9.4",
  "tracing",
  "ty_python_semantic",
  "ty_vendored",
@@ -4390,7 +4387,7 @@ dependencies = [
  "smallvec",
  "tempfile",
  "thiserror 2.0.12",
- "toml 0.9.2",
+ "toml 0.9.4",
  "tracing",
  "ty_python_semantic",
  "ty_static",
@@ -4714,9 +4711,9 @@ dependencies = [
 
 [[package]]
 name = "wasi"
-version = "0.11.0+wasi-snapshot-preview1"
+version = "0.11.1+wasi-snapshot-preview1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
+checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b"
 
 [[package]]
 name = "wasi"
@@ -4895,9 +4892,9 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 
 [[package]]
 name = "windows-core"
-version = "0.61.1"
+version = "0.61.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "46ec44dc15085cea82cf9c78f85a9114c463a369786585ad2882d1ff0b0acf40"
+checksum = "c0fdd3ddb90610c7638aa2b3a3ab2904fb9e5cdbecc643ddb3647212781c4ae3"
 dependencies = [
  "windows-implement",
  "windows-interface",
@@ -4930,37 +4927,28 @@ dependencies = [
 
 [[package]]
 name = "windows-link"
-version = "0.1.1"
+version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "76840935b766e1b0a05c0066835fb9ec80071d4c09a16f6bd5f7e655e3c14c38"
+checksum = "5e6ad25900d524eaabdbbb96d20b4311e1e7ae1699af4fb28c17ae66c80d798a"
 
 [[package]]
 name = "windows-result"
-version = "0.3.3"
+version = "0.3.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b895b5356fc36103d0f64dd1e94dfa7ac5633f1c9dd6e80fe9ec4adef69e09d"
+checksum = "56f42bd332cc6c8eac5af113fc0c1fd6a8fd2aa08a0119358686e5160d0586c6"
 dependencies = [
  "windows-link",
 ]
 
 [[package]]
 name = "windows-strings"
-version = "0.4.1"
+version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a7ab927b2637c19b3dbe0965e75d8f2d30bdd697a1516191cad2ec4df8fb28a"
+checksum = "56e6c93f3a0c3b36176cb1327a4958a0353d5d166c2a35cb268ace15e91d3b57"
 dependencies = [
  "windows-link",
 ]
 
-[[package]]
-name = "windows-sys"
-version = "0.52.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
-dependencies = [
- "windows-targets 0.52.6",
-]
-
 [[package]]
 name = "windows-sys"
 version = "0.59.0"
@@ -4976,7 +4964,7 @@ version = "0.60.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f2f500e4d28234f72040990ec9d39e3a6b950f9f22d3dba18416c35882612bcb"
 dependencies = [
- "windows-targets 0.53.2",
+ "windows-targets 0.53.3",
 ]
 
 [[package]]
@@ -4997,10 +4985,11 @@ dependencies = [
 
 [[package]]
 name = "windows-targets"
-version = "0.53.2"
+version = "0.53.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c66f69fcc9ce11da9966ddb31a40968cad001c5bedeb5c2b82ede4253ab48aef"
+checksum = "d5fe6031c4041849d7c496a8ded650796e7b6ecc19df1a431c1a363342e5dc91"
 dependencies = [
+ "windows-link",
  "windows_aarch64_gnullvm 0.53.0",
  "windows_aarch64_msvc 0.53.0",
  "windows_i686_gnu 0.53.0",
@@ -5109,9 +5098,9 @@ checksum = "271414315aff87387382ec3d271b52d7ae78726f5d44ac98b4f4030c91880486"
 
 [[package]]
 name = "winnow"
-version = "0.7.10"
+version = "0.7.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c06928c8748d81b05c9be96aad92e1b6ff01833332f281e8cfca3be4b35fc9ec"
+checksum = "f3edebf492c8125044983378ecb5766203ad3b4c2f7a922bd7dd207f6d443e95"
 dependencies = [
  "memchr",
 ]
@@ -5178,18 +5167,18 @@ dependencies = [
 
 [[package]]
 name = "zerocopy"
-version = "0.8.25"
+version = "0.8.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1702d9583232ddb9174e01bb7c15a2ab8fb1bc6f227aa1233858c351a3ba0cb"
+checksum = "1039dd0d3c310cf05de012d8a39ff557cb0d23087fd44cad61df08fc31907a2f"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.8.25"
+version = "0.8.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28a6e20d751156648aa063f3800b706ee209a32c0b4d9f24be3d980b01be55ef"
+checksum = "9ecf5b4cc5364572d7f4c329661bcc82724222973f2cab6f050a4e5c22f75181"
 dependencies = [
  "proc-macro2",
  "quote",

Cargo.toml

@@ -141,7 +141,7 @@ regex-automata = { version = "0.4.9" }
 rustc-hash = { version = "2.0.0" }
 rustc-stable-hash = { version = "0.1.2" }
 # When updating salsa, make sure to also update the revision in `fuzz/Cargo.toml`
-salsa = { git = "https://github.com/salsa-rs/salsa", rev = "dba66f1a37acca014c2402f231ed5b361bd7d8fe" }
+salsa = { git = "https://github.com/salsa-rs/salsa", rev = "f3dc2f30f9a250618161e35600a00de7fe744953" }
 schemars = { version = "0.8.16" }
 seahash = { version = "4.1.0" }
 serde = { version = "1.0.197", features = ["derive"] }

README.md

@@ -148,8 +148,8 @@ curl -LsSf https://astral.sh/ruff/install.sh | sh
 powershell -c "irm https://astral.sh/ruff/install.ps1 | iex"
 
 # For a specific version.
-curl -LsSf https://astral.sh/ruff/0.12.5/install.sh | sh
-powershell -c "irm https://astral.sh/ruff/0.12.5/install.ps1 | iex"
+curl -LsSf https://astral.sh/ruff/0.12.7/install.sh | sh
+powershell -c "irm https://astral.sh/ruff/0.12.7/install.ps1 | iex"
 ```
 
 You can also install Ruff via [Homebrew](https://formulae.brew.sh/formula/ruff), [Conda](https://anaconda.org/conda-forge/ruff),
@@ -182,7 +182,7 @@ Ruff can also be used as a [pre-commit](https://pre-commit.com/) hook via [`ruff
 ```yaml
 - repo: https://github.com/astral-sh/ruff-pre-commit
   # Ruff version.
-  rev: v0.12.5
+  rev: v0.12.7
   hooks:
     # Run the linter.
     - id: ruff-check

crates/ruff/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "ruff"
-version = "0.12.5"
+version = "0.12.7"
 publish = true
 authors = { workspace = true }
 edition = { workspace = true }

crates/ruff/tests/snapshots/integration_test__rule_f401.snap

@@ -95,6 +95,6 @@ is stricter, which could affect the suggested fix. See [this FAQ section](https:
 ## References
 - [Python documentation: `import`](https://docs.python.org/3/reference/simple_stmts.html#the-import-statement)
 - [Python documentation: `importlib.util.find_spec`](https://docs.python.org/3/library/importlib.html#importlib.util.find_spec)
-- [Typing documentation: interface conventions](https://typing.python.org/en/latest/source/libraries.html#library-interface-public-and-private-symbols)
+- [Typing documentation: interface conventions](https://typing.python.org/en/latest/spec/distributing.html#library-interface-public-and-private-symbols)
 
 ----- stderr -----

crates/ruff/tests/snapshots/lint__output_format_sarif.snap

@@ -95,7 +95,7 @@ exit_code: 1
           "rules": [
             {
               "fullDescription": {
-                "text": "## What it does\nChecks for unused imports.\n\n## Why is this bad?\nUnused imports add a performance overhead at runtime, and risk creating\nimport cycles. They also increase the cognitive load of reading the code.\n\nIf an import statement is used to check for the availability or existence\nof a module, consider using `importlib.util.find_spec` instead.\n\nIf an import statement is used to re-export a symbol as part of a module's\npublic interface, consider using a \"redundant\" import alias, which\ninstructs Ruff (and other tools) to respect the re-export, and avoid\nmarking it as unused, as in:\n\n```python\nfrom module import member as member\n```\n\nAlternatively, you can use `__all__` to declare a symbol as part of the module's\ninterface, as in:\n\n```python\n# __init__.py\nimport some_module\n\n__all__ = [\"some_module\"]\n```\n\n## Fix safety\n\nFixes to remove unused imports are safe, except in `__init__.py` files.\n\nApplying fixes to `__init__.py` files is currently in preview. The fix offered depends on the\ntype of the unused import. Ruff will suggest a safe fix to export first-party imports with\neither a redundant alias or, if already present in the file, an `__all__` entry. If multiple\n`__all__` declarations are present, Ruff will not offer a fix. Ruff will suggest an unsafe fix\nto remove third-party and standard library imports -- the fix is unsafe because the module's\ninterface changes.\n\n## Example\n\n```python\nimport numpy as np  # unused import\n\n\ndef area(radius):\n    return 3.14 * radius**2\n```\n\nUse instead:\n\n```python\ndef area(radius):\n    return 3.14 * radius**2\n```\n\nTo check the availability of a module, use `importlib.util.find_spec`:\n\n```python\nfrom importlib.util import find_spec\n\nif find_spec(\"numpy\") is not None:\n    print(\"numpy is installed\")\nelse:\n    print(\"numpy is not installed\")\n```\n\n## Preview\nWhen [preview](https://docs.astral.sh/ruff/preview/) is enabled,\nthe criterion for determining whether an import is first-party\nis stricter, which could affect the suggested fix. See [this FAQ section](https://docs.astral.sh/ruff/faq/#how-does-ruff-determine-which-of-my-imports-are-first-party-third-party-etc) for more details.\n\n## Options\n- `lint.ignore-init-module-imports`\n- `lint.pyflakes.allowed-unused-imports`\n\n## References\n- [Python documentation: `import`](https://docs.python.org/3/reference/simple_stmts.html#the-import-statement)\n- [Python documentation: `importlib.util.find_spec`](https://docs.python.org/3/library/importlib.html#importlib.util.find_spec)\n- [Typing documentation: interface conventions](https://typing.python.org/en/latest/source/libraries.html#library-interface-public-and-private-symbols)\n"
+                "text": "## What it does\nChecks for unused imports.\n\n## Why is this bad?\nUnused imports add a performance overhead at runtime, and risk creating\nimport cycles. They also increase the cognitive load of reading the code.\n\nIf an import statement is used to check for the availability or existence\nof a module, consider using `importlib.util.find_spec` instead.\n\nIf an import statement is used to re-export a symbol as part of a module's\npublic interface, consider using a \"redundant\" import alias, which\ninstructs Ruff (and other tools) to respect the re-export, and avoid\nmarking it as unused, as in:\n\n```python\nfrom module import member as member\n```\n\nAlternatively, you can use `__all__` to declare a symbol as part of the module's\ninterface, as in:\n\n```python\n# __init__.py\nimport some_module\n\n__all__ = [\"some_module\"]\n```\n\n## Fix safety\n\nFixes to remove unused imports are safe, except in `__init__.py` files.\n\nApplying fixes to `__init__.py` files is currently in preview. The fix offered depends on the\ntype of the unused import. Ruff will suggest a safe fix to export first-party imports with\neither a redundant alias or, if already present in the file, an `__all__` entry. If multiple\n`__all__` declarations are present, Ruff will not offer a fix. Ruff will suggest an unsafe fix\nto remove third-party and standard library imports -- the fix is unsafe because the module's\ninterface changes.\n\n## Example\n\n```python\nimport numpy as np  # unused import\n\n\ndef area(radius):\n    return 3.14 * radius**2\n```\n\nUse instead:\n\n```python\ndef area(radius):\n    return 3.14 * radius**2\n```\n\nTo check the availability of a module, use `importlib.util.find_spec`:\n\n```python\nfrom importlib.util import find_spec\n\nif find_spec(\"numpy\") is not None:\n    print(\"numpy is installed\")\nelse:\n    print(\"numpy is not installed\")\n```\n\n## Preview\nWhen [preview](https://docs.astral.sh/ruff/preview/) is enabled,\nthe criterion for determining whether an import is first-party\nis stricter, which could affect the suggested fix. See [this FAQ section](https://docs.astral.sh/ruff/faq/#how-does-ruff-determine-which-of-my-imports-are-first-party-third-party-etc) for more details.\n\n## Options\n- `lint.ignore-init-module-imports`\n- `lint.pyflakes.allowed-unused-imports`\n\n## References\n- [Python documentation: `import`](https://docs.python.org/3/reference/simple_stmts.html#the-import-statement)\n- [Python documentation: `importlib.util.find_spec`](https://docs.python.org/3/library/importlib.html#importlib.util.find_spec)\n- [Typing documentation: interface conventions](https://typing.python.org/en/latest/spec/distributing.html#library-interface-public-and-private-symbols)\n"
               },
               "help": {
                 "text": "`{name}` imported but unused; consider using `importlib.util.find_spec` to test for availability"

crates/ruff_benchmark/benches/ty.rs

@@ -351,6 +351,41 @@ fn benchmark_many_tuple_assignments(criterion: &mut Criterion) {
     });
 }
 
+fn benchmark_tuple_implicit_instance_attributes(criterion: &mut Criterion) {
+    setup_rayon();
+
+    criterion.bench_function("ty_micro[many_tuple_assignments]", |b| {
+        b.iter_batched_ref(
+            || {
+                // This is a regression benchmark for a case that used to hang:
+                // https://github.com/astral-sh/ty/issues/765
+                setup_micro_case(
+                    r#"
+                    from typing import Any
+
+                    class A:
+                        foo: tuple[Any, ...]
+
+                    class B(A):
+                        def __init__(self, parent: "C", x: tuple[Any]):
+                            self.foo = parent.foo + x
+
+                    class C(A):
+                        def __init__(self, parent: B, x: tuple[Any]):
+                            self.foo = parent.foo + x
+                    "#,
+                )
+            },
+            |case| {
+                let Case { db, .. } = case;
+                let result = db.check();
+                assert_eq!(result.len(), 0);
+            },
+            BatchSize::SmallInput,
+        );
+    });
+}
+
 fn benchmark_complex_constrained_attributes_1(criterion: &mut Criterion) {
     setup_rayon();
 
@@ -630,6 +665,7 @@ criterion_group!(
     micro,
     benchmark_many_string_assignments,
     benchmark_many_tuple_assignments,
+    benchmark_tuple_implicit_instance_attributes,
     benchmark_complex_constrained_attributes_1,
     benchmark_complex_constrained_attributes_2,
     benchmark_many_enum_members,

crates/ruff_db/Cargo.toml

@@ -42,7 +42,6 @@ serde_json = { workspace = true, optional = true }
 thiserror = { workspace = true }
 tracing = { workspace = true }
 tracing-subscriber = { workspace = true, optional = true }
-unicode-width = { workspace = true }
 zip = { workspace = true }
 
 [target.'cfg(target_arch="wasm32")'.dependencies]

crates/ruff_db/src/diagnostic/mod.rs

@@ -21,7 +21,7 @@ mod stylesheet;
 /// characteristics in the inputs given to the tool. Typically, but not always,
 /// a characteristic is a deficiency. An example of a characteristic that is
 /// _not_ a deficiency is the `reveal_type` diagnostic for our type checker.
-#[derive(Debug, Clone, Eq, PartialEq, get_size2::GetSize)]
+#[derive(Debug, Clone, Eq, PartialEq, Hash, get_size2::GetSize)]
 pub struct Diagnostic {
     /// The actual diagnostic.
     ///
@@ -479,7 +479,7 @@ impl Diagnostic {
     }
 }
 
-#[derive(Debug, Clone, Eq, PartialEq, get_size2::GetSize)]
+#[derive(Debug, Clone, Eq, PartialEq, Hash, get_size2::GetSize)]
 struct DiagnosticInner {
     id: DiagnosticId,
     severity: Severity,
@@ -555,7 +555,7 @@ impl Eq for RenderingSortKey<'_> {}
 /// Currently, the order in which sub-diagnostics are rendered relative to one
 /// another (for a single parent diagnostic) is the order in which they were
 /// attached to the diagnostic.
-#[derive(Debug, Clone, Eq, PartialEq, get_size2::GetSize)]
+#[derive(Debug, Clone, Eq, PartialEq, Hash, get_size2::GetSize)]
 pub struct SubDiagnostic {
     /// Like with `Diagnostic`, we box the `SubDiagnostic` to make it
     /// pointer-sized.
@@ -659,7 +659,7 @@ impl SubDiagnostic {
     }
 }
 
-#[derive(Debug, Clone, Eq, PartialEq, get_size2::GetSize)]
+#[derive(Debug, Clone, Eq, PartialEq, Hash, get_size2::GetSize)]
 struct SubDiagnosticInner {
     severity: SubDiagnosticSeverity,
     message: DiagnosticMessage,
@@ -687,7 +687,7 @@ struct SubDiagnosticInner {
 ///
 /// Messages attached to annotations should also be as brief and specific as
 /// possible. Long messages could negative impact the quality of rendering.
-#[derive(Debug, Clone, Eq, PartialEq, get_size2::GetSize)]
+#[derive(Debug, Clone, Eq, PartialEq, Hash, get_size2::GetSize)]
 pub struct Annotation {
     /// The span of this annotation, corresponding to some subsequence of the
     /// user's input that we want to highlight.
@@ -807,7 +807,7 @@ impl Annotation {
 ///
 /// These tags are used to provide additional information about the annotation.
 /// and are passed through to the language server protocol.
-#[derive(Debug, Clone, Eq, PartialEq, get_size2::GetSize)]
+#[derive(Debug, Clone, Eq, PartialEq, Hash, get_size2::GetSize)]
 pub enum DiagnosticTag {
     /// Unused or unnecessary code. Used for unused parameters, unreachable code, etc.
     Unnecessary,
@@ -1016,7 +1016,7 @@ impl std::fmt::Display for DiagnosticId {
 ///
 /// This enum presents a unified interface to these two types for the sake of creating [`Span`]s and
 /// emitting diagnostics from both ty and ruff.
-#[derive(Debug, Clone, PartialEq, Eq, get_size2::GetSize)]
+#[derive(Debug, Clone, PartialEq, Eq, Hash, get_size2::GetSize)]
 pub enum UnifiedFile {
     Ty(File),
     Ruff(SourceFile),
@@ -1080,7 +1080,7 @@ impl DiagnosticSource {
 /// It consists of a `File` and an optional range into that file. When the
 /// range isn't present, it semantically implies that the diagnostic refers to
 /// the entire file. For example, when the file should be executable but isn't.
-#[derive(Debug, Clone, PartialEq, Eq, get_size2::GetSize)]
+#[derive(Debug, Clone, PartialEq, Eq, Hash, get_size2::GetSize)]
 pub struct Span {
     file: UnifiedFile,
     range: Option<TextRange>,
@@ -1158,7 +1158,7 @@ impl From<crate::files::FileRange> for Span {
     }
 }
 
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Ord, PartialOrd, get_size2::GetSize)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Ord, PartialOrd, Hash, get_size2::GetSize)]
 pub enum Severity {
     Info,
     Warning,
@@ -1193,7 +1193,7 @@ impl Severity {
 /// This type only exists to add an additional `Help` severity that isn't present in `Severity` or
 /// used for main diagnostics. If we want to add `Severity::Help` in the future, this type could be
 /// deleted and the two combined again.
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Ord, PartialOrd, get_size2::GetSize)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Ord, PartialOrd, Hash, get_size2::GetSize)]
 pub enum SubDiagnosticSeverity {
     Help,
     Info,
@@ -1428,7 +1428,7 @@ impl std::fmt::Display for ConciseMessage<'_> {
 /// In most cases, callers shouldn't need to use this. Instead, there is
 /// a blanket trait implementation for `IntoDiagnosticMessage` for
 /// anything that implements `std::fmt::Display`.
-#[derive(Clone, Debug, Eq, PartialEq, get_size2::GetSize)]
+#[derive(Clone, Debug, Eq, PartialEq, Hash, get_size2::GetSize)]
 pub struct DiagnosticMessage(Box<str>);
 
 impl DiagnosticMessage {

crates/ruff_db/src/diagnostic/render.rs

@@ -585,8 +585,7 @@ impl<'r> RenderableSnippet<'r> {
         let EscapedSourceCode {
             text: snippet,
             annotations,
-        } = replace_whitespace_and_unprintable(snippet, annotations)
-            .fix_up_empty_spans_after_line_terminator();
+        } = replace_unprintable(snippet, annotations).fix_up_empty_spans_after_line_terminator();
 
         RenderableSnippet {
             snippet,
@@ -828,13 +827,18 @@ fn relativize_path<'p>(cwd: &SystemPath, path: &'p str) -> &'p str {
     path
 }
 
-/// Given some source code and annotation ranges, this routine replaces tabs
-/// with ASCII whitespace, and unprintable characters with printable
-/// representations of them.
+/// Given some source code and annotation ranges, this routine replaces
+/// unprintable characters with printable representations of them.
 ///
 /// The source code and annotations returned are updated to reflect changes made
 /// to the source code (if any).
-fn replace_whitespace_and_unprintable<'r>(
+///
+/// We don't need to normalize whitespace, such as converting tabs to spaces,
+/// because `annotate-snippets` handles that internally. Similarly, it's safe to
+/// modify the annotation ranges by inserting 3-byte Unicode replacements
+/// because `annotate-snippets` will account for their actual width when
+/// rendering and displaying the column to the user.
+fn replace_unprintable<'r>(
     source: &'r str,
     mut annotations: Vec<RenderableAnnotation<'r>>,
 ) -> EscapedSourceCode<'r> {
@@ -866,48 +870,17 @@ fn replace_whitespace_and_unprintable<'r>(
         }
     };
 
-    const TAB_SIZE: usize = 4;
-    let mut width = 0;
-    let mut column = 0;
     let mut last_end = 0;
     let mut result = String::new();
     for (index, c) in source.char_indices() {
-        let old_width = width;
-        match c {
-            '\n' | '\r' => {
-                width = 0;
-                column = 0;
-            }
-            '\t' => {
-                let tab_offset = TAB_SIZE - (column % TAB_SIZE);
-                width += tab_offset;
-                column += tab_offset;
+        if let Some(printable) = unprintable_replacement(c) {
+            result.push_str(&source[last_end..index]);
 
-                let tab_width =
-                    u32::try_from(width - old_width).expect("small width because of tab size");
-                result.push_str(&source[last_end..index]);
+            let len = printable.text_len().to_u32();
+            update_ranges(result.text_len().to_usize(), len);
 
-                update_ranges(result.text_len().to_usize(), tab_width);
-
-                for _ in 0..tab_width {
-                    result.push(' ');
-                }
-                last_end = index + 1;
-            }
-            _ => {
-                width += unicode_width::UnicodeWidthChar::width(c).unwrap_or(0);
-                column += 1;
-
-                if let Some(printable) = unprintable_replacement(c) {
-                    result.push_str(&source[last_end..index]);
-
-                    let len = printable.text_len().to_u32();
-                    update_ranges(result.text_len().to_usize(), len);
-
-                    result.push(printable);
-                    last_end = index + 1;
-                }
-            }
+            result.push(printable);
+            last_end = index + 1;
         }
     }
 

crates/ruff_db/src/diagnostic/render/full.rs

@@ -177,4 +177,25 @@ print()
 
         Ok(())
     }
+
+    /// Ensure that the header column matches the column in the user's input, even if we've replaced
+    /// tabs with spaces for rendering purposes.
+    #[test]
+    fn tab_replacement() {
+        let mut env = TestEnvironment::new();
+        env.add("example.py", "def foo():\n\treturn 1");
+        env.format(DiagnosticFormat::Full);
+
+        let diagnostic = env.err().primary("example.py", "2:1", "2:9", "").build();
+
+        insta::assert_snapshot!(env.render(&diagnostic), @r"
+        error[test-diagnostic]: main diagnostic message
+         --> example.py:2:2
+          |
+        1 | def foo():
+        2 |     return 1
+          |     ^^^^^^^^
+          |
+        ");
+    }
 }

crates/ruff_db/src/parsed.rs

@@ -21,7 +21,7 @@ use crate::source::source_text;
 /// reflected in the changed AST offsets.
 /// The other reason is that Ruff's AST doesn't implement `Eq` which Salsa requires
 /// for determining if a query result is unchanged.
-#[salsa::tracked(returns(ref), no_eq, heap_size=get_size2::GetSize::get_heap_size)]
+#[salsa::tracked(returns(ref), no_eq, heap_size=get_size2::heap_size)]
 pub fn parsed_module(db: &dyn Db, file: File) -> ParsedModule {
     let _span = tracing::trace_span!("parsed_module", ?file).entered();
 

crates/ruff_db/src/source.rs

@@ -9,7 +9,7 @@ use crate::Db;
 use crate::files::{File, FilePath};
 
 /// Reads the source text of a python text file (must be valid UTF8) or notebook.
-#[salsa::tracked(heap_size=get_size2::GetSize::get_heap_size)]
+#[salsa::tracked(heap_size=get_size2::heap_size)]
 pub fn source_text(db: &dyn Db, file: File) -> SourceText {
     let path = file.path(db);
     let _span = tracing::trace_span!("source_text", file = %path).entered();
@@ -69,21 +69,21 @@ impl SourceText {
     pub fn as_str(&self) -> &str {
         match &self.inner.kind {
             SourceTextKind::Text(source) => source,
-            SourceTextKind::Notebook(notebook) => notebook.source_code(),
+            SourceTextKind::Notebook { notebook } => notebook.source_code(),
         }
     }
 
     /// Returns the underlying notebook if this is a notebook file.
     pub fn as_notebook(&self) -> Option<&Notebook> {
         match &self.inner.kind {
-            SourceTextKind::Notebook(notebook) => Some(notebook),
+            SourceTextKind::Notebook { notebook } => Some(notebook),
             SourceTextKind::Text(_) => None,
         }
     }
 
     /// Returns `true` if this is a notebook source file.
     pub fn is_notebook(&self) -> bool {
-        matches!(&self.inner.kind, SourceTextKind::Notebook(_))
+        matches!(&self.inner.kind, SourceTextKind::Notebook { .. })
     }
 
     /// Returns `true` if there was an error when reading the content of the file.
@@ -108,7 +108,7 @@ impl std::fmt::Debug for SourceText {
             SourceTextKind::Text(text) => {
                 dbg.field(text);
             }
-            SourceTextKind::Notebook(notebook) => {
+            SourceTextKind::Notebook { notebook } => {
                 dbg.field(notebook);
             }
         }
@@ -123,23 +123,15 @@ struct SourceTextInner {
     read_error: Option<SourceTextError>,
 }
 
-#[derive(Eq, PartialEq)]
+#[derive(Eq, PartialEq, get_size2::GetSize)]
 enum SourceTextKind {
     Text(String),
-    Notebook(Box<Notebook>),
-}
-
-impl get_size2::GetSize for SourceTextKind {
-    fn get_heap_size(&self) -> usize {
-        match self {
-            SourceTextKind::Text(text) => text.get_heap_size(),
-            // TODO: The `get-size` derive does not support ignoring enum variants.
-            //
-            // Jupyter notebooks are not very relevant for memory profiling, and contain
-            // arbitrary JSON values that do not implement the `GetSize` trait.
-            SourceTextKind::Notebook(_) => 0,
-        }
-    }
+    Notebook {
+        // Jupyter notebooks are not very relevant for memory profiling, and contain
+        // arbitrary JSON values that do not implement the `GetSize` trait.
+        #[get_size(ignore)]
+        notebook: Box<Notebook>,
+    },
 }
 
 impl From<String> for SourceTextKind {
@@ -150,7 +142,9 @@ impl From<String> for SourceTextKind {
 
 impl From<Notebook> for SourceTextKind {
     fn from(notebook: Notebook) -> Self {
-        SourceTextKind::Notebook(Box::new(notebook))
+        SourceTextKind::Notebook {
+            notebook: Box::new(notebook),
+        }
     }
 }
 
@@ -163,7 +157,7 @@ pub enum SourceTextError {
 }
 
 /// Computes the [`LineIndex`] for `file`.
-#[salsa::tracked(heap_size=get_size2::GetSize::get_heap_size)]
+#[salsa::tracked(heap_size=get_size2::heap_size)]
 pub fn line_index(db: &dyn Db, file: File) -> LineIndex {
     let _span = tracing::trace_span!("line_index", ?file).entered();
 

crates/ruff_diagnostics/src/fix.rs

@@ -43,7 +43,7 @@ pub enum IsolationLevel {
 }
 
 /// A collection of [`Edit`] elements to be applied to a source file.
-#[derive(Debug, PartialEq, Eq, Clone, get_size2::GetSize)]
+#[derive(Debug, PartialEq, Eq, Clone, Hash, get_size2::GetSize)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
 pub struct Fix {
     /// The [`Edit`] elements to be applied, sorted by [`Edit::start`] in ascending order.

crates/ruff_graph/src/resolver.rs

@@ -69,7 +69,7 @@ impl<'a> Resolver<'a> {
     }
 
     /// Resolves a module name to a module.
-    fn resolve_module(&self, module_name: &ModuleName) -> Option<&'a FilePath> {
+    pub(crate) fn resolve_module(&self, module_name: &ModuleName) -> Option<&'a FilePath> {
         let module = resolve_module(self.db, module_name)?;
         Some(module.file(self.db)?.path(self.db))
     }

crates/ruff_linter/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "ruff_linter"
-version = "0.12.5"
+version = "0.12.7"
 publish = false
 authors = { workspace = true }
 edition = { workspace = true }

crates/ruff_linter/resources/test/fixtures/flake8_errmsg/EM.py

@@ -88,3 +88,25 @@ def f_multi_line_string2():
             example="example"
         )
     )
+
+
+def raise_typing_cast_exception():
+    import typing
+    raise typing.cast("Exception", None)
+
+
+def f_typing_cast_excluded():
+    from typing import cast
+    raise cast(RuntimeError, "This should not trigger EM101")
+
+
+def f_typing_cast_excluded_import():
+    import typing
+    raise typing.cast(RuntimeError, "This should not trigger EM101")
+
+
+def f_typing_cast_excluded_aliased():
+    from typing import cast as my_cast
+    raise my_cast(RuntimeError, "This should not trigger EM101")
+
+

crates/ruff_linter/resources/test/fixtures/flake8_pyi/PYI013.py

@@ -39,6 +39,11 @@ class NonEmptyWithInit:
         pass
 
 
+class NonEmptyChildWithInlineComment:
+    value: int
+    ... # preserve me
+
+
 class EmptyClass:
     ...
 

crates/ruff_linter/resources/test/fixtures/flake8_pyi/PYI013.pyi

@@ -38,6 +38,10 @@ class NonEmptyWithInit:
     def __init__():
         pass
 
+class NonEmptyChildWithInlineComment:
+    value: int
+    ... # preserve me
+
 # Not violations
 
 class EmptyClass: ...

crates/ruff_linter/resources/test/fixtures/flake8_use_pathlib/PTH201.py

@@ -1,4 +1,4 @@
-from pathlib import Path, PurePath
+from pathlib import Path, PurePath, PosixPath, PurePosixPath, WindowsPath, PureWindowsPath
 from pathlib import Path as pth
 
 
@@ -68,3 +68,11 @@ Path(".", "folder")
 PurePath(".", "folder")
 
 Path()
+
+from importlib.metadata import PackagePath
+
+_ = PosixPath(".")
+_ = PurePosixPath(".")
+_ = WindowsPath(".")
+_ = PureWindowsPath(".")
+_ = PackagePath(".")

crates/ruff_linter/resources/test/fixtures/isort/required_imports/docstring_followed_by_continuation.py

@@ -0,0 +1,3 @@
+"""Hello, world!"""\
+
+x = 1; y = 2

crates/ruff_linter/resources/test/fixtures/pyupgrade/UP030_0.py

@@ -59,3 +59,7 @@ kwargs = {x: x for x in range(10)}
 "{1}_{0}".format(1, 2, *args)
 
 "{1}_{0}".format(1, 2)
+
+r"\d{{1,2}} {0}".format(42)
+
+"{{{0}}}".format(123)

crates/ruff_linter/resources/test/fixtures/ruff/RUF010.py

@@ -52,3 +52,7 @@ f"{repr(lambda: 1)}"
 f"{repr(x := 2)}"
 
 f"{str(object=3)}"
+
+f"{str(x for x in [])}"
+
+f"{str((x for x in []))}"

crates/ruff_linter/src/checkers/ast/mod.rs

@@ -590,6 +590,16 @@ impl<'a> Checker<'a> {
             member,
         })
     }
+
+    /// Return the [`LintContext`] for the current analysis.
+    ///
+    /// Note that you should always prefer calling methods like `settings`, `report_diagnostic`, or
+    /// `is_rule_enabled` directly on [`Checker`] when possible. This method exists only for the
+    /// rare cases where rules or helper functions need to be accessed by both a `Checker` and a
+    /// `LintContext` in different analysis phases.
+    pub(crate) const fn context(&self) -> &'a LintContext<'a> {
+        self.context
+    }
 }
 
 pub(crate) struct TypingImporter<'a, 'b> {

crates/ruff_linter/src/importer/insertion.rs

@@ -56,13 +56,19 @@ impl<'a> Insertion<'a> {
         stylist: &Stylist,
     ) -> Insertion<'static> {
         // Skip over any docstrings.
-        let mut location = if let Some(location) = match_docstring_end(body) {
+        let mut location = if let Some(mut location) = match_docstring_end(body) {
             // If the first token after the docstring is a semicolon, insert after the semicolon as
             // an inline statement.
             if let Some(offset) = match_semicolon(locator.after(location)) {
                 return Insertion::inline(" ", location.add(offset).add(TextSize::of(';')), ";");
             }
 
+            // If the first token after the docstring is a continuation character (i.e. "\"), advance
+            // an additional row to prevent inserting in the same logical line.
+            if match_continuation(locator.after(location)).is_some() {
+                location = locator.full_line_end(location);
+            }
+
             // Otherwise, advance to the next row.
             locator.full_line_end(location)
         } else {
@@ -363,6 +369,16 @@ mod tests {
             Insertion::own_line("", TextSize::from(20), "\n")
         );
 
+        let contents = r#"
+"""Hello, world!"""\
+
+"#
+        .trim_start();
+        assert_eq!(
+            insert(contents)?,
+            Insertion::own_line("", TextSize::from(22), "\n")
+        );
+
         let contents = r"
 x = 1
 "

crates/ruff_linter/src/message/snapshots/ruff_linter__message__sarif__tests__results.snap

@@ -81,7 +81,7 @@ expression: value
           "rules": [
             {
               "fullDescription": {
-                "text": "## What it does\nChecks for unused imports.\n\n## Why is this bad?\nUnused imports add a performance overhead at runtime, and risk creating\nimport cycles. They also increase the cognitive load of reading the code.\n\nIf an import statement is used to check for the availability or existence\nof a module, consider using `importlib.util.find_spec` instead.\n\nIf an import statement is used to re-export a symbol as part of a module's\npublic interface, consider using a \"redundant\" import alias, which\ninstructs Ruff (and other tools) to respect the re-export, and avoid\nmarking it as unused, as in:\n\n```python\nfrom module import member as member\n```\n\nAlternatively, you can use `__all__` to declare a symbol as part of the module's\ninterface, as in:\n\n```python\n# __init__.py\nimport some_module\n\n__all__ = [\"some_module\"]\n```\n\n## Fix safety\n\nFixes to remove unused imports are safe, except in `__init__.py` files.\n\nApplying fixes to `__init__.py` files is currently in preview. The fix offered depends on the\ntype of the unused import. Ruff will suggest a safe fix to export first-party imports with\neither a redundant alias or, if already present in the file, an `__all__` entry. If multiple\n`__all__` declarations are present, Ruff will not offer a fix. Ruff will suggest an unsafe fix\nto remove third-party and standard library imports -- the fix is unsafe because the module's\ninterface changes.\n\n## Example\n\n```python\nimport numpy as np  # unused import\n\n\ndef area(radius):\n    return 3.14 * radius**2\n```\n\nUse instead:\n\n```python\ndef area(radius):\n    return 3.14 * radius**2\n```\n\nTo check the availability of a module, use `importlib.util.find_spec`:\n\n```python\nfrom importlib.util import find_spec\n\nif find_spec(\"numpy\") is not None:\n    print(\"numpy is installed\")\nelse:\n    print(\"numpy is not installed\")\n```\n\n## Preview\nWhen [preview](https://docs.astral.sh/ruff/preview/) is enabled,\nthe criterion for determining whether an import is first-party\nis stricter, which could affect the suggested fix. See [this FAQ section](https://docs.astral.sh/ruff/faq/#how-does-ruff-determine-which-of-my-imports-are-first-party-third-party-etc) for more details.\n\n## Options\n- `lint.ignore-init-module-imports`\n- `lint.pyflakes.allowed-unused-imports`\n\n## References\n- [Python documentation: `import`](https://docs.python.org/3/reference/simple_stmts.html#the-import-statement)\n- [Python documentation: `importlib.util.find_spec`](https://docs.python.org/3/library/importlib.html#importlib.util.find_spec)\n- [Typing documentation: interface conventions](https://typing.python.org/en/latest/source/libraries.html#library-interface-public-and-private-symbols)\n"
+                "text": "## What it does\nChecks for unused imports.\n\n## Why is this bad?\nUnused imports add a performance overhead at runtime, and risk creating\nimport cycles. They also increase the cognitive load of reading the code.\n\nIf an import statement is used to check for the availability or existence\nof a module, consider using `importlib.util.find_spec` instead.\n\nIf an import statement is used to re-export a symbol as part of a module's\npublic interface, consider using a \"redundant\" import alias, which\ninstructs Ruff (and other tools) to respect the re-export, and avoid\nmarking it as unused, as in:\n\n```python\nfrom module import member as member\n```\n\nAlternatively, you can use `__all__` to declare a symbol as part of the module's\ninterface, as in:\n\n```python\n# __init__.py\nimport some_module\n\n__all__ = [\"some_module\"]\n```\n\n## Fix safety\n\nFixes to remove unused imports are safe, except in `__init__.py` files.\n\nApplying fixes to `__init__.py` files is currently in preview. The fix offered depends on the\ntype of the unused import. Ruff will suggest a safe fix to export first-party imports with\neither a redundant alias or, if already present in the file, an `__all__` entry. If multiple\n`__all__` declarations are present, Ruff will not offer a fix. Ruff will suggest an unsafe fix\nto remove third-party and standard library imports -- the fix is unsafe because the module's\ninterface changes.\n\n## Example\n\n```python\nimport numpy as np  # unused import\n\n\ndef area(radius):\n    return 3.14 * radius**2\n```\n\nUse instead:\n\n```python\ndef area(radius):\n    return 3.14 * radius**2\n```\n\nTo check the availability of a module, use `importlib.util.find_spec`:\n\n```python\nfrom importlib.util import find_spec\n\nif find_spec(\"numpy\") is not None:\n    print(\"numpy is installed\")\nelse:\n    print(\"numpy is not installed\")\n```\n\n## Preview\nWhen [preview](https://docs.astral.sh/ruff/preview/) is enabled,\nthe criterion for determining whether an import is first-party\nis stricter, which could affect the suggested fix. See [this FAQ section](https://docs.astral.sh/ruff/faq/#how-does-ruff-determine-which-of-my-imports-are-first-party-third-party-etc) for more details.\n\n## Options\n- `lint.ignore-init-module-imports`\n- `lint.pyflakes.allowed-unused-imports`\n\n## References\n- [Python documentation: `import`](https://docs.python.org/3/reference/simple_stmts.html#the-import-statement)\n- [Python documentation: `importlib.util.find_spec`](https://docs.python.org/3/library/importlib.html#importlib.util.find_spec)\n- [Typing documentation: interface conventions](https://typing.python.org/en/latest/spec/distributing.html#library-interface-public-and-private-symbols)\n"
               },
               "help": {
                 "text": "`{name}` imported but unused; consider using `importlib.util.find_spec` to test for availability"

crates/ruff_linter/src/message/text.rs

@@ -13,7 +13,6 @@ use ruff_notebook::NotebookIndex;
 use ruff_source_file::OneIndexed;
 use ruff_text_size::{TextLen, TextRange, TextSize};
 
-use crate::line_width::{IndentWidth, LineWidthBuilder};
 use crate::message::diff::Diff;
 use crate::message::{Emitter, EmitterContext};
 use crate::settings::types::UnsafeFixes;
@@ -229,7 +228,7 @@ impl Display for MessageCodeFrame<'_> {
         let start_offset = source_code.line_start(start_index);
         let end_offset = source_code.line_end(end_index);
 
-        let source = replace_whitespace_and_unprintable(
+        let source = replace_unprintable(
             source_code.slice(TextRange::new(start_offset, end_offset)),
             self.message.expect_range() - start_offset,
         )
@@ -272,16 +271,20 @@ impl Display for MessageCodeFrame<'_> {
 }
 
 /// Given some source code and an annotation range, this routine replaces
-/// tabs with ASCII whitespace, and unprintable characters with printable
-/// representations of them.
+///  unprintable characters with printable representations of them.
 ///
 /// The source code returned has an annotation that is updated to reflect
 /// changes made to the source code (if any).
-fn replace_whitespace_and_unprintable(source: &str, annotation_range: TextRange) -> SourceCode {
+///
+/// We don't need to normalize whitespace, such as converting tabs to spaces,
+/// because `annotate-snippets` handles that internally. Similarly, it's safe to
+/// modify the annotation ranges by inserting 3-byte Unicode replacements
+/// because `annotate-snippets` will account for their actual width when
+/// rendering and displaying the column to the user.
+fn replace_unprintable(source: &str, annotation_range: TextRange) -> SourceCode {
     let mut result = String::new();
     let mut last_end = 0;
     let mut range = annotation_range;
-    let mut line_width = LineWidthBuilder::new(IndentWidth::default());
 
     // Updates the range given by the caller whenever a single byte (at
     // `index` in `source`) is replaced with `len` bytes.
@@ -310,19 +313,7 @@ fn replace_whitespace_and_unprintable(source: &str, annotation_range: TextRange)
     };
 
     for (index, c) in source.char_indices() {
-        let old_width = line_width.get();
-        line_width = line_width.add_char(c);
-
-        if matches!(c, '\t') {
-            let tab_width = u32::try_from(line_width.get() - old_width)
-                .expect("small width because of tab size");
-            result.push_str(&source[last_end..index]);
-            for _ in 0..tab_width {
-                result.push(' ');
-            }
-            last_end = index + 1;
-            update_range(index, tab_width);
-        } else if let Some(printable) = unprintable_replacement(c) {
+        if let Some(printable) = unprintable_replacement(c) {
             result.push_str(&source[last_end..index]);
             result.push(printable);
             last_end = index + 1;

crates/ruff_linter/src/rules/flake8_errmsg/rules/string_in_exception.rs

@@ -182,60 +182,27 @@ impl Violation for DotFormatInException {
 
 /// EM101, EM102, EM103
 pub(crate) fn string_in_exception(checker: &Checker, stmt: &Stmt, exc: &Expr) {
-    if let Expr::Call(ast::ExprCall {
+    let Expr::Call(ast::ExprCall {
+        func,
         arguments: Arguments { args, .. },
         ..
     }) = exc
-    {
-        if let Some(first) = args.first() {
-            match first {
-                // Check for string literals.
-                Expr::StringLiteral(ast::ExprStringLiteral { value: string, .. }) => {
-                    if checker.is_rule_enabled(Rule::RawStringInException) {
-                        if string.len() >= checker.settings().flake8_errmsg.max_string_length {
-                            let mut diagnostic =
-                                checker.report_diagnostic(RawStringInException, first.range());
-                            if let Some(indentation) =
-                                whitespace::indentation(checker.source(), stmt)
-                            {
-                                diagnostic.set_fix(generate_fix(
-                                    stmt,
-                                    first,
-                                    indentation,
-                                    checker.stylist(),
-                                    checker.locator(),
-                                ));
-                            }
-                        }
-                    }
-                }
-                // Check for byte string literals.
-                Expr::BytesLiteral(ast::ExprBytesLiteral { value: bytes, .. }) => {
-                    if checker.settings().rules.enabled(Rule::RawStringInException) {
-                        if bytes.len() >= checker.settings().flake8_errmsg.max_string_length
-                            && is_raise_exception_byte_string_enabled(checker.settings())
-                        {
-                            let mut diagnostic =
-                                checker.report_diagnostic(RawStringInException, first.range());
-                            if let Some(indentation) =
-                                whitespace::indentation(checker.source(), stmt)
-                            {
-                                diagnostic.set_fix(generate_fix(
-                                    stmt,
-                                    first,
-                                    indentation,
-                                    checker.stylist(),
-                                    checker.locator(),
-                                ));
-                            }
-                        }
-                    }
-                }
-                // Check for f-strings.
-                Expr::FString(_) => {
-                    if checker.is_rule_enabled(Rule::FStringInException) {
+    else {
+        return;
+    };
+
+    if checker.semantic().match_typing_expr(func, "cast") {
+        return;
+    }
+
+    if let Some(first) = args.first() {
+        match first {
+            // Check for string literals.
+            Expr::StringLiteral(ast::ExprStringLiteral { value: string, .. }) => {
+                if checker.is_rule_enabled(Rule::RawStringInException) {
+                    if string.len() >= checker.settings().flake8_errmsg.max_string_length {
                         let mut diagnostic =
-                            checker.report_diagnostic(FStringInException, first.range());
+                            checker.report_diagnostic(RawStringInException, first.range());
                         if let Some(indentation) = whitespace::indentation(checker.source(), stmt) {
                             diagnostic.set_fix(generate_fix(
                                 stmt,
@@ -247,32 +214,66 @@ pub(crate) fn string_in_exception(checker: &Checker, stmt: &Stmt, exc: &Expr) {
                         }
                     }
                 }
-                // Check for .format() calls.
-                Expr::Call(ast::ExprCall { func, .. }) => {
-                    if checker.is_rule_enabled(Rule::DotFormatInException) {
-                        if let Expr::Attribute(ast::ExprAttribute { value, attr, .. }) =
-                            func.as_ref()
-                        {
-                            if attr == "format" && value.is_literal_expr() {
-                                let mut diagnostic =
-                                    checker.report_diagnostic(DotFormatInException, first.range());
-                                if let Some(indentation) =
-                                    whitespace::indentation(checker.source(), stmt)
-                                {
-                                    diagnostic.set_fix(generate_fix(
-                                        stmt,
-                                        first,
-                                        indentation,
-                                        checker.stylist(),
-                                        checker.locator(),
-                                    ));
-                                }
+            }
+            // Check for byte string literals.
+            Expr::BytesLiteral(ast::ExprBytesLiteral { value: bytes, .. }) => {
+                if checker.settings().rules.enabled(Rule::RawStringInException) {
+                    if bytes.len() >= checker.settings().flake8_errmsg.max_string_length
+                        && is_raise_exception_byte_string_enabled(checker.settings())
+                    {
+                        let mut diagnostic =
+                            checker.report_diagnostic(RawStringInException, first.range());
+                        if let Some(indentation) = whitespace::indentation(checker.source(), stmt) {
+                            diagnostic.set_fix(generate_fix(
+                                stmt,
+                                first,
+                                indentation,
+                                checker.stylist(),
+                                checker.locator(),
+                            ));
+                        }
+                    }
+                }
+            }
+            // Check for f-strings.
+            Expr::FString(_) => {
+                if checker.is_rule_enabled(Rule::FStringInException) {
+                    let mut diagnostic =
+                        checker.report_diagnostic(FStringInException, first.range());
+                    if let Some(indentation) = whitespace::indentation(checker.source(), stmt) {
+                        diagnostic.set_fix(generate_fix(
+                            stmt,
+                            first,
+                            indentation,
+                            checker.stylist(),
+                            checker.locator(),
+                        ));
+                    }
+                }
+            }
+            // Check for .format() calls.
+            Expr::Call(ast::ExprCall { func, .. }) => {
+                if checker.is_rule_enabled(Rule::DotFormatInException) {
+                    if let Expr::Attribute(ast::ExprAttribute { value, attr, .. }) = func.as_ref() {
+                        if attr == "format" && value.is_literal_expr() {
+                            let mut diagnostic =
+                                checker.report_diagnostic(DotFormatInException, first.range());
+                            if let Some(indentation) =
+                                whitespace::indentation(checker.source(), stmt)
+                            {
+                                diagnostic.set_fix(generate_fix(
+                                    stmt,
+                                    first,
+                                    indentation,
+                                    checker.stylist(),
+                                    checker.locator(),
+                                ));
                             }
                         }
                     }
                 }
-                _ => {}
             }
+            _ => {}
         }
     }
 }

crates/ruff_linter/src/rules/flake8_errmsg/snapshots/ruff_linter__rules__flake8_errmsg__tests__custom.snap

@@ -278,3 +278,6 @@ EM.py:84:9: EM103 [*] Exception must not use a `.format()` string directly, assi
    91 |+    raise RuntimeError(
    92 |+        msg
    93 |+    )
+91 94 | 
+92 95 | 
+93 96 | def raise_typing_cast_exception():

crates/ruff_linter/src/rules/flake8_errmsg/snapshots/ruff_linter__rules__flake8_errmsg__tests__defaults.snap

@@ -343,3 +343,6 @@ EM.py:84:9: EM103 [*] Exception must not use a `.format()` string directly, assi
    91 |+    raise RuntimeError(
    92 |+        msg
    93 |+    )
+91 94 | 
+92 95 | 
+93 96 | def raise_typing_cast_exception():

crates/ruff_linter/src/rules/flake8_pyi/rules/ellipsis_in_non_empty_class_body.rs

@@ -1,10 +1,11 @@
 use ruff_macros::{ViolationMetadata, derive_message_formats};
+use ruff_python_ast::whitespace::trailing_comment_start_offset;
 use ruff_python_ast::{Stmt, StmtExpr};
 use ruff_text_size::Ranged;
 
 use crate::checkers::ast::Checker;
 use crate::fix;
-use crate::{Fix, FixAvailability, Violation};
+use crate::{Edit, Fix, FixAvailability, Violation};
 
 /// ## What it does
 /// Removes ellipses (`...`) in otherwise non-empty class bodies.
@@ -50,15 +51,21 @@ pub(crate) fn ellipsis_in_non_empty_class_body(checker: &Checker, body: &[Stmt])
     }
 
     for stmt in body {
-        let Stmt::Expr(StmtExpr { value, .. }) = &stmt else {
+        let Stmt::Expr(StmtExpr { value, .. }) = stmt else {
             continue;
         };
 
         if value.is_ellipsis_literal_expr() {
             let mut diagnostic =
                 checker.report_diagnostic(EllipsisInNonEmptyClassBody, stmt.range());
-            let edit =
-                fix::edits::delete_stmt(stmt, Some(stmt), checker.locator(), checker.indexer());
+
+            // Try to preserve trailing comment if it exists
+            let edit = if let Some(index) = trailing_comment_start_offset(stmt, checker.source()) {
+                Edit::range_deletion(stmt.range().add_end(index))
+            } else {
+                fix::edits::delete_stmt(stmt, Some(stmt), checker.locator(), checker.indexer())
+            };
+
             diagnostic.set_fix(Fix::safe_edit(edit).isolate(Checker::isolation(
                 checker.semantic().current_statement_id(),
             )));

crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI013_PYI013.py.snap

@@ -145,3 +145,22 @@ PYI013.py:36:5: PYI013 [*] Non-empty class body must not contain `...`
 37 36 | 
 38 37 |     def __init__():
 39 38 |         pass
+
+PYI013.py:44:5: PYI013 [*] Non-empty class body must not contain `...`
+   |
+42 | class NonEmptyChildWithInlineComment:
+43 |     value: int
+44 |     ... # preserve me
+   |     ^^^ PYI013
+   |
+   = help: Remove unnecessary `...`
+
+ℹ Safe fix
+41 41 | 
+42 42 | class NonEmptyChildWithInlineComment:
+43 43 |     value: int
+44    |-    ... # preserve me
+   44 |+    # preserve me
+45 45 | 
+46 46 | 
+47 47 | class EmptyClass:

crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI013_PYI013.pyi.snap

@@ -17,9 +17,10 @@ PYI013.pyi:5:5: PYI013 [*] Non-empty class body must not contain `...`
 3 3 | class OneAttributeClass:
 4 4 |     value: int
 5   |-    ...  # Error
-6 5 | 
-7 6 | class OneAttributeClass2:
-8 7 |     ...  # Error
+  5 |+    # Error
+6 6 | 
+7 7 | class OneAttributeClass2:
+8 8 |     ...  # Error
 
 PYI013.pyi:8:5: PYI013 [*] Non-empty class body must not contain `...`
   |
@@ -35,9 +36,10 @@ PYI013.pyi:8:5: PYI013 [*] Non-empty class body must not contain `...`
 6 6 | 
 7 7 | class OneAttributeClass2:
 8   |-    ...  # Error
-9 8 |     value: int
-10 9 | 
-11 10 | class MyClass:
+  8 |+    # Error
+9 9 |     value: int
+10 10 | 
+11 11 | class MyClass:
 
 PYI013.pyi:12:5: PYI013 [*] Non-empty class body must not contain `...`
    |
@@ -91,9 +93,10 @@ PYI013.pyi:17:5: PYI013 [*] Non-empty class body must not contain `...`
 15 15 | class TwoEllipsesClass:
 16 16 |     ...
 17    |-    ...  # Error
-18 17 | 
-19 18 | class DocstringClass:
-20 19 |     """
+   17 |+    # Error
+18 18 | 
+19 19 | class DocstringClass:
+20 20 |     """
 
 PYI013.pyi:24:5: PYI013 [*] Non-empty class body must not contain `...`
    |
@@ -111,9 +114,10 @@ PYI013.pyi:24:5: PYI013 [*] Non-empty class body must not contain `...`
 22 22 |     """
 23 23 | 
 24    |-    ...  # Error
-25 24 | 
-26 25 | class NonEmptyChild(Exception):
-27 26 |     value: int
+   24 |+    # Error
+25 25 | 
+26 26 | class NonEmptyChild(Exception):
+27 27 |     value: int
 
 PYI013.pyi:28:5: PYI013 [*] Non-empty class body must not contain `...`
    |
@@ -131,9 +135,10 @@ PYI013.pyi:28:5: PYI013 [*] Non-empty class body must not contain `...`
 26 26 | class NonEmptyChild(Exception):
 27 27 |     value: int
 28    |-    ...  # Error
-29 28 | 
-30 29 | class NonEmptyChild2(Exception):
-31 30 |     ...  # Error
+   28 |+    # Error
+29 29 | 
+30 30 | class NonEmptyChild2(Exception):
+31 31 |     ...  # Error
 
 PYI013.pyi:31:5: PYI013 [*] Non-empty class body must not contain `...`
    |
@@ -149,9 +154,10 @@ PYI013.pyi:31:5: PYI013 [*] Non-empty class body must not contain `...`
 29 29 | 
 30 30 | class NonEmptyChild2(Exception):
 31    |-    ...  # Error
-32 31 |     value: int
-33 32 | 
-34 33 | class NonEmptyWithInit:
+   31 |+    # Error
+32 32 |     value: int
+33 33 | 
+34 34 | class NonEmptyWithInit:
 
 PYI013.pyi:36:5: PYI013 [*] Non-empty class body must not contain `...`
    |
@@ -169,6 +175,28 @@ PYI013.pyi:36:5: PYI013 [*] Non-empty class body must not contain `...`
 34 34 | class NonEmptyWithInit:
 35 35 |     value: int
 36    |-    ...  # Error
-37 36 | 
-38 37 |     def __init__():
-39 38 |         pass
+   36 |+    # Error
+37 37 | 
+38 38 |     def __init__():
+39 39 |         pass
+
+PYI013.pyi:43:5: PYI013 [*] Non-empty class body must not contain `...`
+   |
+41 | class NonEmptyChildWithInlineComment:
+42 |     value: int
+43 |     ... # preserve me
+   |     ^^^ PYI013
+44 |
+45 | # Not violations
+   |
+   = help: Remove unnecessary `...`
+
+ℹ Safe fix
+40 40 | 
+41 41 | class NonEmptyChildWithInlineComment:
+42 42 |     value: int
+43    |-    ... # preserve me
+   43 |+    # preserve me
+44 44 | 
+45 45 | # Not violations
+46 46 |

crates/ruff_linter/src/rules/flake8_use_pathlib/helpers.rs

@@ -20,6 +20,35 @@ pub(crate) fn is_pathlib_path_call(checker: &Checker, expr: &Expr) -> bool {
     })
 }
 
+/// Check if the given segments represent a pathlib Path subclass or `PackagePath` with preview mode support.
+/// In stable mode, only checks for `Path` and `PurePath`. In preview mode, also checks for
+/// `PosixPath`, `PurePosixPath`, `WindowsPath`, `PureWindowsPath`, and `PackagePath`.
+pub(crate) fn is_pure_path_subclass_with_preview(
+    checker: &crate::checkers::ast::Checker,
+    segments: &[&str],
+) -> bool {
+    let is_core_pathlib = matches!(segments, ["pathlib", "Path" | "PurePath"]);
+
+    if is_core_pathlib {
+        return true;
+    }
+
+    if checker.settings().preview.is_enabled() {
+        let is_expanded_pathlib = matches!(
+            segments,
+            [
+                "pathlib",
+                "PosixPath" | "PurePosixPath" | "WindowsPath" | "PureWindowsPath"
+            ]
+        );
+        let is_packagepath = matches!(segments, ["importlib", "metadata", "PackagePath"]);
+
+        return is_expanded_pathlib || is_packagepath;
+    }
+
+    false
+}
+
 /// We check functions that take only 1 argument,  this does not apply to functions
 /// with `dir_fd` argument, because `dir_fd` is not supported by pathlib,
 /// so check if it's set to non-default values

crates/ruff_linter/src/rules/flake8_use_pathlib/mod.rs

@@ -123,6 +123,7 @@ mod tests {
         Ok(())
     }
 
+    #[test_case(Rule::PathConstructorCurrentDirectory, Path::new("PTH201.py"))]
     #[test_case(Rule::OsPathGetsize, Path::new("PTH202.py"))]
     #[test_case(Rule::OsPathGetsize, Path::new("PTH202_2.py"))]
     #[test_case(Rule::OsPathGetatime, Path::new("PTH203.py"))]

crates/ruff_linter/src/rules/flake8_use_pathlib/rules/path_constructor_current_directory.rs

@@ -9,6 +9,7 @@ use ruff_text_size::{Ranged, TextRange};
 
 use crate::checkers::ast::Checker;
 use crate::fix::edits::{Parentheses, remove_argument};
+use crate::rules::flake8_use_pathlib::helpers::is_pure_path_subclass_with_preview;
 use crate::{AlwaysFixableViolation, Applicability, Edit, Fix};
 
 /// ## What it does
@@ -69,7 +70,7 @@ pub(crate) fn path_constructor_current_directory(
 
     let arguments = &call.arguments;
 
-    if !matches!(segments, ["pathlib", "Path" | "PurePath"]) {
+    if !is_pure_path_subclass_with_preview(checker, segments) {
         return;
     }
 

crates/ruff_linter/src/rules/flake8_use_pathlib/snapshots/ruff_linter__rules__flake8_use_pathlib__tests__preview__PTH201_PTH201.py.snap

@@ -0,0 +1,423 @@
+---
+source: crates/ruff_linter/src/rules/flake8_use_pathlib/mod.rs
+assertion_line: 144
+---
+PTH201.py:6:10: PTH201 [*] Do not pass the current directory explicitly to `Path`
+  |
+5 | # match
+6 | _ = Path(".")
+  |          ^^^ PTH201
+7 | _ = pth(".")
+8 | _ = PurePath(".")
+  |
+  = help: Remove the current directory argument
+
+ℹ Safe fix
+3 3 | 
+4 4 | 
+5 5 | # match
+6   |-_ = Path(".")
+  6 |+_ = Path()
+7 7 | _ = pth(".")
+8 8 | _ = PurePath(".")
+9 9 | _ = Path("")
+
+PTH201.py:7:9: PTH201 [*] Do not pass the current directory explicitly to `Path`
+  |
+5 | # match
+6 | _ = Path(".")
+7 | _ = pth(".")
+  |         ^^^ PTH201
+8 | _ = PurePath(".")
+9 | _ = Path("")
+  |
+  = help: Remove the current directory argument
+
+ℹ Safe fix
+4 4 | 
+5 5 | # match
+6 6 | _ = Path(".")
+7   |-_ = pth(".")
+  7 |+_ = pth()
+8 8 | _ = PurePath(".")
+9 9 | _ = Path("")
+10 10 | 
+
+PTH201.py:8:14: PTH201 [*] Do not pass the current directory explicitly to `Path`
+  |
+6 | _ = Path(".")
+7 | _ = pth(".")
+8 | _ = PurePath(".")
+  |              ^^^ PTH201
+9 | _ = Path("")
+  |
+  = help: Remove the current directory argument
+
+ℹ Safe fix
+5 5 | # match
+6 6 | _ = Path(".")
+7 7 | _ = pth(".")
+8   |-_ = PurePath(".")
+  8 |+_ = PurePath()
+9 9 | _ = Path("")
+10 10 | 
+11 11 | Path('', )
+
+PTH201.py:9:10: PTH201 [*] Do not pass the current directory explicitly to `Path`
+   |
+ 7 | _ = pth(".")
+ 8 | _ = PurePath(".")
+ 9 | _ = Path("")
+   |          ^^ PTH201
+10 |
+11 | Path('', )
+   |
+   = help: Remove the current directory argument
+
+ℹ Safe fix
+6  6  | _ = Path(".")
+7  7  | _ = pth(".")
+8  8  | _ = PurePath(".")
+9     |-_ = Path("")
+   9  |+_ = Path()
+10 10 | 
+11 11 | Path('', )
+12 12 | 
+
+PTH201.py:11:6: PTH201 [*] Do not pass the current directory explicitly to `Path`
+   |
+ 9 | _ = Path("")
+10 |
+11 | Path('', )
+   |      ^^ PTH201
+12 |
+13 | Path(
+   |
+   = help: Remove the current directory argument
+
+ℹ Safe fix
+8  8  | _ = PurePath(".")
+9  9  | _ = Path("")
+10 10 | 
+11    |-Path('', )
+   11 |+Path()
+12 12 | 
+13 13 | Path(
+14 14 |     '',
+
+PTH201.py:14:5: PTH201 [*] Do not pass the current directory explicitly to `Path`
+   |
+13 | Path(
+14 |     '',
+   |     ^^ PTH201
+15 | )
+   |
+   = help: Remove the current directory argument
+
+ℹ Safe fix
+10 10 | 
+11 11 | Path('', )
+12 12 | 
+13    |-Path(
+14    |-    '',
+15    |-)
+   13 |+Path()
+16 14 | 
+17 15 | Path(  # Comment before argument
+18 16 |     '',
+
+PTH201.py:18:5: PTH201 [*] Do not pass the current directory explicitly to `Path`
+   |
+17 | Path(  # Comment before argument
+18 |     '',
+   |     ^^ PTH201
+19 | )
+   |
+   = help: Remove the current directory argument
+
+ℹ Unsafe fix
+14 14 |     '',
+15 15 | )
+16 16 | 
+17    |-Path(  # Comment before argument
+18    |-    '',
+19    |-)
+   17 |+Path()
+20 18 | 
+21 19 | Path(
+22 20 |     '',  # EOL comment
+
+PTH201.py:22:5: PTH201 [*] Do not pass the current directory explicitly to `Path`
+   |
+21 | Path(
+22 |     '',  # EOL comment
+   |     ^^ PTH201
+23 | )
+   |
+   = help: Remove the current directory argument
+
+ℹ Unsafe fix
+18 18 |     '',
+19 19 | )
+20 20 | 
+21    |-Path(
+22    |-    '',  # EOL comment
+23    |-)
+   21 |+Path()
+24 22 | 
+25 23 | Path(
+26 24 |     ''  # Comment in the middle of implicitly concatenated string
+
+PTH201.py:26:5: PTH201 [*] Do not pass the current directory explicitly to `Path`
+   |
+25 |   Path(
+26 | /     ''  # Comment in the middle of implicitly concatenated string
+27 | |     ".",
+   | |_______^ PTH201
+28 |   )
+   |
+   = help: Remove the current directory argument
+
+ℹ Unsafe fix
+22 22 |     '',  # EOL comment
+23 23 | )
+24 24 | 
+25    |-Path(
+26    |-    ''  # Comment in the middle of implicitly concatenated string
+27    |-    ".",
+28    |-)
+   25 |+Path()
+29 26 | 
+30 27 | Path(
+31 28 |     ''  # Comment before comma
+
+PTH201.py:31:5: PTH201 [*] Do not pass the current directory explicitly to `Path`
+   |
+30 | Path(
+31 |     ''  # Comment before comma
+   |     ^^ PTH201
+32 |     ,
+33 | )
+   |
+   = help: Remove the current directory argument
+
+ℹ Unsafe fix
+27 27 |     ".",
+28 28 | )
+29 29 | 
+30    |-Path(
+31    |-    ''  # Comment before comma
+32    |-    ,
+33    |-)
+   30 |+Path()
+34 31 | 
+35 32 | Path(
+36 33 |     '',
+
+PTH201.py:36:5: PTH201 [*] Do not pass the current directory explicitly to `Path`
+   |
+35 | Path(
+36 |     '',
+   |     ^^ PTH201
+37 | ) / "bare"
+   |
+   = help: Remove the current directory argument
+
+ℹ Safe fix
+33 33 | )
+34 34 | 
+35 35 | Path(
+36    |-    '',
+37    |-) / "bare"
+   36 |+    "bare",
+   37 |+)
+38 38 | 
+39 39 | Path(  # Comment before argument
+40 40 |     '',
+
+PTH201.py:40:5: PTH201 [*] Do not pass the current directory explicitly to `Path`
+   |
+39 | Path(  # Comment before argument
+40 |     '',
+   |     ^^ PTH201
+41 | ) / ("parenthesized")
+   |
+   = help: Remove the current directory argument
+
+ℹ Unsafe fix
+37 37 | ) / "bare"
+38 38 | 
+39 39 | Path(  # Comment before argument
+40    |-    '',
+41    |-) / ("parenthesized")
+   40 |+    ("parenthesized"),
+   41 |+)
+42 42 | 
+43 43 | Path(
+44 44 |     '',  # EOL comment
+
+PTH201.py:44:5: PTH201 [*] Do not pass the current directory explicitly to `Path`
+   |
+43 | Path(
+44 |     '',  # EOL comment
+   |     ^^ PTH201
+45 | ) / ( ("double parenthesized"  )   )
+   |
+   = help: Remove the current directory argument
+
+ℹ Unsafe fix
+41 41 | ) / ("parenthesized")
+42 42 | 
+43 43 | Path(
+44    |-    '',  # EOL comment
+45    |-) / ( ("double parenthesized"  )   )
+   44 |+    ( ("double parenthesized"  )   ),  # EOL comment
+   45 |+)
+46 46 | 
+47 47 | (  Path(
+48 48 |     ''  # Comment in the middle of implicitly concatenated string
+
+PTH201.py:48:5: PTH201 [*] Do not pass the current directory explicitly to `Path`
+   |
+47 |   (  Path(
+48 | /     ''  # Comment in the middle of implicitly concatenated string
+49 | |     ".",
+   | |_______^ PTH201
+50 |   ) )/ (("parenthesized path call")
+51 |         # Comment between closing parentheses
+   |
+   = help: Remove the current directory argument
+
+ℹ Unsafe fix
+44 44 |     '',  # EOL comment
+45 45 | ) / ( ("double parenthesized"  )   )
+46 46 | 
+47    |-(  Path(
+48    |-    ''  # Comment in the middle of implicitly concatenated string
+49    |-    ".",
+50    |-) )/ (("parenthesized path call")
+   47 |+Path(
+   48 |+    (("parenthesized path call")
+51 49 |       # Comment between closing parentheses
+   50 |+),
+52 51 | )
+53 52 | 
+54 53 | Path(
+
+PTH201.py:55:5: PTH201 [*] Do not pass the current directory explicitly to `Path`
+   |
+54 | Path(
+55 |     ''  # Comment before comma
+   |     ^^ PTH201
+56 |     ,
+57 | ) / "multiple" / (
+   |
+   = help: Remove the current directory argument
+
+ℹ Unsafe fix
+52 52 | )
+53 53 | 
+54 54 | Path(
+55    |-    ''  # Comment before comma
+   55 |+    "multiple"  # Comment before comma
+56 56 |     ,
+57    |-) / "multiple" / (
+   57 |+) / (
+58 58 |     "frag"  # Comment
+59 59 |     'ment'
+60 60 | )
+
+PTH201.py:74:15: PTH201 [*] Do not pass the current directory explicitly to `Path`
+   |
+72 | from importlib.metadata import PackagePath
+73 |
+74 | _ = PosixPath(".")
+   |               ^^^ PTH201
+75 | _ = PurePosixPath(".")
+76 | _ = WindowsPath(".")
+   |
+   = help: Remove the current directory argument
+
+ℹ Safe fix
+71 71 | 
+72 72 | from importlib.metadata import PackagePath
+73 73 | 
+74    |-_ = PosixPath(".")
+   74 |+_ = PosixPath()
+75 75 | _ = PurePosixPath(".")
+76 76 | _ = WindowsPath(".")
+77 77 | _ = PureWindowsPath(".")
+
+PTH201.py:75:19: PTH201 [*] Do not pass the current directory explicitly to `Path`
+   |
+74 | _ = PosixPath(".")
+75 | _ = PurePosixPath(".")
+   |                   ^^^ PTH201
+76 | _ = WindowsPath(".")
+77 | _ = PureWindowsPath(".")
+   |
+   = help: Remove the current directory argument
+
+ℹ Safe fix
+72 72 | from importlib.metadata import PackagePath
+73 73 | 
+74 74 | _ = PosixPath(".")
+75    |-_ = PurePosixPath(".")
+   75 |+_ = PurePosixPath()
+76 76 | _ = WindowsPath(".")
+77 77 | _ = PureWindowsPath(".")
+78 78 | _ = PackagePath(".")
+
+PTH201.py:76:17: PTH201 [*] Do not pass the current directory explicitly to `Path`
+   |
+74 | _ = PosixPath(".")
+75 | _ = PurePosixPath(".")
+76 | _ = WindowsPath(".")
+   |                 ^^^ PTH201
+77 | _ = PureWindowsPath(".")
+78 | _ = PackagePath(".")
+   |
+   = help: Remove the current directory argument
+
+ℹ Safe fix
+73 73 | 
+74 74 | _ = PosixPath(".")
+75 75 | _ = PurePosixPath(".")
+76    |-_ = WindowsPath(".")
+   76 |+_ = WindowsPath()
+77 77 | _ = PureWindowsPath(".")
+78 78 | _ = PackagePath(".")
+
+PTH201.py:77:21: PTH201 [*] Do not pass the current directory explicitly to `Path`
+   |
+75 | _ = PurePosixPath(".")
+76 | _ = WindowsPath(".")
+77 | _ = PureWindowsPath(".")
+   |                     ^^^ PTH201
+78 | _ = PackagePath(".")
+   |
+   = help: Remove the current directory argument
+
+ℹ Safe fix
+74 74 | _ = PosixPath(".")
+75 75 | _ = PurePosixPath(".")
+76 76 | _ = WindowsPath(".")
+77    |-_ = PureWindowsPath(".")
+   77 |+_ = PureWindowsPath()
+78 78 | _ = PackagePath(".")
+
+PTH201.py:78:17: PTH201 [*] Do not pass the current directory explicitly to `Path`
+   |
+76 | _ = WindowsPath(".")
+77 | _ = PureWindowsPath(".")
+78 | _ = PackagePath(".")
+   |                 ^^^ PTH201
+   |
+   = help: Remove the current directory argument
+
+ℹ Safe fix
+75 75 | _ = PurePosixPath(".")
+76 76 | _ = WindowsPath(".")
+77 77 | _ = PureWindowsPath(".")
+78    |-_ = PackagePath(".")
+   78 |+_ = PackagePath()

crates/ruff_linter/src/rules/isort/mod.rs

@@ -794,6 +794,7 @@ mod tests {
     #[test_case(Path::new("comments_and_newlines.py"))]
     #[test_case(Path::new("docstring.py"))]
     #[test_case(Path::new("docstring.pyi"))]
+    #[test_case(Path::new("docstring_followed_by_continuation.py"))]
     #[test_case(Path::new("docstring_only.py"))]
     #[test_case(Path::new("docstring_with_continuation.py"))]
     #[test_case(Path::new("docstring_with_semicolon.py"))]
@@ -828,6 +829,7 @@ mod tests {
     #[test_case(Path::new("comments_and_newlines.py"))]
     #[test_case(Path::new("docstring.py"))]
     #[test_case(Path::new("docstring.pyi"))]
+    #[test_case(Path::new("docstring_followed_by_continuation.py"))]
     #[test_case(Path::new("docstring_only.py"))]
     #[test_case(Path::new("docstring_with_continuation.py"))]
     #[test_case(Path::new("docstring_with_semicolon.py"))]

crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__required_import_docstring_followed_by_continuation.py.snap

@@ -0,0 +1,9 @@
+---
+source: crates/ruff_linter/src/rules/isort/mod.rs
+---
+docstring_followed_by_continuation.py:1:1: I002 [*] Missing required import: `from __future__ import annotations`
+ℹ Safe fix
+1 1 | """Hello, world!"""\
+2 2 | 
+  3 |+from __future__ import annotations
+3 4 | x = 1; y = 2

crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__required_import_with_alias_docstring_followed_by_continuation.py.snap

@@ -0,0 +1,9 @@
+---
+source: crates/ruff_linter/src/rules/isort/mod.rs
+---
+docstring_followed_by_continuation.py:1:1: I002 [*] Missing required import: `from __future__ import annotations as _annotations`
+ℹ Safe fix
+1 1 | """Hello, world!"""\
+2 2 | 
+  3 |+from __future__ import annotations as _annotations
+3 4 | x = 1; y = 2

crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E101_E101.py.snap

@@ -15,8 +15,8 @@ E101.py:15:1: E101 Indentation contains mixed spaces and tabs
    |
 13 | def func_mixed_start_with_space():
 14 |     # E101
-15 |                print("mixed starts with space")
-   | ^^^^^^^^^^^^^^^ E101
+15 |                     print("mixed starts with space")
+   | ^^^^^^^^^^^^^^^^^^^^ E101
 16 |
 17 | def xyz():
    |
@@ -25,6 +25,6 @@ E101.py:19:1: E101 Indentation contains mixed spaces and tabs
    |
 17 | def xyz():
 18 |     # E101
-19 |     print("xyz");
-   | ^^^^ E101
+19 |        print("xyz");
+   | ^^^^^^^ E101
    |

crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E201_E20.py.snap

@@ -47,7 +47,7 @@ E20.py:6:15: E201 [*] Whitespace after '{'
 6 | spam(ham[1], { eggs: 2})
   |               ^ E201
 7 | #: E201:1:6
-8 | spam(   ham[1], {eggs: 2})
+8 | spam(    ham[1], {eggs: 2})
   |
   = help: Remove whitespace before '{'
 
@@ -65,10 +65,10 @@ E20.py:8:6: E201 [*] Whitespace after '('
    |
  6 | spam(ham[1], { eggs: 2})
  7 | #: E201:1:6
- 8 | spam(   ham[1], {eggs: 2})
-   |      ^^^ E201
+ 8 | spam(    ham[1], {eggs: 2})
+   |      ^^^^ E201
  9 | #: E201:1:10
-10 | spam(ham[   1], {eggs: 2})
+10 | spam(ham[    1], {eggs: 2})
    |
    = help: Remove whitespace before '('
 
@@ -84,12 +84,12 @@ E20.py:8:6: E201 [*] Whitespace after '('
 
 E20.py:10:10: E201 [*] Whitespace after '['
    |
- 8 | spam(   ham[1], {eggs: 2})
+ 8 | spam(    ham[1], {eggs: 2})
  9 | #: E201:1:10
-10 | spam(ham[   1], {eggs: 2})
-   |          ^^^ E201
+10 | spam(ham[    1], {eggs: 2})
+   |          ^^^^ E201
 11 | #: E201:1:15
-12 | spam(ham[1], {  eggs: 2})
+12 | spam(ham[1], {    eggs: 2})
    |
    = help: Remove whitespace before '['
 
@@ -105,10 +105,10 @@ E20.py:10:10: E201 [*] Whitespace after '['
 
 E20.py:12:15: E201 [*] Whitespace after '{'
    |
-10 | spam(ham[   1], {eggs: 2})
+10 | spam(ham[    1], {eggs: 2})
 11 | #: E201:1:15
-12 | spam(ham[1], {  eggs: 2})
-   |               ^^ E201
+12 | spam(ham[1], {    eggs: 2})
+   |               ^^^^ E201
 13 | #: Okay
 14 | spam(ham[1], {eggs: 2})
    |

crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E202_E20.py.snap

@@ -49,7 +49,7 @@ E20.py:23:11: E202 [*] Whitespace before ']'
 23 | spam(ham[1 ], {eggs: 2})
    |           ^ E202
 24 | #: E202:1:23
-25 | spam(ham[1], {eggs: 2}  )
+25 | spam(ham[1], {eggs: 2}    )
    |
    = help: Remove whitespace before ']'
 
@@ -67,10 +67,10 @@ E20.py:25:23: E202 [*] Whitespace before ')'
    |
 23 | spam(ham[1 ], {eggs: 2})
 24 | #: E202:1:23
-25 | spam(ham[1], {eggs: 2}  )
-   |                       ^^ E202
+25 | spam(ham[1], {eggs: 2}    )
+   |                       ^^^^ E202
 26 | #: E202:1:22
-27 | spam(ham[1], {eggs: 2   })
+27 | spam(ham[1], {eggs: 2    })
    |
    = help: Remove whitespace before ')'
 
@@ -86,12 +86,12 @@ E20.py:25:23: E202 [*] Whitespace before ')'
 
 E20.py:27:22: E202 [*] Whitespace before '}'
    |
-25 | spam(ham[1], {eggs: 2}  )
+25 | spam(ham[1], {eggs: 2}    )
 26 | #: E202:1:22
-27 | spam(ham[1], {eggs: 2   })
-   |                      ^^^ E202
+27 | spam(ham[1], {eggs: 2    })
+   |                      ^^^^ E202
 28 | #: E202:1:11
-29 | spam(ham[1  ], {eggs: 2})
+29 | spam(ham[1    ], {eggs: 2})
    |
    = help: Remove whitespace before '}'
 
@@ -107,10 +107,10 @@ E20.py:27:22: E202 [*] Whitespace before '}'
 
 E20.py:29:11: E202 [*] Whitespace before ']'
    |
-27 | spam(ham[1], {eggs: 2   })
+27 | spam(ham[1], {eggs: 2    })
 28 | #: E202:1:11
-29 | spam(ham[1  ], {eggs: 2})
-   |           ^^ E202
+29 | spam(ham[1    ], {eggs: 2})
+   |           ^^^^ E202
 30 | #: Okay
 31 | spam(ham[1], {eggs: 2})
    |

crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E203_E20.py.snap

@@ -25,8 +25,8 @@ E20.py:55:10: E203 [*] Whitespace before ':'
    |
 53 |     x, y = y, x
 54 | #: E203:1:10
-55 | if x == 4   :
-   |          ^^^ E203
+55 | if x == 4    :
+   |          ^^^^ E203
 56 |     print(x, y)
 57 |     x, y = y, x
    |
@@ -67,8 +67,8 @@ E20.py:63:16: E203 [*] Whitespace before ';'
    |
 61 | #: E203:2:15 E702:2:16
 62 | if x == 4:
-63 |     print(x, y) ; x, y = y, x
-   |                ^ E203
+63 |     print(x, y)    ; x, y = y, x
+   |                ^^^^ E203
 64 | #: E203:3:13
 65 | if x == 4:
    |

crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E223_E22.py.snap

@@ -1,13 +1,12 @@
 ---
 source: crates/ruff_linter/src/rules/pycodestyle/mod.rs
-snapshot_kind: text
 ---
 E22.py:43:2: E223 [*] Tab before operator
    |
 41 | #: E223
 42 | foobart = 4
-43 | a   = 3  # aligned with tab
-   |  ^^^ E223
+43 | a    = 3  # aligned with tab
+   |  ^^^^ E223
 44 | #:
    |
    = help: Replace with single space

crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E242_E24.py.snap

@@ -1,13 +1,12 @@
 ---
 source: crates/ruff_linter/src/rules/pycodestyle/mod.rs
-snapshot_kind: text
 ---
 E24.py:6:8: E242 [*] Tab after comma
   |
 4 | b = (1, 20)
 5 | #: E242
-6 | a = (1, 2)  # tab before 2
-  |        ^ E242
+6 | a = (1,    2)  # tab before 2
+  |        ^^^^ E242
 7 | #: Okay
 8 | b = (1, 20)  # space before 20
   |

crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E271_E27.py.snap

@@ -66,7 +66,7 @@ E27.py:8:3: E271 [*] Multiple spaces after keyword
 
 E27.py:15:6: E271 [*] Multiple spaces after keyword
    |
-13 | True        and False
+13 | True        and    False
 14 | #: E271
 15 | a and  b
    |      ^^ E271

crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E272_E27.py.snap

@@ -1,6 +1,5 @@
 ---
 source: crates/ruff_linter/src/rules/pycodestyle/mod.rs
-snapshot_kind: text
 ---
 E27.py:21:2: E272 [*] Multiple spaces before keyword
    |
@@ -51,7 +50,7 @@ E27.py:25:5: E272 [*] Multiple spaces before keyword
 25 | this  and False
    |     ^^ E272
 26 | #: E273
-27 | a and   b
+27 | a and    b
    |
    = help: Replace with single space
 

crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E273_E27.py.snap

@@ -8,7 +8,7 @@ E27.py:11:9: E273 [*] Tab after keyword
 11 | True and        False
    |         ^^^^^^^^ E273
 12 | #: E273 E274
-13 | True        and False
+13 | True        and    False
    |
    = help: Replace with single space
 
@@ -26,7 +26,7 @@ E27.py:13:5: E273 [*] Tab after keyword
    |
 11 | True and        False
 12 | #: E273 E274
-13 | True        and False
+13 | True        and    False
    |     ^^^^^^^^ E273
 14 | #: E271
 15 | a and  b
@@ -47,8 +47,8 @@ E27.py:13:10: E273 [*] Tab after keyword
    |
 11 | True and        False
 12 | #: E273 E274
-13 | True        and False
-   |                ^ E273
+13 | True        and    False
+   |                ^^^^ E273
 14 | #: E271
 15 | a and  b
    |
@@ -68,10 +68,10 @@ E27.py:27:6: E273 [*] Tab after keyword
    |
 25 | this  and False
 26 | #: E273
-27 | a and   b
-   |      ^^^ E273
+27 | a and    b
+   |      ^^^^ E273
 28 | #: E274
-29 | a       and b
+29 | a        and b
    |
    = help: Replace with single space
 
@@ -87,10 +87,10 @@ E27.py:27:6: E273 [*] Tab after keyword
 
 E27.py:31:10: E273 [*] Tab after keyword
    |
-29 | a       and b
+29 | a        and b
 30 | #: E273 E274
-31 | this        and False
-   |                ^ E273
+31 | this        and    False
+   |                ^^^^ E273
 32 | #: Okay
 33 | from u import (a, b)
    |

crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E274_E27.py.snap

@@ -1,15 +1,14 @@
 ---
 source: crates/ruff_linter/src/rules/pycodestyle/mod.rs
-snapshot_kind: text
 ---
 E27.py:29:2: E274 [*] Tab before keyword
    |
-27 | a and   b
+27 | a and    b
 28 | #: E274
-29 | a       and b
-   |  ^^^^^^^ E274
+29 | a        and b
+   |  ^^^^^^^^ E274
 30 | #: E273 E274
-31 | this        and False
+31 | this        and    False
    |
    = help: Replace with single space
 
@@ -25,9 +24,9 @@ E27.py:29:2: E274 [*] Tab before keyword
 
 E27.py:31:5: E274 [*] Tab before keyword
    |
-29 | a       and b
+29 | a        and b
 30 | #: E273 E274
-31 | this        and False
+31 | this        and    False
    |     ^^^^^^^^ E274
 32 | #: Okay
 33 | from u import (a, b)

crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__W191_W19.py.snap

@@ -1,6 +1,5 @@
 ---
 source: crates/ruff_linter/src/rules/pycodestyle/mod.rs
-snapshot_kind: text
 ---
 W19.py:1:1: W191 Indentation contains tabs
   |
@@ -371,7 +370,7 @@ W19.py:157:1: W191 Indentation contains tabs
 156 | f"test{
 157 |     tab_indented_should_be_flagged
     | ^^^^ W191
-158 | }   <- this tab is fine"
+158 | }    <- this tab is fine"
     |
 
 W19.py:161:1: W191 Indentation contains tabs
@@ -379,5 +378,5 @@ W19.py:161:1: W191 Indentation contains tabs
 160 | f"""test{
 161 |     tab_indented_should_be_flagged
     | ^^^^ W191
-162 | }   <- this tab is fine"""
+162 | }    <- this tab is fine"""
     |

crates/ruff_linter/src/rules/pyflakes/rules/unused_import.rs

@@ -103,7 +103,7 @@ use crate::{Applicability, Fix, FixAvailability, Violation};
 /// ## References
 /// - [Python documentation: `import`](https://docs.python.org/3/reference/simple_stmts.html#the-import-statement)
 /// - [Python documentation: `importlib.util.find_spec`](https://docs.python.org/3/library/importlib.html#importlib.util.find_spec)
-/// - [Typing documentation: interface conventions](https://typing.python.org/en/latest/source/libraries.html#library-interface-public-and-private-symbols)
+/// - [Typing documentation: interface conventions](https://typing.python.org/en/latest/spec/distributing.html#library-interface-public-and-private-symbols)
 #[derive(ViolationMetadata)]
 pub(crate) struct UnusedImport {
     /// Qualified name of the import
@@ -255,7 +255,7 @@ fn is_first_party(import: &AnyImport, checker: &Checker) -> bool {
     }
 }
 
-/// Find the `Expr` for top level `__all__` bindings.
+/// Find the `Expr` for top-level `__all__` bindings.
 fn find_dunder_all_exprs<'a>(semantic: &'a SemanticModel) -> Vec<&'a ast::Expr> {
     semantic
         .global_scope()
@@ -541,7 +541,7 @@ fn fix_by_removing_imports<'a>(
         checker.indexer(),
     )?;
 
-    // It's unsafe to remove things from `__init__.py` because it can break public interfaces
+    // It's unsafe to remove things from `__init__.py` because it can break public interfaces.
     let applicability = if in_init {
         Applicability::Unsafe
     } else {
@@ -556,7 +556,7 @@ fn fix_by_removing_imports<'a>(
 }
 
 /// Generate a [`Fix`] to make bindings in a statement explicit, either by adding them to `__all__`
-/// or changing them from `import a` to `import a as a`.
+/// or by changing them from `import a` to `import a as a`.
 fn fix_by_reexporting<'a>(
     checker: &Checker,
     node_id: NodeId,
@@ -585,7 +585,7 @@ fn fix_by_reexporting<'a>(
         _ => bail!("Cannot offer a fix when there are multiple __all__ definitions"),
     };
 
-    // Only emit a fix if there are edits
+    // Only emit a fix if there are edits.
     let mut tail = edits.into_iter();
     let head = tail.next().ok_or(anyhow!("No edits to make"))?;
 

crates/ruff_linter/src/rules/pyupgrade/mod.rs

@@ -7,16 +7,18 @@ pub(crate) mod types;
 
 #[cfg(test)]
 mod tests {
+    use std::collections::BTreeSet;
     use std::path::Path;
 
     use anyhow::Result;
     use ruff_python_ast::PythonVersion;
+    use ruff_python_semantic::{MemberNameImport, NameImport};
     use test_case::test_case;
 
     use crate::registry::Rule;
-    use crate::rules::pyupgrade;
+    use crate::rules::{isort, pyupgrade};
     use crate::settings::types::PreviewMode;
-    use crate::test::test_path;
+    use crate::test::{test_path, test_snippet};
     use crate::{assert_diagnostics, settings};
 
     #[test_case(Rule::ConvertNamedTupleFunctionalToClass, Path::new("UP014.py"))]
@@ -294,4 +296,63 @@ mod tests {
         assert_diagnostics!(diagnostics);
         Ok(())
     }
+
+    #[test]
+    fn i002_conflict() {
+        let diagnostics = test_snippet(
+            "from pipes import quote, Template",
+            &settings::LinterSettings {
+                isort: isort::settings::Settings {
+                    required_imports: BTreeSet::from_iter([
+                        // https://github.com/astral-sh/ruff/issues/18729
+                        NameImport::ImportFrom(MemberNameImport::member(
+                            "__future__".to_string(),
+                            "generator_stop".to_string(),
+                        )),
+                        // https://github.com/astral-sh/ruff/issues/16802
+                        NameImport::ImportFrom(MemberNameImport::member(
+                            "collections".to_string(),
+                            "Sequence".to_string(),
+                        )),
+                        // Only bail out if _all_ the names in UP035 are required. `pipes.Template`
+                        // isn't flagged by UP035, so requiring it shouldn't prevent `pipes.quote`
+                        // from getting a diagnostic.
+                        NameImport::ImportFrom(MemberNameImport::member(
+                            "pipes".to_string(),
+                            "Template".to_string(),
+                        )),
+                    ]),
+                    ..Default::default()
+                },
+                ..settings::LinterSettings::for_rules([
+                    Rule::MissingRequiredImport,
+                    Rule::UnnecessaryFutureImport,
+                    Rule::DeprecatedImport,
+                ])
+            },
+        );
+        assert_diagnostics!(diagnostics, @r"
+        <filename>:1:1: UP035 [*] Import from `shlex` instead: `quote`
+          |
+        1 | from pipes import quote, Template
+          | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ UP035
+          |
+          = help: Import from `shlex`
+
+        ℹ Safe fix
+        1   |-from pipes import quote, Template
+          1 |+from pipes import Template
+          2 |+from shlex import quote
+
+        <filename>:1:1: I002 [*] Missing required import: `from __future__ import generator_stop`
+        ℹ Safe fix
+          1 |+from __future__ import generator_stop
+        1 2 | from pipes import quote, Template
+
+        <filename>:1:1: I002 [*] Missing required import: `from collections import Sequence`
+        ℹ Safe fix
+          1 |+from collections import Sequence
+        1 2 | from pipes import quote, Template
+        ");
+    }
 }

crates/ruff_linter/src/rules/pyupgrade/rules/deprecated_import.rs

@@ -2,7 +2,7 @@ use itertools::Itertools;
 
 use ruff_macros::{ViolationMetadata, derive_message_formats};
 use ruff_python_ast::whitespace::indentation;
-use ruff_python_ast::{Alias, StmtImportFrom};
+use ruff_python_ast::{Alias, StmtImportFrom, StmtRef};
 use ruff_python_codegen::Stylist;
 use ruff_python_parser::Tokens;
 use ruff_text_size::Ranged;
@@ -10,9 +10,12 @@ use ruff_text_size::Ranged;
 use crate::Locator;
 use crate::checkers::ast::Checker;
 use crate::rules::pyupgrade::fixes;
+use crate::rules::pyupgrade::rules::unnecessary_future_import::is_import_required_by_isort;
 use crate::{Edit, Fix, FixAvailability, Violation};
 use ruff_python_ast::PythonVersion;
 
+use super::RequiredImports;
+
 /// An import was moved and renamed as part of a deprecation.
 /// For example, `typing.AbstractSet` was moved to `collections.abc.Set`.
 #[derive(Debug, PartialEq, Eq)]
@@ -410,6 +413,7 @@ struct ImportReplacer<'a> {
     stylist: &'a Stylist<'a>,
     tokens: &'a Tokens,
     version: PythonVersion,
+    required_imports: &'a RequiredImports,
 }
 
 impl<'a> ImportReplacer<'a> {
@@ -420,6 +424,7 @@ impl<'a> ImportReplacer<'a> {
         stylist: &'a Stylist<'a>,
         tokens: &'a Tokens,
         version: PythonVersion,
+        required_imports: &'a RequiredImports,
     ) -> Self {
         Self {
             import_from_stmt,
@@ -428,6 +433,7 @@ impl<'a> ImportReplacer<'a> {
             stylist,
             tokens,
             version,
+            required_imports,
         }
     }
 
@@ -437,6 +443,13 @@ impl<'a> ImportReplacer<'a> {
         if self.module == "typing" {
             if self.version >= PythonVersion::PY39 {
                 for member in &self.import_from_stmt.names {
+                    if is_import_required_by_isort(
+                        self.required_imports,
+                        StmtRef::ImportFrom(self.import_from_stmt),
+                        member,
+                    ) {
+                        continue;
+                    }
                     if let Some(target) = TYPING_TO_RENAME_PY39.iter().find_map(|(name, target)| {
                         if &member.name == *name {
                             Some(*target)
@@ -673,7 +686,13 @@ impl<'a> ImportReplacer<'a> {
         let mut matched_names = vec![];
         let mut unmatched_names = vec![];
         for name in &self.import_from_stmt.names {
-            if candidates.contains(&name.name.as_str()) {
+            if is_import_required_by_isort(
+                self.required_imports,
+                StmtRef::ImportFrom(self.import_from_stmt),
+                name,
+            ) {
+                unmatched_names.push(name);
+            } else if candidates.contains(&name.name.as_str()) {
                 matched_names.push(name);
             } else {
                 unmatched_names.push(name);
@@ -726,6 +745,7 @@ pub(crate) fn deprecated_import(checker: &Checker, import_from_stmt: &StmtImport
         checker.stylist(),
         checker.tokens(),
         checker.target_version(),
+        &checker.settings().isort.required_imports,
     );
 
     for (operation, fix) in fixer.without_renames() {

crates/ruff_linter/src/rules/pyupgrade/rules/format_literals.rs

@@ -124,10 +124,20 @@ fn is_sequential(indices: &[usize]) -> bool {
     indices.iter().enumerate().all(|(idx, value)| idx == *value)
 }
 
-// An opening curly brace, followed by any integer, followed by any text,
-// followed by a closing brace.
-static FORMAT_SPECIFIER: LazyLock<Regex> =
-    LazyLock::new(|| Regex::new(r"\{(?P<int>\d+)(?P<fmt>.*?)}").unwrap());
+static FORMAT_SPECIFIER: LazyLock<Regex> = LazyLock::new(|| {
+    Regex::new(
+        r"(?x)
+            (?P<prefix>
+                ^|[^{]|(?:\{{2})+  # preceded by nothing, a non-brace, or an even number of braces
+            )
+            \{                     # opening curly brace
+                (?P<int>\d+)       # followed by any integer
+                (?P<fmt>.*?)       # followed by any text
+            }                      # followed by a closing brace
+        ",
+    )
+    .unwrap()
+});
 
 /// Remove the explicit positional indices from a format string.
 fn remove_specifiers<'a>(value: &mut Expression<'a>, arena: &'a typed_arena::Arena<String>) {
@@ -135,7 +145,7 @@ fn remove_specifiers<'a>(value: &mut Expression<'a>, arena: &'a typed_arena::Are
         Expression::SimpleString(expr) => {
             expr.value = arena.alloc(
                 FORMAT_SPECIFIER
-                    .replace_all(expr.value, "{$fmt}")
+                    .replace_all(expr.value, "$prefix{$fmt}")
                     .to_string(),
             );
         }
@@ -146,7 +156,7 @@ fn remove_specifiers<'a>(value: &mut Expression<'a>, arena: &'a typed_arena::Are
                     libcst_native::String::Simple(string) => {
                         string.value = arena.alloc(
                             FORMAT_SPECIFIER
-                                .replace_all(string.value, "{$fmt}")
+                                .replace_all(string.value, "$prefix{$fmt}")
                                 .to_string(),
                         );
                     }

crates/ruff_linter/src/rules/pyupgrade/rules/unnecessary_future_import.rs

@@ -1,7 +1,10 @@
+use std::collections::BTreeSet;
+
 use itertools::Itertools;
-use ruff_python_ast::{Alias, Stmt};
 
 use ruff_macros::{ViolationMetadata, derive_message_formats};
+use ruff_python_ast::{self as ast, Alias, Stmt, StmtRef};
+use ruff_python_semantic::NameImport;
 use ruff_text_size::Ranged;
 
 use crate::checkers::ast::Checker;
@@ -84,6 +87,29 @@ const PY37_PLUS_REMOVE_FUTURES: &[&str] = &[
     "generator_stop",
 ];
 
+pub(crate) type RequiredImports = BTreeSet<NameImport>;
+
+pub(crate) fn is_import_required_by_isort(
+    required_imports: &RequiredImports,
+    stmt: StmtRef,
+    alias: &Alias,
+) -> bool {
+    let segments: &[&str] = match stmt {
+        StmtRef::ImportFrom(ast::StmtImportFrom {
+            module: Some(module),
+            ..
+        }) => &[module.as_str(), alias.name.as_str()],
+        StmtRef::ImportFrom(ast::StmtImportFrom { module: None, .. }) | StmtRef::Import(_) => {
+            &[alias.name.as_str()]
+        }
+        _ => return false,
+    };
+
+    required_imports
+        .iter()
+        .any(|required_import| required_import.qualified_name().segments() == segments)
+}
+
 /// UP010
 pub(crate) fn unnecessary_future_import(checker: &Checker, stmt: &Stmt, names: &[Alias]) {
     let mut unused_imports: Vec<&Alias> = vec![];
@@ -91,6 +117,15 @@ pub(crate) fn unnecessary_future_import(checker: &Checker, stmt: &Stmt, names: &
         if alias.asname.is_some() {
             continue;
         }
+
+        if is_import_required_by_isort(
+            &checker.settings().isort.required_imports,
+            stmt.into(),
+            alias,
+        ) {
+            continue;
+        }
+
         if PY33_PLUS_REMOVE_FUTURES.contains(&alias.name.as_str())
             || PY37_PLUS_REMOVE_FUTURES.contains(&alias.name.as_str())
         {
@@ -119,7 +154,7 @@ pub(crate) fn unnecessary_future_import(checker: &Checker, stmt: &Stmt, names: &
             unused_imports
                 .iter()
                 .map(|alias| &alias.name)
-                .map(ruff_python_ast::Identifier::as_str),
+                .map(ast::Identifier::as_str),
             statement,
             parent,
             checker.locator(),

crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP030_0.py.snap

@@ -481,6 +481,7 @@ UP030_0.py:59:1: UP030 [*] Use implicit references for positional format fields
    59 |+"{}_{}".format(2, 1, )
 60 60 | 
 61 61 | "{1}_{0}".format(1, 2)
+62 62 | 
 
 UP030_0.py:61:1: UP030 [*] Use implicit references for positional format fields
    |
@@ -488,6 +489,8 @@ UP030_0.py:61:1: UP030 [*] Use implicit references for positional format fields
 60 |
 61 | "{1}_{0}".format(1, 2)
    | ^^^^^^^^^^^^^^^^^^^^^^ UP030
+62 |
+63 | r"\d{{1,2}} {0}".format(42)
    |
    = help: Remove explicit positional indices
 
@@ -497,3 +500,42 @@ UP030_0.py:61:1: UP030 [*] Use implicit references for positional format fields
 60 60 | 
 61    |-"{1}_{0}".format(1, 2)
    61 |+"{}_{}".format(2, 1)
+62 62 | 
+63 63 | r"\d{{1,2}} {0}".format(42)
+64 64 | 
+
+UP030_0.py:63:1: UP030 [*] Use implicit references for positional format fields
+   |
+61 | "{1}_{0}".format(1, 2)
+62 |
+63 | r"\d{{1,2}} {0}".format(42)
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ UP030
+64 |
+65 | "{{{0}}}".format(123)
+   |
+   = help: Remove explicit positional indices
+
+ℹ Unsafe fix
+60 60 | 
+61 61 | "{1}_{0}".format(1, 2)
+62 62 | 
+63    |-r"\d{{1,2}} {0}".format(42)
+   63 |+r"\d{{1,2}} {}".format(42)
+64 64 | 
+65 65 | "{{{0}}}".format(123)
+
+UP030_0.py:65:1: UP030 [*] Use implicit references for positional format fields
+   |
+63 | r"\d{{1,2}} {0}".format(42)
+64 |
+65 | "{{{0}}}".format(123)
+   | ^^^^^^^^^^^^^^^^^^^^^ UP030
+   |
+   = help: Remove explicit positional indices
+
+ℹ Unsafe fix
+62 62 | 
+63 63 | r"\d{{1,2}} {0}".format(42)
+64 64 | 
+65    |-"{{{0}}}".format(123)
+   65 |+"{{{}}}".format(123)

crates/ruff_linter/src/rules/refurb/rules/metaclass_abcmeta.rs

@@ -22,13 +22,19 @@ use crate::{AlwaysFixableViolation, Edit, Fix};
 ///
 /// ## Example
 /// ```python
-/// class C(metaclass=ABCMeta):
+/// import abc
+///
+///
+/// class C(metaclass=abc.ABCMeta):
 ///     pass
 /// ```
 ///
 /// Use instead:
 /// ```python
-/// class C(ABC):
+/// import abc
+///
+///
+/// class C(abc.ABC):
 ///     pass
 /// ```
 ///

crates/ruff_linter/src/rules/refurb/rules/unnecessary_from_float.rs

@@ -26,6 +26,9 @@ use crate::{Applicability, Edit, Fix, FixAvailability, Violation};
 ///
 /// ## Example
 /// ```python
+/// from decimal import Decimal
+/// from fractions import Fraction
+///
 /// Decimal.from_float(4.2)
 /// Decimal.from_float(float("inf"))
 /// Fraction.from_float(4.2)
@@ -34,10 +37,13 @@ use crate::{Applicability, Edit, Fix, FixAvailability, Violation};
 ///
 /// Use instead:
 /// ```python
+/// from decimal import Decimal
+/// from fractions import Fraction
+///
 /// Decimal(4.2)
 /// Decimal("inf")
 /// Fraction(4.2)
-/// Fraction(Decimal(4.2))
+/// Fraction(Decimal("4.2"))
 /// ```
 ///
 /// ## Fix safety

crates/ruff_linter/src/rules/refurb/rules/verbose_decimal_constructor.rs

@@ -30,12 +30,16 @@ use crate::{Edit, Fix, FixAvailability, Violation};
 ///
 /// ## Example
 /// ```python
+/// from decimal import Decimal
+///
 /// Decimal("0")
 /// Decimal(float("Infinity"))
 /// ```
 ///
 /// Use instead:
 /// ```python
+/// from decimal import Decimal
+///
 /// Decimal(0)
 /// Decimal("Infinity")
 /// ```

crates/ruff_linter/src/rules/ruff/rules/ambiguous_unicode_character.rs

@@ -12,7 +12,6 @@ use crate::checkers::ast::{Checker, LintContext};
 use crate::preview::is_unicode_to_unicode_confusables_enabled;
 use crate::rules::ruff::rules::Context;
 use crate::rules::ruff::rules::confusables::confusable;
-use crate::settings::LinterSettings;
 
 /// ## What it does
 /// Checks for ambiguous Unicode characters in strings.
@@ -180,9 +179,7 @@ pub(crate) fn ambiguous_unicode_character_comment(
     range: TextRange,
 ) {
     let text = locator.slice(range);
-    for candidate in ambiguous_unicode_character(text, range, context.settings()) {
-        candidate.into_diagnostic(Context::Comment, context);
-    }
+    ambiguous_unicode_character(text, range, Context::Comment, context);
 }
 
 /// RUF001, RUF002
@@ -203,22 +200,19 @@ pub(crate) fn ambiguous_unicode_character_string(checker: &Checker, string_like:
         match part {
             ast::StringLikePart::String(string_literal) => {
                 let text = checker.locator().slice(string_literal);
-                for candidate in
-                    ambiguous_unicode_character(text, string_literal.range(), checker.settings())
-                {
-                    candidate.report_diagnostic(checker, context);
-                }
+                ambiguous_unicode_character(
+                    text,
+                    string_literal.range(),
+                    context,
+                    checker.context(),
+                );
             }
             ast::StringLikePart::Bytes(_) => {}
             ast::StringLikePart::FString(FString { elements, .. })
             | ast::StringLikePart::TString(TString { elements, .. }) => {
                 for literal in elements.literals() {
                     let text = checker.locator().slice(literal);
-                    for candidate in
-                        ambiguous_unicode_character(text, literal.range(), checker.settings())
-                    {
-                        candidate.report_diagnostic(checker, context);
-                    }
+                    ambiguous_unicode_character(text, literal.range(), context, checker.context());
                 }
             }
         }
@@ -228,13 +222,12 @@ pub(crate) fn ambiguous_unicode_character_string(checker: &Checker, string_like:
 fn ambiguous_unicode_character(
     text: &str,
     range: TextRange,
-    settings: &LinterSettings,
-) -> Vec<Candidate> {
-    let mut candidates = Vec::new();
-
+    context: Context,
+    lint_context: &LintContext,
+) {
     // Most of the time, we don't need to check for ambiguous unicode characters at all.
     if text.is_ascii() {
-        return candidates;
+        return;
     }
 
     // Iterate over the "words" in the text.
@@ -246,7 +239,7 @@ fn ambiguous_unicode_character(
             if !word_candidates.is_empty() {
                 if word_flags.is_candidate_word() {
                     for candidate in word_candidates.drain(..) {
-                        candidates.push(candidate);
+                        candidate.into_diagnostic(context, lint_context);
                     }
                 }
                 word_candidates.clear();
@@ -257,21 +250,23 @@ fn ambiguous_unicode_character(
             // case, it's always included as a diagnostic.
             if !current_char.is_ascii() {
                 if let Some(representant) = confusable(current_char as u32).filter(|representant| {
-                    is_unicode_to_unicode_confusables_enabled(settings) || representant.is_ascii()
+                    is_unicode_to_unicode_confusables_enabled(lint_context.settings())
+                        || representant.is_ascii()
                 }) {
                     let candidate = Candidate::new(
                         TextSize::try_from(relative_offset).unwrap() + range.start(),
                         current_char,
                         representant,
                     );
-                    candidates.push(candidate);
+                    candidate.into_diagnostic(context, lint_context);
                 }
             }
         } else if current_char.is_ascii() {
             // The current word contains at least one ASCII character.
             word_flags |= WordFlags::ASCII;
         } else if let Some(representant) = confusable(current_char as u32).filter(|representant| {
-            is_unicode_to_unicode_confusables_enabled(settings) || representant.is_ascii()
+            is_unicode_to_unicode_confusables_enabled(lint_context.settings())
+                || representant.is_ascii()
         }) {
             // The current word contains an ambiguous unicode character.
             word_candidates.push(Candidate::new(
@@ -289,13 +284,11 @@ fn ambiguous_unicode_character(
     if !word_candidates.is_empty() {
         if word_flags.is_candidate_word() {
             for candidate in word_candidates.drain(..) {
-                candidates.push(candidate);
+                candidate.into_diagnostic(context, lint_context);
             }
         }
         word_candidates.clear();
     }
-
-    candidates
 }
 
 bitflags! {
@@ -373,39 +366,6 @@ impl Candidate {
             };
         }
     }
-
-    fn report_diagnostic(self, checker: &Checker, context: Context) {
-        if !checker
-            .settings()
-            .allowed_confusables
-            .contains(&self.confusable)
-        {
-            let char_range = TextRange::at(self.offset, self.confusable.text_len());
-            match context {
-                Context::String => checker.report_diagnostic_if_enabled(
-                    AmbiguousUnicodeCharacterString {
-                        confusable: self.confusable,
-                        representant: self.representant,
-                    },
-                    char_range,
-                ),
-                Context::Docstring => checker.report_diagnostic_if_enabled(
-                    AmbiguousUnicodeCharacterDocstring {
-                        confusable: self.confusable,
-                        representant: self.representant,
-                    },
-                    char_range,
-                ),
-                Context::Comment => checker.report_diagnostic_if_enabled(
-                    AmbiguousUnicodeCharacterComment {
-                        confusable: self.confusable,
-                        representant: self.representant,
-                    },
-                    char_range,
-                ),
-            };
-        }
-    }
 }
 
 struct NamedUnicode(char);

crates/ruff_linter/src/rules/ruff/rules/explicit_f_string_type_conversion.rs

@@ -149,8 +149,7 @@ fn convert_call_to_conversion_flag(
             formatted_string_expression.whitespace_before_expression = space();
         }
 
-        formatted_string_expression.expression = if needs_paren(OperatorPrecedence::from_expr(arg))
-        {
+        formatted_string_expression.expression = if needs_paren_expr(arg) {
             call.args[0]
                 .value
                 .clone()
@@ -178,6 +177,16 @@ fn needs_paren(precedence: OperatorPrecedence) -> bool {
     precedence <= OperatorPrecedence::Lambda
 }
 
+fn needs_paren_expr(arg: &Expr) -> bool {
+    // Generator expressions need to be parenthesized in f-string expressions
+    if let Some(generator) = arg.as_generator_expr() {
+        return !generator.parenthesized;
+    }
+
+    // Check precedence for other expressions
+    needs_paren(OperatorPrecedence::from_expr(arg))
+}
+
 /// Represents the three built-in Python conversion functions that can be replaced
 /// with f-string conversion flags.
 #[derive(Copy, Clone)]

crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF010_RUF010.py.snap

@@ -359,6 +359,7 @@ RUF010.py:52:4: RUF010 [*] Use explicit conversion flag
    52 |+f"{(x := 2)!r}"
 53 53 | 
 54 54 | f"{str(object=3)}"
+55 55 | 
 
 RUF010.py:54:4: RUF010 [*] Use explicit conversion flag
    |
@@ -366,6 +367,8 @@ RUF010.py:54:4: RUF010 [*] Use explicit conversion flag
 53 |
 54 | f"{str(object=3)}"
    |    ^^^^^^^^^^^^^ RUF010
+55 |
+56 | f"{str(x for x in [])}"
    |
    = help: Replace with conversion flag
 
@@ -375,3 +378,42 @@ RUF010.py:54:4: RUF010 [*] Use explicit conversion flag
 53 53 | 
 54    |-f"{str(object=3)}"
    54 |+f"{3!s}"
+55 55 | 
+56 56 | f"{str(x for x in [])}"
+57 57 | 
+
+RUF010.py:56:4: RUF010 [*] Use explicit conversion flag
+   |
+54 | f"{str(object=3)}"
+55 |
+56 | f"{str(x for x in [])}"
+   |    ^^^^^^^^^^^^^^^^^^ RUF010
+57 |
+58 | f"{str((x for x in []))}"
+   |
+   = help: Replace with conversion flag
+
+ℹ Safe fix
+53 53 | 
+54 54 | f"{str(object=3)}"
+55 55 | 
+56    |-f"{str(x for x in [])}"
+   56 |+f"{(x for x in [])!s}"
+57 57 | 
+58 58 | f"{str((x for x in []))}"
+
+RUF010.py:58:4: RUF010 [*] Use explicit conversion flag
+   |
+56 | f"{str(x for x in [])}"
+57 |
+58 | f"{str((x for x in []))}"
+   |    ^^^^^^^^^^^^^^^^^^^^ RUF010
+   |
+   = help: Replace with conversion flag
+
+ℹ Safe fix
+55 55 | 
+56 56 | f"{str(x for x in [])}"
+57 57 | 
+58    |-f"{str((x for x in []))}"
+   58 |+f"{(x for x in [])!s}"

crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__preview__RUF054_RUF054.py.snap

@@ -22,7 +22,7 @@ RUF054.py:10:3: RUF054 Indented form feed
 RUF054.py:13:2: RUF054 Indented form feed
    |
 12 | def _():
-13 |        pass
+13 |         pass
    |     ^ RUF054
 14 |
 15 | if False:

crates/ruff_linter/src/test.rs

@@ -380,7 +380,7 @@ macro_rules! assert_diagnostics {
     }};
     ($value:expr, @$snapshot:literal) => {{
         insta::with_settings!({ omit_expression => true }, {
-            insta::assert_snapshot!($crate::test::print_messages(&$value), $snapshot);
+            insta::assert_snapshot!($crate::test::print_messages(&$value), @$snapshot);
         });
     }};
     ($name:expr, $value:expr) => {{

crates/ruff_source_file/src/lib.rs

@@ -1,5 +1,6 @@
 use std::cmp::Ordering;
 use std::fmt::{Debug, Display, Formatter};
+use std::hash::Hash;
 use std::sync::{Arc, OnceLock};
 
 #[cfg(feature = "serde")]
@@ -162,7 +163,7 @@ impl SourceFileBuilder {
 /// A source file that is identified by its name. Optionally stores the source code and [`LineIndex`].
 ///
 /// Cloning a [`SourceFile`] is cheap, because it only requires bumping a reference count.
-#[derive(Clone, Eq, PartialEq)]
+#[derive(Clone, Eq, PartialEq, Hash)]
 #[cfg_attr(feature = "get-size", derive(get_size2::GetSize))]
 pub struct SourceFile {
     inner: Arc<SourceFileInner>,
@@ -241,6 +242,13 @@ impl PartialEq for SourceFileInner {
 
 impl Eq for SourceFileInner {}
 
+impl Hash for SourceFileInner {
+    fn hash<H: std::hash::Hasher>(&self, state: &mut H) {
+        self.name.hash(state);
+        self.code.hash(state);
+    }
+}
+
 /// The line and column of an offset in a source file.
 ///
 /// See [`LineIndex::line_column`] for more information.

crates/ruff_wasm/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "ruff_wasm"
-version = "0.12.5"
+version = "0.12.7"
 publish = false
 authors = { workspace = true }
 edition = { workspace = true }

crates/ty_ide/src/completion.rs

@@ -66,9 +66,9 @@ enum CompletionTargetTokens<'t> {
     /// A token was found under the cursor, but it didn't
     /// match any of our anticipated token patterns.
     Generic { token: &'t Token },
-    /// No token was found, but we have the offset of the
-    /// cursor.
-    Unknown { offset: TextSize },
+    /// No token was found. We generally treat this like
+    /// `Generic` (i.e., offer scope based completions).
+    Unknown,
 }
 
 impl<'t> CompletionTargetTokens<'t> {
@@ -78,7 +78,7 @@ impl<'t> CompletionTargetTokens<'t> {
         static OBJECT_DOT_NON_EMPTY: [TokenKind; 2] = [TokenKind::Dot, TokenKind::Name];
 
         let offset = match parsed.tokens().at_offset(offset) {
-            TokenAt::None => return Some(CompletionTargetTokens::Unknown { offset }),
+            TokenAt::None => return Some(CompletionTargetTokens::Unknown),
             TokenAt::Single(tok) => tok.end(),
             TokenAt::Between(_, tok) => tok.start(),
         };
@@ -122,7 +122,7 @@ impl<'t> CompletionTargetTokens<'t> {
                 return None;
             } else {
                 let Some(last) = before.last() else {
-                    return Some(CompletionTargetTokens::Unknown { offset });
+                    return Some(CompletionTargetTokens::Unknown);
                 };
                 CompletionTargetTokens::Generic { token: last }
             },
@@ -171,7 +171,7 @@ impl<'t> CompletionTargetTokens<'t> {
                     node: covering_node.node(),
                 })
             }
-            CompletionTargetTokens::Unknown { offset } => {
+            CompletionTargetTokens::Unknown => {
                 let range = TextRange::empty(offset);
                 let covering_node = covering_node(parsed.syntax().into(), range);
                 Some(CompletionTargetAst::Scoped {
@@ -1247,7 +1247,7 @@ quux.<CURSOR>
         __init_subclass__ :: bound method object.__init_subclass__() -> None
         __module__ :: str
         __ne__ :: bound method object.__ne__(value: object, /) -> bool
-        __new__ :: bound method object.__new__() -> Self
+        __new__ :: bound method object.__new__() -> Self@object
         __reduce__ :: bound method object.__reduce__() -> str | tuple[Any, ...]
         __reduce_ex__ :: bound method object.__reduce_ex__(protocol: SupportsIndex, /) -> str | tuple[Any, ...]
         __repr__ :: bound method object.__repr__() -> str
@@ -1292,7 +1292,7 @@ quux.b<CURSOR>
         __init_subclass__ :: bound method object.__init_subclass__() -> None
         __module__ :: str
         __ne__ :: bound method object.__ne__(value: object, /) -> bool
-        __new__ :: bound method object.__new__() -> Self
+        __new__ :: bound method object.__new__() -> Self@object
         __reduce__ :: bound method object.__reduce__() -> str | tuple[Any, ...]
         __reduce_ex__ :: bound method object.__reduce_ex__(protocol: SupportsIndex, /) -> str | tuple[Any, ...]
         __repr__ :: bound method object.__repr__() -> str
@@ -1346,7 +1346,7 @@ C.<CURSOR>
         __mro__ :: tuple[<class 'C'>, <class 'object'>]
         __name__ :: str
         __ne__ :: def __ne__(self, value: object, /) -> bool
-        __new__ :: def __new__(cls) -> Self
+        __new__ :: def __new__(cls) -> Self@object
         __or__ :: bound method <class 'C'>.__or__(value: Any, /) -> UnionType
         __prepare__ :: bound method <class 'Meta'>.__prepare__(name: str, bases: tuple[type, ...], /, **kwds: Any) -> MutableMapping[str, object]
         __qualname__ :: str
@@ -1522,7 +1522,7 @@ Quux.<CURSOR>
         __mro__ :: tuple[<class 'Quux'>, <class 'object'>]
         __name__ :: str
         __ne__ :: def __ne__(self, value: object, /) -> bool
-        __new__ :: def __new__(cls) -> Self
+        __new__ :: def __new__(cls) -> Self@object
         __or__ :: bound method <class 'Quux'>.__or__(value: Any, /) -> UnionType
         __prepare__ :: bound method <class 'type'>.__prepare__(name: str, bases: tuple[type, ...], /, **kwds: Any) -> MutableMapping[str, object]
         __qualname__ :: str
@@ -1574,8 +1574,8 @@ Answer.<CURSOR>
                 __bool__ :: bound method <class 'Answer'>.__bool__() -> Literal[True]
                 __class__ :: <class 'EnumMeta'>
                 __contains__ :: bound method <class 'Answer'>.__contains__(value: object) -> bool
-                __copy__ :: def __copy__(self) -> Self
-                __deepcopy__ :: def __deepcopy__(self, memo: Any) -> Self
+                __copy__ :: def __copy__(self) -> Self@Enum
+                __deepcopy__ :: def __deepcopy__(self, memo: Any) -> Self@Enum
                 __delattr__ :: def __delattr__(self, name: str, /) -> None
                 __dict__ :: MappingProxyType[str, Any]
                 __dictoffset__ :: int
@@ -1585,28 +1585,28 @@ Answer.<CURSOR>
                 __flags__ :: int
                 __format__ :: def __format__(self, format_spec: str) -> str
                 __getattribute__ :: def __getattribute__(self, name: str, /) -> Any
-                __getitem__ :: bound method <class 'Answer'>.__getitem__(name: str) -> _EnumMemberT
+                __getitem__ :: bound method <class 'Answer'>.__getitem__(name: str) -> _EnumMemberT@__getitem__
                 __getstate__ :: def __getstate__(self) -> object
                 __hash__ :: def __hash__(self) -> int
                 __init__ :: def __init__(self) -> None
                 __init_subclass__ :: def __init_subclass__(cls) -> None
                 __instancecheck__ :: bound method <class 'Answer'>.__instancecheck__(instance: Any, /) -> bool
                 __itemsize__ :: int
-                __iter__ :: bound method <class 'Answer'>.__iter__() -> Iterator[_EnumMemberT]
+                __iter__ :: bound method <class 'Answer'>.__iter__() -> Iterator[_EnumMemberT@__iter__]
                 __len__ :: bound method <class 'Answer'>.__len__() -> int
                 __members__ :: MappingProxyType[str, Unknown]
                 __module__ :: str
                 __mro__ :: tuple[<class 'Answer'>, <class 'Enum'>, <class 'object'>]
                 __name__ :: str
                 __ne__ :: def __ne__(self, value: object, /) -> bool
-                __new__ :: def __new__(cls, value: object) -> Self
+                __new__ :: def __new__(cls, value: object) -> Self@Enum
                 __or__ :: bound method <class 'Answer'>.__or__(value: Any, /) -> UnionType
                 __order__ :: str
                 __prepare__ :: bound method <class 'EnumMeta'>.__prepare__(cls: str, bases: tuple[type, ...], **kwds: Any) -> _EnumDict
                 __qualname__ :: str
                 __reduce__ :: def __reduce__(self) -> str | tuple[Any, ...]
                 __repr__ :: def __repr__(self) -> str
-                __reversed__ :: bound method <class 'Answer'>.__reversed__() -> Iterator[_EnumMemberT]
+                __reversed__ :: bound method <class 'Answer'>.__reversed__() -> Iterator[_EnumMemberT@__reversed__]
                 __ror__ :: bound method <class 'Answer'>.__ror__(value: Any, /) -> UnionType
                 __setattr__ :: def __setattr__(self, name: str, value: Any, /) -> None
                 __signature__ :: bound method <class 'Answer'>.__signature__() -> str

crates/ty_ide/src/goto_references.rs

@@ -38,7 +38,7 @@ mod tests {
 
     impl CursorTest {
         fn references(&self) -> String {
-            let Some(reference_results) =
+            let Some(mut reference_results) =
                 goto_references(&self.db, self.cursor.file, self.cursor.offset, true)
             else {
                 return "No references found".to_string();
@@ -48,6 +48,8 @@ mod tests {
                 return "No references found".to_string();
             }
 
+            reference_results.sort_by_key(ReferenceTarget::file);
+
             self.render_diagnostics(reference_results.into_iter().enumerate().map(
                 |(i, ref_item)| -> ReferenceResult {
                     ReferenceResult {

crates/ty_ide/src/hover.rs

@@ -371,10 +371,10 @@ mod tests {
         );
 
         assert_snapshot!(test.hover(), @r"
-        T
+        T@Alias
         ---------------------------------------------
         ```python
-        T
+        T@Alias
         ```
         ---------------------------------------------
         info[hover]: Hovered content is

crates/ty_project/src/db.rs

@@ -1,5 +1,5 @@
 use std::fmt::Formatter;
-use std::panic::{AssertUnwindSafe, RefUnwindSafe};
+use std::panic::RefUnwindSafe;
 use std::sync::Arc;
 use std::{cmp, fmt};
 
@@ -87,9 +87,7 @@ impl ProjectDatabase {
     ///
     /// [`set_check_mode`]: ProjectDatabase::set_check_mode
     pub fn check(&self) -> Vec<Diagnostic> {
-        let mut reporter = DummyReporter;
-        let reporter = AssertUnwindSafe(&mut reporter as &mut dyn ProgressReporter);
-        self.project().check(self, reporter)
+        self.project().check(self, &mut DummyReporter)
     }
 
     /// Checks the files in the project and its dependencies, using the given reporter.
@@ -98,7 +96,6 @@ impl ProjectDatabase {
     ///
     /// [`set_check_mode`]: ProjectDatabase::set_check_mode
     pub fn check_with_reporter(&self, reporter: &mut dyn ProgressReporter) -> Vec<Diagnostic> {
-        let reporter = AssertUnwindSafe(reporter);
         self.project().check(self, reporter)
     }
 

crates/ty_project/src/lib.rs

@@ -174,7 +174,7 @@ impl Project {
     /// This is a salsa query to prevent re-computing queries if other, unrelated
     /// settings change. For example, we don't want that changing the terminal settings
     /// invalidates any type checking queries.
-    #[salsa::tracked(returns(deref), heap_size=get_size2::GetSize::get_heap_size)]
+    #[salsa::tracked(returns(deref), heap_size=get_size2::heap_size)]
     pub fn rules(self, db: &dyn Db) -> Arc<RuleSelection> {
         self.settings(db).to_rules()
     }
@@ -228,7 +228,7 @@ impl Project {
     pub(crate) fn check(
         self,
         db: &ProjectDatabase,
-        mut reporter: AssertUnwindSafe<&mut dyn ProgressReporter>,
+        reporter: &mut dyn ProgressReporter,
     ) -> Vec<Diagnostic> {
         let project_span = tracing::debug_span!("Project::check");
         let _span = project_span.enter();
@@ -511,7 +511,7 @@ impl Project {
     }
 }
 
-#[salsa::tracked(returns(ref), heap_size=get_size2::GetSize::get_heap_size)]
+#[salsa::tracked(returns(ref), heap_size=get_size2::heap_size)]
 pub(crate) fn check_file_impl(db: &dyn Db, file: File) -> Result<Box<[Diagnostic]>, Diagnostic> {
     let mut diagnostics: Vec<Diagnostic> = Vec::new();
 

crates/ty_project/src/metadata/settings.rs

@@ -96,7 +96,7 @@ impl Override {
 }
 
 /// Resolves the settings for a given file.
-#[salsa::tracked(returns(ref), heap_size=get_size2::GetSize::get_heap_size)]
+#[salsa::tracked(returns(ref), heap_size=get_size2::heap_size)]
 pub(crate) fn file_settings(db: &dyn Db, file: File) -> FileSettings {
     let settings = db.project().settings(db);
 
@@ -155,7 +155,7 @@ pub(crate) fn file_settings(db: &dyn Db, file: File) -> FileSettings {
 /// This is to make Salsa happy because it requires that queries with only a single argument
 /// take a salsa-struct as argument, which isn't the case here. The `()` enables salsa's
 /// automatic interning for the arguments.
-#[salsa::tracked(heap_size=get_size2::GetSize::get_heap_size)]
+#[salsa::tracked(heap_size=get_size2::heap_size)]
 fn merge_overrides(db: &dyn Db, overrides: Vec<Arc<InnerOverrideOptions>>, _: ()) -> FileSettings {
     let mut overrides = overrides.into_iter().rev();
     let mut merged = (*overrides.next().unwrap()).clone();

crates/ty_python_semantic/resources/mdtest/annotations/self.md

@@ -16,7 +16,7 @@ from typing import Self
 
 class Shape:
     def set_scale(self: Self, scale: float) -> Self:
-        reveal_type(self)  # revealed: Self
+        reveal_type(self)  # revealed: Self@Shape
         return self
 
     def nested_type(self: Self) -> list[Self]:
@@ -24,7 +24,7 @@ class Shape:
 
     def nested_func(self: Self) -> Self:
         def inner() -> Self:
-            reveal_type(self)  # revealed: Self
+            reveal_type(self)  # revealed: Self@Shape
             return self
         return inner()
 
@@ -38,13 +38,13 @@ reveal_type(Shape().nested_func())  # revealed: Shape
 
 class Circle(Shape):
     def set_scale(self: Self, scale: float) -> Self:
-        reveal_type(self)  # revealed: Self
+        reveal_type(self)  # revealed: Self@Circle
         return self
 
 class Outer:
     class Inner:
         def foo(self: Self) -> Self:
-            reveal_type(self)  # revealed: Self
+            reveal_type(self)  # revealed: Self@Inner
             return self
 ```
 
@@ -151,7 +151,7 @@ from typing import Self
 
 class Shape:
     def union(self: Self, other: Self | None):
-        reveal_type(other)  # revealed: Self | None
+        reveal_type(other)  # revealed: Self@Shape | None
         return self
 ```
 

crates/ty_python_semantic/resources/mdtest/annotations/unsupported_special_forms.md

@@ -26,7 +26,7 @@ def i(callback: Callable[Concatenate[int, P], R_co], *args: P.args, **kwargs: P.
 
 class Foo:
     def method(self, x: Self):
-        reveal_type(x)  # revealed: Self
+        reveal_type(x)  # revealed: Self@Foo
 ```
 
 ## Type expressions

crates/ty_python_semantic/resources/mdtest/assignment/augmented.md

@@ -13,7 +13,7 @@ reveal_type(x)  # revealed: int | float
 
 x = (1, 2)
 x += (3, 4)
-reveal_type(x)  # revealed: tuple[Literal[1], Literal[2], Literal[3], Literal[4]]
+reveal_type(x)  # revealed: tuple[Literal[1, 2, 3, 4], ...]
 ```
 
 ## Dunder methods

crates/ty_python_semantic/resources/mdtest/async.md

@@ -0,0 +1,123 @@
+# `async` / `await`
+
+## Basic
+
+```py
+async def retrieve() -> int:
+    return 42
+
+async def main():
+    result = await retrieve()
+
+    reveal_type(result)  # revealed: int
+```
+
+## Generic `async` functions
+
+```py
+from typing import TypeVar
+
+T = TypeVar("T")
+
+async def persist(x: T) -> T:
+    return x
+
+async def f(x: int):
+    result = await persist(x)
+
+    reveal_type(result)  # revealed: int
+```
+
+## Use cases
+
+### `Future`
+
+```py
+import asyncio
+import concurrent.futures
+
+def blocking_function() -> int:
+    return 42
+
+async def main():
+    loop = asyncio.get_event_loop()
+    with concurrent.futures.ThreadPoolExecutor() as pool:
+        result = await loop.run_in_executor(pool, blocking_function)
+
+        # TODO: should be `int`
+        reveal_type(result)  # revealed: Unknown
+```
+
+### `asyncio.Task`
+
+```py
+import asyncio
+
+async def f() -> int:
+    return 1
+
+async def main():
+    task = asyncio.create_task(f())
+
+    result = await task
+
+    # TODO: this should be `int`
+    reveal_type(result)  # revealed: Unknown
+```
+
+### `asyncio.gather`
+
+```py
+import asyncio
+
+async def task(name: str) -> int:
+    return len(name)
+
+async def main():
+    (a, b) = await asyncio.gather(
+        task("A"),
+        task("B"),
+    )
+
+    # TODO: these should be `int`
+    reveal_type(a)  # revealed: Unknown
+    reveal_type(b)  # revealed: Unknown
+```
+
+## Under the hood
+
+```toml
+[environment]
+python-version = "3.12"  # Use 3.12 to be able to use PEP 695 generics
+```
+
+Let's look at the example from the beginning again:
+
+```py
+async def retrieve() -> int:
+    return 42
+```
+
+When we look at the signature of this function, we see that it actually returns a `CoroutineType`:
+
+```py
+reveal_type(retrieve)  # revealed: def retrieve() -> CoroutineType[Any, Any, int]
+```
+
+The expression `await retrieve()` desugars into a call to the `__await__` dunder method on the
+`CoroutineType` object, followed by a `yield from`. Let's first see the return type of `__await__`:
+
+```py
+reveal_type(retrieve().__await__())  # revealed: Generator[Any, None, int]
+```
+
+We can see that this returns a `Generator` that yields `Any`, and eventually returns `int`. For the
+final type of the `await` expression, we retrieve that third argument of the `Generator` type:
+
+```py
+from typing import Generator
+
+def _():
+    result = yield from retrieve().__await__()
+    reveal_type(result)  # revealed: int
+```

crates/ty_python_semantic/resources/mdtest/binary/in.md

@@ -1,49 +0,0 @@
-# Static binary operations using `in`
-
-## Basic functionality
-
-This demonstrates type inference support for `<str-literal> in <tuple>`:
-
-```py
-from ty_extensions import static_assert
-
-static_assert("foo" in ("quux", "foo", "baz"))
-static_assert("foo" not in ("quux", "bar", "baz"))
-```
-
-## With variables
-
-```py
-from ty_extensions import static_assert
-
-x = ("quux", "foo", "baz")
-static_assert("foo" in x)
-
-x = ("quux", "bar", "baz")
-static_assert("foo" not in x)
-```
-
-## Statically unknown results in a `bool`
-
-```py
-def _(a: str, b: str):
-    reveal_type("foo" in (a, b))  # revealed: bool
-```
-
-## Values being unknown doesn't mean the result is unknown
-
-For example, when the types are completely disjoint:
-
-```py
-from ty_extensions import static_assert
-
-def _(a: int, b: int):
-    static_assert("foo" not in (a, b))
-```
-
-## Failure cases
-
-```py
-# We don't support byte strings.
-reveal_type(b"foo" not in (b"quux", b"foo", b"baz"))  # revealed: bool
-```

crates/ty_python_semantic/resources/mdtest/binary/tuples.md

@@ -3,14 +3,14 @@
 ## Concatenation for heterogeneous tuples
 
 ```py
-reveal_type((1, 2) + (3, 4))  # revealed: tuple[Literal[1], Literal[2], Literal[3], Literal[4]]
-reveal_type(() + (1, 2))  # revealed: tuple[Literal[1], Literal[2]]
-reveal_type((1, 2) + ())  # revealed: tuple[Literal[1], Literal[2]]
+reveal_type((1, 2) + (3, 4))  # revealed: tuple[Literal[1, 2, 3, 4], ...]
+reveal_type(() + (1, 2))  # revealed: tuple[Literal[1, 2], ...]
+reveal_type((1, 2) + ())  # revealed: tuple[Literal[1, 2], ...]
 reveal_type(() + ())  # revealed: tuple[()]
 
 def _(x: tuple[int, str], y: tuple[None, tuple[int]]):
-    reveal_type(x + y)  # revealed: tuple[int, str, None, tuple[int]]
-    reveal_type(y + x)  # revealed: tuple[None, tuple[int], int, str]
+    reveal_type(x + y)  # revealed: tuple[int | str | None | tuple[int], ...]
+    reveal_type(y + x)  # revealed: tuple[None | tuple[int] | int | str, ...]
 ```
 
 ## Concatenation for homogeneous tuples
@@ -19,10 +19,10 @@ def _(x: tuple[int, str], y: tuple[None, tuple[int]]):
 def _(x: tuple[int, ...], y: tuple[str, ...]):
     reveal_type(x + x)  # revealed: tuple[int, ...]
     reveal_type(x + y)  # revealed: tuple[int | str, ...]
-    reveal_type((1, 2) + x)  # revealed: tuple[Literal[1], Literal[2], *tuple[int, ...]]
-    reveal_type(x + (3, 4))  # revealed: tuple[*tuple[int, ...], Literal[3], Literal[4]]
-    reveal_type((1, 2) + x + (3, 4))  # revealed: tuple[Literal[1], Literal[2], *tuple[int, ...], Literal[3], Literal[4]]
-    reveal_type((1, 2) + y + (3, 4) + x)  # revealed: tuple[Literal[1], Literal[2], *tuple[int | str, ...]]
+    reveal_type((1, 2) + x)  # revealed: tuple[int, ...]
+    reveal_type(x + (3, 4))  # revealed: tuple[int, ...]
+    reveal_type((1, 2) + x + (3, 4))  # revealed: tuple[int, ...]
+    reveal_type((1, 2) + y + (3, 4) + x)  # revealed: tuple[int | str, ...]
 ```
 
 We get the same results even when we use a legacy type alias, even though this involves first
@@ -41,8 +41,8 @@ StrTuple = tuple[str, ...]
 def _(one_two: OneTwo, x: IntTuple, y: StrTuple, three_four: ThreeFour):
     reveal_type(x + x)  # revealed: tuple[int, ...]
     reveal_type(x + y)  # revealed: tuple[int | str, ...]
-    reveal_type(one_two + x)  # revealed: tuple[Literal[1], Literal[2], *tuple[int, ...]]
-    reveal_type(x + three_four)  # revealed: tuple[*tuple[int, ...], Literal[3], Literal[4]]
-    reveal_type(one_two + x + three_four)  # revealed: tuple[Literal[1], Literal[2], *tuple[int, ...], Literal[3], Literal[4]]
-    reveal_type(one_two + y + three_four + x)  # revealed: tuple[Literal[1], Literal[2], *tuple[int | str, ...]]
+    reveal_type(one_two + x)  # revealed: tuple[int, ...]
+    reveal_type(x + three_four)  # revealed: tuple[int, ...]
+    reveal_type(one_two + x + three_four)  # revealed: tuple[int, ...]
+    reveal_type(one_two + y + three_four + x)  # revealed: tuple[int | str, ...]
 ```

crates/ty_python_semantic/resources/mdtest/call/builtins.md

@@ -152,7 +152,8 @@ s = SubclassOfA()
 reveal_type(isinstance(s, SubclassOfA))  # revealed: Literal[True]
 reveal_type(isinstance(s, A))  # revealed: Literal[True]
 
-def _(x: A | B):
+def _(x: A | B, y: list[int]):
+    reveal_type(isinstance(y, list))  # revealed: Literal[True]
     reveal_type(isinstance(x, A))  # revealed: bool
 
     if isinstance(x, A):

crates/ty_python_semantic/resources/mdtest/call/function.md

@@ -15,8 +15,7 @@ reveal_type(get_int())  # revealed: int
 async def get_int_async() -> int:
     return 42
 
-# TODO: we don't yet support `types.CoroutineType`, should be generic `Coroutine[Any, Any, int]`
-reveal_type(get_int_async())  # revealed: @Todo(generic types.CoroutineType)
+reveal_type(get_int_async())  # revealed: CoroutineType[Any, Any, int]
 ```
 
 ## Generic

crates/ty_python_semantic/resources/mdtest/call/replace.md

@@ -0,0 +1,70 @@
+# `replace`
+
+The `replace` function and the `replace` protocol were added in Python 3.13:
+<https://docs.python.org/3/whatsnew/3.13.html#copy>
+
+```toml
+[environment]
+python-version = "3.13"
+```
+
+## Basic
+
+```py
+from copy import replace
+from datetime import time
+
+t = time(12, 0, 0)
+t = replace(t, minute=30)
+
+reveal_type(t)  # revealed: time
+```
+
+## The `__replace__` protocol
+
+### Dataclasses
+
+Dataclasses support the `__replace__` protocol:
+
+```py
+from dataclasses import dataclass
+from copy import replace
+
+@dataclass
+class Point:
+    x: int
+    y: int
+
+reveal_type(Point.__replace__)  # revealed: (self: Point, *, x: int = int, y: int = int) -> Point
+```
+
+The `__replace__` method can either be called directly or through the `replace` function:
+
+```py
+a = Point(1, 2)
+
+b = a.__replace__(x=3, y=4)
+reveal_type(b)  # revealed: Point
+
+b = replace(a, x=3, y=4)
+reveal_type(b)  # revealed: Point
+```
+
+A call to `replace` does not require all keyword arguments:
+
+```py
+c = a.__replace__(y=4)
+reveal_type(c)  # revealed: Point
+
+d = replace(a, y=4)
+reveal_type(d)  # revealed: Point
+```
+
+Invalid calls to `__replace__` or `replace` will raise an error:
+
+```py
+e = a.__replace__(x="wrong")  # error: [invalid-argument-type]
+
+# TODO: this should ideally also be emit an error
+e = replace(a, x="wrong")
+```

crates/ty_python_semantic/resources/mdtest/comprehensions/basic.md

@@ -128,7 +128,7 @@ class AsyncIterable:
         return AsyncIterator()
 
 async def _():
-    # revealed: @Todo(async iterables/iterators)
+    # revealed: int
     [reveal_type(x) async for x in AsyncIterable()]
 ```
 
@@ -147,6 +147,7 @@ class Iterable:
         return Iterator()
 
 async def _():
-    # revealed: @Todo(async iterables/iterators)
+    # error: [not-iterable] "Object of type `Iterable` is not async-iterable"
+    # revealed: Unknown
     [reveal_type(x) async for x in Iterable()]
 ```

crates/ty_python_semantic/resources/mdtest/del.md

@@ -181,7 +181,7 @@ def f(l: list[int]):
     # but if it was greater than that, it will not be an error.
     reveal_type(l[0])  # revealed: int
 
-    # error: [call-non-callable]
+    # error: [invalid-argument-type]
     del l["string"]
 
     l[0] = 1

crates/ty_python_semantic/resources/mdtest/diagnostics/semantic_syntax_errors.md

@@ -27,6 +27,7 @@ If all of the comprehensions are `async`, on the other hand, the code was still
 
 ```py
 async def test():
+    # error: [not-iterable] "Object of type `range` is not async-iterable"
     return [[x async for x in elements(n)] async for n in range(3)]
 ```
 

crates/ty_python_semantic/resources/mdtest/exhaustiveness_checking.md

@@ -238,3 +238,103 @@ def match_non_exhaustive(x: A | B | C):
             # this diagnostic is correct: the inferred type of `x` is `B & ~A & ~C`
             assert_never(x)  # error: [type-assertion-failure]
 ```
+
+## `isinstance` checks with generics
+
+```toml
+[environment]
+python-version = "3.12"
+```
+
+```py
+from typing import assert_never
+
+class A[T]: ...
+class ASub[T](A[T]): ...
+class B[T]: ...
+class C[T]: ...
+class D: ...
+class E: ...
+class F: ...
+
+def if_else_exhaustive(x: A[D] | B[E] | C[F]):
+    if isinstance(x, A):
+        pass
+    elif isinstance(x, B):
+        pass
+    elif isinstance(x, C):
+        pass
+    else:
+        # TODO: both of these are false positives (https://github.com/astral-sh/ty/issues/456)
+        no_diagnostic_here  # error: [unresolved-reference]
+        assert_never(x)  # error: [type-assertion-failure]
+
+# TODO: false-positive diagnostic (https://github.com/astral-sh/ty/issues/456)
+def if_else_exhaustive_no_assertion(x: A[D] | B[E] | C[F]) -> int:  # error: [invalid-return-type]
+    if isinstance(x, A):
+        return 0
+    elif isinstance(x, B):
+        return 1
+    elif isinstance(x, C):
+        return 2
+
+def if_else_non_exhaustive(x: A[D] | B[E] | C[F]):
+    if isinstance(x, A):
+        pass
+    elif isinstance(x, C):
+        pass
+    else:
+        this_should_be_an_error  # error: [unresolved-reference]
+
+        # this diagnostic is correct: the inferred type of `x` is `B[E] & ~A[D] & ~C[F]`
+        assert_never(x)  # error: [type-assertion-failure]
+
+def match_exhaustive(x: A[D] | B[E] | C[F]):
+    match x:
+        case A():
+            pass
+        case B():
+            pass
+        case C():
+            pass
+        case _:
+            # TODO: both of these are false positives (https://github.com/astral-sh/ty/issues/456)
+            no_diagnostic_here  # error: [unresolved-reference]
+            assert_never(x)  # error: [type-assertion-failure]
+
+# TODO: false-positive diagnostic (https://github.com/astral-sh/ty/issues/456)
+def match_exhaustive_no_assertion(x: A[D] | B[E] | C[F]) -> int:  # error: [invalid-return-type]
+    match x:
+        case A():
+            return 0
+        case B():
+            return 1
+        case C():
+            return 2
+
+def match_non_exhaustive(x: A[D] | B[E] | C[F]):
+    match x:
+        case A():
+            pass
+        case C():
+            pass
+        case _:
+            this_should_be_an_error  # error: [unresolved-reference]
+
+            # this diagnostic is correct: the inferred type of `x` is `B[E] & ~A[D] & ~C[F]`
+            assert_never(x)  # error: [type-assertion-failure]
+
+# This function might seem a bit silly, but it's a pattern that exists in real-world code!
+# see https://github.com/bokeh/bokeh/blob/adef0157284696ce86961b2089c75fddda53c15c/src/bokeh/core/property/container.py#L130-L140
+def no_invalid_return_diagnostic_here_either[T](x: A[T]) -> ASub[T]:
+    if isinstance(x, A):
+        if isinstance(x, ASub):
+            return x
+        else:
+            return ASub()
+    else:
+        # We *would* emit a diagnostic here complaining that it's an invalid `return` statement
+        # ...except that we (correctly) infer that this branch is unreachable, so the complaint
+        # is null and void (and therefore we don't emit a diagnostic)
+        return x
+```

crates/ty_python_semantic/resources/mdtest/expression/yield_and_yield_from.md

@@ -0,0 +1,130 @@
+# `yield` and `yield from`
+
+## Basic `yield` and `yield from`
+
+The type of a `yield` expression is the "send" type of the generator function. The type of a
+`yield from` expression is the return type of the inner generator:
+
+```py
+from typing import Generator
+
+def inner_generator() -> Generator[int, bytes, str]:
+    yield 1
+    yield 2
+    x = yield 3
+
+    # TODO: this should be `bytes`
+    reveal_type(x)  # revealed: @Todo(yield expressions)
+
+    return "done"
+
+def outer_generator():
+    result = yield from inner_generator()
+    reveal_type(result)  # revealed: str
+```
+
+## `yield from` with a custom iterable
+
+`yield from` can also be used with custom iterable types. In that case, the type of the `yield from`
+expression can not be determined
+
+```py
+from typing import Generator, TypeVar, Generic
+
+T = TypeVar("T")
+
+class OnceIterator(Generic[T]):
+    def __init__(self, value: T):
+        self.value = value
+        self.returned = False
+
+    def __next__(self) -> T:
+        if self.returned:
+            raise StopIteration(42)
+
+        self.returned = True
+        return self.value
+
+class Once(Generic[T]):
+    def __init__(self, value: T):
+        self.value = value
+
+    def __iter__(self) -> OnceIterator[T]:
+        return OnceIterator(self.value)
+
+for x in Once("a"):
+    reveal_type(x)  # revealed: str
+
+def generator() -> Generator:
+    result = yield from Once("a")
+
+    # At runtime, the value of `result` will be the `.value` attribute of the `StopIteration`
+    # error raised by `OnceIterator` to signal to the interpreter that the iterator has been
+    # exhausted. Here that will always be 42, but this information cannot be captured in the
+    # signature of `OnceIterator.__next__`, since exceptions lie outside the type signature.
+    # We therefore just infer `Unknown` here.
+    #
+    # If the `StopIteration` error in `OnceIterator.__next__` had been simply `raise StopIteration`
+    # (the more common case), then the `.value` attribute of the `StopIteration` instance
+    # would default to `None`.
+    reveal_type(result)  # revealed: Unknown
+```
+
+## `yield from` with a generator that return `types.GeneratorType`
+
+`types.GeneratorType` is a nominal type that implements the `typing.Generator` protocol:
+
+```py
+from types import GeneratorType
+
+def inner_generator() -> GeneratorType[int, bytes, str]:
+    yield 1
+    yield 2
+    x = yield 3
+
+    # TODO: this should be `bytes`
+    reveal_type(x)  # revealed: @Todo(yield expressions)
+
+    return "done"
+
+def outer_generator():
+    result = yield from inner_generator()
+    reveal_type(result)  # revealed: str
+```
+
+## Error cases
+
+### Non-iterable type
+
+```py
+from typing import Generator
+
+def generator() -> Generator:
+    yield from 42  # error: [not-iterable] "Object of type `Literal[42]` is not iterable"
+```
+
+### Invalid `yield` type
+
+```py
+from typing import Generator
+
+# TODO: This should be an error. Claims to yield `int`, but yields `str`.
+def invalid_generator() -> Generator[int, None, None]:
+    yield "not an int"  # This should be an `int`
+```
+
+### Invalid return type
+
+```py
+from typing import Generator
+
+# TODO: should emit an error (does not return `str`)
+def invalid_generator1() -> Generator[int, None, str]:
+    yield 1
+
+# TODO: should emit an error (does not return `int`)
+def invalid_generator2() -> Generator[int, None, None]:
+    yield 1
+
+    return "done"
+```

crates/ty_python_semantic/resources/mdtest/generics/legacy/classes.md

@@ -15,8 +15,10 @@ S = TypeVar("S")
 class SingleTypevar(Generic[T]): ...
 class MultipleTypevars(Generic[T, S]): ...
 
-reveal_type(generic_context(SingleTypevar))  # revealed: tuple[T]
-reveal_type(generic_context(MultipleTypevars))  # revealed: tuple[T, S]
+# revealed: tuple[T@SingleTypevar]
+reveal_type(generic_context(SingleTypevar))
+# revealed: tuple[T@MultipleTypevars, S@MultipleTypevars]
+reveal_type(generic_context(MultipleTypevars))
 ```
 
 Inheriting from `Generic` multiple times yields a `duplicate-base` diagnostic, just like any other
@@ -49,9 +51,12 @@ class InheritedGeneric(MultipleTypevars[T, S]): ...
 class InheritedGenericPartiallySpecialized(MultipleTypevars[T, int]): ...
 class InheritedGenericFullySpecialized(MultipleTypevars[str, int]): ...
 
-reveal_type(generic_context(InheritedGeneric))  # revealed: tuple[T, S]
-reveal_type(generic_context(InheritedGenericPartiallySpecialized))  # revealed: tuple[T]
-reveal_type(generic_context(InheritedGenericFullySpecialized))  # revealed: None
+# revealed: tuple[T@InheritedGeneric, S@InheritedGeneric]
+reveal_type(generic_context(InheritedGeneric))
+# revealed: tuple[T@InheritedGenericPartiallySpecialized]
+reveal_type(generic_context(InheritedGenericPartiallySpecialized))
+# revealed: None
+reveal_type(generic_context(InheritedGenericFullySpecialized))
 ```
 
 If you don't specialize a generic base class, we use the default specialization, which maps each
@@ -78,9 +83,12 @@ class ExplicitInheritedGenericPartiallySpecializedExtraTypevar(MultipleTypevars[
 # error: [invalid-generic-class] "`Generic` base class must include all type variables used in other base classes"
 class ExplicitInheritedGenericPartiallySpecializedMissingTypevar(MultipleTypevars[T, int], Generic[S]): ...
 
-reveal_type(generic_context(ExplicitInheritedGeneric))  # revealed: tuple[T, S]
-reveal_type(generic_context(ExplicitInheritedGenericPartiallySpecialized))  # revealed: tuple[T]
-reveal_type(generic_context(ExplicitInheritedGenericPartiallySpecializedExtraTypevar))  # revealed: tuple[T, S]
+# revealed: tuple[T@ExplicitInheritedGeneric, S@ExplicitInheritedGeneric]
+reveal_type(generic_context(ExplicitInheritedGeneric))
+# revealed: tuple[T@ExplicitInheritedGenericPartiallySpecialized]
+reveal_type(generic_context(ExplicitInheritedGenericPartiallySpecialized))
+# revealed: tuple[T@ExplicitInheritedGenericPartiallySpecializedExtraTypevar, S@ExplicitInheritedGenericPartiallySpecializedExtraTypevar]
+reveal_type(generic_context(ExplicitInheritedGenericPartiallySpecializedExtraTypevar))
 ```
 
 ## Specializing generic classes explicitly
@@ -321,6 +329,57 @@ class D(C[V, int]):
 reveal_type(D(1))  # revealed: D[int]
 ```
 
+### Generic class inherits `__init__` from generic base class
+
+```py
+from typing import Generic, TypeVar
+
+T = TypeVar("T")
+U = TypeVar("U")
+
+class C(Generic[T, U]):
+    def __init__(self, t: T, u: U) -> None: ...
+
+class D(C[T, U]):
+    pass
+
+reveal_type(C(1, "str"))  # revealed: C[int, str]
+reveal_type(D(1, "str"))  # revealed: D[int, str]
+```
+
+### Generic class inherits `__init__` from `dict`
+
+This is a specific example of the above, since it was reported specifically by a user.
+
+```py
+from typing import Generic, TypeVar
+
+T = TypeVar("T")
+U = TypeVar("U")
+
+class D(dict[T, U]):
+    pass
+
+reveal_type(D(key=1))  # revealed: D[str, int]
+```
+
+### Generic class inherits `__new__` from `tuple`
+
+(Technically, we synthesize a `__new__` method that is more precise than the one defined in typeshed
+for `tuple`, so we use a different mechanism to make sure it has the right inherited generic
+context. But from the user's point of view, this is another example of the above.)
+
+```py
+from typing import Generic, TypeVar
+
+T = TypeVar("T")
+U = TypeVar("U")
+
+class C(tuple[T, U]): ...
+
+reveal_type(C((1, 2)))  # revealed: C[int, int]
+```
+
 ### `__init__` is itself generic
 
 ```py
@@ -446,18 +505,18 @@ class C(Generic[T]):
     def generic_method(self, t: T, u: U) -> U:
         return u
 
-reveal_type(generic_context(C))  # revealed: tuple[T]
+reveal_type(generic_context(C))  # revealed: tuple[T@C]
 reveal_type(generic_context(C.method))  # revealed: None
-reveal_type(generic_context(C.generic_method))  # revealed: tuple[U]
+reveal_type(generic_context(C.generic_method))  # revealed: tuple[U@generic_method]
 reveal_type(generic_context(C[int]))  # revealed: None
 reveal_type(generic_context(C[int].method))  # revealed: None
-reveal_type(generic_context(C[int].generic_method))  # revealed: tuple[U]
+reveal_type(generic_context(C[int].generic_method))  # revealed: tuple[U@generic_method]
 
 c: C[int] = C[int]()
 reveal_type(c.generic_method(1, "string"))  # revealed: Literal["string"]
 reveal_type(generic_context(c))  # revealed: None
 reveal_type(generic_context(c.method))  # revealed: None
-reveal_type(generic_context(c.generic_method))  # revealed: tuple[U]
+reveal_type(generic_context(c.generic_method))  # revealed: tuple[U@generic_method]
 ```
 
 ## Specializations propagate
@@ -540,7 +599,8 @@ class WithOverloadedMethod(Generic[T]):
     def method(self, x: S | T) -> S | T:
         return x
 
-reveal_type(WithOverloadedMethod[int].method)  # revealed: Overload[(self, x: int) -> int, (self, x: S) -> S | int]
+# revealed: Overload[(self, x: int) -> int, (self, x: S@method) -> S@method | int]
+reveal_type(WithOverloadedMethod[int].method)
 ```
 
 ## Cyclic class definitions

crates/ty_python_semantic/resources/mdtest/generics/legacy/functions.md

@@ -145,27 +145,34 @@ T = TypeVar("T")
 def takes_mixed_tuple_suffix(x: tuple[int, bytes, *tuple[str, ...], T, int]) -> T:
     return x[-2]
 
-# TODO: revealed: Literal[True]
-reveal_type(takes_mixed_tuple_suffix((1, b"foo", "bar", "baz", True, 42)))  # revealed: Unknown
-
 def takes_mixed_tuple_prefix(x: tuple[int, T, *tuple[str, ...], bool, int]) -> T:
     return x[1]
 
-# TODO: revealed: Literal[b"foo"]
-reveal_type(takes_mixed_tuple_prefix((1, b"foo", "bar", "baz", True, 42)))  # revealed: Unknown
+def _(x: tuple[int, bytes, *tuple[str, ...], bool, int]):
+    reveal_type(takes_mixed_tuple_suffix(x))  # revealed: bool
+    reveal_type(takes_mixed_tuple_prefix(x))  # revealed: bytes
+
+reveal_type(takes_mixed_tuple_suffix((1, b"foo", "bar", "baz", True, 42)))  # revealed: Literal[True]
+reveal_type(takes_mixed_tuple_prefix((1, b"foo", "bar", "baz", True, 42)))  # revealed: Literal[b"foo"]
 
 def takes_fixed_tuple(x: tuple[T, int]) -> T:
     return x[0]
 
+def _(x: tuple[str, int]):
+    reveal_type(takes_fixed_tuple(x))  # revealed: str
+
 reveal_type(takes_fixed_tuple((True, 42)))  # revealed: Literal[True]
 
 def takes_homogeneous_tuple(x: tuple[T, ...]) -> T:
     return x[0]
 
-# TODO: revealed: Literal[42]
-reveal_type(takes_homogeneous_tuple((42,)))  # revealed: Unknown
-# TODO: revealed: Literal[42, 43]
-reveal_type(takes_homogeneous_tuple((42, 43)))  # revealed: Unknown
+def _(x: tuple[str, int], y: tuple[bool, ...], z: tuple[int, str, *tuple[range, ...], bytes]):
+    reveal_type(takes_homogeneous_tuple(x))  # revealed: str | int
+    reveal_type(takes_homogeneous_tuple(y))  # revealed: bool
+    reveal_type(takes_homogeneous_tuple(z))  # revealed: int | str | range | bytes
+
+reveal_type(takes_homogeneous_tuple((42,)))  # revealed: Literal[42]
+reveal_type(takes_homogeneous_tuple((42, 43)))  # revealed: Literal[42, 43]
 ```
 
 ## Inferring a bound typevar
@@ -219,7 +226,7 @@ from typing import TypeVar
 T = TypeVar("T", bound=int)
 
 def good_param(x: T) -> None:
-    reveal_type(x)  # revealed: T
+    reveal_type(x)  # revealed: T@good_param
 ```
 
 If the function is annotated as returning the typevar, this means that the upper bound is _not_
@@ -232,7 +239,7 @@ def good_return(x: T) -> T:
     return x
 
 def bad_return(x: T) -> T:
-    # error: [invalid-return-type] "Return type does not match returned value: expected `T`, found `int`"
+    # error: [invalid-return-type] "Return type does not match returned value: expected `T@bad_return`, found `int`"
     return x + 1
 ```
 
@@ -250,7 +257,7 @@ def different_types(cond: bool, t: T, s: S) -> T:
     if cond:
         return t
     else:
-        # error: [invalid-return-type] "Return type does not match returned value: expected `T`, found `S`"
+        # error: [invalid-return-type] "Return type does not match returned value: expected `T@different_types`, found `S@different_types`"
         return s
 
 def same_types(cond: bool, t1: T, t2: T) -> T:
@@ -272,7 +279,7 @@ T = TypeVar("T", int, str)
 
 def same_constrained_types(t1: T, t2: T) -> T:
     # TODO: no error
-    # error: [unsupported-operator] "Operator `+` is unsupported between objects of type `T` and `T`"
+    # error: [unsupported-operator] "Operator `+` is unsupported between objects of type `T@same_constrained_types` and `T@same_constrained_types`"
     return t1 + t2
 ```
 

crates/ty_python_semantic/resources/mdtest/generics/legacy/variables.md

@@ -182,7 +182,7 @@ from typing import Callable, TypeVar
 T = TypeVar("T", bound=Callable[[], int])
 
 def bound(f: T):
-    reveal_type(f)  # revealed: T
+    reveal_type(f)  # revealed: T@bound
     reveal_type(f())  # revealed: int
 ```
 
@@ -192,7 +192,7 @@ Same with a constrained typevar, as long as all constraints are callable:
 T = TypeVar("T", Callable[[], int], Callable[[], str])
 
 def constrained(f: T):
-    reveal_type(f)  # revealed: T
+    reveal_type(f)  # revealed: T@constrained
     reveal_type(f())  # revealed: int | str
 ```
 

crates/ty_python_semantic/resources/mdtest/generics/pep695/classes.md

@@ -16,8 +16,10 @@ from ty_extensions import generic_context
 class SingleTypevar[T]: ...
 class MultipleTypevars[T, S]: ...
 
-reveal_type(generic_context(SingleTypevar))  # revealed: tuple[T]
-reveal_type(generic_context(MultipleTypevars))  # revealed: tuple[T, S]
+# revealed: tuple[T@SingleTypevar]
+reveal_type(generic_context(SingleTypevar))
+# revealed: tuple[T@MultipleTypevars, S@MultipleTypevars]
+reveal_type(generic_context(MultipleTypevars))
 ```
 
 You cannot use the same typevar more than once.
@@ -43,9 +45,12 @@ class InheritedGeneric[U, V](MultipleTypevars[U, V]): ...
 class InheritedGenericPartiallySpecialized[U](MultipleTypevars[U, int]): ...
 class InheritedGenericFullySpecialized(MultipleTypevars[str, int]): ...
 
-reveal_type(generic_context(InheritedGeneric))  # revealed: tuple[U, V]
-reveal_type(generic_context(InheritedGenericPartiallySpecialized))  # revealed: tuple[U]
-reveal_type(generic_context(InheritedGenericFullySpecialized))  # revealed: None
+# revealed: tuple[U@InheritedGeneric, V@InheritedGeneric]
+reveal_type(generic_context(InheritedGeneric))
+# revealed: tuple[U@InheritedGenericPartiallySpecialized]
+reveal_type(generic_context(InheritedGenericPartiallySpecialized))
+# revealed: None
+reveal_type(generic_context(InheritedGenericFullySpecialized))
 ```
 
 If you don't specialize a generic base class, we use the default specialization, which maps each
@@ -303,6 +308,42 @@ class D[V](C[V, int]):
 reveal_type(D(1))  # revealed: D[int]
 ```
 
+### Generic class inherits `__init__` from generic base class
+
+```py
+class C[T, U]:
+    def __init__(self, t: T, u: U) -> None: ...
+
+class D[T, U](C[T, U]):
+    pass
+
+reveal_type(C(1, "str"))  # revealed: C[int, str]
+reveal_type(D(1, "str"))  # revealed: D[int, str]
+```
+
+### Generic class inherits `__init__` from `dict`
+
+This is a specific example of the above, since it was reported specifically by a user.
+
+```py
+class D[T, U](dict[T, U]):
+    pass
+
+reveal_type(D(key=1))  # revealed: D[str, int]
+```
+
+### Generic class inherits `__new__` from `tuple`
+
+(Technically, we synthesize a `__new__` method that is more precise than the one defined in typeshed
+for `tuple`, so we use a different mechanism to make sure it has the right inherited generic
+context. But from the user's point of view, this is another example of the above.)
+
+```py
+class C[T, U](tuple[T, U]): ...
+
+reveal_type(C((1, 2)))  # revealed: C[int, int]
+```
+
 ### `__init__` is itself generic
 
 ```py
@@ -406,18 +447,18 @@ class C[T]:
     # TODO: error
     def cannot_shadow_class_typevar[T](self, t: T): ...
 
-reveal_type(generic_context(C))  # revealed: tuple[T]
+reveal_type(generic_context(C))  # revealed: tuple[T@C]
 reveal_type(generic_context(C.method))  # revealed: None
-reveal_type(generic_context(C.generic_method))  # revealed: tuple[U]
+reveal_type(generic_context(C.generic_method))  # revealed: tuple[U@generic_method]
 reveal_type(generic_context(C[int]))  # revealed: None
 reveal_type(generic_context(C[int].method))  # revealed: None
-reveal_type(generic_context(C[int].generic_method))  # revealed: tuple[U]
+reveal_type(generic_context(C[int].generic_method))  # revealed: tuple[U@generic_method]
 
 c: C[int] = C[int]()
 reveal_type(c.generic_method(1, "string"))  # revealed: Literal["string"]
 reveal_type(generic_context(c))  # revealed: None
 reveal_type(generic_context(c.method))  # revealed: None
-reveal_type(generic_context(c.generic_method))  # revealed: tuple[U]
+reveal_type(generic_context(c.generic_method))  # revealed: tuple[U@generic_method]
 ```
 
 ## Specializations propagate
@@ -466,7 +507,8 @@ class WithOverloadedMethod[T]:
     def method[S](self, x: S | T) -> S | T:
         return x
 
-reveal_type(WithOverloadedMethod[int].method)  # revealed: Overload[(self, x: int) -> int, (self, x: S) -> S | int]
+# revealed: Overload[(self, x: int) -> int, (self, x: S@method) -> S@method | int]
+reveal_type(WithOverloadedMethod[int].method)
 ```
 
 ## Cyclic class definitions

crates/ty_python_semantic/resources/mdtest/generics/pep695/functions.md

@@ -131,27 +131,34 @@ reveal_type(takes_in_protocol(ExplicitGenericSub[str]()))  # revealed: str
 def takes_mixed_tuple_suffix[T](x: tuple[int, bytes, *tuple[str, ...], T, int]) -> T:
     return x[-2]
 
-# TODO: revealed: Literal[True]
-reveal_type(takes_mixed_tuple_suffix((1, b"foo", "bar", "baz", True, 42)))  # revealed: Unknown
-
 def takes_mixed_tuple_prefix[T](x: tuple[int, T, *tuple[str, ...], bool, int]) -> T:
     return x[1]
 
-# TODO: revealed: Literal[b"foo"]
-reveal_type(takes_mixed_tuple_prefix((1, b"foo", "bar", "baz", True, 42)))  # revealed: Unknown
+def _(x: tuple[int, bytes, *tuple[str, ...], bool, int]):
+    reveal_type(takes_mixed_tuple_suffix(x))  # revealed: bool
+    reveal_type(takes_mixed_tuple_prefix(x))  # revealed: bytes
+
+reveal_type(takes_mixed_tuple_suffix((1, b"foo", "bar", "baz", True, 42)))  # revealed: Literal[True]
+reveal_type(takes_mixed_tuple_prefix((1, b"foo", "bar", "baz", True, 42)))  # revealed: Literal[b"foo"]
 
 def takes_fixed_tuple[T](x: tuple[T, int]) -> T:
     return x[0]
 
+def _(x: tuple[str, int]):
+    reveal_type(takes_fixed_tuple(x))  # revealed: str
+
 reveal_type(takes_fixed_tuple((True, 42)))  # revealed: Literal[True]
 
 def takes_homogeneous_tuple[T](x: tuple[T, ...]) -> T:
     return x[0]
 
-# TODO: revealed: Literal[42]
-reveal_type(takes_homogeneous_tuple((42,)))  # revealed: Unknown
-# TODO: revealed: Literal[42, 43]
-reveal_type(takes_homogeneous_tuple((42, 43)))  # revealed: Unknown
+def _(x: tuple[str, int], y: tuple[bool, ...], z: tuple[int, str, *tuple[range, ...], bytes]):
+    reveal_type(takes_homogeneous_tuple(x))  # revealed: str | int
+    reveal_type(takes_homogeneous_tuple(y))  # revealed: bool
+    reveal_type(takes_homogeneous_tuple(z))  # revealed: int | str | range | bytes
+
+reveal_type(takes_homogeneous_tuple((42,)))  # revealed: Literal[42]
+reveal_type(takes_homogeneous_tuple((42, 43)))  # revealed: Literal[42, 43]
 ```
 
 ## Inferring a bound typevar
@@ -195,7 +202,7 @@ in the function.
 
 ```py
 def good_param[T: int](x: T) -> None:
-    reveal_type(x)  # revealed: T
+    reveal_type(x)  # revealed: T@good_param
 ```
 
 If the function is annotated as returning the typevar, this means that the upper bound is _not_
@@ -208,7 +215,7 @@ def good_return[T: int](x: T) -> T:
     return x
 
 def bad_return[T: int](x: T) -> T:
-    # error: [invalid-return-type] "Return type does not match returned value: expected `T`, found `int`"
+    # error: [invalid-return-type] "Return type does not match returned value: expected `T@bad_return`, found `int`"
     return x + 1
 ```
 
@@ -221,7 +228,7 @@ def different_types[T, S](cond: bool, t: T, s: S) -> T:
     if cond:
         return t
     else:
-        # error: [invalid-return-type] "Return type does not match returned value: expected `T`, found `S`"
+        # error: [invalid-return-type] "Return type does not match returned value: expected `T@different_types`, found `S@different_types`"
         return s
 
 def same_types[T](cond: bool, t1: T, t2: T) -> T:
@@ -239,7 +246,7 @@ methods that are compatible with the return type, so the `return` expression is
 ```py
 def same_constrained_types[T: (int, str)](t1: T, t2: T) -> T:
     # TODO: no error
-    # error: [unsupported-operator] "Operator `+` is unsupported between objects of type `T` and `T`"
+    # error: [unsupported-operator] "Operator `+` is unsupported between objects of type `T@same_constrained_types` and `T@same_constrained_types`"
     return t1 + t2
 ```
 

crates/ty_python_semantic/resources/mdtest/generics/pep695/variables.md

@@ -104,13 +104,11 @@ different uses of the same typevar.
 
 ```py
 def f[T](x: T, y: T) -> None:
-    # TODO: revealed: T@f
-    reveal_type(x)  # revealed: T
+    reveal_type(x)  # revealed: T@f
 
 class C[T]:
     def m(self, x: T) -> None:
-        # TODO: revealed: T@c
-        reveal_type(x)  # revealed: T
+        reveal_type(x)  # revealed: T@C
 ```
 
 ## Subtyping and assignability
@@ -452,19 +450,19 @@ class Unrelated: ...
 
 def unbounded_unconstrained[T](t: T) -> None:
     def _(x: T | Super) -> None:
-        reveal_type(x)  # revealed: T | Super
+        reveal_type(x)  # revealed: T@unbounded_unconstrained | Super
 
     def _(x: T | Base) -> None:
-        reveal_type(x)  # revealed: T | Base
+        reveal_type(x)  # revealed: T@unbounded_unconstrained | Base
 
     def _(x: T | Sub) -> None:
-        reveal_type(x)  # revealed: T | Sub
+        reveal_type(x)  # revealed: T@unbounded_unconstrained | Sub
 
     def _(x: T | Unrelated) -> None:
-        reveal_type(x)  # revealed: T | Unrelated
+        reveal_type(x)  # revealed: T@unbounded_unconstrained | Unrelated
 
     def _(x: T | Any) -> None:
-        reveal_type(x)  # revealed: T | Any
+        reveal_type(x)  # revealed: T@unbounded_unconstrained | Any
 ```
 
 The union of a bounded typevar with its bound is that bound. (The typevar is guaranteed to be
@@ -480,13 +478,13 @@ def bounded[T: Base](t: T) -> None:
         reveal_type(x)  # revealed: Base
 
     def _(x: T | Sub) -> None:
-        reveal_type(x)  # revealed: T | Sub
+        reveal_type(x)  # revealed: T@bounded | Sub
 
     def _(x: T | Unrelated) -> None:
-        reveal_type(x)  # revealed: T | Unrelated
+        reveal_type(x)  # revealed: T@bounded | Unrelated
 
     def _(x: T | Any) -> None:
-        reveal_type(x)  # revealed: T | Any
+        reveal_type(x)  # revealed: T@bounded | Any
 ```
 
 The union of a constrained typevar with a type depends on how that type relates to the constraints.
@@ -503,13 +501,13 @@ def constrained[T: (Base, Sub)](t: T) -> None:
         reveal_type(x)  # revealed: Base
 
     def _(x: T | Sub) -> None:
-        reveal_type(x)  # revealed: T
+        reveal_type(x)  # revealed: T@constrained
 
     def _(x: T | Unrelated) -> None:
-        reveal_type(x)  # revealed: T | Unrelated
+        reveal_type(x)  # revealed: T@constrained | Unrelated
 
     def _(x: T | Any) -> None:
-        reveal_type(x)  # revealed: T | Any
+        reveal_type(x)  # revealed: T@constrained | Any
 ```
 
 ## Intersections involving typevars
@@ -528,19 +526,19 @@ class Unrelated: ...
 
 def unbounded_unconstrained[T](t: T) -> None:
     def _(x: Intersection[T, Super]) -> None:
-        reveal_type(x)  # revealed: T & Super
+        reveal_type(x)  # revealed: T@unbounded_unconstrained & Super
 
     def _(x: Intersection[T, Base]) -> None:
-        reveal_type(x)  # revealed: T & Base
+        reveal_type(x)  # revealed: T@unbounded_unconstrained & Base
 
     def _(x: Intersection[T, Sub]) -> None:
-        reveal_type(x)  # revealed: T & Sub
+        reveal_type(x)  # revealed: T@unbounded_unconstrained & Sub
 
     def _(x: Intersection[T, Unrelated]) -> None:
-        reveal_type(x)  # revealed: T & Unrelated
+        reveal_type(x)  # revealed: T@unbounded_unconstrained & Unrelated
 
     def _(x: Intersection[T, Any]) -> None:
-        reveal_type(x)  # revealed: T & Any
+        reveal_type(x)  # revealed: T@unbounded_unconstrained & Any
 ```
 
 The intersection of a bounded typevar with its bound or a supertype of its bound is the typevar
@@ -552,19 +550,19 @@ from its bound is `Never`.
 ```py
 def bounded[T: Base](t: T) -> None:
     def _(x: Intersection[T, Super]) -> None:
-        reveal_type(x)  # revealed: T
+        reveal_type(x)  # revealed: T@bounded
 
     def _(x: Intersection[T, Base]) -> None:
-        reveal_type(x)  # revealed: T
+        reveal_type(x)  # revealed: T@bounded
 
     def _(x: Intersection[T, Sub]) -> None:
-        reveal_type(x)  # revealed: T & Sub
+        reveal_type(x)  # revealed: T@bounded & Sub
 
     def _(x: Intersection[T, None]) -> None:
         reveal_type(x)  # revealed: Never
 
     def _(x: Intersection[T, Any]) -> None:
-        reveal_type(x)  # revealed: T & Any
+        reveal_type(x)  # revealed: T@bounded & Any
 ```
 
 Constrained typevars can be modeled using a hypothetical `OneOf` connector, where the typevar must
@@ -586,7 +584,7 @@ can simplify the intersection as a whole to that constraint.
 def constrained[T: (Base, Sub, Unrelated)](t: T) -> None:
     def _(x: Intersection[T, Base]) -> None:
         # With OneOf this would be OneOf[Base, Sub]
-        reveal_type(x)  # revealed: T & Base
+        reveal_type(x)  # revealed: T@constrained & Base
 
     def _(x: Intersection[T, Unrelated]) -> None:
         reveal_type(x)  # revealed: Unrelated
@@ -598,7 +596,7 @@ def constrained[T: (Base, Sub, Unrelated)](t: T) -> None:
         reveal_type(x)  # revealed: Never
 
     def _(x: Intersection[T, Any]) -> None:
-        reveal_type(x)  # revealed: T & Any
+        reveal_type(x)  # revealed: T@constrained & Any
 ```
 
 We can simplify the intersection similarly when removing a type from a constrained typevar, since
@@ -613,19 +611,19 @@ def remove_constraint[T: (int, str, bool)](t: T) -> None:
 
     def _(x: Intersection[T, Not[str]]) -> None:
         # With OneOf this would be OneOf[int, bool]
-        reveal_type(x)  # revealed: T & ~str
+        reveal_type(x)  # revealed: T@remove_constraint & ~str
 
     def _(x: Intersection[T, Not[bool]]) -> None:
-        reveal_type(x)  # revealed: T & ~bool
+        reveal_type(x)  # revealed: T@remove_constraint & ~bool
 
     def _(x: Intersection[T, Not[int], Not[str]]) -> None:
         reveal_type(x)  # revealed: Never
 
     def _(x: Intersection[T, Not[None]]) -> None:
-        reveal_type(x)  # revealed: T
+        reveal_type(x)  # revealed: T@remove_constraint
 
     def _(x: Intersection[T, Not[Any]]) -> None:
-        reveal_type(x)  # revealed: T & Any
+        reveal_type(x)  # revealed: T@remove_constraint & Any
 ```
 
 The intersection of a typevar with any other type is assignable to (and if fully static, a subtype
@@ -710,7 +708,7 @@ A typevar bound to a Callable type is callable:
 from typing import Callable
 
 def bound[T: Callable[[], int]](f: T):
-    reveal_type(f)  # revealed: T
+    reveal_type(f)  # revealed: T@bound
     reveal_type(f())  # revealed: int
 ```
 
@@ -718,7 +716,7 @@ Same with a constrained typevar, as long as all constraints are callable:
 
 ```py
 def constrained[T: (Callable[[], int], Callable[[], str])](f: T):
-    reveal_type(f)  # revealed: T
+    reveal_type(f)  # revealed: T@constrained
     reveal_type(f())  # revealed: int | str
 ```
 

crates/ty_python_semantic/resources/mdtest/generics/scoping.md

@@ -152,9 +152,9 @@ already solved and specialized when the class was specialized:
 from ty_extensions import generic_context
 
 legacy.m("string", None)  # error: [invalid-argument-type]
-reveal_type(legacy.m)  # revealed: bound method Legacy[int].m(x: int, y: S) -> S
-reveal_type(generic_context(Legacy))  # revealed: tuple[T]
-reveal_type(generic_context(legacy.m))  # revealed: tuple[S]
+reveal_type(legacy.m)  # revealed: bound method Legacy[int].m(x: int, y: S@m) -> S@m
+reveal_type(generic_context(Legacy))  # revealed: tuple[T@Legacy]
+reveal_type(generic_context(legacy.m))  # revealed: tuple[S@m]
 ```
 
 With PEP 695 syntax, it is clearer that the method uses a separate typevar:

crates/ty_python_semantic/resources/mdtest/ide_support/all_members.md

@@ -1,60 +1,65 @@
 # List all members
 
+This test suite acts as a set of unit tests for our `ide_support::all_members` routine, which lists
+all members available on a given type. This routine is used for autocomplete suggestions.
+
 ## Basic functionality
 
 <!-- snapshot-diagnostics -->
 
-The `ty_extensions.all_members` function allows access to a tuple of accessible members/attributes
-on a given object. For example, all member functions of `str` are available on `"a"`:
+The `ty_extensions.all_members` and `ty_extensions.has_member` functions expose a Python-level API
+that can be used to query which attributes `ide_support::all_members` understands as being available
+on a given object. For example, all member functions of `str` are available on `"a"`. The Python API
+`all_members` returns a tuple of all available members; `has_member` returns `Literal[True]` if a
+given member is present in that tuple, and `Literal[False]` if not:
 
 ```py
-from ty_extensions import all_members, static_assert
+from ty_extensions import static_assert, has_member
 
-members_of_str = all_members("a")
-
-static_assert("replace" in members_of_str)
-static_assert("startswith" in members_of_str)
-static_assert("isupper" in members_of_str)
+static_assert(has_member("a", "replace"))
+static_assert(has_member("a", "startswith"))
+static_assert(has_member("a", "isupper"))
 ```
 
 Similarly, special members such as `__add__` are also available:
 
 ```py
-static_assert("__add__" in members_of_str)
-static_assert("__gt__" in members_of_str)
+static_assert(has_member("a", "__add__"))
+static_assert(has_member("a", "__gt__"))
 ```
 
 Members of base classes are also included (these dunder methods are defined on `object`):
 
 ```py
-static_assert("__doc__" in members_of_str)
-static_assert("__repr__" in members_of_str)
+static_assert(has_member("a", "__doc__"))
+static_assert(has_member("a", "__repr__"))
 ```
 
 Non-existent members are not included:
 
 ```py
-static_assert("non_existent" not in members_of_str)
+static_assert(not has_member("a", "non_existent"))
 ```
 
-Note: The full list of all members is relatively long, but `reveal_type` can theoretically be used
-to see them all:
+The full list of all members is relatively long, but `reveal_type` can be used in combination with
+`all_members` to see them all:
 
 ```py
 from typing_extensions import reveal_type
+from ty_extensions import all_members
 
-reveal_type(members_of_str)  # error: [revealed-type]
+reveal_type(all_members("a"))  # error: [revealed-type]
 ```
 
 ## Kinds of types
 
 ### Class instances
 
-For instances of classes, `all_members` returns class members and implicit instance members of all
-classes in the MRO:
+For instances of classes, class members and implicit instance members of all superclasses are
+understood as being available:
 
 ```py
-from ty_extensions import all_members, static_assert
+from ty_extensions import has_member, static_assert
 
 class Base:
     base_class_attr: int = 1
@@ -86,25 +91,23 @@ class C(Intermediate):
     def static_method() -> int:
         return 1
 
-members_of_instance = all_members(C())
+static_assert(has_member(C(), "base_class_attr"))
+static_assert(has_member(C(), "intermediate_attr"))
+static_assert(has_member(C(), "class_attr"))
 
-static_assert("base_class_attr" in members_of_instance)
-static_assert("intermediate_attr" in members_of_instance)
-static_assert("class_attr" in members_of_instance)
+static_assert(has_member(C(), "base_instance_attr"))
+static_assert(has_member(C(), "intermediate_instance_attr"))
+static_assert(has_member(C(), "instance_attr"))
 
-static_assert("base_instance_attr" in members_of_instance)
-static_assert("intermediate_instance_attr" in members_of_instance)
-static_assert("instance_attr" in members_of_instance)
+static_assert(has_member(C(), "f_base"))
+static_assert(has_member(C(), "f_intermediate"))
+static_assert(has_member(C(), "f_c"))
 
-static_assert("f_base" in members_of_instance)
-static_assert("f_intermediate" in members_of_instance)
-static_assert("f_c" in members_of_instance)
+static_assert(has_member(C(), "property_attr"))
+static_assert(has_member(C(), "class_method"))
+static_assert(has_member(C(), "static_method"))
 
-static_assert("property_attr" in members_of_instance)
-static_assert("class_method" in members_of_instance)
-static_assert("static_method" in members_of_instance)
-
-static_assert("non_existent" not in members_of_instance)
+static_assert(not has_member(C(), "non_existent"))
 ```
 
 ### Class objects
@@ -112,7 +115,7 @@ static_assert("non_existent" not in members_of_instance)
 Class-level attributes can also be accessed through the class itself:
 
 ```py
-from ty_extensions import all_members, static_assert
+from ty_extensions import has_member, static_assert
 
 class Base:
     base_attr: int = 1
@@ -123,18 +126,16 @@ class C(Base):
     def f(self):
         self.instance_attr = True
 
-members_of_class = all_members(C)
+static_assert(has_member(C, "class_attr"))
+static_assert(has_member(C, "base_attr"))
 
-static_assert("class_attr" in members_of_class)
-static_assert("base_attr" in members_of_class)
-
-static_assert("non_existent" not in members_of_class)
+static_assert(not has_member(C, "non_existent"))
 ```
 
 But instance attributes can not be accessed this way:
 
 ```py
-static_assert("instance_attr" not in members_of_class)
+static_assert(not has_member(C, "instance_attr"))
 ```
 
 When a class has a metaclass, members of that metaclass (and bases of that metaclass) are also
@@ -150,16 +151,16 @@ class Meta(MetaBase):
 class D(Base, metaclass=Meta):
     class_attr = 3
 
-static_assert("meta_base_attr" in all_members(D))
-static_assert("meta_attr" in all_members(D))
-static_assert("base_attr" in all_members(D))
-static_assert("class_attr" in all_members(D))
+static_assert(has_member(D, "meta_base_attr"))
+static_assert(has_member(D, "meta_attr"))
+static_assert(has_member(D, "base_attr"))
+static_assert(has_member(D, "class_attr"))
 ```
 
 ### Generic classes
 
 ```py
-from ty_extensions import all_members, static_assert
+from ty_extensions import has_member, static_assert
 from typing import Generic, TypeVar
 
 T = TypeVar("T")
@@ -167,52 +168,53 @@ T = TypeVar("T")
 class C(Generic[T]):
     base_attr: T
 
-static_assert("base_attr" in all_members(C[int]))
-static_assert("base_attr" in all_members(C[int]()))
+static_assert(has_member(C[int], "base_attr"))
+static_assert(has_member(C[int](), "base_attr"))
 ```
 
 ### Other instance-like types
 
 ```py
-from ty_extensions import all_members, static_assert
+from ty_extensions import has_member, static_assert
 from typing_extensions import LiteralString
 
-static_assert("__xor__" in all_members(True))
-static_assert("bit_length" in all_members(1))
-static_assert("startswith" in all_members("a"))
-static_assert("__buffer__" in all_members(b"a"))
-static_assert("is_integer" in all_members(3.14))
+static_assert(has_member(True, "__xor__"))
+static_assert(has_member(1, "bit_length"))
+static_assert(has_member("a", "startswith"))
+static_assert(has_member(b"a", "__buffer__"))
+static_assert(has_member(3.14, "is_integer"))
 
 def _(literal_string: LiteralString):
-    static_assert("startswith" in all_members(literal_string))
+    static_assert(has_member(literal_string, "startswith"))
 
-static_assert("count" in all_members(("some", "tuple", 1, 2)))
+static_assert(has_member(("some", "tuple", 1, 2), "count"))
 
-static_assert("__doc__" in all_members(len))
-static_assert("__doc__" in all_members("a".startswith))
+static_assert(has_member(len, "__doc__"))
+static_assert(has_member("a".startswith, "__doc__"))
 ```
 
 ### Enums
 
 ```py
-from ty_extensions import all_members, static_assert
+from ty_extensions import has_member, static_assert
 from enum import Enum
 
 class Answer(Enum):
     NO = 0
     YES = 1
 
-static_assert("NO" in all_members(Answer))
-static_assert("YES" in all_members(Answer))
-static_assert("__members__" in all_members(Answer))
+static_assert(has_member(Answer, "NO"))
+static_assert(has_member(Answer, "YES"))
+static_assert(has_member(Answer, "__members__"))
 ```
 
 ### Unions
 
-For unions, `all_members` will only return members that are available on all elements of the union.
+For unions, `ide_support::all_members` only returns members that are available on all elements of
+the union.
 
 ```py
-from ty_extensions import all_members, static_assert
+from ty_extensions import has_member, static_assert
 
 class A:
     on_both: int = 1
@@ -223,20 +225,20 @@ class B:
     only_on_b: str = "b"
 
 def f(union: A | B):
-    static_assert("on_both" in all_members(union))
-    static_assert("only_on_a" not in all_members(union))
-    static_assert("only_on_b" not in all_members(union))
+    static_assert(has_member(union, "on_both"))
+    static_assert(not has_member(union, "only_on_a"))
+    static_assert(not has_member(union, "only_on_b"))
 ```
 
 ### Intersections
 
 #### Only positive types
 
-Conversely, for intersections, `all_members` will list members that are available on any of the
-elements:
+Conversely, for intersections, `ide_support::all_members` lists members that are available on any of
+the elements:
 
 ```py
-from ty_extensions import all_members, static_assert
+from ty_extensions import has_member, static_assert
 
 class A:
     on_both: int = 1
@@ -249,9 +251,9 @@ class B:
 def f(intersection: object):
     if isinstance(intersection, A):
         if isinstance(intersection, B):
-            static_assert("on_both" in all_members(intersection))
-            static_assert("only_on_a" in all_members(intersection))
-            static_assert("only_on_b" in all_members(intersection))
+            static_assert(has_member(intersection, "on_both"))
+            static_assert(has_member(intersection, "only_on_a"))
+            static_assert(has_member(intersection, "only_on_b"))
 ```
 
 #### With negative types
@@ -259,7 +261,7 @@ def f(intersection: object):
 It also works when negative types are introduced:
 
 ```py
-from ty_extensions import all_members, static_assert
+from ty_extensions import has_member, static_assert
 
 class A:
     on_all: int = 1
@@ -284,27 +286,27 @@ def f(intersection: object):
         if isinstance(intersection, B):
             if not isinstance(intersection, C):
                 reveal_type(intersection)  # revealed: A & B & ~C
-                static_assert("on_all" in all_members(intersection))
-                static_assert("only_on_a" in all_members(intersection))
-                static_assert("only_on_b" in all_members(intersection))
-                static_assert("only_on_c" not in all_members(intersection))
-                static_assert("only_on_ab" in all_members(intersection))
-                static_assert("only_on_ac" in all_members(intersection))
-                static_assert("only_on_bc" in all_members(intersection))
+                static_assert(has_member(intersection, "on_all"))
+                static_assert(has_member(intersection, "only_on_a"))
+                static_assert(has_member(intersection, "only_on_b"))
+                static_assert(not has_member(intersection, "only_on_c"))
+                static_assert(has_member(intersection, "only_on_ab"))
+                static_assert(has_member(intersection, "only_on_ac"))
+                static_assert(has_member(intersection, "only_on_bc"))
 ```
 
 ## Modules
 
 ### Basic support with sub-modules
 
-`all_members` can also list attributes on modules:
+`ide_support::all_members` can also list attributes on modules:
 
 ```py
-from ty_extensions import all_members, static_assert
+from ty_extensions import has_member, static_assert
 import math
 
-static_assert("pi" in all_members(math))
-static_assert("cos" in all_members(math))
+static_assert(has_member(math, "pi"))
+static_assert(has_member(math, "cos"))
 ```
 
 This also works for submodules:
@@ -312,18 +314,18 @@ This also works for submodules:
 ```py
 import os
 
-static_assert("path" in all_members(os))
+static_assert(has_member(os, "path"))
 
 import os.path
 
-static_assert("join" in all_members(os.path))
+static_assert(has_member(os.path, "join"))
 ```
 
 Special members available on all modules are also included:
 
 ```py
-static_assert("__name__" in all_members(math))
-static_assert("__doc__" in all_members(math))
+static_assert(has_member(math, "__name__"))
+static_assert(has_member(math, "__doc__"))
 ```
 
 ### `__all__` is not respected for direct module access
@@ -331,12 +333,12 @@ static_assert("__doc__" in all_members(math))
 `foo.py`:
 
 ```py
-from ty_extensions import all_members, static_assert
+from ty_extensions import has_member, static_assert
 
 import bar
 
-static_assert("lion" in all_members(bar))
-static_assert("tiger" in all_members(bar))
+static_assert(has_member(bar, "lion"))
+static_assert(has_member(bar, "tiger"))
 ```
 
 `bar.py`:
@@ -348,17 +350,17 @@ lion = 1
 tiger = 1
 ```
 
-### `__all__` is respected for glob imports
+### `__all__` is respected for `*` imports
 
 `foo.py`:
 
 ```py
-from ty_extensions import all_members, static_assert
+from ty_extensions import has_member, static_assert
 
 import bar
 
-static_assert("lion" in all_members(bar))
-static_assert("tiger" not in all_members(bar))
+static_assert(has_member(bar, "lion"))
+static_assert(not has_member(bar, "tiger"))
 ```
 
 `bar.py`:
@@ -400,12 +402,12 @@ def evaluate(x: Optional[int] = None) -> int: ...
 `play.py`:
 
 ```py
-from ty_extensions import all_members, static_assert
+from ty_extensions import has_member, static_assert
 
 import module
 
-static_assert("evaluate" in all_members(module))
-static_assert("Optional" not in all_members(module))
+static_assert(has_member(module, "evaluate"))
+static_assert(not has_member(module, "Optional"))
 ```
 
 ## Conditionally available members
@@ -421,9 +423,9 @@ python-version = "3.9"
 ```
 
 ```py
-from ty_extensions import all_members, static_assert
+from ty_extensions import has_member, static_assert
 
-static_assert("bit_count" not in all_members(42))
+static_assert(not has_member(42, "bit_count"))
 ```
 
 ### 3.10
@@ -434,19 +436,19 @@ python-version = "3.10"
 ```
 
 ```py
-from ty_extensions import all_members, static_assert
+from ty_extensions import has_member, static_assert
 
-static_assert("bit_count" in all_members(42))
+static_assert(has_member(42, "bit_count"))
 ```
 
-## Failures cases
+## Failure cases
 
 ### Dynamically added members
 
-Dynamically added members can not be accessed:
+Dynamically added members cannot be accessed:
 
 ```py
-from ty_extensions import all_members, static_assert
+from ty_extensions import has_member, static_assert
 
 class C:
     static_attr = 1
@@ -460,8 +462,8 @@ class C:
 c = C()
 c.dynamic_attr = "a"
 
-static_assert("static_attr" in all_members(c))
-static_assert("dynamic_attr" not in all_members(c))
+static_assert(has_member(c, "static_attr"))
+static_assert(not has_member(c, "dynamic_attr"))
 ```
 
 ### Dataclasses
@@ -469,24 +471,24 @@ static_assert("dynamic_attr" not in all_members(c))
 So far, we do not include synthetic members of dataclasses.
 
 ```py
-from ty_extensions import all_members, static_assert
+from ty_extensions import has_member, static_assert
 from dataclasses import dataclass
 
 @dataclass(order=True)
 class Person:
-    name: str
     age: int
+    name: str
 
-static_assert("name" in all_members(Person))
-static_assert("age" in all_members(Person))
+static_assert(has_member(Person, "name"))
+static_assert(has_member(Person, "age"))
 
 # These are always available, since they are also defined on `object`:
-static_assert("__init__" in all_members(Person))
-static_assert("__repr__" in all_members(Person))
-static_assert("__eq__" in all_members(Person))
+static_assert(has_member(Person, "__init__"))
+static_assert(has_member(Person, "__repr__"))
+static_assert(has_member(Person, "__eq__"))
 
 # TODO: this should ideally be available:
-static_assert("__lt__" in all_members(Person))  # error: [static-assert-error]
+static_assert(has_member(Person, "__lt__"))  # error: [static-assert-error]
 ```
 
 ### Attributes not available at runtime
@@ -496,8 +498,8 @@ example, `__annotations__` does not exist on `int` at runtime, but it is availab
 on `object` in typeshed:
 
 ```py
-from ty_extensions import all_members, static_assert
+from ty_extensions import has_member, static_assert
 
 # TODO: this should ideally not be available:
-static_assert("__annotations__" not in all_members(3))  # error: [static-assert-error]
+static_assert(not has_member(3, "__annotations__"))  # error: [static-assert-error]
 ```

crates/ty_python_semantic/resources/mdtest/instance_layout_conflict.md

@@ -122,15 +122,14 @@ class A:
     __slots__ = ()
     __slots__ += ("a", "b")
 
-reveal_type(A.__slots__)  # revealed: tuple[Literal["a"], Literal["b"]]
+reveal_type(A.__slots__)  # revealed: tuple[Literal["a", "b"], ...]
 
 class B:
     __slots__ = ("c", "d")
 
-class C(  # error: [instance-layout-conflict]
-    A,
-    B,
-): ...
+# TODO: ideally this would trigger `[instance-layout-conflict]`
+# (but it's also not high-priority)
+class C(A, B): ...
 ```
 
 ## Explicitly annotated `__slots__`

crates/ty_python_semantic/resources/mdtest/loops/async_for.md

@@ -2,27 +2,6 @@
 
 Async `for` loops do not work according to the synchronous iteration protocol.
 
-## Invalid async for loop
-
-```py
-async def foo():
-    class Iterator:
-        def __next__(self) -> int:
-            return 42
-
-    class Iterable:
-        def __iter__(self) -> Iterator:
-            return Iterator()
-
-    async for x in Iterator():
-        pass
-
-    # TODO: should reveal `Unknown` because `__aiter__` is not defined
-    # revealed: @Todo(async iterables/iterators)
-    # error: [possibly-unresolved-reference]
-    reveal_type(x)
-```
-
 ## Basic async for loop
 
 ```py
@@ -35,11 +14,154 @@ async def foo():
         def __aiter__(self) -> IntAsyncIterator:
             return IntAsyncIterator()
 
-    # TODO(Alex): async iterables/iterators!
     async for x in IntAsyncIterable():
-        pass
-
-    # error: [possibly-unresolved-reference]
-    # revealed: @Todo(async iterables/iterators)
-    reveal_type(x)
+        reveal_type(x)  # revealed: int
+```
+
+## Async for loop with unpacking
+
+```py
+async def foo():
+    class AsyncIterator:
+        async def __anext__(self) -> tuple[int, str]:
+            return 42, "hello"
+
+    class AsyncIterable:
+        def __aiter__(self) -> AsyncIterator:
+            return AsyncIterator()
+
+    async for x, y in AsyncIterable():
+        reveal_type(x)  # revealed: int
+        reveal_type(y)  # revealed: str
+```
+
+## Error cases
+
+<!-- snapshot-diagnostics -->
+
+### No `__aiter__` method
+
+```py
+from typing_extensions import reveal_type
+
+class NotAsyncIterable: ...
+
+async def foo():
+    # error: [not-iterable] "Object of type `NotAsyncIterable` is not async-iterable"
+    async for x in NotAsyncIterable():
+        reveal_type(x)  # revealed: Unknown
+```
+
+### Synchronously iterable, but not asynchronously iterable
+
+```py
+from typing_extensions import reveal_type
+
+async def foo():
+    class Iterator:
+        def __next__(self) -> int:
+            return 42
+
+    class Iterable:
+        def __iter__(self) -> Iterator:
+            return Iterator()
+
+    # error: [not-iterable] "Object of type `Iterator` is not async-iterable"
+    async for x in Iterator():
+        reveal_type(x)  # revealed: Unknown
+```
+
+### No `__anext__` method
+
+```py
+from typing_extensions import reveal_type
+
+class NoAnext: ...
+
+class AsyncIterable:
+    def __aiter__(self) -> NoAnext:
+        return NoAnext()
+
+async def foo():
+    # error: [not-iterable] "Object of type `AsyncIterable` is not async-iterable"
+    async for x in AsyncIterable():
+        reveal_type(x)  # revealed: Unknown
+```
+
+### Possibly unbound `__anext__` method
+
+```py
+from typing_extensions import reveal_type
+
+async def foo(flag: bool):
+    class PossiblyUnboundAnext:
+        if flag:
+            async def __anext__(self) -> int:
+                return 42
+
+    class AsyncIterable:
+        def __aiter__(self) -> PossiblyUnboundAnext:
+            return PossiblyUnboundAnext()
+
+    # error: [not-iterable] "Object of type `AsyncIterable` may not be async-iterable"
+    async for x in AsyncIterable():
+        reveal_type(x)  # revealed: int
+```
+
+### Possibly unbound `__aiter__` method
+
+```py
+from typing_extensions import reveal_type
+
+async def foo(flag: bool):
+    class AsyncIterable:
+        async def __anext__(self) -> int:
+            return 42
+
+    class PossiblyUnboundAiter:
+        if flag:
+            def __aiter__(self) -> AsyncIterable:
+                return AsyncIterable()
+
+    # error: "Object of type `PossiblyUnboundAiter` may not be async-iterable"
+    async for x in PossiblyUnboundAiter():
+        reveal_type(x)  # revealed: int
+```
+
+### Wrong signature for `__aiter__`
+
+```py
+from typing_extensions import reveal_type
+
+class AsyncIterator:
+    async def __anext__(self) -> int:
+        return 42
+
+class AsyncIterable:
+    def __aiter__(self, arg: int) -> AsyncIterator:  # wrong
+        return AsyncIterator()
+
+async def foo():
+    # error: [not-iterable] "Object of type `AsyncIterable` is not async-iterable"
+    async for x in AsyncIterable():
+        reveal_type(x)  # revealed: int
+```
+
+### Wrong signature for `__anext__`
+
+```py
+from typing_extensions import reveal_type
+
+class AsyncIterator:
+    async def __anext__(self, arg: int) -> int:  # wrong
+        return 42
+
+class AsyncIterable:
+    def __aiter__(self) -> AsyncIterator:
+        return AsyncIterator()
+
+async def foo():
+    # error: [not-iterable] "Object of type `AsyncIterable` is not async-iterable"
+    async for x in AsyncIterable():
+        reveal_type(x)  # revealed: int
 ```

crates/ty_python_semantic/resources/mdtest/mro.md

@@ -536,19 +536,19 @@ T = TypeVar("T")
 
 class peekable(Generic[T], Iterator[T]): ...
 
-# revealed: tuple[<class 'peekable[Unknown]'>, <class 'Iterator[T]'>, <class 'Iterable[T]'>, typing.Protocol, typing.Generic, <class 'object'>]
+# revealed: tuple[<class 'peekable[Unknown]'>, <class 'Iterator[T@peekable]'>, <class 'Iterable[T@peekable]'>, typing.Protocol, typing.Generic, <class 'object'>]
 reveal_type(peekable.__mro__)
 
 class peekable2(Iterator[T], Generic[T]): ...
 
-# revealed: tuple[<class 'peekable2[Unknown]'>, <class 'Iterator[T]'>, <class 'Iterable[T]'>, typing.Protocol, typing.Generic, <class 'object'>]
+# revealed: tuple[<class 'peekable2[Unknown]'>, <class 'Iterator[T@peekable2]'>, <class 'Iterable[T@peekable2]'>, typing.Protocol, typing.Generic, <class 'object'>]
 reveal_type(peekable2.__mro__)
 
 class Base: ...
 class Intermediate(Base, Generic[T]): ...
 class Sub(Intermediate[T], Base): ...
 
-# revealed: tuple[<class 'Sub[Unknown]'>, <class 'Intermediate[T]'>, <class 'Base'>, typing.Generic, <class 'object'>]
+# revealed: tuple[<class 'Sub[Unknown]'>, <class 'Intermediate[T@Sub]'>, <class 'Base'>, typing.Generic, <class 'object'>]
 reveal_type(Sub.__mro__)
 ```
 

crates/ty_python_semantic/resources/mdtest/named_tuple.md

@@ -150,9 +150,9 @@ class Person(NamedTuple):
 
 reveal_type(Person._field_defaults)  # revealed: dict[str, Any]
 reveal_type(Person._fields)  # revealed: tuple[str, ...]
-reveal_type(Person._make)  # revealed: bound method <class 'Person'>._make(iterable: Iterable[Any]) -> Self
+reveal_type(Person._make)  # revealed: bound method <class 'Person'>._make(iterable: Iterable[Any]) -> Self@NamedTupleFallback
 reveal_type(Person._asdict)  # revealed: def _asdict(self) -> dict[str, Any]
-reveal_type(Person._replace)  # revealed: def _replace(self, **kwargs: Any) -> Self
+reveal_type(Person._replace)  # revealed: def _replace(self, **kwargs: Any) -> Self@NamedTupleFallback
 
 # TODO: should be `Person` once we support `Self`
 reveal_type(Person._make(("Alice", 42)))  # revealed: Unknown