fixup

.github/workflows/release.yml

@@ -60,7 +60,7 @@ jobs:
     env:
       GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
     steps:
-      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8
+      - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3
         with:
           persist-credentials: false
           submodules: recursive
@@ -123,7 +123,7 @@ jobs:
       GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       BUILD_MANIFEST_NAME: target/distrib/global-dist-manifest.json
     steps:
-      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8
+      - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3
         with:
           persist-credentials: false
           submodules: recursive
@@ -174,7 +174,7 @@ jobs:
     outputs:
       val: ${{ steps.host.outputs.manifest }}
     steps:
-      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8
+      - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3
         with:
           persist-credentials: false
           submodules: recursive
@@ -250,7 +250,7 @@ jobs:
     env:
       GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
     steps:
-      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8
+      - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3
         with:
           persist-credentials: false
           submodules: recursive

.github/workflows/ty-ecosystem-analyzer.yaml

@@ -67,7 +67,7 @@ jobs:
 
           cd ..
 
-          uv tool install "git+https://github.com/astral-sh/ecosystem-analyzer@2e1816eac09c90140b1ba51d19afc5f59da460f5"
+          uv tool install "git+https://github.com/astral-sh/ecosystem-analyzer@55df3c868f3fa9ab34cff0498dd6106722aac205"
 
           ecosystem-analyzer \
             --repository ruff \

.github/workflows/ty-ecosystem-report.yaml

@@ -52,7 +52,7 @@ jobs:
 
           cd ..
 
-          uv tool install "git+https://github.com/astral-sh/ecosystem-analyzer@2e1816eac09c90140b1ba51d19afc5f59da460f5"
+          uv tool install "git+https://github.com/astral-sh/ecosystem-analyzer@55df3c868f3fa9ab34cff0498dd6106722aac205"
 
           ecosystem-analyzer \
             --verbose \

CHANGELOG.md

@@ -1,54 +1,5 @@
 # Changelog
 
-## 0.14.10
-
-Released on 2025-12-18.
-
-### Preview features
-
-- [formatter] Fluent formatting of method chains ([#21369](https://github.com/astral-sh/ruff/pull/21369))
-- [formatter] Keep lambda parameters on one line and parenthesize the body if it expands ([#21385](https://github.com/astral-sh/ruff/pull/21385))
-- \[`flake8-implicit-str-concat`\] New rule to prevent implicit string concatenation in collections (`ISC004`) ([#21972](https://github.com/astral-sh/ruff/pull/21972))
-- \[`flake8-use-pathlib`\] Make fixes unsafe when types change in compound statements (`PTH104`, `PTH105`, `PTH109`, `PTH115`) ([#22009](https://github.com/astral-sh/ruff/pull/22009))
-- \[`refurb`\] Extend support for `Path.open` (`FURB101`, `FURB103`) ([#21080](https://github.com/astral-sh/ruff/pull/21080))
-
-### Bug fixes
-
-- \[`pyupgrade`\] Fix parsing named Unicode escape sequences (`UP032`) ([#21901](https://github.com/astral-sh/ruff/pull/21901))
-
-### Rule changes
-
-- \[`eradicate`\] Ignore `ruff:disable` and `ruff:enable` comments in `ERA001` ([#22038](https://github.com/astral-sh/ruff/pull/22038))
-- \[`flake8-pytest-style`\] Allow `match` and `check` keyword arguments without an expected exception type (`PT010`) ([#21964](https://github.com/astral-sh/ruff/pull/21964))
-- [syntax-errors] Annotated name cannot be global ([#20868](https://github.com/astral-sh/ruff/pull/20868))
-
-### Documentation
-
-- Add `uv` and `ty` to the Ruff README ([#21996](https://github.com/astral-sh/ruff/pull/21996))
-- Document known lambda formatting deviations from Black ([#21954](https://github.com/astral-sh/ruff/pull/21954))
-- Update `setup.md` ([#22024](https://github.com/astral-sh/ruff/pull/22024))
-- \[`flake8-bandit`\] Fix broken link (`S704`) ([#22039](https://github.com/astral-sh/ruff/pull/22039))
-
-### Other changes
-
-- Fix playground Share button showing "Copied!" before clipboard copy completes ([#21942](https://github.com/astral-sh/ruff/pull/21942))
-
-### Contributors
-
-- [@dylwil3](https://github.com/dylwil3)
-- [@charliecloudberry](https://github.com/charliecloudberry)
-- [@charliermarsh](https://github.com/charliermarsh)
-- [@chirizxc](https://github.com/chirizxc)
-- [@ntBre](https://github.com/ntBre)
-- [@zanieb](https://github.com/zanieb)
-- [@amyreese](https://github.com/amyreese)
-- [@hauntsaninja](https://github.com/hauntsaninja)
-- [@11happy](https://github.com/11happy)
-- [@mahiro72](https://github.com/mahiro72)
-- [@MichaReiser](https://github.com/MichaReiser)
-- [@phongddo](https://github.com/phongddo)
-- [@PeterJCLaw](https://github.com/PeterJCLaw)
-
 ## 0.14.9
 
 Released on 2025-12-11.

Cargo.lock

@@ -1004,6 +1004,27 @@ dependencies = [
  "crypto-common",
 ]
 
+[[package]]
+name = "dir-test"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "62c013fe825864f3e4593f36426c1fa7a74f5603f13ca8d1af7a990c1cd94a79"
+dependencies = [
+ "dir-test-macros",
+]
+
+[[package]]
+name = "dir-test-macros"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d42f54d7b4a6bc2400fe5b338e35d1a335787585375322f49c5d5fe7b243da7e"
+dependencies = [
+ "glob",
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "dirs"
 version = "6.0.0"
@@ -2887,7 +2908,7 @@ dependencies = [
 
 [[package]]
 name = "ruff"
-version = "0.14.10"
+version = "0.14.9"
 dependencies = [
  "anyhow",
  "argfile",
@@ -3145,7 +3166,7 @@ dependencies = [
 
 [[package]]
 name = "ruff_linter"
-version = "0.14.10"
+version = "0.14.9"
 dependencies = [
  "aho-corasick",
  "anyhow",
@@ -3504,7 +3525,7 @@ dependencies = [
 
 [[package]]
 name = "ruff_wasm"
-version = "0.14.10"
+version = "0.14.9"
 dependencies = [
  "console_error_panic_hook",
  "console_log",
@@ -4369,7 +4390,6 @@ dependencies = [
  "ruff_python_trivia",
  "salsa",
  "tempfile",
- "tikv-jemallocator",
  "toml",
  "tracing",
  "tracing-flame",
@@ -4492,7 +4512,7 @@ dependencies = [
  "camino",
  "colored 3.0.0",
  "compact_str",
- "datatest-stable",
+ "dir-test",
  "drop_bomb",
  "get-size2",
  "glob",

Cargo.toml

@@ -5,7 +5,7 @@ resolver = "2"
 [workspace.package]
 # Please update rustfmt.toml when bumping the Rust edition
 edition = "2024"
-rust-version = "1.90"
+rust-version = "1.89"
 homepage = "https://docs.astral.sh/ruff"
 documentation = "https://docs.astral.sh/ruff"
 repository = "https://github.com/astral-sh/ruff"
@@ -82,6 +82,7 @@ criterion = { version = "0.7.0", default-features = false }
 crossbeam = { version = "0.8.4" }
 dashmap = { version = "6.0.1" }
 datatest-stable = { version = "0.3.3" }
+dir-test = { version = "0.4.0" }
 dunce = { version = "1.0.5" }
 drop_bomb = { version = "0.1.5" }
 etcetera = { version = "0.11.0" }

README.md

@@ -57,11 +57,8 @@ Ruff is extremely actively developed and used in major open-source projects like
 
 ...and [many more](#whos-using-ruff).
 
-Ruff is backed by [Astral](https://astral.sh), the creators of
-[uv](https://github.com/astral-sh/uv) and [ty](https://github.com/astral-sh/ty).
-
-Read the [launch post](https://astral.sh/blog/announcing-astral-the-company-behind-ruff), or the
-original [project announcement](https://notes.crmarsh.com/python-tooling-could-be-much-much-faster).
+Ruff is backed by [Astral](https://astral.sh). Read the [launch post](https://astral.sh/blog/announcing-astral-the-company-behind-ruff),
+or the original [project announcement](https://notes.crmarsh.com/python-tooling-could-be-much-much-faster).
 
 ## Testimonials
 
@@ -150,8 +147,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.14.10/install.sh | sh
-powershell -c "irm https://astral.sh/ruff/0.14.10/install.ps1 | iex"
+curl -LsSf https://astral.sh/ruff/0.14.9/install.sh | sh
+powershell -c "irm https://astral.sh/ruff/0.14.9/install.ps1 | iex"
 ```
 
 You can also install Ruff via [Homebrew](https://formulae.brew.sh/formula/ruff), [Conda](https://anaconda.org/conda-forge/ruff),
@@ -184,7 +181,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.14.10
+  rev: v0.14.9
   hooks:
     # Run the linter.
     - id: ruff-check

_typos.toml

@@ -4,7 +4,6 @@ extend-exclude = [
     "crates/ty_vendored/vendor/**/*",
     "**/resources/**/*",
     "**/snapshots/**/*",
-    "crates/ruff_linter/src/rules/flake8_implicit_str_concat/rules/collection_literal.rs",
     # Completion tests tend to have a lot of incomplete
     # words naturally. It's annoying to have to make all
     # of them actually words. So just ignore typos here.

crates/ruff/Cargo.toml

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

crates/ruff/src/args.rs

@@ -10,7 +10,7 @@ use anyhow::bail;
 use clap::builder::Styles;
 use clap::builder::styling::{AnsiColor, Effects};
 use clap::builder::{TypedValueParser, ValueParserFactory};
-use clap::{Parser, Subcommand};
+use clap::{Parser, Subcommand, command};
 use colored::Colorize;
 use itertools::Itertools;
 use path_absolutize::path_dedot;

crates/ruff/src/lib.rs

@@ -9,7 +9,7 @@ use std::sync::mpsc::channel;
 use anyhow::Result;
 use clap::CommandFactory;
 use colored::Colorize;
-use log::error;
+use log::{error, warn};
 use notify::{RecursiveMode, Watcher, recommended_watcher};
 
 use args::{GlobalConfigArgs, ServerCommand};

crates/ruff_benchmark/benches/ty_walltime.rs

@@ -194,7 +194,7 @@ static SYMPY: Benchmark = Benchmark::new(
         max_dep_date: "2025-06-17",
         python_version: PythonVersion::PY312,
     },
-    13100,
+    13030,
 );
 
 static TANJUN: Benchmark = Benchmark::new(
@@ -223,7 +223,7 @@ static STATIC_FRAME: Benchmark = Benchmark::new(
         max_dep_date: "2025-08-09",
         python_version: PythonVersion::PY311,
     },
-    1100,
+    950,
 );
 
 #[track_caller]

crates/ruff_db/src/system/test.rs

@@ -1,6 +1,5 @@
 use glob::PatternError;
 use ruff_notebook::{Notebook, NotebookError};
-use rustc_hash::FxHashMap;
 use std::panic::RefUnwindSafe;
 use std::sync::{Arc, Mutex};
 
@@ -21,44 +20,18 @@ use super::walk_directory::WalkDirectoryBuilder;
 ///
 /// ## Warning
 /// Don't use this system for production code. It's intended for testing only.
-#[derive(Debug)]
+#[derive(Debug, Clone)]
 pub struct TestSystem {
     inner: Arc<dyn WritableSystem + RefUnwindSafe + Send + Sync>,
-    /// Environment variable overrides. If a key is present here, it takes precedence
-    /// over the inner system's environment variables.
-    env_overrides: Arc<Mutex<FxHashMap<String, Option<String>>>>,
-}
-
-impl Clone for TestSystem {
-    fn clone(&self) -> Self {
-        Self {
-            inner: self.inner.clone(),
-            env_overrides: self.env_overrides.clone(),
-        }
-    }
 }
 
 impl TestSystem {
     pub fn new(inner: impl WritableSystem + RefUnwindSafe + Send + Sync + 'static) -> Self {
         Self {
             inner: Arc::new(inner),
-            env_overrides: Arc::new(Mutex::new(FxHashMap::default())),
         }
     }
 
-    /// Sets an environment variable override. This takes precedence over the inner system.
-    pub fn set_env_var(&self, name: impl Into<String>, value: impl Into<String>) {
-        self.env_overrides
-            .lock()
-            .unwrap()
-            .insert(name.into(), Some(value.into()));
-    }
-
-    /// Removes an environment variable override, making it appear as not set.
-    pub fn remove_env_var(&self, name: impl Into<String>) {
-        self.env_overrides.lock().unwrap().insert(name.into(), None);
-    }
-
     /// Returns the [`InMemorySystem`].
     ///
     /// ## Panics
@@ -174,18 +147,6 @@ impl System for TestSystem {
         self.system().case_sensitivity()
     }
 
-    fn env_var(&self, name: &str) -> std::result::Result<String, std::env::VarError> {
-        // Check overrides first
-        if let Some(override_value) = self.env_overrides.lock().unwrap().get(name) {
-            return match override_value {
-                Some(value) => Ok(value.clone()),
-                None => Err(std::env::VarError::NotPresent),
-            };
-        }
-        // Fall back to inner system
-        self.system().env_var(name)
-    }
-
     fn dyn_clone(&self) -> Box<dyn System> {
         Box::new(self.clone())
     }
@@ -195,7 +156,6 @@ impl Default for TestSystem {
     fn default() -> Self {
         Self {
             inner: Arc::new(InMemorySystem::default()),
-            env_overrides: Arc::new(Mutex::new(FxHashMap::default())),
         }
     }
 }

crates/ruff_dev/src/generate_ty_options.rs

@@ -144,8 +144,8 @@ fn emit_field(output: &mut String, name: &str, field: &OptionField, parents: &[S
     output.push('\n');
 
     if let Some(deprecated) = &field.deprecated {
-        output.push_str("!!! warning \"Deprecated\"\n");
-        output.push_str("    This option has been deprecated");
+        output.push_str("> [!WARN] \"Deprecated\"\n");
+        output.push_str("> This option has been deprecated");
 
         if let Some(since) = deprecated.since {
             write!(output, " in {since}").unwrap();
@@ -166,9 +166,8 @@ fn emit_field(output: &mut String, name: &str, field: &OptionField, parents: &[S
     output.push('\n');
     let _ = writeln!(output, "**Type**: `{}`", field.value_type);
     output.push('\n');
-    output.push_str("**Example usage**:\n\n");
+    output.push_str("**Example usage** (`pyproject.toml`):\n\n");
     output.push_str(&format_example(
-        "pyproject.toml",
         &format_header(
             field.scope,
             field.example,
@@ -180,11 +179,11 @@ fn emit_field(output: &mut String, name: &str, field: &OptionField, parents: &[S
     output.push('\n');
 }
 
-fn format_example(title: &str, header: &str, content: &str) -> String {
+fn format_example(header: &str, content: &str) -> String {
     if header.is_empty() {
-        format!("```toml title=\"{title}\"\n{content}\n```\n",)
+        format!("```toml\n{content}\n```\n",)
     } else {
-        format!("```toml title=\"{title}\"\n{header}\n{content}\n```\n",)
+        format!("```toml\n{header}\n{content}\n```\n",)
     }
 }
 

crates/ruff_diagnostics/src/edit.rs

@@ -39,7 +39,7 @@ impl Edit {
 
     /// Creates an edit that replaces the content in `range` with `content`.
     pub fn range_replacement(content: String, range: TextRange) -> Self {
-        debug_assert!(!content.is_empty(), "Prefer `Edit::deletion`");
+        debug_assert!(!content.is_empty(), "Prefer `Fix::deletion`");
 
         Self {
             content: Some(Box::from(content)),

crates/ruff_formatter/src/macros.rs

@@ -337,7 +337,7 @@ macro_rules! best_fitting {
 #[cfg(test)]
 mod tests {
     use crate::prelude::*;
-    use crate::{FormatState, SimpleFormatOptions, VecBuffer};
+    use crate::{FormatState, SimpleFormatOptions, VecBuffer, write};
 
     struct TestFormat;
 
@@ -385,8 +385,8 @@ mod tests {
 
     #[test]
     fn best_fitting_variants_print_as_lists() {
-        use crate::Formatted;
         use crate::prelude::*;
+        use crate::{Formatted, format, format_args};
 
         // The second variant below should be selected when printing at a width of 30
         let formatted_best_fitting = format!(

crates/ruff_linter/Cargo.toml

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

crates/ruff_linter/resources/test/fixtures/flake8_implicit_str_concat/ISC004.py

@@ -1,66 +0,0 @@
-facts = (
-    "Lobsters have blue blood.",
-    "The liver is the only human organ that can fully regenerate itself.",
-    "Clarinets are made almost entirely out of wood from the mpingo tree."
-    "In 1971, astronaut Alan Shepard played golf on the moon.",
-)
-
-facts = [
-    "Lobsters have blue blood.",
-    "The liver is the only human organ that can fully regenerate itself.",
-    "Clarinets are made almost entirely out of wood from the mpingo tree."
-    "In 1971, astronaut Alan Shepard played golf on the moon.",
-]
-
-facts = {
-    "Lobsters have blue blood.",
-    "The liver is the only human organ that can fully regenerate itself.",
-    "Clarinets are made almost entirely out of wood from the mpingo tree."
-    "In 1971, astronaut Alan Shepard played golf on the moon.",
-}
-
-facts = {
-    (
-        "Clarinets are made almost entirely out of wood from the mpingo tree."
-        "In 1971, astronaut Alan Shepard played golf on the moon."
-    ),
-}
-
-facts = (
-    "Octopuses have three hearts."
-    # Missing comma here.
-    "Honey never spoils.",
-)
-
-facts = [
-    "Octopuses have three hearts."
-    # Missing comma here.
-    "Honey never spoils.",
-]
-
-facts = {
-    "Octopuses have three hearts."
-    # Missing comma here.
-    "Honey never spoils.",
-}
-
-facts = (
-    (
-        "Clarinets are made almost entirely out of wood from the mpingo tree."
-        "In 1971, astronaut Alan Shepard played golf on the moon."
-    ),
-)
-
-facts = [
-    (
-        "Clarinets are made almost entirely out of wood from the mpingo tree."
-        "In 1971, astronaut Alan Shepard played golf on the moon."
-    ),
-]
-
-facts = (
-    "Lobsters have blue blood.\n"
-    "The liver is the only human organ that can fully regenerate itself.\n"
-    "Clarinets are made almost entirely out of wood from the mpingo tree.\n"
-    "In 1971, astronaut Alan Shepard played golf on the moon.\n"
-)

crates/ruff_linter/resources/test/fixtures/flake8_pytest_style/PT010.py

@@ -9,15 +9,3 @@ def test_ok():
 def test_error():
     with pytest.raises(UnicodeError):
         pass
-
-def test_match_only():
-    with pytest.raises(match="some error message"):
-        pass
-
-def test_check_only():
-    with pytest.raises(check=lambda e: True):
-        pass
-
-def test_match_and_check():
-    with pytest.raises(match="some error message", check=lambda e: True):
-        pass

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

@@ -136,38 +136,4 @@ os.chmod("pth1_file", 0o700, None, True, 1, *[1], **{"x": 1}, foo=1)
 os.rename("pth1_file", "pth1_file1", None, None, 1, *[1], **{"x": 1}, foo=1)
 os.replace("pth1_file1", "pth1_file", None, None, 1, *[1], **{"x": 1}, foo=1)
 
-os.path.samefile("pth1_file", "pth1_link", 1, *[1], **{"x": 1}, foo=1)
-
-# See: https://github.com/astral-sh/ruff/issues/21794
-import sys
-
-if os.rename("pth1.py", "pth1.py.bak"):
-    print("rename: truthy")
-else:
-    print("rename: falsey")
-
-if os.replace("pth1.py.bak", "pth1.py"):
-    print("replace: truthy")
-else:
-    print("replace: falsey")
-
-try:
-    for _ in os.getcwd():
-        print("getcwd: iterable")
-        break
-except TypeError as e:
-    print("getcwd: not iterable")
-
-try:
-    for _ in os.getcwdb():
-        print("getcwdb: iterable")
-        break
-except TypeError as e:
-    print("getcwdb: not iterable")
-
-try:
-    for _ in os.readlink(sys.executable):
-        print("readlink: iterable")
-        break
-except TypeError as e:
-    print("readlink: not iterable")
+os.path.samefile("pth1_file", "pth1_link", 1, *[1], **{"x": 1}, foo=1)

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

@@ -132,6 +132,7 @@ async def c():
 # Non-errors
 ###
 
+# False-negative: RustPython doesn't parse the `\N{snowman}`.
 "\N{snowman} {}".format(a)
 
 "{".format(a)
@@ -275,6 +276,3 @@ if __name__ == "__main__":
     number = 0
     string = "{}".format(number := number + 1)
     print(string)
-
-# Unicode escape
-"\N{angle}AOB = {angle}°".format(angle=180)

crates/ruff_linter/resources/test/fixtures/refurb/FURB101.py

@@ -138,6 +138,5 @@ with open("file.txt", encoding="utf-8") as f:
 with open("file.txt", encoding="utf-8") as f:
     contents = process_contents(f.read())
 
-with open("file1.txt", encoding="utf-8") as f:
+with open("file.txt", encoding="utf-8") as f:
     contents: str = process_contents(f.read())
-

crates/ruff_linter/resources/test/fixtures/refurb/FURB101_1.py

@@ -1,8 +0,0 @@
-
-from pathlib import Path
-
-with Path("file.txt").open() as f:
-    contents = f.read()
-
-with Path("file.txt").open("r") as f:
-    contents = f.read()

crates/ruff_linter/resources/test/fixtures/refurb/FURB103_1.py

@@ -1,26 +0,0 @@
-from pathlib import Path
-
-with Path("file.txt").open("w") as f:
-    f.write("test")
-
-with Path("file.txt").open("wb") as f:
-    f.write(b"test")
-
-with Path("file.txt").open(mode="w") as f:
-    f.write("test")
-
-with Path("file.txt").open("w", encoding="utf8") as f:
-    f.write("test")
-
-with Path("file.txt").open("w", errors="ignore") as f:
-    f.write("test")
-
-with Path(foo()).open("w") as f:
-    f.write("test")
-
-p = Path("file.txt")
-with p.open("w") as f:
-    f.write("test")
-
-with Path("foo", "bar", "baz").open("w") as f:
-    f.write("test")

crates/ruff_linter/resources/test/fixtures/semantic_errors/annotated_global.py

@@ -1,38 +0,0 @@
-a: int = 1
-def f1():
-    global a
-    a: str = "foo"  # error
-
-b: int = 1
-def outer():
-    def inner():
-        global b
-        b: str = "nested"  # error
-
-c: int = 1
-def f2():
-    global c
-    c: list[str] = []  # error
-
-d: int = 1
-def f3():
-    global d
-    d: str  # error
-
-e: int = 1
-def f4():
-    e: str = "happy"  # okay
-
-global f
-f: int = 1  # okay
-
-g: int = 1
-global g  # error
-
-class C:
-    x: str
-    global x  # error
-
-class D:
-    global x  # error
-    x: str

crates/ruff_linter/src/checkers/ast/analyze/expression.rs

@@ -214,13 +214,6 @@ pub(crate) fn expression(expr: &Expr, checker: &Checker) {
             range: _,
             node_index: _,
         }) => {
-            if checker.is_rule_enabled(Rule::ImplicitStringConcatenationInCollectionLiteral) {
-                flake8_implicit_str_concat::rules::implicit_string_concatenation_in_collection_literal(
-                    checker,
-                    expr,
-                    elts,
-                );
-            }
             if ctx.is_store() {
                 let check_too_many_expressions =
                     checker.is_rule_enabled(Rule::ExpressionsInStarAssignment);
@@ -1336,13 +1329,6 @@ pub(crate) fn expression(expr: &Expr, checker: &Checker) {
             }
         }
         Expr::Set(set) => {
-            if checker.is_rule_enabled(Rule::ImplicitStringConcatenationInCollectionLiteral) {
-                flake8_implicit_str_concat::rules::implicit_string_concatenation_in_collection_literal(
-                    checker,
-                    expr,
-                    &set.elts,
-                );
-            }
             if checker.is_rule_enabled(Rule::DuplicateValue) {
                 flake8_bugbear::rules::duplicate_value(checker, set);
             }

crates/ruff_linter/src/codes.rs

@@ -454,7 +454,6 @@ pub fn code_to_rule(linter: Linter, code: &str) -> Option<(RuleGroup, Rule)> {
         (Flake8ImplicitStrConcat, "001") => rules::flake8_implicit_str_concat::rules::SingleLineImplicitStringConcatenation,
         (Flake8ImplicitStrConcat, "002") => rules::flake8_implicit_str_concat::rules::MultiLineImplicitStringConcatenation,
         (Flake8ImplicitStrConcat, "003") => rules::flake8_implicit_str_concat::rules::ExplicitStringConcatenation,
-        (Flake8ImplicitStrConcat, "004") => rules::flake8_implicit_str_concat::rules::ImplicitStringConcatenationInCollectionLiteral,
 
         // flake8-print
         (Flake8Print, "1") => rules::flake8_print::rules::Print,

crates/ruff_linter/src/fix/edits.rs

@@ -286,7 +286,12 @@ pub(crate) fn add_argument(argument: &str, arguments: &Arguments, tokens: &Token
 
 /// Generic function to add a (regular) parameter to a function definition.
 pub(crate) fn add_parameter(parameter: &str, parameters: &Parameters, source: &str) -> Edit {
-    if let Some(last) = parameters.args.iter().rfind(|arg| arg.default.is_none()) {
+    if let Some(last) = parameters
+        .args
+        .iter()
+        .filter(|arg| arg.default.is_none())
+        .next_back()
+    {
         // Case 1: at least one regular parameter, so append after the last one.
         Edit::insertion(format!(", {parameter}"), last.end())
     } else if !parameters.args.is_empty() {

crates/ruff_linter/src/linter.rs

@@ -1001,7 +1001,6 @@ mod tests {
     #[test_case(Path::new("write_to_debug.py"), PythonVersion::PY310)]
     #[test_case(Path::new("invalid_expression.py"), PythonVersion::PY312)]
     #[test_case(Path::new("global_parameter.py"), PythonVersion::PY310)]
-    #[test_case(Path::new("annotated_global.py"), PythonVersion::PY314)]
     fn test_semantic_errors(path: &Path, python_version: PythonVersion) -> Result<()> {
         let snapshot = format!(
             "semantic_syntax_error_{}_{}",

crates/ruff_linter/src/rules/eradicate/detection.rs

@@ -22,7 +22,6 @@ static ALLOWLIST_REGEX: LazyLock<Regex> = LazyLock::new(|| {
             # Case-sensitive
             pyright
         |   pyrefly
-        |   ruff\s*:\s*(disable|enable)
         |   mypy:
         |   type:\s*ignore
         |   SPDX-License-Identifier:
@@ -149,8 +148,6 @@ mod tests {
         assert!(!comment_contains_code("# 123", &[]));
         assert!(!comment_contains_code("# 123.1", &[]));
         assert!(!comment_contains_code("# 1, 2, 3", &[]));
-        assert!(!comment_contains_code("# ruff: disable[E501]", &[]));
-        assert!(!comment_contains_code("#ruff:enable[E501, F84]", &[]));
         assert!(!comment_contains_code(
             "# pylint: disable=redefined-outer-name",
             &[]

crates/ruff_linter/src/rules/flake8_async/rules/blocking_open_call.rs

@@ -70,7 +70,7 @@ fn is_open_call(func: &Expr, semantic: &SemanticModel) -> bool {
 }
 
 /// Returns `true` if an expression resolves to a call to `pathlib.Path.open`.
-pub(crate) fn is_open_call_from_pathlib(func: &Expr, semantic: &SemanticModel) -> bool {
+fn is_open_call_from_pathlib(func: &Expr, semantic: &SemanticModel) -> bool {
     let Expr::Attribute(ast::ExprAttribute { attr, value, .. }) = func else {
         return false;
     };

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

@@ -18,7 +18,7 @@ mod async_zero_sleep;
 mod blocking_http_call;
 mod blocking_http_call_httpx;
 mod blocking_input;
-pub(crate) mod blocking_open_call;
+mod blocking_open_call;
 mod blocking_path_methods;
 mod blocking_process_invocation;
 mod blocking_sleep;

crates/ruff_linter/src/rules/flake8_bandit/rules/unsafe_markup_use.rs

@@ -12,7 +12,7 @@ use crate::{checkers::ast::Checker, settings::LinterSettings};
 /// Checks for non-literal strings being passed to [`markupsafe.Markup`][markupsafe-markup].
 ///
 /// ## Why is this bad?
-/// [`markupsafe.Markup`][markupsafe-markup] does not perform any escaping, so passing dynamic
+/// [`markupsafe.Markup`] does not perform any escaping, so passing dynamic
 /// content, like f-strings, variables or interpolated strings will potentially
 /// lead to XSS vulnerabilities.
 ///

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

@@ -32,10 +32,6 @@ mod tests {
         Path::new("ISC_syntax_error_2.py")
     )]
     #[test_case(Rule::ExplicitStringConcatenation, Path::new("ISC.py"))]
-    #[test_case(
-        Rule::ImplicitStringConcatenationInCollectionLiteral,
-        Path::new("ISC004.py")
-    )]
     fn rules(rule_code: Rule, path: &Path) -> Result<()> {
         let snapshot = format!("{}_{}", rule_code.noqa_code(), path.to_string_lossy());
         let diagnostics = test_path(

crates/ruff_linter/src/rules/flake8_implicit_str_concat/rules/collection_literal.rs

@@ -1,103 +0,0 @@
-use ruff_macros::{ViolationMetadata, derive_message_formats};
-use ruff_python_ast::token::parenthesized_range;
-use ruff_python_ast::{Expr, StringLike};
-use ruff_text_size::Ranged;
-
-use crate::checkers::ast::Checker;
-use crate::{Edit, Fix, FixAvailability, Violation};
-
-/// ## What it does
-/// Checks for implicitly concatenated strings inside list, tuple, and set literals.
-///
-/// ## Why is this bad?
-/// In collection literals, implicit string concatenation is often the result of
-/// a missing comma between elements, which can silently merge items together.
-///
-/// ## Example
-/// ```python
-/// facts = (
-///     "Lobsters have blue blood.",
-///     "The liver is the only human organ that can fully regenerate itself.",
-///     "Clarinets are made almost entirely out of wood from the mpingo tree."
-///     "In 1971, astronaut Alan Shepard played golf on the moon.",
-/// )
-/// ```
-///
-/// Instead, you likely intended:
-/// ```python
-/// facts = (
-///     "Lobsters have blue blood.",
-///     "The liver is the only human organ that can fully regenerate itself.",
-///     "Clarinets are made almost entirely out of wood from the mpingo tree.",
-///     "In 1971, astronaut Alan Shepard played golf on the moon.",
-/// )
-/// ```
-///
-/// If the concatenation is intentional, wrap it in parentheses to make it
-/// explicit:
-/// ```python
-/// facts = (
-///     "Lobsters have blue blood.",
-///     "The liver is the only human organ that can fully regenerate itself.",
-///     (
-///         "Clarinets are made almost entirely out of wood from the mpingo tree."
-///         "In 1971, astronaut Alan Shepard played golf on the moon."
-///     ),
-/// )
-/// ```
-///
-/// ## Fix safety
-/// The fix is safe in that it does not change the semantics of your code.
-/// However, the issue is that you may often want to change semantics
-/// by adding a missing comma.
-#[derive(ViolationMetadata)]
-#[violation_metadata(preview_since = "0.14.10")]
-pub(crate) struct ImplicitStringConcatenationInCollectionLiteral;
-
-impl Violation for ImplicitStringConcatenationInCollectionLiteral {
-    const FIX_AVAILABILITY: FixAvailability = FixAvailability::Always;
-
-    #[derive_message_formats]
-    fn message(&self) -> String {
-        "Unparenthesized implicit string concatenation in collection".to_string()
-    }
-
-    fn fix_title(&self) -> Option<String> {
-        Some("Wrap implicitly concatenated strings in parentheses".to_string())
-    }
-}
-
-/// ISC004
-pub(crate) fn implicit_string_concatenation_in_collection_literal(
-    checker: &Checker,
-    expr: &Expr,
-    elements: &[Expr],
-) {
-    for element in elements {
-        let Ok(string_like) = StringLike::try_from(element) else {
-            continue;
-        };
-        if !string_like.is_implicit_concatenated() {
-            continue;
-        }
-        if parenthesized_range(
-            string_like.as_expression_ref(),
-            expr.into(),
-            checker.tokens(),
-        )
-        .is_some()
-        {
-            continue;
-        }
-
-        let mut diagnostic = checker.report_diagnostic(
-            ImplicitStringConcatenationInCollectionLiteral,
-            string_like.range(),
-        );
-        diagnostic.help("Did you forget a comma?");
-        diagnostic.set_fix(Fix::unsafe_edits(
-            Edit::insertion("(".to_string(), string_like.range().start()),
-            [Edit::insertion(")".to_string(), string_like.range().end())],
-        ));
-    }
-}

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

@@ -1,7 +1,5 @@
-pub(crate) use collection_literal::*;
 pub(crate) use explicit::*;
 pub(crate) use implicit::*;
 
-mod collection_literal;
 mod explicit;
 mod implicit;

crates/ruff_linter/src/rules/flake8_implicit_str_concat/snapshots/ruff_linter__rules__flake8_implicit_str_concat__tests__ISC004_ISC004.py.snap

@@ -1,149 +0,0 @@
----
-source: crates/ruff_linter/src/rules/flake8_implicit_str_concat/mod.rs
----
-ISC004 [*] Unparenthesized implicit string concatenation in collection
- --> ISC004.py:4:5
-  |
-2 |       "Lobsters have blue blood.",
-3 |       "The liver is the only human organ that can fully regenerate itself.",
-4 | /     "Clarinets are made almost entirely out of wood from the mpingo tree."
-5 | |     "In 1971, astronaut Alan Shepard played golf on the moon.",
-  | |______________________________________________________________^
-6 |   )
-  |
-help: Wrap implicitly concatenated strings in parentheses
-help: Did you forget a comma?
-1 | facts = (
-2 |     "Lobsters have blue blood.",
-3 |     "The liver is the only human organ that can fully regenerate itself.",
-  -     "Clarinets are made almost entirely out of wood from the mpingo tree."
-  -     "In 1971, astronaut Alan Shepard played golf on the moon.",
-4 +     ("Clarinets are made almost entirely out of wood from the mpingo tree."
-5 +     "In 1971, astronaut Alan Shepard played golf on the moon."),
-6 | )
-7 | 
-8 | facts = [
-note: This is an unsafe fix and may change runtime behavior
-
-ISC004 [*] Unparenthesized implicit string concatenation in collection
-  --> ISC004.py:11:5
-   |
- 9 |       "Lobsters have blue blood.",
-10 |       "The liver is the only human organ that can fully regenerate itself.",
-11 | /     "Clarinets are made almost entirely out of wood from the mpingo tree."
-12 | |     "In 1971, astronaut Alan Shepard played golf on the moon.",
-   | |______________________________________________________________^
-13 |   ]
-   |
-help: Wrap implicitly concatenated strings in parentheses
-help: Did you forget a comma?
-8  | facts = [
-9  |     "Lobsters have blue blood.",
-10 |     "The liver is the only human organ that can fully regenerate itself.",
-   -     "Clarinets are made almost entirely out of wood from the mpingo tree."
-   -     "In 1971, astronaut Alan Shepard played golf on the moon.",
-11 +     ("Clarinets are made almost entirely out of wood from the mpingo tree."
-12 +     "In 1971, astronaut Alan Shepard played golf on the moon."),
-13 | ]
-14 | 
-15 | facts = {
-note: This is an unsafe fix and may change runtime behavior
-
-ISC004 [*] Unparenthesized implicit string concatenation in collection
-  --> ISC004.py:18:5
-   |
-16 |       "Lobsters have blue blood.",
-17 |       "The liver is the only human organ that can fully regenerate itself.",
-18 | /     "Clarinets are made almost entirely out of wood from the mpingo tree."
-19 | |     "In 1971, astronaut Alan Shepard played golf on the moon.",
-   | |______________________________________________________________^
-20 |   }
-   |
-help: Wrap implicitly concatenated strings in parentheses
-help: Did you forget a comma?
-15 | facts = {
-16 |     "Lobsters have blue blood.",
-17 |     "The liver is the only human organ that can fully regenerate itself.",
-   -     "Clarinets are made almost entirely out of wood from the mpingo tree."
-   -     "In 1971, astronaut Alan Shepard played golf on the moon.",
-18 +     ("Clarinets are made almost entirely out of wood from the mpingo tree."
-19 +     "In 1971, astronaut Alan Shepard played golf on the moon."),
-20 | }
-21 | 
-22 | facts = {
-note: This is an unsafe fix and may change runtime behavior
-
-ISC004 [*] Unparenthesized implicit string concatenation in collection
-  --> ISC004.py:30:5
-   |
-29 |   facts = (
-30 | /     "Octopuses have three hearts."
-31 | |     # Missing comma here.
-32 | |     "Honey never spoils.",
-   | |_________________________^
-33 |   )
-   |
-help: Wrap implicitly concatenated strings in parentheses
-help: Did you forget a comma?
-27 | }
-28 | 
-29 | facts = (
-   -     "Octopuses have three hearts."
-30 +     ("Octopuses have three hearts."
-31 |     # Missing comma here.
-   -     "Honey never spoils.",
-32 +     "Honey never spoils."),
-33 | )
-34 | 
-35 | facts = [
-note: This is an unsafe fix and may change runtime behavior
-
-ISC004 [*] Unparenthesized implicit string concatenation in collection
-  --> ISC004.py:36:5
-   |
-35 |   facts = [
-36 | /     "Octopuses have three hearts."
-37 | |     # Missing comma here.
-38 | |     "Honey never spoils.",
-   | |_________________________^
-39 |   ]
-   |
-help: Wrap implicitly concatenated strings in parentheses
-help: Did you forget a comma?
-33 | )
-34 | 
-35 | facts = [
-   -     "Octopuses have three hearts."
-36 +     ("Octopuses have three hearts."
-37 |     # Missing comma here.
-   -     "Honey never spoils.",
-38 +     "Honey never spoils."),
-39 | ]
-40 | 
-41 | facts = {
-note: This is an unsafe fix and may change runtime behavior
-
-ISC004 [*] Unparenthesized implicit string concatenation in collection
-  --> ISC004.py:42:5
-   |
-41 |   facts = {
-42 | /     "Octopuses have three hearts."
-43 | |     # Missing comma here.
-44 | |     "Honey never spoils.",
-   | |_________________________^
-45 |   }
-   |
-help: Wrap implicitly concatenated strings in parentheses
-help: Did you forget a comma?
-39 | ]
-40 | 
-41 | facts = {
-   -     "Octopuses have three hearts."
-42 +     ("Octopuses have three hearts."
-43 |     # Missing comma here.
-   -     "Honey never spoils.",
-44 +     "Honey never spoils."),
-45 | }
-46 | 
-47 | facts = (
-note: This is an unsafe fix and may change runtime behavior

crates/ruff_linter/src/rules/flake8_pytest_style/rules/raises.rs

@@ -125,9 +125,6 @@ impl Violation for PytestRaisesTooBroad {
 /// ## Why is this bad?
 /// `pytest.raises` expects to receive an expected exception as its first
 /// argument. If omitted, the `pytest.raises` call will fail at runtime.
-/// The rule will also accept calls without an expected exception but with
-/// `match` and/or `check` keyword arguments, which are also valid after
-/// pytest version 8.4.0.
 ///
 /// ## Example
 /// ```python
@@ -184,8 +181,6 @@ pub(crate) fn raises_call(checker: &Checker, call: &ast::ExprCall) {
                 .arguments
                 .find_argument("expected_exception", 0)
                 .is_none()
-                && call.arguments.find_keyword("match").is_none()
-                && call.arguments.find_keyword("check").is_none()
             {
                 checker.report_diagnostic(PytestRaisesWithoutException, call.func.range());
             }

crates/ruff_linter/src/rules/flake8_simplify/rules/yoda_conditions.rs

@@ -146,7 +146,7 @@ fn reverse_comparison(expr: &Expr, locator: &Locator, stylist: &Stylist) -> Resu
         let left = (*comparison.left).clone();
 
         // Copy the right side to the left side.
-        *comparison.left = comparison.comparisons[0].comparator.clone();
+        comparison.left = Box::new(comparison.comparisons[0].comparator.clone());
 
         // Copy the left side to the right side.
         comparison.comparisons[0].comparator = left;

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

@@ -210,7 +210,6 @@ pub(crate) fn is_argument_non_default(arguments: &Arguments, name: &str, positio
 
 /// Returns `true` if the given call is a top-level expression in its statement.
 /// This means the call's return value is not used, so return type changes don't matter.
-pub(crate) fn is_top_level_expression_in_statement(checker: &Checker) -> bool {
+pub(crate) fn is_top_level_expression_call(checker: &Checker) -> bool {
     checker.semantic().current_expression_parent().is_none()
-        && checker.semantic().current_statement().is_expr_stmt()
 }

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

@@ -6,7 +6,7 @@ use ruff_text_size::Ranged;
 use crate::checkers::ast::Checker;
 use crate::importer::ImportRequest;
 use crate::preview::is_fix_os_getcwd_enabled;
-use crate::rules::flake8_use_pathlib::helpers::is_top_level_expression_in_statement;
+use crate::rules::flake8_use_pathlib::helpers::is_top_level_expression_call;
 use crate::{FixAvailability, Violation};
 
 /// ## What it does
@@ -89,7 +89,7 @@ pub(crate) fn os_getcwd(checker: &Checker, call: &ExprCall, segments: &[&str]) {
 
             // Unsafe when the fix would delete comments or change a used return value
             let applicability = if checker.comment_ranges().intersects(range)
-                || !is_top_level_expression_in_statement(checker)
+                || !is_top_level_expression_call(checker)
             {
                 Applicability::Unsafe
             } else {

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

@@ -6,7 +6,7 @@ use crate::checkers::ast::Checker;
 use crate::preview::is_fix_os_readlink_enabled;
 use crate::rules::flake8_use_pathlib::helpers::{
     check_os_pathlib_single_arg_calls, is_keyword_only_argument_non_default,
-    is_top_level_expression_in_statement,
+    is_top_level_expression_call,
 };
 use crate::{FixAvailability, Violation};
 
@@ -86,7 +86,7 @@ pub(crate) fn os_readlink(checker: &Checker, call: &ExprCall, segments: &[&str])
         return;
     }
 
-    let applicability = if !is_top_level_expression_in_statement(checker) {
+    let applicability = if !is_top_level_expression_call(checker) {
         // Unsafe because the return type changes (str/bytes -> Path)
         Applicability::Unsafe
     } else {

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

@@ -6,7 +6,7 @@ use crate::checkers::ast::Checker;
 use crate::preview::is_fix_os_rename_enabled;
 use crate::rules::flake8_use_pathlib::helpers::{
     check_os_pathlib_two_arg_calls, has_unknown_keywords_or_starred_expr,
-    is_keyword_only_argument_non_default, is_top_level_expression_in_statement,
+    is_keyword_only_argument_non_default, is_top_level_expression_call,
 };
 use crate::{FixAvailability, Violation};
 
@@ -92,7 +92,7 @@ pub(crate) fn os_rename(checker: &Checker, call: &ExprCall, segments: &[&str]) {
         );
 
     // Unsafe when the fix would delete comments or change a used return value
-    let applicability = if !is_top_level_expression_in_statement(checker) {
+    let applicability = if !is_top_level_expression_call(checker) {
         // Unsafe because the return type changes (None -> Path)
         Applicability::Unsafe
     } else {

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

@@ -6,7 +6,7 @@ use crate::checkers::ast::Checker;
 use crate::preview::is_fix_os_replace_enabled;
 use crate::rules::flake8_use_pathlib::helpers::{
     check_os_pathlib_two_arg_calls, has_unknown_keywords_or_starred_expr,
-    is_keyword_only_argument_non_default, is_top_level_expression_in_statement,
+    is_keyword_only_argument_non_default, is_top_level_expression_call,
 };
 use crate::{FixAvailability, Violation};
 
@@ -95,7 +95,7 @@ pub(crate) fn os_replace(checker: &Checker, call: &ExprCall, segments: &[&str])
         );
 
     // Unsafe when the fix would delete comments or change a used return value
-    let applicability = if !is_top_level_expression_in_statement(checker) {
+    let applicability = if !is_top_level_expression_call(checker) {
         // Unsafe because the return type changes (None -> Path)
         Applicability::Unsafe
     } else {

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

@@ -567,64 +567,5 @@ PTH121 `os.path.samefile()` should be replaced by `Path.samefile()`
 138 |
 139 | os.path.samefile("pth1_file", "pth1_link", 1, *[1], **{"x": 1}, foo=1)
     | ^^^^^^^^^^^^^^^^
-140 |
-141 | # See: https://github.com/astral-sh/ruff/issues/21794
     |
 help: Replace with `Path(...).samefile()`
-
-PTH104 `os.rename()` should be replaced by `Path.rename()`
-   --> full_name.py:144:4
-    |
-142 | import sys
-143 |
-144 | if os.rename("pth1.py", "pth1.py.bak"):
-    |    ^^^^^^^^^
-145 |     print("rename: truthy")
-146 | else:
-    |
-help: Replace with `Path(...).rename(...)`
-
-PTH105 `os.replace()` should be replaced by `Path.replace()`
-   --> full_name.py:149:4
-    |
-147 |     print("rename: falsey")
-148 |
-149 | if os.replace("pth1.py.bak", "pth1.py"):
-    |    ^^^^^^^^^^
-150 |     print("replace: truthy")
-151 | else:
-    |
-help: Replace with `Path(...).replace(...)`
-
-PTH109 `os.getcwd()` should be replaced by `Path.cwd()`
-   --> full_name.py:155:14
-    |
-154 | try:
-155 |     for _ in os.getcwd():
-    |              ^^^^^^^^^
-156 |         print("getcwd: iterable")
-157 |         break
-    |
-help: Replace with `Path.cwd()`
-
-PTH109 `os.getcwd()` should be replaced by `Path.cwd()`
-   --> full_name.py:162:14
-    |
-161 | try:
-162 |     for _ in os.getcwdb():
-    |              ^^^^^^^^^^
-163 |         print("getcwdb: iterable")
-164 |         break
-    |
-help: Replace with `Path.cwd()`
-
-PTH115 `os.readlink()` should be replaced by `Path.readlink()`
-   --> full_name.py:169:14
-    |
-168 | try:
-169 |     for _ in os.readlink(sys.executable):
-    |              ^^^^^^^^^^^
-170 |         print("readlink: iterable")
-171 |         break
-    |
-help: Replace with `Path(...).readlink()`

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

@@ -1037,142 +1037,5 @@ PTH121 `os.path.samefile()` should be replaced by `Path.samefile()`
 138 |
 139 | os.path.samefile("pth1_file", "pth1_link", 1, *[1], **{"x": 1}, foo=1)
     | ^^^^^^^^^^^^^^^^
-140 |
-141 | # See: https://github.com/astral-sh/ruff/issues/21794
     |
 help: Replace with `Path(...).samefile()`
-
-PTH104 [*] `os.rename()` should be replaced by `Path.rename()`
-   --> full_name.py:144:4
-    |
-142 | import sys
-143 |
-144 | if os.rename("pth1.py", "pth1.py.bak"):
-    |    ^^^^^^^^^
-145 |     print("rename: truthy")
-146 | else:
-    |
-help: Replace with `Path(...).rename(...)`
-140 | 
-141 | # See: https://github.com/astral-sh/ruff/issues/21794
-142 | import sys
-143 + import pathlib
-144 | 
-    - if os.rename("pth1.py", "pth1.py.bak"):
-145 + if pathlib.Path("pth1.py").rename("pth1.py.bak"):
-146 |     print("rename: truthy")
-147 | else:
-148 |     print("rename: falsey")
-note: This is an unsafe fix and may change runtime behavior
-
-PTH105 [*] `os.replace()` should be replaced by `Path.replace()`
-   --> full_name.py:149:4
-    |
-147 |     print("rename: falsey")
-148 |
-149 | if os.replace("pth1.py.bak", "pth1.py"):
-    |    ^^^^^^^^^^
-150 |     print("replace: truthy")
-151 | else:
-    |
-help: Replace with `Path(...).replace(...)`
-140 | 
-141 | # See: https://github.com/astral-sh/ruff/issues/21794
-142 | import sys
-143 + import pathlib
-144 | 
-145 | if os.rename("pth1.py", "pth1.py.bak"):
-146 |     print("rename: truthy")
-147 | else:
-148 |     print("rename: falsey")
-149 | 
-    - if os.replace("pth1.py.bak", "pth1.py"):
-150 + if pathlib.Path("pth1.py.bak").replace("pth1.py"):
-151 |     print("replace: truthy")
-152 | else:
-153 |     print("replace: falsey")
-note: This is an unsafe fix and may change runtime behavior
-
-PTH109 [*] `os.getcwd()` should be replaced by `Path.cwd()`
-   --> full_name.py:155:14
-    |
-154 | try:
-155 |     for _ in os.getcwd():
-    |              ^^^^^^^^^
-156 |         print("getcwd: iterable")
-157 |         break
-    |
-help: Replace with `Path.cwd()`
-140 | 
-141 | # See: https://github.com/astral-sh/ruff/issues/21794
-142 | import sys
-143 + import pathlib
-144 | 
-145 | if os.rename("pth1.py", "pth1.py.bak"):
-146 |     print("rename: truthy")
---------------------------------------------------------------------------------
-153 |     print("replace: falsey")
-154 | 
-155 | try:
-    -     for _ in os.getcwd():
-156 +     for _ in pathlib.Path.cwd():
-157 |         print("getcwd: iterable")
-158 |         break
-159 | except TypeError as e:
-note: This is an unsafe fix and may change runtime behavior
-
-PTH109 [*] `os.getcwd()` should be replaced by `Path.cwd()`
-   --> full_name.py:162:14
-    |
-161 | try:
-162 |     for _ in os.getcwdb():
-    |              ^^^^^^^^^^
-163 |         print("getcwdb: iterable")
-164 |         break
-    |
-help: Replace with `Path.cwd()`
-140 | 
-141 | # See: https://github.com/astral-sh/ruff/issues/21794
-142 | import sys
-143 + import pathlib
-144 | 
-145 | if os.rename("pth1.py", "pth1.py.bak"):
-146 |     print("rename: truthy")
---------------------------------------------------------------------------------
-160 |     print("getcwd: not iterable")
-161 | 
-162 | try:
-    -     for _ in os.getcwdb():
-163 +     for _ in pathlib.Path.cwd():
-164 |         print("getcwdb: iterable")
-165 |         break
-166 | except TypeError as e:
-note: This is an unsafe fix and may change runtime behavior
-
-PTH115 [*] `os.readlink()` should be replaced by `Path.readlink()`
-   --> full_name.py:169:14
-    |
-168 | try:
-169 |     for _ in os.readlink(sys.executable):
-    |              ^^^^^^^^^^^
-170 |         print("readlink: iterable")
-171 |         break
-    |
-help: Replace with `Path(...).readlink()`
-140 | 
-141 | # See: https://github.com/astral-sh/ruff/issues/21794
-142 | import sys
-143 + import pathlib
-144 | 
-145 | if os.rename("pth1.py", "pth1.py.bak"):
-146 |     print("rename: truthy")
---------------------------------------------------------------------------------
-167 |     print("getcwdb: not iterable")
-168 | 
-169 | try:
-    -     for _ in os.readlink(sys.executable):
-170 +     for _ in pathlib.Path(sys.executable).readlink():
-171 |         print("readlink: iterable")
-172 |         break
-173 | except TypeError as e:
-note: This is an unsafe fix and may change runtime behavior

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

@@ -902,76 +902,56 @@ help: Convert to f-string
 132 | # Non-errors
 
 UP032 [*] Use f-string instead of `format` call
-   --> UP032_0.py:135:1
+   --> UP032_0.py:160:1
     |
-133 | ###
-134 |
-135 | "\N{snowman} {}".format(a)
-    | ^^^^^^^^^^^^^^^^^^^^^^^^^^
-136 |
-137 | "{".format(a)
-    |
-help: Convert to f-string
-132 | # Non-errors
-133 | ###
-134 | 
-    - "\N{snowman} {}".format(a)
-135 + f"\N{snowman} {a}"
-136 | 
-137 | "{".format(a)
-138 | 
-
-UP032 [*] Use f-string instead of `format` call
-   --> UP032_0.py:159:1
-    |
-157 |   r'"\N{snowman} {}".format(a)'
-158 |
-159 | / "123456789 {}".format(
-160 | |     11111111111111111111111111111111111111111111111111111111111111111111111111,
-161 | | )
+158 |   r'"\N{snowman} {}".format(a)'
+159 |
+160 | / "123456789 {}".format(
+161 | |     11111111111111111111111111111111111111111111111111111111111111111111111111,
+162 | | )
     | |_^
-162 |
-163 |   """
+163 |
+164 |   """
     |
 help: Convert to f-string
-156 | 
-157 | r'"\N{snowman} {}".format(a)'
-158 | 
+157 | 
+158 | r'"\N{snowman} {}".format(a)'
+159 | 
     - "123456789 {}".format(
     -     11111111111111111111111111111111111111111111111111111111111111111111111111,
     - )
-159 + f"123456789 {11111111111111111111111111111111111111111111111111111111111111111111111111}"
-160 | 
-161 | """
-162 | {}
+160 + f"123456789 {11111111111111111111111111111111111111111111111111111111111111111111111111}"
+161 | 
+162 | """
+163 | {}
 
 UP032 [*] Use f-string instead of `format` call
-   --> UP032_0.py:163:1
+   --> UP032_0.py:164:1
     |
-161 |   )
-162 |
-163 | / """
-164 | | {}
+162 |   )
+163 |
+164 | / """
 165 | | {}
 166 | | {}
-167 | | """.format(
-168 | | 1,
-169 | | 2,
-170 | | 111111111111111111111111111111111111111111111111111111111111111111111111111111111111111,
-171 | | )
+167 | | {}
+168 | | """.format(
+169 | | 1,
+170 | | 2,
+171 | | 111111111111111111111111111111111111111111111111111111111111111111111111111111111111111,
+172 | | )
     | |_^
-172 |
-173 |   aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa = """{}
+173 |
+174 |   aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa = """{}
     |
 help: Convert to f-string
-160 |     11111111111111111111111111111111111111111111111111111111111111111111111111,
-161 | )
-162 | 
-163 + f"""
-164 + {1}
-165 + {2}
-166 + {111111111111111111111111111111111111111111111111111111111111111111111111111111111111111}
-167 | """
+161 |     11111111111111111111111111111111111111111111111111111111111111111111111111,
+162 | )
+163 | 
+164 + f"""
+165 + {1}
+166 + {2}
+167 + {111111111111111111111111111111111111111111111111111111111111111111111111111111111111111}
+168 | """
     - {}
     - {}
     - {}
@@ -980,408 +960,392 @@ help: Convert to f-string
     - 2,
     - 111111111111111111111111111111111111111111111111111111111111111111111111111111111111111,
     - )
-168 | 
-169 | aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa = """{}
-170 | """.format(
+169 | 
+170 | aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa = """{}
+171 | """.format(
 
 UP032 [*] Use f-string instead of `format` call
-   --> UP032_0.py:173:84
+   --> UP032_0.py:174:84
     |
-171 |   )
-172 |
-173 |   aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa = """{}
+172 |   )
+173 |
+174 |   aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa = """{}
     |  ____________________________________________________________________________________^
-174 | | """.format(
-175 | |     111111
-176 | | )
+175 | | """.format(
+176 | |     111111
+177 | | )
     | |_^
-177 |
-178 |   "{}".format(
+178 |
+179 |   "{}".format(
     |
 help: Convert to f-string
-170 | 111111111111111111111111111111111111111111111111111111111111111111111111111111111111111,
-171 | )
-172 | 
+171 | 111111111111111111111111111111111111111111111111111111111111111111111111111111111111111,
+172 | )
+173 | 
     - aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa = """{}
     - """.format(
     -     111111
     - )
-173 + aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa = f"""{111111}
-174 + """
-175 | 
-176 | "{}".format(
-177 |     [
+174 + aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa = f"""{111111}
+175 + """
+176 | 
+177 | "{}".format(
+178 |     [
 
 UP032 Use f-string instead of `format` call
-   --> UP032_0.py:201:1
+   --> UP032_0.py:202:1
     |
-199 |   "{}".format(**c)
-200 |
-201 | / "{}".format(
-202 | |     1  # comment
-203 | | )
+200 |   "{}".format(**c)
+201 |
+202 | / "{}".format(
+203 | |     1  # comment
+204 | | )
     | |_^
     |
 help: Convert to f-string
 
 UP032 [*] Use f-string instead of `format` call
-   --> UP032_0.py:208:1
+   --> UP032_0.py:209:1
     |
-206 | # The fixed string will exceed the line length, but it's still smaller than the
-207 | # existing line length, so it's fine.
-208 | "<Customer: {}, {}, {}, {}, {}>".format(self.internal_ids, self.external_ids, self.properties, self.tags, self.others)
+207 | # The fixed string will exceed the line length, but it's still smaller than the
+208 | # existing line length, so it's fine.
+209 | "<Customer: {}, {}, {}, {}, {}>".format(self.internal_ids, self.external_ids, self.properties, self.tags, self.others)
     | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-209 |
-210 | # When fixing, trim the trailing empty string.
+210 |
+211 | # When fixing, trim the trailing empty string.
     |
 help: Convert to f-string
-205 | 
-206 | # The fixed string will exceed the line length, but it's still smaller than the
-207 | # existing line length, so it's fine.
+206 | 
+207 | # The fixed string will exceed the line length, but it's still smaller than the
+208 | # existing line length, so it's fine.
     - "<Customer: {}, {}, {}, {}, {}>".format(self.internal_ids, self.external_ids, self.properties, self.tags, self.others)
-208 + f"<Customer: {self.internal_ids}, {self.external_ids}, {self.properties}, {self.tags}, {self.others}>"
-209 | 
-210 | # When fixing, trim the trailing empty string.
-211 | raise ValueError("Conflicting configuration dicts: {!r} {!r}"
+209 + f"<Customer: {self.internal_ids}, {self.external_ids}, {self.properties}, {self.tags}, {self.others}>"
+210 | 
+211 | # When fixing, trim the trailing empty string.
+212 | raise ValueError("Conflicting configuration dicts: {!r} {!r}"
 
 UP032 [*] Use f-string instead of `format` call
-   --> UP032_0.py:211:18
+   --> UP032_0.py:212:18
     |
-210 |   # When fixing, trim the trailing empty string.
-211 |   raise ValueError("Conflicting configuration dicts: {!r} {!r}"
+211 |   # When fixing, trim the trailing empty string.
+212 |   raise ValueError("Conflicting configuration dicts: {!r} {!r}"
     |  __________________^
-212 | |                  "".format(new_dict, d))
+213 | |                  "".format(new_dict, d))
     | |_______________________________________^
-213 |
-214 |   # When fixing, trim the trailing empty string.
+214 |
+215 |   # When fixing, trim the trailing empty string.
     |
 help: Convert to f-string
-208 | "<Customer: {}, {}, {}, {}, {}>".format(self.internal_ids, self.external_ids, self.properties, self.tags, self.others)
-209 | 
-210 | # When fixing, trim the trailing empty string.
+209 | "<Customer: {}, {}, {}, {}, {}>".format(self.internal_ids, self.external_ids, self.properties, self.tags, self.others)
+210 | 
+211 | # When fixing, trim the trailing empty string.
     - raise ValueError("Conflicting configuration dicts: {!r} {!r}"
     -                  "".format(new_dict, d))
-211 + raise ValueError(f"Conflicting configuration dicts: {new_dict!r} {d!r}")
-212 | 
-213 | # When fixing, trim the trailing empty string.
-214 | raise ValueError("Conflicting configuration dicts: {!r} {!r}"
-
-UP032 [*] Use f-string instead of `format` call
-   --> UP032_0.py:215:18
-    |
-214 |   # When fixing, trim the trailing empty string.
-215 |   raise ValueError("Conflicting configuration dicts: {!r} {!r}"
-    |  __________________^
-216 | |                  .format(new_dict, d))
-    | |_____________________________________^
-217 |
-218 |   raise ValueError(
-    |
-help: Convert to f-string
-212 |                  "".format(new_dict, d))
+212 + raise ValueError(f"Conflicting configuration dicts: {new_dict!r} {d!r}")
 213 | 
 214 | # When fixing, trim the trailing empty string.
+215 | raise ValueError("Conflicting configuration dicts: {!r} {!r}"
+
+UP032 [*] Use f-string instead of `format` call
+   --> UP032_0.py:216:18
+    |
+215 |   # When fixing, trim the trailing empty string.
+216 |   raise ValueError("Conflicting configuration dicts: {!r} {!r}"
+    |  __________________^
+217 | |                  .format(new_dict, d))
+    | |_____________________________________^
+218 |
+219 |   raise ValueError(
+    |
+help: Convert to f-string
+213 |                  "".format(new_dict, d))
+214 | 
+215 | # When fixing, trim the trailing empty string.
     - raise ValueError("Conflicting configuration dicts: {!r} {!r}"
     -                  .format(new_dict, d))
-215 + raise ValueError(f"Conflicting configuration dicts: {new_dict!r} {d!r}"
-216 +                  )
-217 | 
-218 | raise ValueError(
-219 |     "Conflicting configuration dicts: {!r} {!r}"
+216 + raise ValueError(f"Conflicting configuration dicts: {new_dict!r} {d!r}"
+217 +                  )
+218 | 
+219 | raise ValueError(
+220 |     "Conflicting configuration dicts: {!r} {!r}"
 
 UP032 [*] Use f-string instead of `format` call
-   --> UP032_0.py:219:5
+   --> UP032_0.py:220:5
     |
-218 |   raise ValueError(
-219 | /     "Conflicting configuration dicts: {!r} {!r}"
-220 | |     "".format(new_dict, d)
+219 |   raise ValueError(
+220 | /     "Conflicting configuration dicts: {!r} {!r}"
+221 | |     "".format(new_dict, d)
     | |__________________________^
-221 |   )
+222 |   )
     |
 help: Convert to f-string
-216 |                  .format(new_dict, d))
-217 | 
-218 | raise ValueError(
+217 |                  .format(new_dict, d))
+218 | 
+219 | raise ValueError(
     -     "Conflicting configuration dicts: {!r} {!r}"
     -     "".format(new_dict, d)
-219 +     f"Conflicting configuration dicts: {new_dict!r} {d!r}"
-220 | )
-221 | 
-222 | raise ValueError(
-
-UP032 [*] Use f-string instead of `format` call
-   --> UP032_0.py:224:5
-    |
-223 |   raise ValueError(
-224 | /     "Conflicting configuration dicts: {!r} {!r}"
-225 | |     "".format(new_dict, d)
-    | |__________________________^
-226 |
-227 |   )
-    |
-help: Convert to f-string
+220 +     f"Conflicting configuration dicts: {new_dict!r} {d!r}"
 221 | )
 222 | 
 223 | raise ValueError(
-    -     "Conflicting configuration dicts: {!r} {!r}"
-    -     "".format(new_dict, d)
-224 +     f"Conflicting configuration dicts: {new_dict!r} {d!r}"
-225 | 
-226 | )
-227 | 
 
 UP032 [*] Use f-string instead of `format` call
-   --> UP032_0.py:230:1
+   --> UP032_0.py:225:5
     |
-229 |   # The first string will be converted to an f-string and the curly braces in the second should be converted to be unescaped
-230 | / (
-231 | |     "{}"
-232 | |     "{{}}"
-233 | | ).format(a)
-    | |___________^
-234 |
-235 |   ("{}" "{{}}").format(a)
+224 |   raise ValueError(
+225 | /     "Conflicting configuration dicts: {!r} {!r}"
+226 | |     "".format(new_dict, d)
+    | |__________________________^
+227 |
+228 |   )
     |
 help: Convert to f-string
+222 | )
+223 | 
+224 | raise ValueError(
+    -     "Conflicting configuration dicts: {!r} {!r}"
+    -     "".format(new_dict, d)
+225 +     f"Conflicting configuration dicts: {new_dict!r} {d!r}"
+226 | 
+227 | )
 228 | 
-229 | # The first string will be converted to an f-string and the curly braces in the second should be converted to be unescaped
-230 | (
-231 +     f"{a}"
-232 |     "{}"
-    -     "{{}}"
-    - ).format(a)
-233 + )
-234 | 
-235 | ("{}" "{{}}").format(a)
-236 | 
 
 UP032 [*] Use f-string instead of `format` call
-   --> UP032_0.py:235:1
+   --> UP032_0.py:231:1
     |
-233 | ).format(a)
-234 |
-235 | ("{}" "{{}}").format(a)
+230 |   # The first string will be converted to an f-string and the curly braces in the second should be converted to be unescaped
+231 | / (
+232 | |     "{}"
+233 | |     "{{}}"
+234 | | ).format(a)
+    | |___________^
+235 |
+236 |   ("{}" "{{}}").format(a)
+    |
+help: Convert to f-string
+229 | 
+230 | # The first string will be converted to an f-string and the curly braces in the second should be converted to be unescaped
+231 | (
+232 +     f"{a}"
+233 |     "{}"
+    -     "{{}}"
+    - ).format(a)
+234 + )
+235 | 
+236 | ("{}" "{{}}").format(a)
+237 | 
+
+UP032 [*] Use f-string instead of `format` call
+   --> UP032_0.py:236:1
+    |
+234 | ).format(a)
+235 |
+236 | ("{}" "{{}}").format(a)
     | ^^^^^^^^^^^^^^^^^^^^^^^
     |
 help: Convert to f-string
-232 |     "{{}}"
-233 | ).format(a)
-234 | 
+233 |     "{{}}"
+234 | ).format(a)
+235 | 
     - ("{}" "{{}}").format(a)
-235 + (f"{a}" "{}")
-236 | 
+236 + (f"{a}" "{}")
 237 | 
-238 | # Both strings will be converted to an f-string and the curly braces in the second should left escaped
+238 | 
+239 | # Both strings will be converted to an f-string and the curly braces in the second should left escaped
 
 UP032 [*] Use f-string instead of `format` call
-   --> UP032_0.py:239:1
+   --> UP032_0.py:240:1
     |
-238 |   # Both strings will be converted to an f-string and the curly braces in the second should left escaped
-239 | / (
-240 | |     "{}"
-241 | |     "{{{}}}"
-242 | | ).format(a, b)
+239 |   # Both strings will be converted to an f-string and the curly braces in the second should left escaped
+240 | / (
+241 | |     "{}"
+242 | |     "{{{}}}"
+243 | | ).format(a, b)
     | |______________^
-243 |
-244 |   ("{}" "{{{}}}").format(a, b)
+244 |
+245 |   ("{}" "{{{}}}").format(a, b)
     |
 help: Convert to f-string
-237 | 
-238 | # Both strings will be converted to an f-string and the curly braces in the second should left escaped
-239 | (
+238 | 
+239 | # Both strings will be converted to an f-string and the curly braces in the second should left escaped
+240 | (
     -     "{}"
     -     "{{{}}}"
     - ).format(a, b)
-240 +     f"{a}"
-241 +     f"{{{b}}}"
-242 + )
-243 | 
-244 | ("{}" "{{{}}}").format(a, b)
-245 | 
+241 +     f"{a}"
+242 +     f"{{{b}}}"
+243 + )
+244 | 
+245 | ("{}" "{{{}}}").format(a, b)
+246 | 
 
 UP032 [*] Use f-string instead of `format` call
-   --> UP032_0.py:244:1
+   --> UP032_0.py:245:1
     |
-242 | ).format(a, b)
-243 |
-244 | ("{}" "{{{}}}").format(a, b)
+243 | ).format(a, b)
+244 |
+245 | ("{}" "{{{}}}").format(a, b)
     | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-245 |
-246 | # The dictionary should be parenthesized.
+246 |
+247 | # The dictionary should be parenthesized.
     |
 help: Convert to f-string
-241 |     "{{{}}}"
-242 | ).format(a, b)
-243 | 
+242 |     "{{{}}}"
+243 | ).format(a, b)
+244 | 
     - ("{}" "{{{}}}").format(a, b)
-244 + (f"{a}" f"{{{b}}}")
-245 | 
-246 | # The dictionary should be parenthesized.
-247 | "{}".format({0: 1}[0])
+245 + (f"{a}" f"{{{b}}}")
+246 | 
+247 | # The dictionary should be parenthesized.
+248 | "{}".format({0: 1}[0])
 
 UP032 [*] Use f-string instead of `format` call
-   --> UP032_0.py:247:1
+   --> UP032_0.py:248:1
     |
-246 | # The dictionary should be parenthesized.
-247 | "{}".format({0: 1}[0])
+247 | # The dictionary should be parenthesized.
+248 | "{}".format({0: 1}[0])
     | ^^^^^^^^^^^^^^^^^^^^^^
-248 |
-249 | # The dictionary should be parenthesized.
+249 |
+250 | # The dictionary should be parenthesized.
     |
 help: Convert to f-string
-244 | ("{}" "{{{}}}").format(a, b)
-245 | 
-246 | # The dictionary should be parenthesized.
+245 | ("{}" "{{{}}}").format(a, b)
+246 | 
+247 | # The dictionary should be parenthesized.
     - "{}".format({0: 1}[0])
-247 + f"{({0: 1}[0])}"
-248 | 
-249 | # The dictionary should be parenthesized.
-250 | "{}".format({0: 1}.bar)
+248 + f"{({0: 1}[0])}"
+249 | 
+250 | # The dictionary should be parenthesized.
+251 | "{}".format({0: 1}.bar)
 
 UP032 [*] Use f-string instead of `format` call
-   --> UP032_0.py:250:1
+   --> UP032_0.py:251:1
     |
-249 | # The dictionary should be parenthesized.
-250 | "{}".format({0: 1}.bar)
+250 | # The dictionary should be parenthesized.
+251 | "{}".format({0: 1}.bar)
     | ^^^^^^^^^^^^^^^^^^^^^^^
-251 |
-252 | # The dictionary should be parenthesized.
+252 |
+253 | # The dictionary should be parenthesized.
     |
 help: Convert to f-string
-247 | "{}".format({0: 1}[0])
-248 | 
-249 | # The dictionary should be parenthesized.
+248 | "{}".format({0: 1}[0])
+249 | 
+250 | # The dictionary should be parenthesized.
     - "{}".format({0: 1}.bar)
-250 + f"{({0: 1}.bar)}"
-251 | 
-252 | # The dictionary should be parenthesized.
-253 | "{}".format({0: 1}())
+251 + f"{({0: 1}.bar)}"
+252 | 
+253 | # The dictionary should be parenthesized.
+254 | "{}".format({0: 1}())
 
 UP032 [*] Use f-string instead of `format` call
-   --> UP032_0.py:253:1
+   --> UP032_0.py:254:1
     |
-252 | # The dictionary should be parenthesized.
-253 | "{}".format({0: 1}())
+253 | # The dictionary should be parenthesized.
+254 | "{}".format({0: 1}())
     | ^^^^^^^^^^^^^^^^^^^^^
-254 |
-255 | # The string shouldn't be converted, since it would require repeating the function call.
+255 |
+256 | # The string shouldn't be converted, since it would require repeating the function call.
     |
 help: Convert to f-string
-250 | "{}".format({0: 1}.bar)
-251 | 
-252 | # The dictionary should be parenthesized.
+251 | "{}".format({0: 1}.bar)
+252 | 
+253 | # The dictionary should be parenthesized.
     - "{}".format({0: 1}())
-253 + f"{({0: 1}())}"
-254 | 
-255 | # The string shouldn't be converted, since it would require repeating the function call.
-256 | "{x} {x}".format(x=foo())
+254 + f"{({0: 1}())}"
+255 | 
+256 | # The string shouldn't be converted, since it would require repeating the function call.
+257 | "{x} {x}".format(x=foo())
 
 UP032 [*] Use f-string instead of `format` call
-   --> UP032_0.py:260:1
+   --> UP032_0.py:261:1
     |
-259 | # The string _should_ be converted, since the function call is repeated in the arguments.
-260 | "{0} {1}".format(foo(), foo())
+260 | # The string _should_ be converted, since the function call is repeated in the arguments.
+261 | "{0} {1}".format(foo(), foo())
     | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-261 |
-262 | # The call should be removed, but the string itself should remain.
+262 |
+263 | # The call should be removed, but the string itself should remain.
     |
 help: Convert to f-string
-257 | "{0} {0}".format(foo())
-258 | 
-259 | # The string _should_ be converted, since the function call is repeated in the arguments.
+258 | "{0} {0}".format(foo())
+259 | 
+260 | # The string _should_ be converted, since the function call is repeated in the arguments.
     - "{0} {1}".format(foo(), foo())
-260 + f"{foo()} {foo()}"
-261 | 
-262 | # The call should be removed, but the string itself should remain.
-263 | ''.format(self.project)
+261 + f"{foo()} {foo()}"
+262 | 
+263 | # The call should be removed, but the string itself should remain.
+264 | ''.format(self.project)
 
 UP032 [*] Use f-string instead of `format` call
-   --> UP032_0.py:263:1
+   --> UP032_0.py:264:1
     |
-262 | # The call should be removed, but the string itself should remain.
-263 | ''.format(self.project)
+263 | # The call should be removed, but the string itself should remain.
+264 | ''.format(self.project)
     | ^^^^^^^^^^^^^^^^^^^^^^^
-264 |
-265 | # The call should be removed, but the string itself should remain.
+265 |
+266 | # The call should be removed, but the string itself should remain.
     |
 help: Convert to f-string
-260 | "{0} {1}".format(foo(), foo())
-261 | 
-262 | # The call should be removed, but the string itself should remain.
+261 | "{0} {1}".format(foo(), foo())
+262 | 
+263 | # The call should be removed, but the string itself should remain.
     - ''.format(self.project)
-263 + ''
-264 | 
-265 | # The call should be removed, but the string itself should remain.
-266 | "".format(self.project)
+264 + ''
+265 | 
+266 | # The call should be removed, but the string itself should remain.
+267 | "".format(self.project)
 
 UP032 [*] Use f-string instead of `format` call
-   --> UP032_0.py:266:1
+   --> UP032_0.py:267:1
     |
-265 | # The call should be removed, but the string itself should remain.
-266 | "".format(self.project)
+266 | # The call should be removed, but the string itself should remain.
+267 | "".format(self.project)
     | ^^^^^^^^^^^^^^^^^^^^^^^
-267 |
-268 | # Not a valid type annotation but this test shouldn't result in a panic.
+268 |
+269 | # Not a valid type annotation but this test shouldn't result in a panic.
     |
 help: Convert to f-string
-263 | ''.format(self.project)
-264 | 
-265 | # The call should be removed, but the string itself should remain.
+264 | ''.format(self.project)
+265 | 
+266 | # The call should be removed, but the string itself should remain.
     - "".format(self.project)
-266 + ""
-267 | 
-268 | # Not a valid type annotation but this test shouldn't result in a panic.
-269 | # Refer: https://github.com/astral-sh/ruff/issues/11736
+267 + ""
+268 | 
+269 | # Not a valid type annotation but this test shouldn't result in a panic.
+270 | # Refer: https://github.com/astral-sh/ruff/issues/11736
 
 UP032 [*] Use f-string instead of `format` call
-   --> UP032_0.py:270:5
+   --> UP032_0.py:271:5
     |
-268 | # Not a valid type annotation but this test shouldn't result in a panic.
-269 | # Refer: https://github.com/astral-sh/ruff/issues/11736
-270 | x: "'{} + {}'.format(x, y)"
+269 | # Not a valid type annotation but this test shouldn't result in a panic.
+270 | # Refer: https://github.com/astral-sh/ruff/issues/11736
+271 | x: "'{} + {}'.format(x, y)"
     |     ^^^^^^^^^^^^^^^^^^^^^^
-271 |
-272 | # Regression https://github.com/astral-sh/ruff/issues/21000
+272 |
+273 | # Regression https://github.com/astral-sh/ruff/issues/21000
     |
 help: Convert to f-string
-267 | 
-268 | # Not a valid type annotation but this test shouldn't result in a panic.
-269 | # Refer: https://github.com/astral-sh/ruff/issues/11736
+268 | 
+269 | # Not a valid type annotation but this test shouldn't result in a panic.
+270 | # Refer: https://github.com/astral-sh/ruff/issues/11736
     - x: "'{} + {}'.format(x, y)"
-270 + x: "f'{x} + {y}'"
-271 | 
-272 | # Regression https://github.com/astral-sh/ruff/issues/21000
-273 | # Fix should parenthesize walrus
+271 + x: "f'{x} + {y}'"
+272 | 
+273 | # Regression https://github.com/astral-sh/ruff/issues/21000
+274 | # Fix should parenthesize walrus
 
 UP032 [*] Use f-string instead of `format` call
-   --> UP032_0.py:276:14
+   --> UP032_0.py:277:14
     |
-274 | if __name__ == "__main__":
-275 |     number = 0
-276 |     string = "{}".format(number := number + 1)
+275 | if __name__ == "__main__":
+276 |     number = 0
+277 |     string = "{}".format(number := number + 1)
     |              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-277 |     print(string)
+278 |     print(string)
     |
 help: Convert to f-string
-273 | # Fix should parenthesize walrus
-274 | if __name__ == "__main__":
-275 |     number = 0
+274 | # Fix should parenthesize walrus
+275 | if __name__ == "__main__":
+276 |     number = 0
     -     string = "{}".format(number := number + 1)
-276 +     string = f"{(number := number + 1)}"
-277 |     print(string)
-278 | 
-279 | # Unicode escape
-
-UP032 [*] Use f-string instead of `format` call
-   --> UP032_0.py:280:1
-    |
-279 | # Unicode escape
-280 | "\N{angle}AOB = {angle}°".format(angle=180)
-    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-    |
-help: Convert to f-string
-277 |     print(string)
-278 | 
-279 | # Unicode escape
-    - "\N{angle}AOB = {angle}°".format(angle=180)
-280 + f"\N{angle}AOB = {180}°"
+277 +     string = f"{(number := number + 1)}"
+278 |     print(string)

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

@@ -3,11 +3,10 @@ use std::borrow::Cow;
 use ruff_python_ast::PythonVersion;
 use ruff_python_ast::{self as ast, Expr, name::Name, token::parenthesized_range};
 use ruff_python_codegen::Generator;
-use ruff_python_semantic::{ResolvedReference, SemanticModel};
+use ruff_python_semantic::{BindingId, ResolvedReference, SemanticModel};
 use ruff_text_size::{Ranged, TextRange};
 
 use crate::checkers::ast::Checker;
-use crate::rules::flake8_async::rules::blocking_open_call::is_open_call_from_pathlib;
 use crate::{Applicability, Edit, Fix};
 
 /// Format a code snippet to call `name.method()`.
@@ -120,13 +119,14 @@ impl OpenMode {
 pub(super) struct FileOpen<'a> {
     /// With item where the open happens, we use it for the reporting range.
     pub(super) item: &'a ast::WithItem,
+    /// Filename expression used as the first argument in `open`, we use it in the diagnostic message.
+    pub(super) filename: &'a Expr,
     /// The file open mode.
     pub(super) mode: OpenMode,
     /// The file open keywords.
     pub(super) keywords: Vec<&'a ast::Keyword>,
     /// We only check `open` operations whose file handles are used exactly once.
     pub(super) reference: &'a ResolvedReference,
-    pub(super) argument: OpenArgument<'a>,
 }
 
 impl FileOpen<'_> {
@@ -137,45 +137,6 @@ impl FileOpen<'_> {
     }
 }
 
-#[derive(Debug, Clone, Copy)]
-pub(super) enum OpenArgument<'a> {
-    /// The filename argument to `open`, e.g. "foo.txt" in:
-    ///
-    /// ```py
-    /// f = open("foo.txt")
-    /// ```
-    Builtin { filename: &'a Expr },
-    /// The `Path` receiver of a `pathlib.Path.open` call, e.g. the `p` in the
-    /// context manager in:
-    ///
-    /// ```py
-    /// p = Path("foo.txt")
-    /// with p.open() as f: ...
-    /// ```
-    ///
-    /// or `Path("foo.txt")` in
-    ///
-    /// ```py
-    /// with Path("foo.txt").open() as f: ...
-    /// ```
-    Pathlib { path: &'a Expr },
-}
-
-impl OpenArgument<'_> {
-    pub(super) fn display<'src>(&self, source: &'src str) -> &'src str {
-        &source[self.range()]
-    }
-}
-
-impl Ranged for OpenArgument<'_> {
-    fn range(&self) -> TextRange {
-        match self {
-            OpenArgument::Builtin { filename } => filename.range(),
-            OpenArgument::Pathlib { path } => path.range(),
-        }
-    }
-}
-
 /// Find and return all `open` operations in the given `with` statement.
 pub(super) fn find_file_opens<'a>(
     with: &'a ast::StmtWith,
@@ -185,65 +146,10 @@ pub(super) fn find_file_opens<'a>(
 ) -> Vec<FileOpen<'a>> {
     with.items
         .iter()
-        .filter_map(|item| {
-            find_file_open(item, with, semantic, read_mode, python_version)
-                .or_else(|| find_path_open(item, with, semantic, read_mode, python_version))
-        })
+        .filter_map(|item| find_file_open(item, with, semantic, read_mode, python_version))
         .collect()
 }
 
-fn resolve_file_open<'a>(
-    item: &'a ast::WithItem,
-    with: &'a ast::StmtWith,
-    semantic: &'a SemanticModel<'a>,
-    read_mode: bool,
-    mode: OpenMode,
-    keywords: Vec<&'a ast::Keyword>,
-    argument: OpenArgument<'a>,
-) -> Option<FileOpen<'a>> {
-    match mode {
-        OpenMode::ReadText | OpenMode::ReadBytes => {
-            if !read_mode {
-                return None;
-            }
-        }
-        OpenMode::WriteText | OpenMode::WriteBytes => {
-            if read_mode {
-                return None;
-            }
-        }
-    }
-
-    if matches!(mode, OpenMode::ReadBytes | OpenMode::WriteBytes) && !keywords.is_empty() {
-        return None;
-    }
-    let var = item.optional_vars.as_deref()?.as_name_expr()?;
-    let scope = semantic.current_scope();
-
-    let binding = scope.get_all(var.id.as_str()).find_map(|id| {
-        let b = semantic.binding(id);
-        (b.range() == var.range()).then_some(b)
-    })?;
-    let references: Vec<&ResolvedReference> = binding
-        .references
-        .iter()
-        .map(|id| semantic.reference(*id))
-        .filter(|reference| with.range().contains_range(reference.range()))
-        .collect();
-
-    let [reference] = references.as_slice() else {
-        return None;
-    };
-
-    Some(FileOpen {
-        item,
-        mode,
-        keywords,
-        reference,
-        argument,
-    })
-}
-
 /// Find `open` operation in the given `with` item.
 fn find_file_open<'a>(
     item: &'a ast::WithItem,
@@ -259,6 +165,8 @@ fn find_file_open<'a>(
         ..
     } = item.context_expr.as_call_expr()?;
 
+    let var = item.optional_vars.as_deref()?.as_name_expr()?;
+
     // Ignore calls with `*args` and `**kwargs`. In the exact case of `open(*filename, mode="w")`,
     // it could be a match; but in all other cases, the call _could_ contain unsupported keyword
     // arguments, like `buffering`.
@@ -279,57 +187,58 @@ fn find_file_open<'a>(
     let (keywords, kw_mode) = match_open_keywords(keywords, read_mode, python_version)?;
 
     let mode = kw_mode.unwrap_or(pos_mode);
-    resolve_file_open(
-        item,
-        with,
-        semantic,
-        read_mode,
-        mode,
-        keywords,
-        OpenArgument::Builtin { filename },
-    )
-}
 
-fn find_path_open<'a>(
-    item: &'a ast::WithItem,
-    with: &'a ast::StmtWith,
-    semantic: &'a SemanticModel<'a>,
-    read_mode: bool,
-    python_version: PythonVersion,
-) -> Option<FileOpen<'a>> {
-    let ast::ExprCall {
-        func,
-        arguments: ast::Arguments { args, keywords, .. },
-        ..
-    } = item.context_expr.as_call_expr()?;
-    if args.iter().any(Expr::is_starred_expr)
-        || keywords.iter().any(|keyword| keyword.arg.is_none())
-    {
+    match mode {
+        OpenMode::ReadText | OpenMode::ReadBytes => {
+            if !read_mode {
+                return None;
+            }
+        }
+        OpenMode::WriteText | OpenMode::WriteBytes => {
+            if read_mode {
+                return None;
+            }
+        }
+    }
+
+    // Path.read_bytes and Path.write_bytes do not support any kwargs.
+    if matches!(mode, OpenMode::ReadBytes | OpenMode::WriteBytes) && !keywords.is_empty() {
         return None;
     }
-    if !is_open_call_from_pathlib(func, semantic) {
+
+    // Now we need to find what is this variable bound to...
+    let scope = semantic.current_scope();
+    let bindings: Vec<BindingId> = scope.get_all(var.id.as_str()).collect();
+
+    let binding = bindings
+        .iter()
+        .map(|id| semantic.binding(*id))
+        // We might have many bindings with the same name, but we only care
+        // for the one we are looking at right now.
+        .find(|binding| binding.range() == var.range())?;
+
+    // Since many references can share the same binding, we can limit our attention span
+    // exclusively to the body of the current `with` statement.
+    let references: Vec<&ResolvedReference> = binding
+        .references
+        .iter()
+        .map(|id| semantic.reference(*id))
+        .filter(|reference| with.range().contains_range(reference.range()))
+        .collect();
+
+    // And even with all these restrictions, if the file handle gets used not exactly once,
+    // it doesn't fit the bill.
+    let [reference] = references.as_slice() else {
         return None;
-    }
-    let attr = func.as_attribute_expr()?;
-    let mode = if args.is_empty() {
-        OpenMode::ReadText
-    } else {
-        match_open_mode(args.first()?)?
     };
 
-    let (keywords, kw_mode) = match_open_keywords(keywords, read_mode, python_version)?;
-    let mode = kw_mode.unwrap_or(mode);
-    resolve_file_open(
+    Some(FileOpen {
         item,
-        with,
-        semantic,
-        read_mode,
+        filename,
         mode,
         keywords,
-        OpenArgument::Pathlib {
-            path: attr.value.as_ref(),
-        },
-    )
+        reference,
+    })
 }
 
 /// Match positional arguments. Return expression for the file name and open mode.

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

@@ -15,8 +15,7 @@ mod tests {
     use crate::test::test_path;
     use crate::{assert_diagnostics, settings};
 
-    #[test_case(Rule::ReadWholeFile, Path::new("FURB101_0.py"))]
-    #[test_case(Rule::ReadWholeFile, Path::new("FURB101_1.py"))]
+    #[test_case(Rule::ReadWholeFile, Path::new("FURB101.py"))]
     #[test_case(Rule::RepeatedAppend, Path::new("FURB113.py"))]
     #[test_case(Rule::IfExpInsteadOfOrOperator, Path::new("FURB110.py"))]
     #[test_case(Rule::ReimplementedOperator, Path::new("FURB118.py"))]
@@ -47,8 +46,7 @@ mod tests {
     #[test_case(Rule::MetaClassABCMeta, Path::new("FURB180.py"))]
     #[test_case(Rule::HashlibDigestHex, Path::new("FURB181.py"))]
     #[test_case(Rule::ListReverseCopy, Path::new("FURB187.py"))]
-    #[test_case(Rule::WriteWholeFile, Path::new("FURB103_0.py"))]
-    #[test_case(Rule::WriteWholeFile, Path::new("FURB103_1.py"))]
+    #[test_case(Rule::WriteWholeFile, Path::new("FURB103.py"))]
     #[test_case(Rule::FStringNumberFormat, Path::new("FURB116.py"))]
     #[test_case(Rule::SortedMinMax, Path::new("FURB192.py"))]
     #[test_case(Rule::SliceToRemovePrefixOrSuffix, Path::new("FURB188.py"))]
@@ -67,7 +65,7 @@ mod tests {
     #[test]
     fn write_whole_file_python_39() -> Result<()> {
         let diagnostics = test_path(
-            Path::new("refurb/FURB103_0.py"),
+            Path::new("refurb/FURB103.py"),
             &settings::LinterSettings::for_rule(Rule::WriteWholeFile)
                 .with_target_version(PythonVersion::PY39),
         )?;

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

@@ -10,7 +10,7 @@ use ruff_text_size::{Ranged, TextRange};
 use crate::checkers::ast::Checker;
 use crate::fix::snippet::SourceCodeSnippet;
 use crate::importer::ImportRequest;
-use crate::rules::refurb::helpers::{FileOpen, OpenArgument, find_file_opens};
+use crate::rules::refurb::helpers::{FileOpen, find_file_opens};
 use crate::{FixAvailability, Violation};
 
 /// ## What it does
@@ -42,41 +42,27 @@ use crate::{FixAvailability, Violation};
 /// - [Python documentation: `Path.read_text`](https://docs.python.org/3/library/pathlib.html#pathlib.Path.read_text)
 #[derive(ViolationMetadata)]
 #[violation_metadata(preview_since = "v0.1.2")]
-pub(crate) struct ReadWholeFile<'a> {
+pub(crate) struct ReadWholeFile {
     filename: SourceCodeSnippet,
     suggestion: SourceCodeSnippet,
-    argument: OpenArgument<'a>,
 }
 
-impl Violation for ReadWholeFile<'_> {
+impl Violation for ReadWholeFile {
     const FIX_AVAILABILITY: FixAvailability = FixAvailability::Sometimes;
 
     #[derive_message_formats]
     fn message(&self) -> String {
         let filename = self.filename.truncated_display();
         let suggestion = self.suggestion.truncated_display();
-        match self.argument {
-            OpenArgument::Pathlib { .. } => {
-                format!(
-                    "`Path.open()` followed by `read()` can be replaced by `{filename}.{suggestion}`"
-                )
-            }
-            OpenArgument::Builtin { .. } => {
-                format!("`open` and `read` should be replaced by `Path({filename}).{suggestion}`")
-            }
-        }
+        format!("`open` and `read` should be replaced by `Path({filename}).{suggestion}`")
     }
 
     fn fix_title(&self) -> Option<String> {
-        let filename = self.filename.truncated_display();
-        let suggestion = self.suggestion.truncated_display();
-
-        match self.argument {
-            OpenArgument::Pathlib { .. } => Some(format!("Replace with `{filename}.{suggestion}`")),
-            OpenArgument::Builtin { .. } => {
-                Some(format!("Replace with `Path({filename}).{suggestion}`"))
-            }
-        }
+        Some(format!(
+            "Replace with `Path({}).{}`",
+            self.filename.truncated_display(),
+            self.suggestion.truncated_display(),
+        ))
     }
 }
 
@@ -128,13 +114,13 @@ impl<'a> Visitor<'a> for ReadMatcher<'a, '_> {
                 .position(|open| open.is_ref(read_from))
             {
                 let open = self.candidates.remove(open);
-                let filename_display = open.argument.display(self.checker.source());
                 let suggestion = make_suggestion(&open, self.checker.generator());
                 let mut diagnostic = self.checker.report_diagnostic(
                     ReadWholeFile {
-                        filename: SourceCodeSnippet::from_str(filename_display),
+                        filename: SourceCodeSnippet::from_str(
+                            &self.checker.generator().expr(open.filename),
+                        ),
                         suggestion: SourceCodeSnippet::from_str(&suggestion),
-                        argument: open.argument,
                     },
                     open.item.range(),
                 );
@@ -202,6 +188,8 @@ fn generate_fix(
 
     let locator = checker.locator();
 
+    let filename_code = locator.slice(open.filename.range());
+
     let (import_edit, binding) = checker
         .importer()
         .get_or_import_symbol(
@@ -218,15 +206,10 @@ fn generate_fix(
         [Stmt::Assign(ast::StmtAssign { targets, value, .. })] if value.range() == expr.range() => {
             match targets.as_slice() {
                 [Expr::Name(name)] => {
-                    let target = match open.argument {
-                        OpenArgument::Builtin { filename } => {
-                            let filename_code = locator.slice(filename.range());
-                            format!("{binding}({filename_code})")
-                        }
-                        OpenArgument::Pathlib { path } => locator.slice(path.range()).to_string(),
-                    };
-
-                    format!("{name} = {target}.{suggestion}", name = name.id)
+                    format!(
+                        "{name} = {binding}({filename_code}).{suggestion}",
+                        name = name.id
+                    )
                 }
                 _ => return None,
             }
@@ -240,16 +223,8 @@ fn generate_fix(
             }),
         ] if value.range() == expr.range() => match target.as_ref() {
             Expr::Name(name) => {
-                let target = match open.argument {
-                    OpenArgument::Builtin { filename } => {
-                        let filename_code = locator.slice(filename.range());
-                        format!("{binding}({filename_code})")
-                    }
-                    OpenArgument::Pathlib { path } => locator.slice(path.range()).to_string(),
-                };
-
                 format!(
-                    "{var}: {ann} = {target}.{suggestion}",
+                    "{var}: {ann} = {binding}({filename_code}).{suggestion}",
                     var = name.id,
                     ann = locator.slice(annotation.range())
                 )

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

@@ -176,7 +176,7 @@ fn match_consecutive_appends<'a>(
     let suite = if semantic.at_top_level() {
         // If the statement is at the top level, we should go to the parent module.
         // Module is available in the definitions list.
-        EnclosingSuite::new(semantic.definitions.python_ast()?, stmt.into())?
+        EnclosingSuite::new(semantic.definitions.python_ast()?, stmt)?
     } else {
         // Otherwise, go to the parent, and take its body as a sequence of siblings.
         semantic

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

@@ -9,7 +9,7 @@ use ruff_text_size::Ranged;
 use crate::checkers::ast::Checker;
 use crate::fix::snippet::SourceCodeSnippet;
 use crate::importer::ImportRequest;
-use crate::rules::refurb::helpers::{FileOpen, OpenArgument, find_file_opens};
+use crate::rules::refurb::helpers::{FileOpen, find_file_opens};
 use crate::{FixAvailability, Locator, Violation};
 
 /// ## What it does
@@ -42,40 +42,26 @@ use crate::{FixAvailability, Locator, Violation};
 /// - [Python documentation: `Path.write_text`](https://docs.python.org/3/library/pathlib.html#pathlib.Path.write_text)
 #[derive(ViolationMetadata)]
 #[violation_metadata(preview_since = "v0.3.6")]
-pub(crate) struct WriteWholeFile<'a> {
+pub(crate) struct WriteWholeFile {
     filename: SourceCodeSnippet,
     suggestion: SourceCodeSnippet,
-    argument: OpenArgument<'a>,
 }
 
-impl Violation for WriteWholeFile<'_> {
+impl Violation for WriteWholeFile {
     const FIX_AVAILABILITY: FixAvailability = FixAvailability::Sometimes;
 
     #[derive_message_formats]
     fn message(&self) -> String {
         let filename = self.filename.truncated_display();
         let suggestion = self.suggestion.truncated_display();
-        match self.argument {
-            OpenArgument::Pathlib { .. } => {
-                format!(
-                    "`Path.open()` followed by `write()` can be replaced by `{filename}.{suggestion}`"
-                )
-            }
-            OpenArgument::Builtin { .. } => {
-                format!("`open` and `write` should be replaced by `Path({filename}).{suggestion}`")
-            }
-        }
+        format!("`open` and `write` should be replaced by `Path({filename}).{suggestion}`")
     }
     fn fix_title(&self) -> Option<String> {
-        let filename = self.filename.truncated_display();
-        let suggestion = self.suggestion.truncated_display();
-
-        match self.argument {
-            OpenArgument::Pathlib { .. } => Some(format!("Replace with `{filename}.{suggestion}`")),
-            OpenArgument::Builtin { .. } => {
-                Some(format!("Replace with `Path({filename}).{suggestion}`"))
-            }
-        }
+        Some(format!(
+            "Replace with `Path({}).{}`",
+            self.filename.truncated_display(),
+            self.suggestion.truncated_display(),
+        ))
     }
 }
 
@@ -139,15 +125,16 @@ impl<'a> Visitor<'a> for WriteMatcher<'a, '_> {
                 .position(|open| open.is_ref(write_to))
             {
                 let open = self.candidates.remove(open);
+
                 if self.loop_counter == 0 {
-                    let filename_display = open.argument.display(self.checker.source());
                     let suggestion = make_suggestion(&open, content, self.checker.locator());
 
                     let mut diagnostic = self.checker.report_diagnostic(
                         WriteWholeFile {
-                            filename: SourceCodeSnippet::from_str(filename_display),
+                            filename: SourceCodeSnippet::from_str(
+                                &self.checker.generator().expr(open.filename),
+                            ),
                             suggestion: SourceCodeSnippet::from_str(&suggestion),
-                            argument: open.argument,
                         },
                         open.item.range(),
                     );
@@ -211,6 +198,7 @@ fn generate_fix(
     }
 
     let locator = checker.locator();
+    let filename_code = locator.slice(open.filename.range());
 
     let (import_edit, binding) = checker
         .importer()
@@ -221,15 +209,7 @@ fn generate_fix(
         )
         .ok()?;
 
-    let target = match open.argument {
-        OpenArgument::Builtin { filename } => {
-            let filename_code = locator.slice(filename.range());
-            format!("{binding}({filename_code})")
-        }
-        OpenArgument::Pathlib { path } => locator.slice(path.range()).to_string(),
-    };
-
-    let replacement = format!("{target}.{suggestion}");
+    let replacement = format!("{binding}({filename_code}).{suggestion}");
 
     let applicability = if checker.comment_ranges().intersects(with_stmt.range()) {
         Applicability::Unsafe

crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB101_FURB101.py.snap

@@ -2,7 +2,7 @@
 source: crates/ruff_linter/src/rules/refurb/mod.rs
 ---
 FURB101 [*] `open` and `read` should be replaced by `Path("file.txt").read_text()`
-  --> FURB101_0.py:12:6
+  --> FURB101.py:12:6
    |
 11 | # FURB101
 12 | with open("file.txt") as f:
@@ -26,7 +26,7 @@ help: Replace with `Path("file.txt").read_text()`
 16 | with open("file.txt", "rb") as f:
 
 FURB101 [*] `open` and `read` should be replaced by `Path("file.txt").read_bytes()`
-  --> FURB101_0.py:16:6
+  --> FURB101.py:16:6
    |
 15 | # FURB101
 16 | with open("file.txt", "rb") as f:
@@ -50,7 +50,7 @@ help: Replace with `Path("file.txt").read_bytes()`
 20 | with open("file.txt", mode="rb") as f:
 
 FURB101 [*] `open` and `read` should be replaced by `Path("file.txt").read_bytes()`
-  --> FURB101_0.py:20:6
+  --> FURB101.py:20:6
    |
 19 | # FURB101
 20 | with open("file.txt", mode="rb") as f:
@@ -74,7 +74,7 @@ help: Replace with `Path("file.txt").read_bytes()`
 24 | with open("file.txt", encoding="utf8") as f:
 
 FURB101 [*] `open` and `read` should be replaced by `Path("file.txt").read_text(encoding="utf8")`
-  --> FURB101_0.py:24:6
+  --> FURB101.py:24:6
    |
 23 | # FURB101
 24 | with open("file.txt", encoding="utf8") as f:
@@ -98,7 +98,7 @@ help: Replace with `Path("file.txt").read_text(encoding="utf8")`
 28 | with open("file.txt", errors="ignore") as f:
 
 FURB101 [*] `open` and `read` should be replaced by `Path("file.txt").read_text(errors="ignore")`
-  --> FURB101_0.py:28:6
+  --> FURB101.py:28:6
    |
 27 | # FURB101
 28 | with open("file.txt", errors="ignore") as f:
@@ -122,7 +122,7 @@ help: Replace with `Path("file.txt").read_text(errors="ignore")`
 32 | with open("file.txt", mode="r") as f:  # noqa: FURB120
 
 FURB101 [*] `open` and `read` should be replaced by `Path("file.txt").read_text()`
-  --> FURB101_0.py:32:6
+  --> FURB101.py:32:6
    |
 31 | # FURB101
 32 | with open("file.txt", mode="r") as f:  # noqa: FURB120
@@ -147,7 +147,7 @@ help: Replace with `Path("file.txt").read_text()`
 note: This is an unsafe fix and may change runtime behavior
 
 FURB101 `open` and `read` should be replaced by `Path(foo()).read_bytes()`
-  --> FURB101_0.py:36:6
+  --> FURB101.py:36:6
    |
 35 | # FURB101
 36 | with open(foo(), "rb") as f:
@@ -158,7 +158,7 @@ FURB101 `open` and `read` should be replaced by `Path(foo()).read_bytes()`
 help: Replace with `Path(foo()).read_bytes()`
 
 FURB101 `open` and `read` should be replaced by `Path("a.txt").read_text()`
-  --> FURB101_0.py:44:6
+  --> FURB101.py:44:6
    |
 43 | # FURB101
 44 | with open("a.txt") as a, open("b.txt", "rb") as b:
@@ -169,7 +169,7 @@ FURB101 `open` and `read` should be replaced by `Path("a.txt").read_text()`
 help: Replace with `Path("a.txt").read_text()`
 
 FURB101 `open` and `read` should be replaced by `Path("b.txt").read_bytes()`
-  --> FURB101_0.py:44:26
+  --> FURB101.py:44:26
    |
 43 | # FURB101
 44 | with open("a.txt") as a, open("b.txt", "rb") as b:
@@ -180,7 +180,7 @@ FURB101 `open` and `read` should be replaced by `Path("b.txt").read_bytes()`
 help: Replace with `Path("b.txt").read_bytes()`
 
 FURB101 `open` and `read` should be replaced by `Path("file.txt").read_text()`
-  --> FURB101_0.py:49:18
+  --> FURB101.py:49:18
    |
 48 | # FURB101
 49 | with foo() as a, open("file.txt") as b, foo() as c:
@@ -191,7 +191,7 @@ FURB101 `open` and `read` should be replaced by `Path("file.txt").read_text()`
 help: Replace with `Path("file.txt").read_text()`
 
 FURB101 [*] `open` and `read` should be replaced by `Path("file.txt").read_text(encoding="utf-8")`
-   --> FURB101_0.py:130:6
+   --> FURB101.py:130:6
     |
 129 | # FURB101
 130 | with open("file.txt", encoding="utf-8") as f:
@@ -215,7 +215,7 @@ help: Replace with `Path("file.txt").read_text(encoding="utf-8")`
 134 | with open("file.txt", encoding="utf-8") as f:
 
 FURB101 `open` and `read` should be replaced by `Path("file.txt").read_text(encoding="utf-8")`
-   --> FURB101_0.py:134:6
+   --> FURB101.py:134:6
     |
 133 | # FURB101 but no fix because it would remove the assignment to `x`
 134 | with open("file.txt", encoding="utf-8") as f:
@@ -225,7 +225,7 @@ FURB101 `open` and `read` should be replaced by `Path("file.txt").read_text(enco
 help: Replace with `Path("file.txt").read_text(encoding="utf-8")`
 
 FURB101 `open` and `read` should be replaced by `Path("file.txt").read_text(encoding="utf-8")`
-   --> FURB101_0.py:138:6
+   --> FURB101.py:138:6
     |
 137 | # FURB101 but no fix because it would remove the `process_contents` call
 138 | with open("file.txt", encoding="utf-8") as f:
@@ -234,13 +234,13 @@ FURB101 `open` and `read` should be replaced by `Path("file.txt").read_text(enco
     |
 help: Replace with `Path("file.txt").read_text(encoding="utf-8")`
 
-FURB101 `open` and `read` should be replaced by `Path("file1.txt").read_text(encoding="utf-8")`
-   --> FURB101_0.py:141:6
+FURB101 `open` and `read` should be replaced by `Path("file.txt").read_text(encoding="utf-8")`
+   --> FURB101.py:141:6
     |
 139 |     contents = process_contents(f.read())
 140 |
-141 | with open("file1.txt", encoding="utf-8") as f:
-    |      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+141 | with open("file.txt", encoding="utf-8") as f:
+    |      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 142 |     contents: str = process_contents(f.read())
     |
-help: Replace with `Path("file1.txt").read_text(encoding="utf-8")`
+help: Replace with `Path("file.txt").read_text(encoding="utf-8")`

crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB101_FURB101_1.py.snap

@@ -1,39 +0,0 @@
----
-source: crates/ruff_linter/src/rules/refurb/mod.rs
----
-FURB101 [*] `Path.open()` followed by `read()` can be replaced by `Path("file.txt").read_text()`
- --> FURB101_1.py:4:6
-  |
-2 | from pathlib import Path
-3 |
-4 | with Path("file.txt").open() as f:
-  |      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-5 |     contents = f.read()
-  |
-help: Replace with `Path("file.txt").read_text()`
-1 | 
-2 | from pathlib import Path
-3 | 
-  - with Path("file.txt").open() as f:
-  -     contents = f.read()
-4 + contents = Path("file.txt").read_text()
-5 | 
-6 | with Path("file.txt").open("r") as f:
-7 |     contents = f.read()
-
-FURB101 [*] `Path.open()` followed by `read()` can be replaced by `Path("file.txt").read_text()`
- --> FURB101_1.py:7:6
-  |
-5 |     contents = f.read()
-6 |
-7 | with Path("file.txt").open("r") as f:
-  |      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-8 |     contents = f.read()
-  |
-help: Replace with `Path("file.txt").read_text()`
-4 | with Path("file.txt").open() as f:
-5 |     contents = f.read()
-6 | 
-  - with Path("file.txt").open("r") as f:
-  -     contents = f.read()
-7 + contents = Path("file.txt").read_text()

crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB103_FURB103.py.snap

@@ -2,7 +2,7 @@
 source: crates/ruff_linter/src/rules/refurb/mod.rs
 ---
 FURB103 [*] `open` and `write` should be replaced by `Path("file.txt").write_text("test")`
-  --> FURB103_0.py:12:6
+  --> FURB103.py:12:6
    |
 11 | # FURB103
 12 | with open("file.txt", "w") as f:
@@ -26,7 +26,7 @@ help: Replace with `Path("file.txt").write_text("test")`
 16 | with open("file.txt", "wb") as f:
 
 FURB103 [*] `open` and `write` should be replaced by `Path("file.txt").write_bytes(foobar)`
-  --> FURB103_0.py:16:6
+  --> FURB103.py:16:6
    |
 15 | # FURB103
 16 | with open("file.txt", "wb") as f:
@@ -50,7 +50,7 @@ help: Replace with `Path("file.txt").write_bytes(foobar)`
 20 | with open("file.txt", mode="wb") as f:
 
 FURB103 [*] `open` and `write` should be replaced by `Path("file.txt").write_bytes(b"abc")`
-  --> FURB103_0.py:20:6
+  --> FURB103.py:20:6
    |
 19 | # FURB103
 20 | with open("file.txt", mode="wb") as f:
@@ -74,7 +74,7 @@ help: Replace with `Path("file.txt").write_bytes(b"abc")`
 24 | with open("file.txt", "w", encoding="utf8") as f:
 
 FURB103 [*] `open` and `write` should be replaced by `Path("file.txt").write_text(foobar, encoding="utf8")`
-  --> FURB103_0.py:24:6
+  --> FURB103.py:24:6
    |
 23 | # FURB103
 24 | with open("file.txt", "w", encoding="utf8") as f:
@@ -98,7 +98,7 @@ help: Replace with `Path("file.txt").write_text(foobar, encoding="utf8")`
 28 | with open("file.txt", "w", errors="ignore") as f:
 
 FURB103 [*] `open` and `write` should be replaced by `Path("file.txt").write_text(foobar, errors="ignore")`
-  --> FURB103_0.py:28:6
+  --> FURB103.py:28:6
    |
 27 | # FURB103
 28 | with open("file.txt", "w", errors="ignore") as f:
@@ -122,7 +122,7 @@ help: Replace with `Path("file.txt").write_text(foobar, errors="ignore")`
 32 | with open("file.txt", mode="w") as f:
 
 FURB103 [*] `open` and `write` should be replaced by `Path("file.txt").write_text(foobar)`
-  --> FURB103_0.py:32:6
+  --> FURB103.py:32:6
    |
 31 | # FURB103
 32 | with open("file.txt", mode="w") as f:
@@ -146,7 +146,7 @@ help: Replace with `Path("file.txt").write_text(foobar)`
 36 | with open(foo(), "wb") as f:
 
 FURB103 `open` and `write` should be replaced by `Path(foo()).write_bytes(bar())`
-  --> FURB103_0.py:36:6
+  --> FURB103.py:36:6
    |
 35 | # FURB103
 36 | with open(foo(), "wb") as f:
@@ -157,7 +157,7 @@ FURB103 `open` and `write` should be replaced by `Path(foo()).write_bytes(bar())
 help: Replace with `Path(foo()).write_bytes(bar())`
 
 FURB103 `open` and `write` should be replaced by `Path("a.txt").write_text(x)`
-  --> FURB103_0.py:44:6
+  --> FURB103.py:44:6
    |
 43 | # FURB103
 44 | with open("a.txt", "w") as a, open("b.txt", "wb") as b:
@@ -168,7 +168,7 @@ FURB103 `open` and `write` should be replaced by `Path("a.txt").write_text(x)`
 help: Replace with `Path("a.txt").write_text(x)`
 
 FURB103 `open` and `write` should be replaced by `Path("b.txt").write_bytes(y)`
-  --> FURB103_0.py:44:31
+  --> FURB103.py:44:31
    |
 43 | # FURB103
 44 | with open("a.txt", "w") as a, open("b.txt", "wb") as b:
@@ -179,7 +179,7 @@ FURB103 `open` and `write` should be replaced by `Path("b.txt").write_bytes(y)`
 help: Replace with `Path("b.txt").write_bytes(y)`
 
 FURB103 `open` and `write` should be replaced by `Path("file.txt").write_text(bar(bar(a + x)))`
-  --> FURB103_0.py:49:18
+  --> FURB103.py:49:18
    |
 48 | # FURB103
 49 | with foo() as a, open("file.txt", "w") as b, foo() as c:
@@ -190,7 +190,7 @@ FURB103 `open` and `write` should be replaced by `Path("file.txt").write_text(ba
 help: Replace with `Path("file.txt").write_text(bar(bar(a + x)))`
 
 FURB103 [*] `open` and `write` should be replaced by `Path("file.txt").write_text(foobar, newline="\r\n")`
-  --> FURB103_0.py:58:6
+  --> FURB103.py:58:6
    |
 57 | # FURB103
 58 | with open("file.txt", "w", newline="\r\n") as f:
@@ -214,7 +214,7 @@ help: Replace with `Path("file.txt").write_text(foobar, newline="\r\n")`
 62 | import builtins
 
 FURB103 [*] `open` and `write` should be replaced by `Path("file.txt").write_text(foobar, newline="\r\n")`
-  --> FURB103_0.py:66:6
+  --> FURB103.py:66:6
    |
 65 | # FURB103
 66 | with builtins.open("file.txt", "w", newline="\r\n") as f:
@@ -237,7 +237,7 @@ help: Replace with `Path("file.txt").write_text(foobar, newline="\r\n")`
 70 | from builtins import open as o
 
 FURB103 [*] `open` and `write` should be replaced by `Path("file.txt").write_text(foobar, newline="\r\n")`
-  --> FURB103_0.py:74:6
+  --> FURB103.py:74:6
    |
 73 | # FURB103
 74 | with o("file.txt", "w", newline="\r\n") as f:
@@ -260,7 +260,7 @@ help: Replace with `Path("file.txt").write_text(foobar, newline="\r\n")`
 78 | 
 
 FURB103 [*] `open` and `write` should be replaced by `Path("test.json")....`
-   --> FURB103_0.py:154:6
+   --> FURB103.py:154:6
     |
 152 | data = {"price": 100}
 153 |
@@ -284,7 +284,7 @@ help: Replace with `Path("test.json")....`
 158 | with open("tmp_path/pyproject.toml", "w") as f:
 
 FURB103 [*] `open` and `write` should be replaced by `Path("tmp_path/pyproject.toml")....`
-   --> FURB103_0.py:158:6
+   --> FURB103.py:158:6
     |
 157 | # See: https://github.com/astral-sh/ruff/issues/21381
 158 | with open("tmp_path/pyproject.toml", "w") as f:

crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB103_FURB103_1.py.snap

@@ -1,157 +0,0 @@
----
-source: crates/ruff_linter/src/rules/refurb/mod.rs
----
-FURB103 [*] `Path.open()` followed by `write()` can be replaced by `Path("file.txt").write_text("test")`
- --> FURB103_1.py:3:6
-  |
-1 | from pathlib import Path
-2 |
-3 | with Path("file.txt").open("w") as f:
-  |      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-4 |     f.write("test")
-  |
-help: Replace with `Path("file.txt").write_text("test")`
-1 | from pathlib import Path
-2 | 
-  - with Path("file.txt").open("w") as f:
-  -     f.write("test")
-3 + Path("file.txt").write_text("test")
-4 | 
-5 | with Path("file.txt").open("wb") as f:
-6 |     f.write(b"test")
-
-FURB103 [*] `Path.open()` followed by `write()` can be replaced by `Path("file.txt").write_bytes(b"test")`
- --> FURB103_1.py:6:6
-  |
-4 |     f.write("test")
-5 |
-6 | with Path("file.txt").open("wb") as f:
-  |      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-7 |     f.write(b"test")
-  |
-help: Replace with `Path("file.txt").write_bytes(b"test")`
-3 | with Path("file.txt").open("w") as f:
-4 |     f.write("test")
-5 | 
-  - with Path("file.txt").open("wb") as f:
-  -     f.write(b"test")
-6 + Path("file.txt").write_bytes(b"test")
-7 | 
-8 | with Path("file.txt").open(mode="w") as f:
-9 |     f.write("test")
-
-FURB103 [*] `Path.open()` followed by `write()` can be replaced by `Path("file.txt").write_text("test")`
-  --> FURB103_1.py:9:6
-   |
- 7 |     f.write(b"test")
- 8 |
- 9 | with Path("file.txt").open(mode="w") as f:
-   |      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-10 |     f.write("test")
-   |
-help: Replace with `Path("file.txt").write_text("test")`
-6  | with Path("file.txt").open("wb") as f:
-7  |     f.write(b"test")
-8  | 
-   - with Path("file.txt").open(mode="w") as f:
-   -     f.write("test")
-9  + Path("file.txt").write_text("test")
-10 | 
-11 | with Path("file.txt").open("w", encoding="utf8") as f:
-12 |     f.write("test")
-
-FURB103 [*] `Path.open()` followed by `write()` can be replaced by `Path("file.txt").write_text("test", encoding="utf8")`
-  --> FURB103_1.py:12:6
-   |
-10 |     f.write("test")
-11 |
-12 | with Path("file.txt").open("w", encoding="utf8") as f:
-   |      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-13 |     f.write("test")
-   |
-help: Replace with `Path("file.txt").write_text("test", encoding="utf8")`
-9  | with Path("file.txt").open(mode="w") as f:
-10 |     f.write("test")
-11 | 
-   - with Path("file.txt").open("w", encoding="utf8") as f:
-   -     f.write("test")
-12 + Path("file.txt").write_text("test", encoding="utf8")
-13 | 
-14 | with Path("file.txt").open("w", errors="ignore") as f:
-15 |     f.write("test")
-
-FURB103 [*] `Path.open()` followed by `write()` can be replaced by `Path("file.txt").write_text("test", errors="ignore")`
-  --> FURB103_1.py:15:6
-   |
-13 |     f.write("test")
-14 |
-15 | with Path("file.txt").open("w", errors="ignore") as f:
-   |      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-16 |     f.write("test")
-   |
-help: Replace with `Path("file.txt").write_text("test", errors="ignore")`
-12 | with Path("file.txt").open("w", encoding="utf8") as f:
-13 |     f.write("test")
-14 | 
-   - with Path("file.txt").open("w", errors="ignore") as f:
-   -     f.write("test")
-15 + Path("file.txt").write_text("test", errors="ignore")
-16 | 
-17 | with Path(foo()).open("w") as f:
-18 |     f.write("test")
-
-FURB103 [*] `Path.open()` followed by `write()` can be replaced by `Path(foo()).write_text("test")`
-  --> FURB103_1.py:18:6
-   |
-16 |     f.write("test")
-17 |
-18 | with Path(foo()).open("w") as f:
-   |      ^^^^^^^^^^^^^^^^^^^^^^^^^^
-19 |     f.write("test")
-   |
-help: Replace with `Path(foo()).write_text("test")`
-15 | with Path("file.txt").open("w", errors="ignore") as f:
-16 |     f.write("test")
-17 | 
-   - with Path(foo()).open("w") as f:
-   -     f.write("test")
-18 + Path(foo()).write_text("test")
-19 | 
-20 | p = Path("file.txt")
-21 | with p.open("w") as f:
-
-FURB103 [*] `Path.open()` followed by `write()` can be replaced by `p.write_text("test")`
-  --> FURB103_1.py:22:6
-   |
-21 | p = Path("file.txt")
-22 | with p.open("w") as f:
-   |      ^^^^^^^^^^^^^^^^
-23 |     f.write("test")
-   |
-help: Replace with `p.write_text("test")`
-19 |     f.write("test")
-20 | 
-21 | p = Path("file.txt")
-   - with p.open("w") as f:
-   -     f.write("test")
-22 + p.write_text("test")
-23 | 
-24 | with Path("foo", "bar", "baz").open("w") as f:
-25 |     f.write("test")
-
-FURB103 [*] `Path.open()` followed by `write()` can be replaced by `Path("foo", "bar", "baz").write_text("test")`
-  --> FURB103_1.py:25:6
-   |
-23 |     f.write("test")
-24 |
-25 | with Path("foo", "bar", "baz").open("w") as f:
-   |      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-26 |     f.write("test")
-   |
-help: Replace with `Path("foo", "bar", "baz").write_text("test")`
-22 | with p.open("w") as f:
-23 |     f.write("test")
-24 | 
-   - with Path("foo", "bar", "baz").open("w") as f:
-   -     f.write("test")
-25 + Path("foo", "bar", "baz").write_text("test")

crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__write_whole_file_python_39.snap

@@ -2,7 +2,7 @@
 source: crates/ruff_linter/src/rules/refurb/mod.rs
 ---
 FURB103 [*] `open` and `write` should be replaced by `Path("file.txt").write_text("test")`
-  --> FURB103_0.py:12:6
+  --> FURB103.py:12:6
    |
 11 | # FURB103
 12 | with open("file.txt", "w") as f:
@@ -26,7 +26,7 @@ help: Replace with `Path("file.txt").write_text("test")`
 16 | with open("file.txt", "wb") as f:
 
 FURB103 [*] `open` and `write` should be replaced by `Path("file.txt").write_bytes(foobar)`
-  --> FURB103_0.py:16:6
+  --> FURB103.py:16:6
    |
 15 | # FURB103
 16 | with open("file.txt", "wb") as f:
@@ -50,7 +50,7 @@ help: Replace with `Path("file.txt").write_bytes(foobar)`
 20 | with open("file.txt", mode="wb") as f:
 
 FURB103 [*] `open` and `write` should be replaced by `Path("file.txt").write_bytes(b"abc")`
-  --> FURB103_0.py:20:6
+  --> FURB103.py:20:6
    |
 19 | # FURB103
 20 | with open("file.txt", mode="wb") as f:
@@ -74,7 +74,7 @@ help: Replace with `Path("file.txt").write_bytes(b"abc")`
 24 | with open("file.txt", "w", encoding="utf8") as f:
 
 FURB103 [*] `open` and `write` should be replaced by `Path("file.txt").write_text(foobar, encoding="utf8")`
-  --> FURB103_0.py:24:6
+  --> FURB103.py:24:6
    |
 23 | # FURB103
 24 | with open("file.txt", "w", encoding="utf8") as f:
@@ -98,7 +98,7 @@ help: Replace with `Path("file.txt").write_text(foobar, encoding="utf8")`
 28 | with open("file.txt", "w", errors="ignore") as f:
 
 FURB103 [*] `open` and `write` should be replaced by `Path("file.txt").write_text(foobar, errors="ignore")`
-  --> FURB103_0.py:28:6
+  --> FURB103.py:28:6
    |
 27 | # FURB103
 28 | with open("file.txt", "w", errors="ignore") as f:
@@ -122,7 +122,7 @@ help: Replace with `Path("file.txt").write_text(foobar, errors="ignore")`
 32 | with open("file.txt", mode="w") as f:
 
 FURB103 [*] `open` and `write` should be replaced by `Path("file.txt").write_text(foobar)`
-  --> FURB103_0.py:32:6
+  --> FURB103.py:32:6
    |
 31 | # FURB103
 32 | with open("file.txt", mode="w") as f:
@@ -146,7 +146,7 @@ help: Replace with `Path("file.txt").write_text(foobar)`
 36 | with open(foo(), "wb") as f:
 
 FURB103 `open` and `write` should be replaced by `Path(foo()).write_bytes(bar())`
-  --> FURB103_0.py:36:6
+  --> FURB103.py:36:6
    |
 35 | # FURB103
 36 | with open(foo(), "wb") as f:
@@ -157,7 +157,7 @@ FURB103 `open` and `write` should be replaced by `Path(foo()).write_bytes(bar())
 help: Replace with `Path(foo()).write_bytes(bar())`
 
 FURB103 `open` and `write` should be replaced by `Path("a.txt").write_text(x)`
-  --> FURB103_0.py:44:6
+  --> FURB103.py:44:6
    |
 43 | # FURB103
 44 | with open("a.txt", "w") as a, open("b.txt", "wb") as b:
@@ -168,7 +168,7 @@ FURB103 `open` and `write` should be replaced by `Path("a.txt").write_text(x)`
 help: Replace with `Path("a.txt").write_text(x)`
 
 FURB103 `open` and `write` should be replaced by `Path("b.txt").write_bytes(y)`
-  --> FURB103_0.py:44:31
+  --> FURB103.py:44:31
    |
 43 | # FURB103
 44 | with open("a.txt", "w") as a, open("b.txt", "wb") as b:
@@ -179,7 +179,7 @@ FURB103 `open` and `write` should be replaced by `Path("b.txt").write_bytes(y)`
 help: Replace with `Path("b.txt").write_bytes(y)`
 
 FURB103 `open` and `write` should be replaced by `Path("file.txt").write_text(bar(bar(a + x)))`
-  --> FURB103_0.py:49:18
+  --> FURB103.py:49:18
    |
 48 | # FURB103
 49 | with foo() as a, open("file.txt", "w") as b, foo() as c:
@@ -190,7 +190,7 @@ FURB103 `open` and `write` should be replaced by `Path("file.txt").write_text(ba
 help: Replace with `Path("file.txt").write_text(bar(bar(a + x)))`
 
 FURB103 [*] `open` and `write` should be replaced by `Path("test.json")....`
-   --> FURB103_0.py:154:6
+   --> FURB103.py:154:6
     |
 152 | data = {"price": 100}
 153 |
@@ -214,7 +214,7 @@ help: Replace with `Path("test.json")....`
 158 | with open("tmp_path/pyproject.toml", "w") as f:
 
 FURB103 [*] `open` and `write` should be replaced by `Path("tmp_path/pyproject.toml")....`
-   --> FURB103_0.py:158:6
+   --> FURB103.py:158:6
     |
 157 | # See: https://github.com/astral-sh/ruff/issues/21381
 158 | with open("tmp_path/pyproject.toml", "w") as f:

crates/ruff_linter/src/snapshots/ruff_linter__linter__tests__semantic_syntax_error_annotated_global.py_3.14.snap

@@ -1,74 +0,0 @@
----
-source: crates/ruff_linter/src/linter.rs
----
-invalid-syntax: annotated name `a` can't be global
- --> resources/test/fixtures/semantic_errors/annotated_global.py:4:5
-  |
-2 | def f1():
-3 |     global a
-4 |     a: str = "foo"  # error
-  |     ^
-5 |
-6 | b: int = 1
-  |
-
-invalid-syntax: annotated name `b` can't be global
-  --> resources/test/fixtures/semantic_errors/annotated_global.py:10:9
-   |
- 8 |     def inner():
- 9 |         global b
-10 |         b: str = "nested"  # error
-   |         ^
-11 |
-12 | c: int = 1
-   |
-
-invalid-syntax: annotated name `c` can't be global
-  --> resources/test/fixtures/semantic_errors/annotated_global.py:15:5
-   |
-13 | def f2():
-14 |     global c
-15 |     c: list[str] = []  # error
-   |     ^
-16 |
-17 | d: int = 1
-   |
-
-invalid-syntax: annotated name `d` can't be global
-  --> resources/test/fixtures/semantic_errors/annotated_global.py:20:5
-   |
-18 | def f3():
-19 |     global d
-20 |     d: str  # error
-   |     ^
-21 |
-22 | e: int = 1
-   |
-
-invalid-syntax: annotated name `g` can't be global
-  --> resources/test/fixtures/semantic_errors/annotated_global.py:29:1
-   |
-27 | f: int = 1  # okay
-28 |
-29 | g: int = 1
-   | ^
-30 | global g  # error
-   |
-
-invalid-syntax: annotated name `x` can't be global
-  --> resources/test/fixtures/semantic_errors/annotated_global.py:33:5
-   |
-32 | class C:
-33 |     x: str
-   |     ^
-34 |     global x  # error
-   |
-
-invalid-syntax: annotated name `x` can't be global
-  --> resources/test/fixtures/semantic_errors/annotated_global.py:38:5
-   |
-36 | class D:
-37 |     global x  # error
-38 |     x: str
-   |     ^
-   |

crates/ruff_python_ast/src/lib.rs

@@ -12,7 +12,6 @@ pub use python_version::*;
 pub mod comparable;
 pub mod docstrings;
 mod expression;
-pub mod find_node;
 mod generated;
 pub mod helpers;
 pub mod identifier;

crates/ruff_python_ast/src/traversal.rs

@@ -2,25 +2,18 @@
 use crate::{self as ast, AnyNodeRef, ExceptHandler, Stmt};
 
 /// Given a [`Stmt`] and its parent, return the [`ast::Suite`] that contains the [`Stmt`].
-pub fn suite<'a>(
-    stmt: impl Into<AnyNodeRef<'a>>,
-    parent: impl Into<AnyNodeRef<'a>>,
-) -> Option<EnclosingSuite<'a>> {
+pub fn suite<'a>(stmt: &'a Stmt, parent: &'a Stmt) -> Option<EnclosingSuite<'a>> {
     // TODO: refactor this to work without a parent, ie when `stmt` is at the top level
-    let stmt = stmt.into();
-    match parent.into() {
-        AnyNodeRef::ModModule(ast::ModModule { body, .. }) => EnclosingSuite::new(body, stmt),
-        AnyNodeRef::StmtFunctionDef(ast::StmtFunctionDef { body, .. }) => {
-            EnclosingSuite::new(body, stmt)
-        }
-        AnyNodeRef::StmtClassDef(ast::StmtClassDef { body, .. }) => EnclosingSuite::new(body, stmt),
-        AnyNodeRef::StmtFor(ast::StmtFor { body, orelse, .. }) => [body, orelse]
+    match parent {
+        Stmt::FunctionDef(ast::StmtFunctionDef { body, .. }) => EnclosingSuite::new(body, stmt),
+        Stmt::ClassDef(ast::StmtClassDef { body, .. }) => EnclosingSuite::new(body, stmt),
+        Stmt::For(ast::StmtFor { body, orelse, .. }) => [body, orelse]
             .iter()
             .find_map(|suite| EnclosingSuite::new(suite, stmt)),
-        AnyNodeRef::StmtWhile(ast::StmtWhile { body, orelse, .. }) => [body, orelse]
+        Stmt::While(ast::StmtWhile { body, orelse, .. }) => [body, orelse]
             .iter()
             .find_map(|suite| EnclosingSuite::new(suite, stmt)),
-        AnyNodeRef::StmtIf(ast::StmtIf {
+        Stmt::If(ast::StmtIf {
             body,
             elif_else_clauses,
             ..
@@ -28,12 +21,12 @@ pub fn suite<'a>(
             .into_iter()
             .chain(elif_else_clauses.iter().map(|clause| &clause.body))
             .find_map(|suite| EnclosingSuite::new(suite, stmt)),
-        AnyNodeRef::StmtWith(ast::StmtWith { body, .. }) => EnclosingSuite::new(body, stmt),
-        AnyNodeRef::StmtMatch(ast::StmtMatch { cases, .. }) => cases
+        Stmt::With(ast::StmtWith { body, .. }) => EnclosingSuite::new(body, stmt),
+        Stmt::Match(ast::StmtMatch { cases, .. }) => cases
             .iter()
             .map(|case| &case.body)
             .find_map(|body| EnclosingSuite::new(body, stmt)),
-        AnyNodeRef::StmtTry(ast::StmtTry {
+        Stmt::Try(ast::StmtTry {
             body,
             handlers,
             orelse,
@@ -58,10 +51,10 @@ pub struct EnclosingSuite<'a> {
 }
 
 impl<'a> EnclosingSuite<'a> {
-    pub fn new(suite: &'a [Stmt], stmt: AnyNodeRef<'a>) -> Option<Self> {
+    pub fn new(suite: &'a [Stmt], stmt: &'a Stmt) -> Option<Self> {
         let position = suite
             .iter()
-            .position(|sibling| AnyNodeRef::ptr_eq(sibling.into(), stmt))?;
+            .position(|sibling| AnyNodeRef::ptr_eq(sibling.into(), stmt.into()))?;
 
         Some(EnclosingSuite { suite, position })
     }

crates/ruff_python_ast/src/visitor/source_order.rs

@@ -222,17 +222,6 @@ where
     visitor.leave_node(node);
 }
 
-pub fn walk_node<'a, V>(visitor: &mut V, node: AnyNodeRef<'a>)
-where
-    V: SourceOrderVisitor<'a> + ?Sized,
-{
-    if visitor.enter_node(node).is_traverse() {
-        node.visit_source_order(visitor);
-    }
-
-    visitor.leave_node(node);
-}
-
 #[derive(Copy, Clone, Eq, PartialEq, Debug)]
 pub enum TraversalSignal {
     Traverse,

crates/ruff_python_codegen/src/generator.rs

@@ -1247,7 +1247,6 @@ impl<'a> Generator<'a> {
                     self.p_bytes_repr(&bytes_literal.value, bytes_literal.flags);
                 }
             }
-            #[expect(clippy::eq_op)]
             Expr::NumberLiteral(ast::ExprNumberLiteral { value, .. }) => {
                 static INF_STR: &str = "1e309";
                 assert_eq!(f64::MAX_10_EXP, 308);

crates/ruff_python_formatter/resources/test/fixtures/ruff/fluent.options.json

@@ -1 +0,0 @@
-[{"line_width":8}]

crates/ruff_python_formatter/resources/test/fixtures/ruff/fluent.py

@@ -1,35 +0,0 @@
-# Fixtures for fluent formatting of call chains
-# Note that `fluent.options.json` sets line width to 8
-
-
-x = a.b()
-
-x = a.b().c()
-
-x = a.b().c().d
-
-x = a.b.c.d().e()
-
-x = a.b.c().d.e().f.g()
-
-# Consecutive calls/subscripts are grouped together
-# for the purposes of fluent formatting (though, as 2025.12.15,
-# there may be a break inside of one of these
-# calls/subscripts, but that is unrelated to the fluent format.)
-
-x = a()[0]().b().c()
-
-x = a.b()[0].c.d()[1]().e
-
-# Parentheses affect both where the root of the call
-# chain is and how many calls we require before applying
-# fluent formatting (just 1, in the presence of a parenthesized
-# root, as of 2025.12.15.)
-
-x = (a).b()
-
-x = (a()).b()
-
-x = (a.b()).d.e()
-
-x = (a.b().d).e()

crates/ruff_python_formatter/resources/test/fixtures/ruff/parentheses/call_chains.py

@@ -216,69 +216,3 @@ max_message_id = (
     .baz()
 )
 
-# Note in preview we split at `pl` which some
-# folks may dislike. (Similarly with common
-# `np` and `pd` invocations).
-#
-# This is because we cannot reliably predict,
-# just from syntax, whether a short identifier
-# is being used as a 'namespace' or as an 'object'.
-#
-# As of 2025.12.15, we do not indent methods in
-# fluent formatting. If we ever decide to do so,
-# it may make sense to special case call chain roots
-# that are shorter than the indent-width (like Prettier does).
-# This would have the benefit of handling these common
-# two-letter aliases for libraries.
-
-
-expr = (
-    pl.scan_parquet("/data/pypi-parquet/*.parquet")
-    .filter(
-        [
-            pl.col("path").str.contains(
-                r"\.(asm|c|cc|cpp|cxx|h|hpp|rs|[Ff][0-9]{0,2}(?:or)?|go)$"
-            ),
-            ~pl.col("path").str.contains(r"(^|/)test(|s|ing)"),
-            ~pl.col("path").str.contains("/site-packages/", literal=True),
-        ]
-    )
-    .with_columns(
-        month=pl.col("uploaded_on").dt.truncate("1mo"),
-        ext=pl.col("path")
-        .str.extract(pattern=r"\.([a-z0-9]+)$", group_index=1)
-        .str.replace_all(pattern=r"cxx|cpp|cc|c|hpp|h", value="C/C++")
-        .str.replace_all(pattern="^f.*$", value="Fortran")
-        .str.replace("rs", "Rust", literal=True)
-        .str.replace("go", "Go", literal=True)
-        .str.replace("asm", "Assembly", literal=True)
-        .replace({"": None}),
-    )
-    .group_by(["month", "ext"])
-    .agg(project_count=pl.col("project_name").n_unique())
-    .drop_nulls(["ext"])
-    .sort(["month", "project_count"], descending=True)
-)
-
-def indentation_matching_for_loop_in_preview():
-    if make_this:
-        if more_nested_because_line_length:
-            identical_hidden_layer_sizes = all(
-            current_hidden_layer_sizes == first_hidden_layer_sizes
-            for current_hidden_layer_sizes in self.component_config[
-                HIDDEN_LAYERS_SIZES
-            ].values().attr
-           )
-
-def indentation_matching_walrus_in_preview():
-    if make_this:
-        if more_nested_because_line_length:
-            with self.read_ctx(book_type) as cursor:
-                if (entry_count := len(names := cursor.execute(
-                    'SELECT name FROM address_book WHERE address=?',
-                    (address,),
-                ).fetchall().some_attr)) == 0 or len(set(names)) > 1:
-                    return
-
-# behavior with parenthesized roots
-x = (aaaaaaaaaaaaaaaaaaaaaa).bbbbbbbbbbbbbbbbbbb.cccccccccccccccccccccccc().dddddddddddddddddddddddd().eeeeeeeeeeee

crates/ruff_python_formatter/src/cli.rs

@@ -3,7 +3,7 @@
 use std::path::{Path, PathBuf};
 
 use anyhow::{Context, Result};
-use clap::{Parser, ValueEnum};
+use clap::{Parser, ValueEnum, command};
 
 use ruff_formatter::SourceCode;
 use ruff_python_ast::{PySourceType, PythonVersion};

crates/ruff_python_formatter/src/expression/expr_attribute.rs

@@ -10,7 +10,6 @@ use crate::expression::parentheses::{
     NeedsParentheses, OptionalParentheses, Parentheses, is_expression_parenthesized,
 };
 use crate::prelude::*;
-use crate::preview::is_fluent_layout_split_first_call_enabled;
 
 #[derive(Default)]
 pub struct FormatExprAttribute {
@@ -48,26 +47,20 @@ impl FormatNodeRule<ExprAttribute> for FormatExprAttribute {
                     )
                 };
 
-            if call_chain_layout.is_fluent() {
+            if call_chain_layout == CallChainLayout::Fluent {
                 if parenthesize_value {
                     // Don't propagate the call chain layout.
                     value.format().with_options(Parentheses::Always).fmt(f)?;
                 } else {
                     match value.as_ref() {
                         Expr::Attribute(expr) => {
-                            expr.format()
-                                .with_options(call_chain_layout.transition_after_attribute())
-                                .fmt(f)?;
+                            expr.format().with_options(call_chain_layout).fmt(f)?;
                         }
                         Expr::Call(expr) => {
-                            expr.format()
-                                .with_options(call_chain_layout.transition_after_attribute())
-                                .fmt(f)?;
+                            expr.format().with_options(call_chain_layout).fmt(f)?;
                         }
                         Expr::Subscript(expr) => {
-                            expr.format()
-                                .with_options(call_chain_layout.transition_after_attribute())
-                                .fmt(f)?;
+                            expr.format().with_options(call_chain_layout).fmt(f)?;
                         }
                         _ => {
                             value.format().with_options(Parentheses::Never).fmt(f)?;
@@ -112,30 +105,8 @@ impl FormatNodeRule<ExprAttribute> for FormatExprAttribute {
             // Allow the `.` on its own line if this is a fluent call chain
             // and the value either requires parenthesizing or is a call or subscript expression
             // (it's a fluent chain but not the first element).
-            //
-            // In preview we also break _at_ the first call in the chain.
-            // For example:
-            //
-            // ```diff
-            // # stable formatting vs. preview
-            //  x = (
-            // -    df.merge()
-            // +    df
-            // +    .merge()
-            //      .groupby()
-            //      .agg()
-            //      .filter()
-            //  )
-            // ```
-            else if call_chain_layout.is_fluent() {
-                if parenthesize_value
-                    || value.is_call_expr()
-                    || value.is_subscript_expr()
-                    // Remember to update the doc-comment above when
-                    // stabilizing this behavior.
-                    || (is_fluent_layout_split_first_call_enabled(f.context())
-                        && call_chain_layout.is_first_call_like())
-                {
+            else if call_chain_layout == CallChainLayout::Fluent {
+                if parenthesize_value || value.is_call_expr() || value.is_subscript_expr() {
                     soft_line_break().fmt(f)?;
                 }
             }
@@ -177,8 +148,8 @@ impl FormatNodeRule<ExprAttribute> for FormatExprAttribute {
             )
         });
 
-        let is_call_chain_root =
-            self.call_chain_layout == CallChainLayout::Default && call_chain_layout.is_fluent();
+        let is_call_chain_root = self.call_chain_layout == CallChainLayout::Default
+            && call_chain_layout == CallChainLayout::Fluent;
         if is_call_chain_root {
             write!(f, [group(&format_inner)])
         } else {
@@ -198,8 +169,7 @@ impl NeedsParentheses for ExprAttribute {
             self.into(),
             context.comments().ranges(),
             context.source(),
-        )
-        .is_fluent()
+        ) == CallChainLayout::Fluent
         {
             OptionalParentheses::Multiline
         } else if context.comments().has_dangling(self) {

crates/ruff_python_formatter/src/expression/expr_call.rs

@@ -47,10 +47,7 @@ impl FormatNodeRule<ExprCall> for FormatExprCall {
                 func.format().with_options(Parentheses::Always).fmt(f)
             } else {
                 match func.as_ref() {
-                    Expr::Attribute(expr) => expr
-                        .format()
-                        .with_options(call_chain_layout.decrement_call_like_count())
-                        .fmt(f),
+                    Expr::Attribute(expr) => expr.format().with_options(call_chain_layout).fmt(f),
                     Expr::Call(expr) => expr.format().with_options(call_chain_layout).fmt(f),
                     Expr::Subscript(expr) => expr.format().with_options(call_chain_layout).fmt(f),
                     _ => func.format().with_options(Parentheses::Never).fmt(f),
@@ -70,7 +67,9 @@ impl FormatNodeRule<ExprCall> for FormatExprCall {
         //     queryset.distinct().order_by(field.name).values_list(field_name_flat_long_long=True)
         // )
         // ```
-        if call_chain_layout.is_fluent() && self.call_chain_layout == CallChainLayout::Default {
+        if call_chain_layout == CallChainLayout::Fluent
+            && self.call_chain_layout == CallChainLayout::Default
+        {
             group(&fmt_func).fmt(f)
         } else {
             fmt_func.fmt(f)
@@ -88,8 +87,7 @@ impl NeedsParentheses for ExprCall {
             self.into(),
             context.comments().ranges(),
             context.source(),
-        )
-        .is_fluent()
+        ) == CallChainLayout::Fluent
         {
             OptionalParentheses::Multiline
         } else if context.comments().has_dangling(self) {

crates/ruff_python_formatter/src/expression/expr_lambda.rs

@@ -397,8 +397,7 @@ impl Format<PyFormatContext<'_>> for FormatBody<'_> {
                 body.into(),
                 comments.ranges(),
                 f.context().source(),
-            )
-            .is_fluent()
+            ) == CallChainLayout::Fluent
             {
                 parenthesize_if_expands(&unparenthesized).fmt(f)
             } else {

crates/ruff_python_formatter/src/expression/expr_subscript.rs

@@ -51,10 +51,7 @@ impl FormatNodeRule<ExprSubscript> for FormatExprSubscript {
                 value.format().with_options(Parentheses::Always).fmt(f)
             } else {
                 match value.as_ref() {
-                    Expr::Attribute(expr) => expr
-                        .format()
-                        .with_options(call_chain_layout.decrement_call_like_count())
-                        .fmt(f),
+                    Expr::Attribute(expr) => expr.format().with_options(call_chain_layout).fmt(f),
                     Expr::Call(expr) => expr.format().with_options(call_chain_layout).fmt(f),
                     Expr::Subscript(expr) => expr.format().with_options(call_chain_layout).fmt(f),
                     _ => value.format().with_options(Parentheses::Never).fmt(f),
@@ -74,8 +71,8 @@ impl FormatNodeRule<ExprSubscript> for FormatExprSubscript {
                 .fmt(f)
         });
 
-        let is_call_chain_root =
-            self.call_chain_layout == CallChainLayout::Default && call_chain_layout.is_fluent();
+        let is_call_chain_root = self.call_chain_layout == CallChainLayout::Default
+            && call_chain_layout == CallChainLayout::Fluent;
         if is_call_chain_root {
             write!(f, [group(&format_inner)])
         } else {
@@ -95,8 +92,7 @@ impl NeedsParentheses for ExprSubscript {
                 self.into(),
                 context.comments().ranges(),
                 context.source(),
-            )
-            .is_fluent()
+            ) == CallChainLayout::Fluent
             {
                 OptionalParentheses::Multiline
             } else if is_expression_parenthesized(

crates/ruff_python_formatter/src/expression/mod.rs

@@ -876,22 +876,6 @@ impl<'a> First<'a> {
 ///     )
 /// ).all()
 /// ```
-///
-/// In [`preview`](crate::preview::is_fluent_layout_split_first_call_enabled), we also track the position of the leftmost call or
-/// subscript on an attribute in the chain and break just before the dot.
-///
-/// So, for example, the right-hand summand in the above expression
-/// would get formatted as:
-/// ```python
-///     Blog.objects
-///     .filter(
-///         entry__headline__contains="McCartney",
-///     )
-///     .limit_results[:10]
-///     .filter(
-///         entry__pub_date__year=2010,
-///     )
-/// ```
 #[derive(Copy, Clone, Debug, Default, PartialEq, Eq)]
 pub enum CallChainLayout {
     /// The root of a call chain
@@ -899,149 +883,19 @@ pub enum CallChainLayout {
     Default,
 
     /// A nested call chain element that uses fluent style.
-    Fluent(AttributeState),
+    Fluent,
 
     /// A nested call chain element not using fluent style.
     NonFluent,
 }
 
-/// Records information about the current position within
-/// a call chain.
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
-pub enum AttributeState {
-    /// Stores the number of calls or subscripts
-    /// to the left of the current position in a chain.
-    ///
-    /// Consecutive calls/subscripts on a single
-    /// object only count once. For example, if we are at
-    /// `c` in `a.b()[0]()().c()` then this number would be 1.
-    ///
-    /// Caveat: If the root of the chain is parenthesized,
-    /// it contributes +1 to this count, even if it is not
-    /// a call or subscript. But the name
-    /// `CallLikeOrParenthesizedRootPreceding`
-    /// is a tad unwieldy, and this also rarely occurs.
-    CallLikePreceding(u32),
-    /// Indicates that we are at the first called or
-    /// subscripted object in the chain
-    ///
-    /// For example, if we are at `b` in `a.b()[0]()().c()`
-    FirstCallLike,
-    /// Indicates that we are to the left of the first
-    /// called or subscripted object in the chain, and therefore
-    /// need not break.
-    ///
-    /// For example, if we are at `a` in `a.b()[0]()().c()`
-    BeforeFirstCallLike,
-}
-
 impl CallChainLayout {
-    /// Returns new state decreasing count of remaining calls/subscripts
-    /// to traverse, or the state `FirstCallOrSubscript`, as appropriate.
-    #[must_use]
-    pub(crate) fn decrement_call_like_count(self) -> Self {
-        match self {
-            Self::Fluent(AttributeState::CallLikePreceding(x)) => {
-                if x > 1 {
-                    // Recall that we traverse call chains from right to
-                    // left. So after moving from a call/subscript into
-                    // an attribute, we _decrease_ the count of
-                    // _remaining_ calls or subscripts to the left of our
-                    // current position.
-                    Self::Fluent(AttributeState::CallLikePreceding(x - 1))
-                } else {
-                    Self::Fluent(AttributeState::FirstCallLike)
-                }
-            }
-            _ => self,
-        }
-    }
-
-    /// Returns with state change
-    /// `FirstCallOrSubscript` -> `BeforeFirstCallOrSubscript`
-    /// and otherwise returns unchanged.
-    #[must_use]
-    pub(crate) fn transition_after_attribute(self) -> Self {
-        match self {
-            Self::Fluent(AttributeState::FirstCallLike) => {
-                Self::Fluent(AttributeState::BeforeFirstCallLike)
-            }
-            _ => self,
-        }
-    }
-
-    pub(crate) fn is_first_call_like(self) -> bool {
-        matches!(self, Self::Fluent(AttributeState::FirstCallLike))
-    }
-
-    /// Returns either `Fluent` or `NonFluent` depending on a
-    /// heuristic computed for the whole chain.
-    ///
-    /// Explicitly, the criterion to return `Fluent` is
-    /// as follows:
-    ///
-    /// 1. Beginning from the right (i.e. the `expr` itself),
-    ///    traverse inwards past calls, subscripts, and attribute
-    ///    expressions until we meet the first expression that is
-    ///    either none of these or else is parenthesized. This will
-    ///    be the _root_ of the call chain.
-    /// 2. Count the number of _attribute values_ that are _called
-    ///    or subscripted_ in the chain (note that this includes the
-    ///    root but excludes the rightmost attribute in the chain since
-    ///    it is not the _value_ of some attribute).
-    /// 3. If the root is parenthesized, add 1 to that value.
-    /// 4. If the total is at least 2, return `Fluent`. Otherwise
-    ///    return `NonFluent`
     pub(crate) fn from_expression(
         mut expr: ExprRef,
         comment_ranges: &CommentRanges,
         source: &str,
     ) -> Self {
-        // TODO(dylan): Once the fluent layout preview style is
-        // stabilized, see if it is possible to simplify some of
-        // the logic around parenthesized roots. (While supporting
-        // both styles it is more difficult to do this.)
-
-        // Count of attribute _values_ which are called or
-        // subscripted, after the leftmost parenthesized
-        // value.
-        //
-        // Examples:
-        // ```
-        // # Count of 3 - notice that .d()
-        // # does not contribute
-        // a().b().c[0]()().d()
-        // # Count of 2 - notice that a()
-        // # does not contribute
-        // (a()).b().c[0].d
-        // ```
-        let mut computed_attribute_values_after_parentheses = 0;
-
-        // Similar to the above, but instead looks at all calls
-        // and subscripts rather than looking only at those on
-        // _attribute values_. So this count can differ from the
-        // above.
-        //
-        // Examples of `computed_attribute_values_after_parentheses` vs
-        // `call_like_count`:
-        //
-        // a().b --->  1 vs 1
-        // a.b().c --> 1 vs 1
-        // a.b() --->  0 vs 1
-        let mut call_like_count = 0;
-
-        // Going from right to left, we traverse calls, subscripts,
-        // and attributes until we get to an expression of a different
-        // kind _or_ to a parenthesized expression. This records
-        // the case where we end the traversal at a parenthesized expression.
-        //
-        // In these cases, the inferred semantics of the chain are different.
-        // We interpret this as the user indicating:
-        // "this parenthesized value is the object of interest and we are
-        // doing transformations on it". This increases our confidence that
-        // this should be fluently formatted, and also means we should make
-        // our first break after this value.
-        let mut root_value_parenthesized = false;
+        let mut attributes_after_parentheses = 0;
         loop {
             match expr {
                 ExprRef::Attribute(ast::ExprAttribute { value, .. }) => {
@@ -1053,10 +907,10 @@ impl CallChainLayout {
                     // ```
                     if is_expression_parenthesized(value.into(), comment_ranges, source) {
                         // `(a).b`. We preserve these parentheses so don't recurse
-                        root_value_parenthesized = true;
+                        attributes_after_parentheses += 1;
                         break;
                     } else if matches!(value.as_ref(), Expr::Call(_) | Expr::Subscript(_)) {
-                        computed_attribute_values_after_parentheses += 1;
+                        attributes_after_parentheses += 1;
                     }
 
                     expr = ExprRef::from(value.as_ref());
@@ -1071,68 +925,31 @@ impl CallChainLayout {
                 // ```
                 ExprRef::Call(ast::ExprCall { func: inner, .. })
                 | ExprRef::Subscript(ast::ExprSubscript { value: inner, .. }) => {
-                    // We preserve these parentheses so don't recurse
-                    // e.g. (a)[0].x().y().z()
-                    //         ^stop here
-                    if is_expression_parenthesized(inner.into(), comment_ranges, source) {
-                        break;
-                    }
-
-                    // Accumulate the `call_like_count`, but we only
-                    // want to count things like `a()[0]()()` once.
-                    if !inner.is_call_expr() && !inner.is_subscript_expr() {
-                        call_like_count += 1;
-                    }
-
                     expr = ExprRef::from(inner.as_ref());
                 }
                 _ => {
+                    // We to format the following in fluent style:
+                    // ```
+                    // f2 = (a).w().t(1,)
+                    //       ^ expr
+                    // ```
+                    if is_expression_parenthesized(expr, comment_ranges, source) {
+                        attributes_after_parentheses += 1;
+                    }
+
                     break;
                 }
             }
-        }
 
-        if computed_attribute_values_after_parentheses + u32::from(root_value_parenthesized) < 2 {
+            // We preserve these parentheses so don't recurse
+            if is_expression_parenthesized(expr, comment_ranges, source) {
+                break;
+            }
+        }
+        if attributes_after_parentheses < 2 {
             CallChainLayout::NonFluent
         } else {
-            CallChainLayout::Fluent(AttributeState::CallLikePreceding(
-                // We count a parenthesized root value as an extra
-                // call for the purposes of tracking state.
-                //
-                // The reason is that, in this case, we want the first
-                // "special" break to happen right after the root, as
-                // opposed to right after the first called/subscripted
-                // attribute.
-                //
-                // For example:
-                //
-                // ```
-                // (object_of_interest)
-                // .data.filter()
-                // .agg()
-                // .etc()
-                // ```
-                //
-                // instead of (in preview):
-                //
-                // ```
-                // (object_of_interest)
-                // .data
-                // .filter()
-                // .etc()
-                // ```
-                //
-                // For comparison, if we didn't have parentheses around
-                // the root, we want (and get, in preview):
-                //
-                // ```
-                // object_of_interest.data
-                // .filter()
-                // .agg()
-                // .etc()
-                // ```
-                call_like_count + u32::from(root_value_parenthesized),
-            ))
+            CallChainLayout::Fluent
         }
     }
 
@@ -1155,13 +972,9 @@ impl CallChainLayout {
                     CallChainLayout::NonFluent
                 }
             }
-            layout @ (CallChainLayout::Fluent(_) | CallChainLayout::NonFluent) => layout,
+            layout @ (CallChainLayout::Fluent | CallChainLayout::NonFluent) => layout,
         }
     }
-
-    pub(crate) fn is_fluent(self) -> bool {
-        matches!(self, CallChainLayout::Fluent(_))
-    }
 }
 
 #[derive(Debug, Copy, Clone, PartialEq, Eq)]

crates/ruff_python_formatter/src/preview.rs

@@ -59,10 +59,3 @@ pub(crate) const fn is_avoid_parens_for_long_as_captures_enabled(
 pub(crate) const fn is_parenthesize_lambda_bodies_enabled(context: &PyFormatContext) -> bool {
     context.is_preview()
 }
-
-/// Returns `true` if the
-/// [`fluent_layout_split_first_call`](https://github.com/astral-sh/ruff/pull/21369) preview
-/// style is enabled.
-pub(crate) const fn is_fluent_layout_split_first_call_enabled(context: &PyFormatContext) -> bool {
-    context.is_preview()
-}

crates/ruff_python_formatter/tests/snapshots/black_compatibility@cases__preview_long_dict_values.py.snap

@@ -192,7 +192,7 @@ class Random:
          }
          x = {
              "foobar": (123) + 456,
-@@ -97,24 +94,21 @@
+@@ -97,24 +94,20 @@
  
  
  my_dict = {
@@ -221,14 +221,13 @@ class Random:
 -        .second_call()
 -        .third_call(some_args="some value")
 -    )
-+    "a key in my dict": MyClass.some_attribute
-+    .first_call()
++    "a key in my dict": MyClass.some_attribute.first_call()
 +    .second_call()
 +    .third_call(some_args="some value")
  }
  
  {
-@@ -139,17 +133,17 @@
+@@ -139,17 +132,17 @@
  
  class Random:
      def func():
@@ -364,8 +363,7 @@ my_dict = {
     / 100000.0
 }
 my_dict = {
-    "a key in my dict": MyClass.some_attribute
-    .first_call()
+    "a key in my dict": MyClass.some_attribute.first_call()
     .second_call()
     .third_call(some_args="some value")
 }

crates/ruff_python_formatter/tests/snapshots/format@expression__await.py.snap

@@ -1,6 +1,7 @@
 ---
 source: crates/ruff_python_formatter/tests/fixtures.rs
 input_file: crates/ruff_python_formatter/resources/test/fixtures/ruff/expression/await.py
+snapshot_kind: text
 ---
 ## Input
 ```python
@@ -141,20 +142,3 @@ test_data = await (
     .to_list()
 )
 ```
-
-
-## Preview changes
-```diff
---- Stable
-+++ Preview
-@@ -65,7 +65,8 @@
- 
- # https://github.com/astral-sh/ruff/issues/8644
- test_data = await (
--    Stream.from_async(async_data)
-+    Stream
-+    .from_async(async_data)
-     .flat_map_async()
-     .map()
-     .filter_async(is_valid_data)
-```

crates/ruff_python_formatter/tests/snapshots/format@expression__call.py.snap

@@ -1,6 +1,7 @@
 ---
 source: crates/ruff_python_formatter/tests/fixtures.rs
 input_file: crates/ruff_python_formatter/resources/test/fixtures/ruff/expression/call.py
+snapshot_kind: text
 ---
 ## Input
 ```python
@@ -556,20 +557,3 @@ result = (
 
 result = (object[complicate_caller])("argument").a["b"].test(argument)
 ```
-
-
-## Preview changes
-```diff
---- Stable
-+++ Preview
-@@ -57,7 +57,8 @@
- 
- # Call chains/fluent interface (https://black.readthedocs.io/en/stable/the_black_code_style/current_style.html#call-chains)
- result = (
--    session.query(models.Customer.id)
-+    session
-+    .query(models.Customer.id)
-     .filter(
-         models.Customer.account_id == 10000,
-         models.Customer.email == "user@example.org",
-```

crates/ruff_python_formatter/tests/snapshots/format@expression__lambda.py.snap

@@ -2155,7 +2155,7 @@ transform = (
          ),
          param(
              lambda left, right: (
-@@ -471,15 +463,16 @@
+@@ -471,9 +463,9 @@
          ),
          param(lambda left, right: ibis.timestamp("2017-04-01").cast(dt.date)),
          param(
@@ -2168,15 +2168,7 @@ transform = (
          ),
          # This is too long on one line in the lambda body and gets wrapped
          # inside the body.
-         param(
-             lambda left, right: (
--                ibis.timestamp("2017-04-01")
-+                ibis
-+                .timestamp("2017-04-01")
-                 .cast(dt.date)
-                 .between(left, right)
-                 .between(left, right)
-@@ -507,16 +500,18 @@
+@@ -507,16 +499,18 @@
  ]
  
  # adds parentheses around the body
@@ -2198,7 +2190,7 @@ transform = (
  
  lambda x, y, z: (
      x + y + z
-@@ -527,7 +522,7 @@
+@@ -527,7 +521,7 @@
      x + y + z  # trailing eol body
  )
  
@@ -2207,7 +2199,7 @@ transform = (
  
  lambda x, y, z: (
      # leading body
-@@ -539,21 +534,23 @@
+@@ -539,21 +533,23 @@
  )
  
  (
@@ -2241,7 +2233,7 @@ transform = (
      # dangling header comment
      source_bucket
      if name == source_bucket_name
-@@ -561,8 +558,7 @@
+@@ -561,8 +557,7 @@
  )
  
  (
@@ -2251,7 +2243,7 @@ transform = (
          source_bucket
          if name == source_bucket_name
          else storage.Bucket(mock_service, destination_bucket_name)
-@@ -570,61 +566,71 @@
+@@ -570,61 +565,70 @@
  )
  
  (
@@ -2301,8 +2293,7 @@ transform = (
 -    .cast(dt.date)
 -    .between(left, right)
 +    lambda left, right: (
-+        ibis
-+        .timestamp("2017-04-01")  # comment
++        ibis.timestamp("2017-04-01")  # comment
 +        .cast(dt.date)
 +        .between(left, right)
 +    )
@@ -2355,7 +2346,7 @@ transform = (
  )
  
  (
-@@ -637,27 +643,31 @@
+@@ -637,27 +641,31 @@
  (
      lambda
      # comment
@@ -2395,7 +2386,7 @@ transform = (
  )
  
  (
-@@ -672,25 +682,28 @@
+@@ -672,25 +680,28 @@
  )
  
  (
@@ -2436,7 +2427,7 @@ transform = (
  )
  
  (
-@@ -698,9 +711,9 @@
+@@ -698,9 +709,9 @@
      # comment 1
      *ergs,
      # comment 2
@@ -2449,7 +2440,7 @@ transform = (
  )
  
  (
-@@ -708,19 +721,20 @@
+@@ -708,19 +719,20 @@
      # 2
      left,  # 3
      # 4
@@ -2480,7 +2471,7 @@ transform = (
          )
      )
  )
-@@ -738,48 +752,52 @@
+@@ -738,48 +750,52 @@
  foo(
      lambda from_ts,  # but still wrap the body if it gets too long
      to_ts,
@@ -2557,7 +2548,7 @@ transform = (
  )
  
  (
-@@ -828,8 +846,7 @@
+@@ -828,8 +844,7 @@
  )
  
  (

crates/ruff_python_formatter/tests/snapshots/format@expression__split_empty_brackets.py.snap

@@ -1,6 +1,7 @@
 ---
 source: crates/ruff_python_formatter/tests/fixtures.rs
 input_file: crates/ruff_python_formatter/resources/test/fixtures/ruff/expression/split_empty_brackets.py
+snapshot_kind: text
 ---
 ## Input
 ```python

crates/ruff_python_formatter/tests/snapshots/format@fluent.py.snap

@@ -1,163 +0,0 @@
----
-source: crates/ruff_python_formatter/tests/fixtures.rs
-input_file: crates/ruff_python_formatter/resources/test/fixtures/ruff/fluent.py
----
-## Input
-```python
-# Fixtures for fluent formatting of call chains
-# Note that `fluent.options.json` sets line width to 8
-
-
-x = a.b()
-
-x = a.b().c()
-
-x = a.b().c().d
-
-x = a.b.c.d().e()
-
-x = a.b.c().d.e().f.g()
-
-# Consecutive calls/subscripts are grouped together
-# for the purposes of fluent formatting (though, as 2025.12.15,
-# there may be a break inside of one of these
-# calls/subscripts, but that is unrelated to the fluent format.)
-
-x = a()[0]().b().c()
-
-x = a.b()[0].c.d()[1]().e
-
-# Parentheses affect both where the root of the call
-# chain is and how many calls we require before applying
-# fluent formatting (just 1, in the presence of a parenthesized
-# root, as of 2025.12.15.)
-
-x = (a).b()
-
-x = (a()).b()
-
-x = (a.b()).d.e()
-
-x = (a.b().d).e()
-```
-
-## Outputs
-### Output 1
-```
-indent-style               = space
-line-width                 = 8
-indent-width               = 4
-quote-style                = Double
-line-ending                = LineFeed
-magic-trailing-comma       = Respect
-docstring-code             = Disabled
-docstring-code-line-width  = "dynamic"
-preview                    = Disabled
-target_version             = 3.10
-source_type                = Python
-```
-
-```python
-# Fixtures for fluent formatting of call chains
-# Note that `fluent.options.json` sets line width to 8
-
-
-x = a.b()
-
-x = a.b().c()
-
-x = (
-    a.b()
-    .c()
-    .d
-)
-
-x = a.b.c.d().e()
-
-x = (
-    a.b.c()
-    .d.e()
-    .f.g()
-)
-
-# Consecutive calls/subscripts are grouped together
-# for the purposes of fluent formatting (though, as 2025.12.15,
-# there may be a break inside of one of these
-# calls/subscripts, but that is unrelated to the fluent format.)
-
-x = (
-    a()[
-        0
-    ]()
-    .b()
-    .c()
-)
-
-x = (
-    a.b()[
-        0
-    ]
-    .c.d()[
-        1
-    ]()
-    .e
-)
-
-# Parentheses affect both where the root of the call
-# chain is and how many calls we require before applying
-# fluent formatting (just 1, in the presence of a parenthesized
-# root, as of 2025.12.15.)
-
-x = (
-    a
-).b()
-
-x = (
-    a()
-).b()
-
-x = (
-    a.b()
-).d.e()
-
-x = (
-    a.b().d
-).e()
-```
-
-
-#### Preview changes
-```diff
---- Stable
-+++ Preview
-@@ -7,7 +7,8 @@
- x = a.b().c()
- 
- x = (
--    a.b()
-+    a
-+    .b()
-     .c()
-     .d
- )
-@@ -15,7 +16,8 @@
- x = a.b.c.d().e()
- 
- x = (
--    a.b.c()
-+    a.b
-+    .c()
-     .d.e()
-     .f.g()
- )
-@@ -34,7 +36,8 @@
- )
- 
- x = (
--    a.b()[
-+    a
-+    .b()[
-         0
-     ]
-     .c.d()[
-```

crates/ruff_python_formatter/tests/snapshots/format@parentheses__call_chains.py.snap

@@ -1,6 +1,7 @@
 ---
 source: crates/ruff_python_formatter/tests/fixtures.rs
 input_file: crates/ruff_python_formatter/resources/test/fixtures/ruff/parentheses/call_chains.py
+snapshot_kind: text
 ---
 ## Input
 ```python
@@ -222,72 +223,6 @@ max_message_id = (
     .baz()
 )
 
-# Note in preview we split at `pl` which some
-# folks may dislike. (Similarly with common
-# `np` and `pd` invocations).
-#
-# This is because we cannot reliably predict,
-# just from syntax, whether a short identifier
-# is being used as a 'namespace' or as an 'object'.
-#
-# As of 2025.12.15, we do not indent methods in
-# fluent formatting. If we ever decide to do so,
-# it may make sense to special case call chain roots
-# that are shorter than the indent-width (like Prettier does).
-# This would have the benefit of handling these common
-# two-letter aliases for libraries.
-
-
-expr = (
-    pl.scan_parquet("/data/pypi-parquet/*.parquet")
-    .filter(
-        [
-            pl.col("path").str.contains(
-                r"\.(asm|c|cc|cpp|cxx|h|hpp|rs|[Ff][0-9]{0,2}(?:or)?|go)$"
-            ),
-            ~pl.col("path").str.contains(r"(^|/)test(|s|ing)"),
-            ~pl.col("path").str.contains("/site-packages/", literal=True),
-        ]
-    )
-    .with_columns(
-        month=pl.col("uploaded_on").dt.truncate("1mo"),
-        ext=pl.col("path")
-        .str.extract(pattern=r"\.([a-z0-9]+)$", group_index=1)
-        .str.replace_all(pattern=r"cxx|cpp|cc|c|hpp|h", value="C/C++")
-        .str.replace_all(pattern="^f.*$", value="Fortran")
-        .str.replace("rs", "Rust", literal=True)
-        .str.replace("go", "Go", literal=True)
-        .str.replace("asm", "Assembly", literal=True)
-        .replace({"": None}),
-    )
-    .group_by(["month", "ext"])
-    .agg(project_count=pl.col("project_name").n_unique())
-    .drop_nulls(["ext"])
-    .sort(["month", "project_count"], descending=True)
-)
-
-def indentation_matching_for_loop_in_preview():
-    if make_this:
-        if more_nested_because_line_length:
-            identical_hidden_layer_sizes = all(
-            current_hidden_layer_sizes == first_hidden_layer_sizes
-            for current_hidden_layer_sizes in self.component_config[
-                HIDDEN_LAYERS_SIZES
-            ].values().attr
-           )
-
-def indentation_matching_walrus_in_preview():
-    if make_this:
-        if more_nested_because_line_length:
-            with self.read_ctx(book_type) as cursor:
-                if (entry_count := len(names := cursor.execute(
-                    'SELECT name FROM address_book WHERE address=?',
-                    (address,),
-                ).fetchall().some_attr)) == 0 or len(set(names)) > 1:
-                    return
-
-# behavior with parenthesized roots
-x = (aaaaaaaaaaaaaaaaaaaaaa).bbbbbbbbbbbbbbbbbbb.cccccccccccccccccccccccc().dddddddddddddddddddddddd().eeeeeeeeeeee
 ```
 
 ## Output
@@ -531,237 +466,4 @@ max_message_id = (
     .sum()
     .baz()
 )
-
-# Note in preview we split at `pl` which some
-# folks may dislike. (Similarly with common
-# `np` and `pd` invocations).
-#
-# This is because we cannot reliably predict,
-# just from syntax, whether a short identifier
-# is being used as a 'namespace' or as an 'object'.
-#
-# As of 2025.12.15, we do not indent methods in
-# fluent formatting. If we ever decide to do so,
-# it may make sense to special case call chain roots
-# that are shorter than the indent-width (like Prettier does).
-# This would have the benefit of handling these common
-# two-letter aliases for libraries.
-
-
-expr = (
-    pl.scan_parquet("/data/pypi-parquet/*.parquet")
-    .filter(
-        [
-            pl.col("path").str.contains(
-                r"\.(asm|c|cc|cpp|cxx|h|hpp|rs|[Ff][0-9]{0,2}(?:or)?|go)$"
-            ),
-            ~pl.col("path").str.contains(r"(^|/)test(|s|ing)"),
-            ~pl.col("path").str.contains("/site-packages/", literal=True),
-        ]
-    )
-    .with_columns(
-        month=pl.col("uploaded_on").dt.truncate("1mo"),
-        ext=pl.col("path")
-        .str.extract(pattern=r"\.([a-z0-9]+)$", group_index=1)
-        .str.replace_all(pattern=r"cxx|cpp|cc|c|hpp|h", value="C/C++")
-        .str.replace_all(pattern="^f.*$", value="Fortran")
-        .str.replace("rs", "Rust", literal=True)
-        .str.replace("go", "Go", literal=True)
-        .str.replace("asm", "Assembly", literal=True)
-        .replace({"": None}),
-    )
-    .group_by(["month", "ext"])
-    .agg(project_count=pl.col("project_name").n_unique())
-    .drop_nulls(["ext"])
-    .sort(["month", "project_count"], descending=True)
-)
-
-
-def indentation_matching_for_loop_in_preview():
-    if make_this:
-        if more_nested_because_line_length:
-            identical_hidden_layer_sizes = all(
-                current_hidden_layer_sizes == first_hidden_layer_sizes
-                for current_hidden_layer_sizes in self.component_config[
-                    HIDDEN_LAYERS_SIZES
-                ]
-                .values()
-                .attr
-            )
-
-
-def indentation_matching_walrus_in_preview():
-    if make_this:
-        if more_nested_because_line_length:
-            with self.read_ctx(book_type) as cursor:
-                if (
-                    entry_count := len(
-                        names := cursor.execute(
-                            "SELECT name FROM address_book WHERE address=?",
-                            (address,),
-                        )
-                        .fetchall()
-                        .some_attr
-                    )
-                ) == 0 or len(set(names)) > 1:
-                    return
-
-
-# behavior with parenthesized roots
-x = (
-    (aaaaaaaaaaaaaaaaaaaaaa)
-    .bbbbbbbbbbbbbbbbbbb.cccccccccccccccccccccccc()
-    .dddddddddddddddddddddddd()
-    .eeeeeeeeeeee
-)
-```
-
-
-## Preview changes
-```diff
---- Stable
-+++ Preview
-@@ -21,7 +21,8 @@
- )
- 
- raise OsError("") from (
--    Blog.objects.filter(
-+    Blog.objects
-+    .filter(
-         entry__headline__contains="Lennon",
-     )
-     .filter(
-@@ -33,7 +34,8 @@
- )
- 
- raise OsError("sökdjffffsldkfjlhsakfjhalsökafhsöfdahsödfjösaaksjdllllllllllllll") from (
--    Blog.objects.filter(
-+    Blog.objects
-+    .filter(
-         entry__headline__contains="Lennon",
-     )
-     .filter(
-@@ -46,7 +48,8 @@
- 
- # Break only after calls and indexing
- b1 = (
--    session.query(models.Customer.id)
-+    session
-+    .query(models.Customer.id)
-     .filter(
-         models.Customer.account_id == account_id, models.Customer.email == email_address
-     )
-@@ -54,7 +57,8 @@
- )
- 
- b2 = (
--    Blog.objects.filter(
-+    Blog.objects
-+    .filter(
-         entry__headline__contains="Lennon",
-     )
-     .limit_results[:10]
-@@ -70,7 +74,8 @@
-     ).filter(
-         entry__pub_date__year=2008,
-     )
--    + Blog.objects.filter(
-+    + Blog.objects
-+    .filter(
-         entry__headline__contains="McCartney",
-     )
-     .limit_results[:10]
-@@ -89,7 +94,8 @@
- d11 = x.e().e().e()  #
- d12 = x.e().e().e()  #
- d13 = (
--    x.e()  #
-+    x
-+    .e()  #
-     .e()
-     .e()
- )
-@@ -101,7 +107,8 @@
- 
- # Doesn't fit, fluent style
- d3 = (
--    x.e()  #
-+    x
-+    .e()  #
-     .esadjkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkk()
-     .esadjkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkk()
- )
-@@ -218,7 +225,8 @@
- 
- (
-     (
--        df1_aaaaaaaaaaaa.merge()
-+        df1_aaaaaaaaaaaa
-+        .merge()
-         .groupby(
-             1,
-         )
-@@ -228,7 +236,8 @@
- 
- (
-     (
--        df1_aaaaaaaaaaaa.merge()
-+        df1_aaaaaaaaaaaa
-+        .merge()
-         .groupby(
-             1,
-         )
-@@ -255,19 +264,19 @@
- 
- 
- expr = (
--    pl.scan_parquet("/data/pypi-parquet/*.parquet")
--    .filter(
--        [
--            pl.col("path").str.contains(
--                r"\.(asm|c|cc|cpp|cxx|h|hpp|rs|[Ff][0-9]{0,2}(?:or)?|go)$"
--            ),
--            ~pl.col("path").str.contains(r"(^|/)test(|s|ing)"),
--            ~pl.col("path").str.contains("/site-packages/", literal=True),
--        ]
--    )
-+    pl
-+    .scan_parquet("/data/pypi-parquet/*.parquet")
-+    .filter([
-+        pl.col("path").str.contains(
-+            r"\.(asm|c|cc|cpp|cxx|h|hpp|rs|[Ff][0-9]{0,2}(?:or)?|go)$"
-+        ),
-+        ~pl.col("path").str.contains(r"(^|/)test(|s|ing)"),
-+        ~pl.col("path").str.contains("/site-packages/", literal=True),
-+    ])
-     .with_columns(
-         month=pl.col("uploaded_on").dt.truncate("1mo"),
--        ext=pl.col("path")
-+        ext=pl
-+        .col("path")
-         .str.extract(pattern=r"\.([a-z0-9]+)$", group_index=1)
-         .str.replace_all(pattern=r"cxx|cpp|cc|c|hpp|h", value="C/C++")
-         .str.replace_all(pattern="^f.*$", value="Fortran")
-@@ -288,9 +297,8 @@
-         if more_nested_because_line_length:
-             identical_hidden_layer_sizes = all(
-                 current_hidden_layer_sizes == first_hidden_layer_sizes
--                for current_hidden_layer_sizes in self.component_config[
--                    HIDDEN_LAYERS_SIZES
--                ]
-+                for current_hidden_layer_sizes in self
-+                .component_config[HIDDEN_LAYERS_SIZES]
-                 .values()
-                 .attr
-             )
-@@ -302,7 +310,8 @@
-             with self.read_ctx(book_type) as cursor:
-                 if (
-                     entry_count := len(
--                        names := cursor.execute(
-+                        names := cursor
-+                        .execute(
-                             "SELECT name FROM address_book WHERE address=?",
-                             (address,),
-                         )
 ```

crates/ruff_python_literal/src/format.rs

@@ -592,23 +592,11 @@ impl FormatString {
     fn parse_literal(text: &str) -> Result<(FormatPart, &str), FormatParseError> {
         let mut cur_text = text;
         let mut result_string = String::new();
-        let mut pending_escape = false;
         while !cur_text.is_empty() {
-            if pending_escape
-                && let Some((unicode_string, remaining)) =
-                    FormatString::parse_escaped_unicode_string(cur_text)
-            {
-                result_string.push_str(unicode_string);
-                cur_text = remaining;
-                pending_escape = false;
-                continue;
-            }
-
             match FormatString::parse_literal_single(cur_text) {
                 Ok((next_char, remaining)) => {
                     result_string.push(next_char);
                     cur_text = remaining;
-                    pending_escape = next_char == '\\' && !pending_escape;
                 }
                 Err(err) => {
                     return if result_string.is_empty() {
@@ -690,13 +678,6 @@ impl FormatString {
         }
         Err(FormatParseError::UnmatchedBracket)
     }
-
-    fn parse_escaped_unicode_string(text: &str) -> Option<(&str, &str)> {
-        text.strip_prefix("N{")?.find('}').map(|idx| {
-            let end_idx = idx + 3; // 3 for "N{"
-            (&text[..end_idx], &text[end_idx..])
-        })
-    }
 }
 
 pub trait FromTemplate<'a>: Sized {
@@ -1039,48 +1020,4 @@ mod tests {
             Err(FormatParseError::InvalidCharacterAfterRightBracket)
         );
     }
-
-    #[test]
-    fn test_format_unicode_escape() {
-        let expected = Ok(FormatString {
-            format_parts: vec![FormatPart::Literal("I am a \\N{snowman}".to_owned())],
-        });
-
-        assert_eq!(FormatString::from_str("I am a \\N{snowman}"), expected);
-    }
-
-    #[test]
-    fn test_format_unicode_escape_with_field() {
-        let expected = Ok(FormatString {
-            format_parts: vec![
-                FormatPart::Literal("I am a \\N{snowman}".to_owned()),
-                FormatPart::Field {
-                    field_name: "snowman".to_owned(),
-                    conversion_spec: None,
-                    format_spec: String::new(),
-                },
-            ],
-        });
-
-        assert_eq!(
-            FormatString::from_str("I am a \\N{snowman}{snowman}"),
-            expected
-        );
-    }
-
-    #[test]
-    fn test_format_multiple_escape_with_field() {
-        let expected = Ok(FormatString {
-            format_parts: vec![
-                FormatPart::Literal("I am a \\\\N".to_owned()),
-                FormatPart::Field {
-                    field_name: "snowman".to_owned(),
-                    conversion_spec: None,
-                    format_spec: String::new(),
-                },
-            ],
-        });
-
-        assert_eq!(FormatString::from_str("I am a \\\\N{snowman}"), expected);
-    }
 }

crates/ruff_python_parser/src/semantic_errors.rs

@@ -272,9 +272,7 @@ impl SemanticSyntaxChecker {
 
     fn check_annotation<Ctx: SemanticSyntaxContext>(stmt: &ast::Stmt, ctx: &Ctx) {
         match stmt {
-            Stmt::AnnAssign(ast::StmtAnnAssign {
-                target, annotation, ..
-            }) => {
+            Stmt::AnnAssign(ast::StmtAnnAssign { annotation, .. }) => {
                 if ctx.python_version() > PythonVersion::PY313 {
                     // test_ok valid_annotation_py313
                     // # parse_options: {"target-version": "3.13"}
@@ -299,18 +297,6 @@ impl SemanticSyntaxChecker {
                     };
                     visitor.visit_expr(annotation);
                 }
-                if let Expr::Name(ast::ExprName { id, .. }) = target.as_ref() {
-                    if let Some(global_stmt) = ctx.global(id.as_str()) {
-                        let global_start = global_stmt.start();
-                        if !ctx.in_module_scope() || target.start() < global_start {
-                            Self::add_error(
-                                ctx,
-                                SemanticSyntaxErrorKind::AnnotatedGlobal(id.to_string()),
-                                target.range(),
-                            );
-                        }
-                    }
-                }
             }
             Stmt::FunctionDef(ast::StmtFunctionDef {
                 type_params,

crates/ruff_source_file/src/line_index.rs

@@ -179,45 +179,42 @@ impl LineIndex {
         let line = self.line_index(offset);
         let line_start = self.line_start(line, text);
 
-        let character_offset =
-            self.characters_between(TextRange::new(line_start, offset), text, encoding);
-
-        SourceLocation {
-            line,
-            character_offset: OneIndexed::from_zero_indexed(character_offset),
-        }
-    }
-
-    fn characters_between(
-        &self,
-        range: TextRange,
-        text: &str,
-        encoding: PositionEncoding,
-    ) -> usize {
         if self.is_ascii() {
-            return (range.end() - range.start()).to_usize();
+            return SourceLocation {
+                line,
+                character_offset: OneIndexed::from_zero_indexed((offset - line_start).to_usize()),
+            };
         }
 
         match encoding {
-            PositionEncoding::Utf8 => (range.end() - range.start()).to_usize(),
+            PositionEncoding::Utf8 => {
+                let character_offset = offset - line_start;
+                SourceLocation {
+                    line,
+                    character_offset: OneIndexed::from_zero_indexed(character_offset.to_usize()),
+                }
+            }
             PositionEncoding::Utf16 => {
-                let up_to_character = &text[range];
-                up_to_character.encode_utf16().count()
+                let up_to_character = &text[TextRange::new(line_start, offset)];
+                let character = up_to_character.encode_utf16().count();
+
+                SourceLocation {
+                    line,
+                    character_offset: OneIndexed::from_zero_indexed(character),
+                }
             }
             PositionEncoding::Utf32 => {
-                let up_to_character = &text[range];
-                up_to_character.chars().count()
+                let up_to_character = &text[TextRange::new(line_start, offset)];
+                let character = up_to_character.chars().count();
+
+                SourceLocation {
+                    line,
+                    character_offset: OneIndexed::from_zero_indexed(character),
+                }
             }
         }
     }
 
-    /// Returns the length of the line in characters, respecting the given encoding
-    pub fn line_len(&self, line: OneIndexed, text: &str, encoding: PositionEncoding) -> usize {
-        let line_range = self.line_range(line, text);
-
-        self.characters_between(line_range, text, encoding)
-    }
-
     /// Return the number of lines in the source code.
     pub fn line_count(&self) -> usize {
         self.line_starts().len()

crates/ruff_wasm/Cargo.toml

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

crates/ty/Cargo.toml

@@ -51,11 +51,5 @@ regex = { workspace = true }
 tempfile = { workspace = true }
 toml = { workspace = true }
 
-[features]
-default = []
-
-[target.'cfg(all(not(target_os = "macos"), not(target_os = "windows"), not(target_os = "openbsd"), not(target_os = "aix"), not(target_os = "android"), any(target_arch = "x86_64", target_arch = "aarch64", target_arch = "powerpc64", target_arch = "riscv64")))'.dependencies]
-tikv-jemallocator = { workspace = true }
-
 [lints]
 workspace = true

crates/ty/docs/configuration.md

@@ -18,9 +18,9 @@ Valid severities are:
 
 **Type**: `dict[RuleName, "ignore" | "warn" | "error"]`
 
-**Example usage**:
+**Example usage** (`pyproject.toml`):
 
-```toml title="pyproject.toml"
+```toml
 [tool.ty.rules]
 possibly-unresolved-reference = "warn"
 division-by-zero = "ignore"
@@ -45,9 +45,9 @@ configuration setting.
 
 **Type**: `list[str]`
 
-**Example usage**:
+**Example usage** (`pyproject.toml`):
 
-```toml title="pyproject.toml"
+```toml
 [tool.ty.environment]
 extra-paths = ["./shared/my-search-path"]
 ```
@@ -76,9 +76,9 @@ This option can be used to point to virtual or system Python environments.
 
 **Type**: `str`
 
-**Example usage**:
+**Example usage** (`pyproject.toml`):
 
-```toml title="pyproject.toml"
+```toml
 [tool.ty.environment]
 python = "./custom-venv-location/.venv"
 ```
@@ -103,9 +103,9 @@ If no platform is specified, ty will use the current platform:
 
 **Type**: `"win32" | "darwin" | "android" | "ios" | "linux" | "all" | str`
 
-**Example usage**:
+**Example usage** (`pyproject.toml`):
 
-```toml title="pyproject.toml"
+```toml
 [tool.ty.environment]
 # Tailor type stubs and conditionalized type definitions to windows.
 python-platform = "win32"
@@ -137,9 +137,9 @@ to reflect the differing contents of the standard library across Python versions
 
 **Type**: `"3.7" | "3.8" | "3.9" | "3.10" | "3.11" | "3.12" | "3.13" | "3.14" | <major>.<minor>`
 
-**Example usage**:
+**Example usage** (`pyproject.toml`):
 
-```toml title="pyproject.toml"
+```toml
 [tool.ty.environment]
 python-version = "3.12"
 ```
@@ -165,9 +165,9 @@ it will also be included in the first party search path.
 
 **Type**: `list[str]`
 
-**Example usage**:
+**Example usage** (`pyproject.toml`):
 
-```toml title="pyproject.toml"
+```toml
 [tool.ty.environment]
 # Multiple directories (priority order)
 root = ["./src", "./lib", "./vendor"]
@@ -185,9 +185,9 @@ bundled as a zip file in the binary
 
 **Type**: `str`
 
-**Example usage**:
+**Example usage** (`pyproject.toml`):
 
-```toml title="pyproject.toml"
+```toml
 [tool.ty.environment]
 typeshed = "/path/to/custom/typeshed"
 ```
@@ -200,22 +200,24 @@ Configuration override that applies to specific files based on glob patterns.
 
 An override allows you to apply different rule configurations to specific
 files or directories. Multiple overrides can match the same file, with
-later overrides take precedence. Override rules take precedence over global
-rules for matching files.
+later overrides take precedence.
 
-For example, to relax enforcement of rules in test files:
+### Precedence
+
+- Later overrides in the array take precedence over earlier ones
+- Override rules take precedence over global rules for matching files
+
+### Examples
 
 ```toml
+# Relax rules for test files
 [[tool.ty.overrides]]
 include = ["tests/**", "**/test_*.py"]
 
 [tool.ty.overrides.rules]
 possibly-unresolved-reference = "warn"
-```
 
-Or, to ignore a rule in generated files but retain enforcement in an important file:
-
-```toml
+# Ignore generated files but still check important ones
 [[tool.ty.overrides]]
 include = ["generated/**"]
 exclude = ["generated/important.py"]
@@ -238,9 +240,9 @@ If not specified, defaults to `[]` (excludes no files).
 
 **Type**: `list[str]`
 
-**Example usage**:
+**Example usage** (`pyproject.toml`):
 
-```toml title="pyproject.toml"
+```toml
 [[tool.ty.overrides]]
 exclude = [
     "generated",
@@ -266,9 +268,9 @@ If not specified, defaults to `["**"]` (matches all files).
 
 **Type**: `list[str]`
 
-**Example usage**:
+**Example usage** (`pyproject.toml`):
 
-```toml title="pyproject.toml"
+```toml
 [[tool.ty.overrides]]
 include = [
     "src",
@@ -290,9 +292,9 @@ severity levels or disable them entirely.
 
 **Type**: `dict[RuleName, "ignore" | "warn" | "error"]`
 
-**Example usage**:
+**Example usage** (`pyproject.toml`):
 
-```toml title="pyproject.toml"
+```toml
 [[tool.ty.overrides]]
 include = ["src"]
 
@@ -356,9 +358,9 @@ to re-include `dist` use `exclude = ["!dist"]`
 
 **Type**: `list[str]`
 
-**Example usage**:
+**Example usage** (`pyproject.toml`):
 
-```toml title="pyproject.toml"
+```toml
 [tool.ty.src]
 exclude = [
     "generated",
@@ -397,9 +399,9 @@ matches `<project_root>/src` and not `<project_root>/test/src`).
 
 **Type**: `list[str]`
 
-**Example usage**:
+**Example usage** (`pyproject.toml`):
 
-```toml title="pyproject.toml"
+```toml
 [tool.ty.src]
 include = [
     "src",
@@ -419,9 +421,9 @@ Enabled by default.
 
 **Type**: `bool`
 
-**Example usage**:
+**Example usage** (`pyproject.toml`):
 
-```toml title="pyproject.toml"
+```toml
 [tool.ty.src]
 respect-ignore-files = false
 ```
@@ -430,8 +432,8 @@ respect-ignore-files = false
 
 ### `root`
 
-!!! warning "Deprecated"
-    This option has been deprecated. Use `environment.root` instead.
+> [!WARN] "Deprecated"
+> This option has been deprecated. Use `environment.root` instead.
 
 The root of the project, used for finding first-party modules.
 
@@ -448,9 +450,9 @@ it will also be included in the first party search path.
 
 **Type**: `str`
 
-**Example usage**:
+**Example usage** (`pyproject.toml`):
 
-```toml title="pyproject.toml"
+```toml
 [tool.ty.src]
 root = "./app"
 ```
@@ -469,9 +471,9 @@ Defaults to `false`.
 
 **Type**: `bool`
 
-**Example usage**:
+**Example usage** (`pyproject.toml`):
 
-```toml title="pyproject.toml"
+```toml
 [tool.ty.terminal]
 # Error if ty emits any warning-level diagnostics.
 error-on-warning = true
@@ -489,9 +491,9 @@ Defaults to `full`.
 
 **Type**: `full | concise`
 
-**Example usage**:
+**Example usage** (`pyproject.toml`):
 
-```toml title="pyproject.toml"
+```toml
 [tool.ty.terminal]
 output-format = "concise"
 ```

crates/ty/docs/environment.md

@@ -2,15 +2,6 @@
 
 ty defines and respects the following environment variables:
 
-### `TY_CONFIG_FILE`
-
-Path to a `ty.toml` configuration file to use.
-
-When set, ty will use this file for configuration instead of
-discovering configuration files automatically.
-
-Equivalent to the `--config-file` command-line argument.
-
 ### `TY_LOG`
 
 If set, ty will use this value as the log level for its `--verbose` output.

crates/ty/docs/rules.md

@@ -39,7 +39,7 @@ def test(): -> "int":
 Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.1">0.0.1-alpha.1</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20call-non-callable" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L135" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L134" target="_blank">View source</a>
 </small>
 
 
@@ -63,7 +63,7 @@ Calling a non-callable object will raise a `TypeError` at runtime.
 Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.1">0.0.1-alpha.1</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20conflicting-argument-forms" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L179" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L178" target="_blank">View source</a>
 </small>
 
 
@@ -95,7 +95,7 @@ f(int)  # error
 Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.1">0.0.1-alpha.1</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20conflicting-declarations" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L205" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L204" target="_blank">View source</a>
 </small>
 
 
@@ -126,7 +126,7 @@ a = 1
 Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.1">0.0.1-alpha.1</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20conflicting-metaclass" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L230" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L229" target="_blank">View source</a>
 </small>
 
 
@@ -158,7 +158,7 @@ class C(A, B): ...
 Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.1">0.0.1-alpha.1</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20cyclic-class-definition" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L256" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L255" target="_blank">View source</a>
 </small>
 
 
@@ -190,7 +190,7 @@ class B(A): ...
 Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
 Preview (since <a href="https://github.com/astral-sh/ty/releases/tag/1.0.0">1.0.0</a>) ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20cyclic-type-alias-definition" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L282" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L281" target="_blank">View source</a>
 </small>
 
 
@@ -218,7 +218,7 @@ type B = A
 Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.1">0.0.1-alpha.1</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20duplicate-base" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L343" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L342" target="_blank">View source</a>
 </small>
 
 
@@ -245,7 +245,7 @@ class B(A, A): ...
 Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.12">0.0.1-alpha.12</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20duplicate-kw-only" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L364" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L363" target="_blank">View source</a>
 </small>
 
 
@@ -357,7 +357,7 @@ def test(): -> "Literal[5]":
 Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.1">0.0.1-alpha.1</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20inconsistent-mro" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L590" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L589" target="_blank">View source</a>
 </small>
 
 
@@ -387,7 +387,7 @@ class C(A, B): ...
 Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.1">0.0.1-alpha.1</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20index-out-of-bounds" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L614" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L613" target="_blank">View source</a>
 </small>
 
 
@@ -413,7 +413,7 @@ t[3]  # IndexError: tuple index out of range
 Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.12">0.0.1-alpha.12</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20instance-layout-conflict" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L396" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L395" target="_blank">View source</a>
 </small>
 
 
@@ -502,7 +502,7 @@ an atypical memory layout.
 Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.1">0.0.1-alpha.1</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20invalid-argument-type" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L668" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L667" target="_blank">View source</a>
 </small>
 
 
@@ -529,7 +529,7 @@ func("foo")  # error: [invalid-argument-type]
 Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.1">0.0.1-alpha.1</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20invalid-assignment" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L708" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L707" target="_blank">View source</a>
 </small>
 
 
@@ -557,7 +557,7 @@ a: int = ''
 Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.1">0.0.1-alpha.1</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20invalid-attribute-access" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L2003" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1997" target="_blank">View source</a>
 </small>
 
 
@@ -591,7 +591,7 @@ C.instance_var = 3  # error: Cannot assign to instance variable
 Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.19">0.0.1-alpha.19</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20invalid-await" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L730" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L729" target="_blank">View source</a>
 </small>
 
 
@@ -627,7 +627,7 @@ asyncio.run(main())
 Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.1">0.0.1-alpha.1</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20invalid-base" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L760" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L759" target="_blank">View source</a>
 </small>
 
 
@@ -651,7 +651,7 @@ class A(42): ...  # error: [invalid-base]
 Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.1">0.0.1-alpha.1</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20invalid-context-manager" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L811" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L810" target="_blank">View source</a>
 </small>
 
 
@@ -678,7 +678,7 @@ with 1:
 Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.1">0.0.1-alpha.1</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20invalid-declaration" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L832" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L831" target="_blank">View source</a>
 </small>
 
 
@@ -707,7 +707,7 @@ a: str
 Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.1">0.0.1-alpha.1</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20invalid-exception-caught" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L855" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L854" target="_blank">View source</a>
 </small>
 
 
@@ -751,7 +751,7 @@ except ZeroDivisionError:
 Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.28">0.0.1-alpha.28</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20invalid-explicit-override" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1673" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1667" target="_blank">View source</a>
 </small>
 
 
@@ -787,57 +787,13 @@ class D(A):
     def foo(self): ...  # fine: overrides `A.foo`
 ```
 
-## `invalid-frozen-dataclass-subclass`
-
-<small>
-Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
-Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.35">0.0.1-alpha.35</a> ·
-<a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20invalid-frozen-dataclass-subclass" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L2229" target="_blank">View source</a>
-</small>
-
-
-**What it does**
-
-Checks for dataclasses with invalid frozen inheritance:
-- A frozen dataclass cannot inherit from a non-frozen dataclass.
-- A non-frozen dataclass cannot inherit from a frozen dataclass.
-
-**Why is this bad?**
-
-Python raises a `TypeError` at runtime when either of these inheritance
-patterns occurs.
-
-**Example**
-
-
-```python
-from dataclasses import dataclass
-
-@dataclass
-class Base:
-    x: int
-
-@dataclass(frozen=True)
-class Child(Base):  # Error raised here
-    y: int
-
-@dataclass(frozen=True)
-class FrozenBase:
-    x: int
-
-@dataclass
-class NonFrozenChild(FrozenBase):  # Error raised here
-    y: int
-```
-
 ## `invalid-generic-class`
 
 <small>
 Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.1">0.0.1-alpha.1</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20invalid-generic-class" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L891" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L890" target="_blank">View source</a>
 </small>
 
 
@@ -848,21 +804,16 @@ Checks for the creation of invalid generic classes
 **Why is this bad?**
 
 There are several requirements that you must follow when defining a generic class.
-Many of these result in `TypeError` being raised at runtime if they are violated.
 
 **Examples**
 
 ```python
-from typing_extensions import Generic, TypeVar
+from typing import Generic, TypeVar
 
-T = TypeVar("T")
-U = TypeVar("U", default=int)
+T = TypeVar("T")  # okay
 
 # error: class uses both PEP-695 syntax and legacy syntax
 class C[U](Generic[T]): ...
-
-# error: type parameter with default comes before type parameter without default
-class D(Generic[U, T]): ...
 ```
 
 **References**
@@ -875,7 +826,7 @@ class D(Generic[U, T]): ...
 Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.17">0.0.1-alpha.17</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20invalid-key" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L635" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L634" target="_blank">View source</a>
 </small>
 
 
@@ -914,7 +865,7 @@ carol = Person(name="Carol", age=25)  # typo!
 Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.1">0.0.1-alpha.1</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20invalid-legacy-type-variable" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L922" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L916" target="_blank">View source</a>
 </small>
 
 
@@ -949,7 +900,7 @@ def f(t: TypeVar("U")): ...
 Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.1">0.0.1-alpha.1</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20invalid-metaclass" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1019" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1013" target="_blank">View source</a>
 </small>
 
 
@@ -983,7 +934,7 @@ class B(metaclass=f): ...
 Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.20">0.0.1-alpha.20</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20invalid-method-override" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L2131" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L2125" target="_blank">View source</a>
 </small>
 
 
@@ -1090,7 +1041,7 @@ Correct use of `@override` is enforced by ty's `invalid-explicit-override` rule.
 Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.19">0.0.1-alpha.19</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20invalid-named-tuple" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L542" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L541" target="_blank">View source</a>
 </small>
 
 
@@ -1144,7 +1095,7 @@ AttributeError: Cannot overwrite NamedTuple attribute _asdict
 Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
 Preview (since <a href="https://github.com/astral-sh/ty/releases/tag/1.0.0">1.0.0</a>) ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20invalid-newtype" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L995" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L989" target="_blank">View source</a>
 </small>
 
 
@@ -1174,7 +1125,7 @@ Baz = NewType("Baz", int | str)  # error: invalid base for `typing.NewType`
 Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.1">0.0.1-alpha.1</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20invalid-overload" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1046" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1040" target="_blank">View source</a>
 </small>
 
 
@@ -1224,7 +1175,7 @@ def foo(x: int) -> int: ...
 Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.1">0.0.1-alpha.1</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20invalid-parameter-default" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1145" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1139" target="_blank">View source</a>
 </small>
 
 
@@ -1250,7 +1201,7 @@ def f(a: int = ''): ...
 Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.1">0.0.1-alpha.1</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20invalid-paramspec" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L950" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L944" target="_blank">View source</a>
 </small>
 
 
@@ -1281,7 +1232,7 @@ P2 = ParamSpec("S2")  # error: ParamSpec name must match the variable it's assig
 Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.1">0.0.1-alpha.1</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20invalid-protocol" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L478" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L477" target="_blank">View source</a>
 </small>
 
 
@@ -1315,7 +1266,7 @@ TypeError: Protocols can only inherit from other protocols, got <class 'int'>
 Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.1">0.0.1-alpha.1</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20invalid-raise" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1165" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1159" target="_blank">View source</a>
 </small>
 
 
@@ -1364,7 +1315,7 @@ def g():
 Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.1">0.0.1-alpha.1</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20invalid-return-type" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L689" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L688" target="_blank">View source</a>
 </small>
 
 
@@ -1389,7 +1340,7 @@ def func() -> int:
 Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.1">0.0.1-alpha.1</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20invalid-super-argument" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1208" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1202" target="_blank">View source</a>
 </small>
 
 
@@ -1447,7 +1398,7 @@ TODO #14889
 Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.6">0.0.1-alpha.6</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20invalid-type-alias-type" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L974" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L968" target="_blank">View source</a>
 </small>
 
 
@@ -1474,7 +1425,7 @@ NewAlias = TypeAliasType(get_name(), int)        # error: TypeAliasType name mus
 Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.29">0.0.1-alpha.29</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20invalid-type-arguments" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1440" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1434" target="_blank">View source</a>
 </small>
 
 
@@ -1521,7 +1472,7 @@ Bar[int]  # error: too few arguments
 Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.1">0.0.1-alpha.1</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20invalid-type-checking-constant" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1247" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1241" target="_blank">View source</a>
 </small>
 
 
@@ -1551,7 +1502,7 @@ TYPE_CHECKING = ''
 Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.1">0.0.1-alpha.1</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20invalid-type-form" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1271" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1265" target="_blank">View source</a>
 </small>
 
 
@@ -1581,7 +1532,7 @@ b: Annotated[int]  # `Annotated` expects at least two arguments
 Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.11">0.0.1-alpha.11</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20invalid-type-guard-call" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1323" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1317" target="_blank">View source</a>
 </small>
 
 
@@ -1615,7 +1566,7 @@ f(10)  # Error
 Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.11">0.0.1-alpha.11</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20invalid-type-guard-definition" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1295" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1289" target="_blank">View source</a>
 </small>
 
 
@@ -1649,7 +1600,7 @@ class C:
 Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.1">0.0.1-alpha.1</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20invalid-type-variable-constraints" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1351" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1345" target="_blank">View source</a>
 </small>
 
 
@@ -1684,7 +1635,7 @@ T = TypeVar('T', bound=str)  # valid bound TypeVar
 Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.1">0.0.1-alpha.1</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20missing-argument" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1380" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1374" target="_blank">View source</a>
 </small>
 
 
@@ -1709,7 +1660,7 @@ func()  # TypeError: func() missing 1 required positional argument: 'x'
 Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.20">0.0.1-alpha.20</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20missing-typed-dict-key" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L2104" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L2098" target="_blank">View source</a>
 </small>
 
 
@@ -1742,7 +1693,7 @@ alice["age"]  # KeyError
 Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.1">0.0.1-alpha.1</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20no-matching-overload" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1399" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1393" target="_blank">View source</a>
 </small>
 
 
@@ -1771,7 +1722,7 @@ func("string")  # error: [no-matching-overload]
 Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.1">0.0.1-alpha.1</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20non-subscriptable" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1422" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1416" target="_blank">View source</a>
 </small>
 
 
@@ -1795,7 +1746,7 @@ Subscripting an object that does not support it will raise a `TypeError` at runt
 Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.1">0.0.1-alpha.1</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20not-iterable" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1481" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1475" target="_blank">View source</a>
 </small>
 
 
@@ -1821,7 +1772,7 @@ for i in 34:  # TypeError: 'int' object is not iterable
 Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.29">0.0.1-alpha.29</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20override-of-final-method" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1646" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1640" target="_blank">View source</a>
 </small>
 
 
@@ -1854,7 +1805,7 @@ class B(A):
 Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.1">0.0.1-alpha.1</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20parameter-already-assigned" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1532" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1526" target="_blank">View source</a>
 </small>
 
 
@@ -1881,7 +1832,7 @@ f(1, x=2)  # Error raised here
 Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.22">0.0.1-alpha.22</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20positional-only-parameter-as-kwarg" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1857" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1851" target="_blank">View source</a>
 </small>
 
 
@@ -1939,7 +1890,7 @@ def test(): -> "int":
 Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.1">0.0.1-alpha.1</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20static-assert-error" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1979" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1973" target="_blank">View source</a>
 </small>
 
 
@@ -1969,7 +1920,7 @@ static_assert(int(2.0 * 3.0) == 6)  # error: does not have a statically known tr
 Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.1">0.0.1-alpha.1</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20subclass-of-final-class" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1623" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1617" target="_blank">View source</a>
 </small>
 
 
@@ -1998,7 +1949,7 @@ class B(A): ...  # Error raised here
 Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
 Preview (since <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.30">0.0.1-alpha.30</a>) ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20super-call-in-named-tuple-method" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1791" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1785" target="_blank">View source</a>
 </small>
 
 
@@ -2032,7 +1983,7 @@ class F(NamedTuple):
 Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.1">0.0.1-alpha.1</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20too-many-positional-arguments" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1731" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1725" target="_blank">View source</a>
 </small>
 
 
@@ -2059,7 +2010,7 @@ f("foo")  # Error raised here
 Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.1">0.0.1-alpha.1</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20type-assertion-failure" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1709" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1703" target="_blank">View source</a>
 </small>
 
 
@@ -2087,7 +2038,7 @@ def _(x: int):
 Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.1">0.0.1-alpha.1</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20unavailable-implicit-super-arguments" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1752" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1746" target="_blank">View source</a>
 </small>
 
 
@@ -2133,7 +2084,7 @@ class A:
 Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.1">0.0.1-alpha.1</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20unknown-argument" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1836" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1830" target="_blank">View source</a>
 </small>
 
 
@@ -2160,7 +2111,7 @@ f(x=1, y=2)  # Error raised here
 Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.1">0.0.1-alpha.1</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20unresolved-attribute" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1878" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1872" target="_blank">View source</a>
 </small>
 
 
@@ -2188,7 +2139,7 @@ A().foo  # AttributeError: 'A' object has no attribute 'foo'
 Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.1">0.0.1-alpha.1</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20unresolved-import" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1900" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1894" target="_blank">View source</a>
 </small>
 
 
@@ -2213,7 +2164,7 @@ import foo  # ModuleNotFoundError: No module named 'foo'
 Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.1">0.0.1-alpha.1</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20unresolved-reference" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1919" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1913" target="_blank">View source</a>
 </small>
 
 
@@ -2238,7 +2189,7 @@ print(x)  # NameError: name 'x' is not defined
 Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.1">0.0.1-alpha.1</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20unsupported-bool-conversion" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1501" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1495" target="_blank">View source</a>
 </small>
 
 
@@ -2275,7 +2226,7 @@ b1 < b2 < b1  # exception raised here
 Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.1">0.0.1-alpha.1</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20unsupported-operator" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1938" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1932" target="_blank">View source</a>
 </small>
 
 
@@ -2303,7 +2254,7 @@ A() + A()  # TypeError: unsupported operand type(s) for +: 'A' and 'A'
 Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.1">0.0.1-alpha.1</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20zero-stepsize-in-slice" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1960" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1954" target="_blank">View source</a>
 </small>
 
 
@@ -2328,7 +2279,7 @@ l[1:10:0]  # ValueError: slice step cannot be zero
 Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'warn'."><code>warn</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.20">0.0.1-alpha.20</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20ambiguous-protocol-member" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L507" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L506" target="_blank">View source</a>
 </small>
 
 
@@ -2369,7 +2320,7 @@ class SubProto(BaseProto, Protocol):
 Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'warn'."><code>warn</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.16">0.0.1-alpha.16</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20deprecated" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L322" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L321" target="_blank">View source</a>
 </small>
 
 
@@ -2457,7 +2408,7 @@ a = 20 / 0  # type: ignore
 Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'warn'."><code>warn</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.22">0.0.1-alpha.22</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20possibly-missing-attribute" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1553" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1547" target="_blank">View source</a>
 </small>
 
 
@@ -2485,7 +2436,7 @@ A.c  # AttributeError: type object 'A' has no attribute 'c'
 Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'warn'."><code>warn</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.22">0.0.1-alpha.22</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20possibly-missing-implicit-call" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L153" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L152" target="_blank">View source</a>
 </small>
 
 
@@ -2517,7 +2468,7 @@ A()[0]  # TypeError: 'A' object is not subscriptable
 Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'warn'."><code>warn</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.22">0.0.1-alpha.22</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20possibly-missing-import" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1575" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1569" target="_blank">View source</a>
 </small>
 
 
@@ -2549,7 +2500,7 @@ from module import a  # ImportError: cannot import name 'a' from 'module'
 Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'warn'."><code>warn</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.1">0.0.1-alpha.1</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20redundant-cast" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L2031" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L2025" target="_blank">View source</a>
 </small>
 
 
@@ -2576,7 +2527,7 @@ cast(int, f())  # Redundant
 Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'warn'."><code>warn</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.1">0.0.1-alpha.1</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20undefined-reveal" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1818" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1812" target="_blank">View source</a>
 </small>
 
 
@@ -2600,7 +2551,7 @@ reveal_type(1)  # NameError: name 'reveal_type' is not defined
 Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'warn'."><code>warn</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.15">0.0.1-alpha.15</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20unresolved-global" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L2052" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L2046" target="_blank">View source</a>
 </small>
 
 
@@ -2658,7 +2609,7 @@ def g():
 Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'warn'."><code>warn</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.7">0.0.1-alpha.7</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20unsupported-base" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L778" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L777" target="_blank">View source</a>
 </small>
 
 
@@ -2697,7 +2648,7 @@ class D(C): ...  # error: [unsupported-base]
 Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'warn'."><code>warn</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.22">0.0.1-alpha.22</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20useless-overload-body" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1089" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1083" target="_blank">View source</a>
 </small>
 
 
@@ -2760,7 +2711,7 @@ def foo(x: int | str) -> int | str:
 Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'ignore'."><code>ignore</code></a> ·
 Preview (since <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.1">0.0.1-alpha.1</a>) ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20division-by-zero" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L304" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L303" target="_blank">View source</a>
 </small>
 
 
@@ -2784,7 +2735,7 @@ Dividing by zero raises a `ZeroDivisionError` at runtime.
 Default level: <a href="../rules.md#rule-levels" title="This lint has a default level of 'ignore'."><code>ignore</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.1">0.0.1-alpha.1</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20possibly-unresolved-reference" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1601" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1595" target="_blank">View source</a>
 </small>
 
 

crates/ty/src/args.rs

@@ -9,7 +9,6 @@ use ty_combine::Combine;
 use ty_project::metadata::options::{EnvironmentOptions, Options, SrcOptions, TerminalOptions};
 use ty_project::metadata::value::{RangedValue, RelativeGlobPattern, RelativePathBuf, ValueSource};
 use ty_python_semantic::lint;
-use ty_static::EnvVars;
 
 // Configures Clap v3-style help menu colors
 const STYLES: Styles = Styles::styled()
@@ -122,7 +121,7 @@ pub(crate) struct CheckCommand {
     /// The path to a `ty.toml` file to use for configuration.
     ///
     /// While ty configuration can be included in a `pyproject.toml` file, it is not allowed in this context.
-    #[arg(long, env = EnvVars::TY_CONFIG_FILE, value_name = "PATH")]
+    #[arg(long, env = "TY_CONFIG_FILE", value_name = "PATH")]
     pub(crate) config_file: Option<SystemPathBuf>,
 
     /// The format to use for printing diagnostic messages.

crates/ty/src/main.rs

@@ -2,22 +2,6 @@ use colored::Colorize;
 use std::io;
 use ty::{ExitStatus, run};
 
-#[cfg(all(
-    not(target_os = "macos"),
-    not(target_os = "windows"),
-    not(target_os = "openbsd"),
-    not(target_os = "aix"),
-    not(target_os = "android"),
-    any(
-        target_arch = "x86_64",
-        target_arch = "aarch64",
-        target_arch = "powerpc64",
-        target_arch = "riscv64"
-    )
-))]
-#[global_allocator]
-static GLOBAL: tikv_jemallocator::Jemalloc = tikv_jemallocator::Jemalloc;
-
 pub fn main() -> ExitStatus {
     run().unwrap_or_else(|error| {
         use io::Write;

crates/ty/tests/cli/python_environment.rs

@@ -2703,51 +2703,3 @@ fn pythonpath_multiple_dirs_is_respected() -> anyhow::Result<()> {
 
     Ok(())
 }
-
-/// Test behavior when `VIRTUAL_ENV` is set but points to a non-existent path.
-#[test]
-fn missing_virtual_env() -> anyhow::Result<()> {
-    let working_venv_package1_path = if cfg!(windows) {
-        "project/.venv/Lib/site-packages/package1/__init__.py"
-    } else {
-        "project/.venv/lib/python3.13/site-packages/package1/__init__.py"
-    };
-
-    let case = CliTest::with_files([
-        (
-            "project/test.py",
-            r#"
-            from package1 import WorkingVenv
-            "#,
-        ),
-        (
-            "project/.venv/pyvenv.cfg",
-            r#"
-home = ./
-
-            "#,
-        ),
-        (
-            working_venv_package1_path,
-            r#"
-            class WorkingVenv: ...
-            "#,
-        ),
-    ])?;
-
-    assert_cmd_snapshot!(case.command()
-        .current_dir(case.root().join("project"))
-        .env("VIRTUAL_ENV", case.root().join("nonexistent-venv")), @r"
-    success: false
-    exit_code: 2
-    ----- stdout -----
-
-    ----- stderr -----
-    ty failed
-      Cause: Failed to discover local Python environment
-      Cause: Invalid `VIRTUAL_ENV` environment variable `<temp_dir>/nonexistent-venv`: does not point to a directory on disk
-      Cause: No such file or directory (os error 2)
-    ");
-
-    Ok(())
-}

crates/ty_completion_eval/completion-evaluation-tasks.csv

@@ -15,7 +15,7 @@ import-deprioritizes-type_check_only,main.py,3,2
 import-deprioritizes-type_check_only,main.py,4,3
 import-keyword-completion,main.py,0,1
 internal-typeshed-hidden,main.py,0,2
-none-completion,main.py,0,1
+none-completion,main.py,0,2
 numpy-array,main.py,0,159
 numpy-array,main.py,1,1
 object-attr-instance-methods,main.py,0,1

crates/ty_ide/src/code_action.rs

@@ -1,8 +1,7 @@
-use crate::completion;
+use crate::{completion, find_node::covering_node};
 
 use ruff_db::{files::File, parsed::parsed_module};
 use ruff_diagnostics::Edit;
-use ruff_python_ast::find_node::covering_node;
 use ruff_text_size::TextRange;
 use ty_project::Db;
 use ty_python_semantic::create_suppression_fix;
@@ -30,11 +29,12 @@ pub fn code_actions(
 
     let mut actions = Vec::new();
 
-    // Suggest imports/qualifications for unresolved references (often ideal)
+    // Suggest imports for unresolved references (often ideal)
+    // TODO: suggest qualifying with an already imported symbol
     let is_unresolved_reference =
         lint_id == LintId::of(&UNRESOLVED_REFERENCE) || lint_id == LintId::of(&UNDEFINED_REVEAL);
     if is_unresolved_reference
-        && let Some(import_quick_fix) = unresolved_fixes(db, file, diagnostic_range)
+        && let Some(import_quick_fix) = create_import_symbol_quick_fix(db, file, diagnostic_range)
     {
         actions.extend(import_quick_fix);
     }
@@ -49,7 +49,7 @@ pub fn code_actions(
     actions
 }
 
-fn unresolved_fixes(
+fn create_import_symbol_quick_fix(
     db: &dyn Db,
     file: File,
     diagnostic_range: TextRange,
@@ -59,7 +59,7 @@ fn unresolved_fixes(
     let symbol = &node.expr_name()?.id;
 
     Some(
-        completion::unresolved_fixes(db, file, &parsed, symbol, node)
+        completion::missing_imports(db, file, &parsed, symbol, node)
             .into_iter()
             .map(|import| QuickFix {
                 title: import.label,
@@ -84,7 +84,6 @@ mod tests {
         system::{DbWithWritableSystem, SystemPathBuf},
     };
     use ruff_diagnostics::Fix;
-    use ruff_python_trivia::textwrap::dedent;
     use ruff_text_size::{TextRange, TextSize};
     use ty_project::ProjectMetadata;
     use ty_python_semantic::{
@@ -150,14 +149,15 @@ mod tests {
 
         assert_snapshot!(test.code_actions(&UNRESOLVED_REFERENCE), @r"
         info[code-action]: Ignore 'unresolved-reference' for this line
-         --> main.py:2:5
+         --> main.py:2:17
           |
-        2 | b = a / 0  # ty:ignore[division-by-zero]
-          |     ^
+        2 |             b = a / 0  # ty:ignore[division-by-zero]
+          |                 ^
           |
         1 | 
-          - b = a / 0  # ty:ignore[division-by-zero]
-        2 + b = a / 0  # ty:ignore[division-by-zero, unresolved-reference]
+          -             b = a / 0  # ty:ignore[division-by-zero]
+        2 +             b = a / 0  # ty:ignore[division-by-zero, unresolved-reference]
+        3 |
         ");
     }
 
@@ -171,14 +171,15 @@ mod tests {
 
         assert_snapshot!(test.code_actions(&UNRESOLVED_REFERENCE), @r"
         info[code-action]: Ignore 'unresolved-reference' for this line
-         --> main.py:2:5
+         --> main.py:2:17
           |
-        2 | b = a / 0  # ty:ignore[division-by-zero,]
-          |     ^
+        2 |             b = a / 0  # ty:ignore[division-by-zero,]
+          |                 ^
           |
         1 | 
-          - b = a / 0  # ty:ignore[division-by-zero,]
-        2 + b = a / 0  # ty:ignore[division-by-zero, unresolved-reference]
+          -             b = a / 0  # ty:ignore[division-by-zero,]
+        2 +             b = a / 0  # ty:ignore[division-by-zero, unresolved-reference]
+        3 |
         ");
     }
 
@@ -192,14 +193,15 @@ mod tests {
 
         assert_snapshot!(test.code_actions(&UNRESOLVED_REFERENCE), @r"
         info[code-action]: Ignore 'unresolved-reference' for this line
-         --> main.py:2:5
+         --> main.py:2:17
           |
-        2 | b = a / 0  # ty:ignore[division-by-zero   ]
-          |     ^
+        2 |             b = a / 0  # ty:ignore[division-by-zero   ]
+          |                 ^
           |
         1 | 
-          - b = a / 0  # ty:ignore[division-by-zero   ]
-        2 + b = a / 0  # ty:ignore[division-by-zero, unresolved-reference   ]
+          -             b = a / 0  # ty:ignore[division-by-zero   ]
+        2 +             b = a / 0  # ty:ignore[division-by-zero, unresolved-reference   ]
+        3 |
         ");
     }
 
@@ -213,14 +215,15 @@ mod tests {
 
         assert_snapshot!(test.code_actions(&UNRESOLVED_REFERENCE), @r"
         info[code-action]: Ignore 'unresolved-reference' for this line
-         --> main.py:2:5
+         --> main.py:2:17
           |
-        2 | b = a / 0  # ty:ignore[division-by-zero] some explanation
-          |     ^
+        2 |             b = a / 0  # ty:ignore[division-by-zero] some explanation
+          |                 ^
           |
         1 | 
-          - b = a / 0  # ty:ignore[division-by-zero] some explanation
-        2 + b = a / 0  # ty:ignore[division-by-zero] some explanation  # ty:ignore[unresolved-reference]
+          -             b = a / 0  # ty:ignore[division-by-zero] some explanation
+        2 +             b = a / 0  # ty:ignore[division-by-zero] some explanation  # ty:ignore[unresolved-reference]
+        3 |
         ");
     }
 
@@ -238,22 +241,22 @@ mod tests {
 
         assert_snapshot!(test.code_actions(&UNRESOLVED_REFERENCE), @r"
         info[code-action]: Ignore 'unresolved-reference' for this line
-         --> main.py:3:9
+         --> main.py:3:21
           |
-        2 |   b = (
-        3 | /         a  # ty:ignore[division-by-zero]
-        4 | |         /
-        5 | |         0
-          | |_________^
-        6 |   )
+        2 |               b = (
+        3 | /                     a  # ty:ignore[division-by-zero]
+        4 | |                     /
+        5 | |                     0
+          | |_____________________^
+        6 |               )
           |
         1 | 
-        2 | b = (
-          -         a  # ty:ignore[division-by-zero]
-        3 +         a  # ty:ignore[division-by-zero, unresolved-reference]
-        4 |         /
-        5 |         0
-        6 | )
+        2 |             b = (
+          -                     a  # ty:ignore[division-by-zero]
+        3 +                     a  # ty:ignore[division-by-zero, unresolved-reference]
+        4 |                     /
+        5 |                     0
+        6 |             )
         ");
     }
 
@@ -271,21 +274,22 @@ mod tests {
 
         assert_snapshot!(test.code_actions(&UNRESOLVED_REFERENCE), @r"
         info[code-action]: Ignore 'unresolved-reference' for this line
-         --> main.py:3:9
+         --> main.py:3:21
           |
-        2 |   b = (
-        3 | /         a
-        4 | |         /
-        5 | |         0  # ty:ignore[division-by-zero]
-          | |_________^
-        6 |   )
+        2 |               b = (
+        3 | /                     a
+        4 | |                     /
+        5 | |                     0  # ty:ignore[division-by-zero]
+          | |_____________________^
+        6 |               )
           |
-        2 | b = (
-        3 |         a
-        4 |         /
-          -         0  # ty:ignore[division-by-zero]
-        5 +         0  # ty:ignore[division-by-zero, unresolved-reference]
-        6 | )
+        2 |             b = (
+        3 |                     a
+        4 |                     /
+          -                     0  # ty:ignore[division-by-zero]
+        5 +                     0  # ty:ignore[division-by-zero, unresolved-reference]
+        6 |             )
+        7 |
         ");
     }
 
@@ -303,22 +307,22 @@ mod tests {
 
         assert_snapshot!(test.code_actions(&UNRESOLVED_REFERENCE), @r"
         info[code-action]: Ignore 'unresolved-reference' for this line
-         --> main.py:3:9
+         --> main.py:3:21
           |
-        2 |   b = (
-        3 | /         a  # ty:ignore[division-by-zero]
-        4 | |         /
-        5 | |         0  # ty:ignore[division-by-zero]
-          | |_________^
-        6 |   )
+        2 |               b = (
+        3 | /                     a  # ty:ignore[division-by-zero]
+        4 | |                     /
+        5 | |                     0  # ty:ignore[division-by-zero]
+          | |_____________________^
+        6 |               )
           |
         1 | 
-        2 | b = (
-          -         a  # ty:ignore[division-by-zero]
-        3 +         a  # ty:ignore[division-by-zero, unresolved-reference]
-        4 |         /
-        5 |         0  # ty:ignore[division-by-zero]
-        6 | )
+        2 |             b = (
+          -                     a  # ty:ignore[division-by-zero]
+        3 +                     a  # ty:ignore[division-by-zero, unresolved-reference]
+        4 |                     /
+        5 |                     0  # ty:ignore[division-by-zero]
+        6 |             )
         ");
     }
 
@@ -335,19 +339,20 @@ mod tests {
 
         assert_snapshot!(test.code_actions(&UNRESOLVED_REFERENCE), @r#"
         info[code-action]: Ignore 'unresolved-reference' for this line
-         --> main.py:3:6
+         --> main.py:3:18
           |
-        2 | b = f"""
-        3 |     {a}
-          |      ^
-        4 |     more text
-        5 | """
+        2 |             b = f"""
+        3 |                 {a}
+          |                  ^
+        4 |                 more text
+        5 |             """
           |
-        2 | b = f"""
-        3 |     {a}
-        4 |     more text
-          - """
-        5 + """  # ty:ignore[unresolved-reference]
+        2 |             b = f"""
+        3 |                 {a}
+        4 |                 more text
+          -             """
+        5 +             """  # ty:ignore[unresolved-reference]
+        6 |
         "#);
     }
 
@@ -366,23 +371,23 @@ mod tests {
 
         assert_snapshot!(test.code_actions(&UNRESOLVED_REFERENCE), @r#"
         info[code-action]: Ignore 'unresolved-reference' for this line
-         --> main.py:4:5
+         --> main.py:4:17
           |
-        2 | b = f"""
-        3 |     {
-        4 |     a
-          |     ^
-        5 |     }
-        6 |     more text
+        2 |             b = f"""
+        3 |                 {
+        4 |                 a
+          |                 ^
+        5 |                 }
+        6 |                 more text
           |
         1 | 
-        2 | b = f"""
-        3 |     {
-          -     a
-        4 +     a  # ty:ignore[unresolved-reference]
-        5 |     }
-        6 |     more text
-        7 | """
+        2 |             b = f"""
+        3 |                 {
+          -                 a
+        4 +                 a  # ty:ignore[unresolved-reference]
+        5 |                 }
+        6 |                 more text
+        7 |             """
         "#);
     }
 
@@ -398,18 +403,19 @@ mod tests {
 
         assert_snapshot!(test.code_actions(&UNRESOLVED_REFERENCE), @r#"
         info[code-action]: Ignore 'unresolved-reference' for this line
-         --> main.py:2:5
+         --> main.py:2:17
           |
-        2 | b = a + """
-          |     ^
-        3 |     more text
-        4 | """
+        2 |             b = a + """
+          |                 ^
+        3 |                 more text
+        4 |             """
           |
         1 | 
-        2 | b = a + """
-        3 |     more text
-          - """
-        4 + """  # ty:ignore[unresolved-reference]
+        2 |             b = a + """
+        3 |                 more text
+          -             """
+        4 +             """  # ty:ignore[unresolved-reference]
+        5 |
         "#);
     }
 
@@ -424,16 +430,17 @@ mod tests {
 
         assert_snapshot!(test.code_actions(&UNRESOLVED_REFERENCE), @r#"
         info[code-action]: Ignore 'unresolved-reference' for this line
-         --> main.py:2:5
+         --> main.py:2:17
           |
-        2 | b = a \
-          |     ^
-        3 | + "test"
+        2 |             b = a \
+          |                 ^
+        3 |             + "test"
           |
         1 | 
-        2 | b = a \
-          - + "test"
-        3 + + "test"  # ty:ignore[unresolved-reference]
+        2 |             b = a \
+          -             + "test"
+        3 +             + "test"  # ty:ignore[unresolved-reference]
+        4 |
         "#);
     }
 
@@ -447,249 +454,27 @@ mod tests {
 
         assert_snapshot!(test.code_actions(&UNDEFINED_REVEAL), @r"
         info[code-action]: import typing.reveal_type
-         --> main.py:2:1
+         --> main.py:2:13
           |
-        2 | reveal_type(1)
-          | ^^^^^^^^^^^
+        2 |             reveal_type(1)
+          |             ^^^^^^^^^^^
           |
         help: This is a preferred code action
         1 + from typing import reveal_type
         2 | 
-        3 | reveal_type(1)
+        3 |             reveal_type(1)
+        4 |         
 
         info[code-action]: Ignore 'undefined-reveal' for this line
-         --> main.py:2:1
+         --> main.py:2:13
           |
-        2 | reveal_type(1)
-          | ^^^^^^^^^^^
+        2 |             reveal_type(1)
+          |             ^^^^^^^^^^^
           |
         1 | 
-          - reveal_type(1)
-        2 + reveal_type(1)  # ty:ignore[undefined-reveal]
-        ");
-    }
-
-    #[test]
-    fn unresolved_deprecated() {
-        let test = CodeActionTest::with_source(
-            r#"
-            @<START>deprecated<END>("do not use")
-            def my_func(): ...
-        "#,
-        );
-
-        assert_snapshot!(test.code_actions(&UNRESOLVED_REFERENCE), @r#"
-        info[code-action]: import warnings.deprecated
-         --> main.py:2:2
-          |
-        2 | @deprecated("do not use")
-          |  ^^^^^^^^^^
-        3 | def my_func(): ...
-          |
-        help: This is a preferred code action
-        1 + from warnings import deprecated
-        2 | 
-        3 | @deprecated("do not use")
-        4 | def my_func(): ...
-
-        info[code-action]: Ignore 'unresolved-reference' for this line
-         --> main.py:2:2
-          |
-        2 | @deprecated("do not use")
-          |  ^^^^^^^^^^
-        3 | def my_func(): ...
-          |
-        1 | 
-          - @deprecated("do not use")
-        2 + @deprecated("do not use")  # ty:ignore[unresolved-reference]
-        3 | def my_func(): ...
-        "#);
-    }
-
-    #[test]
-    fn unresolved_deprecated_warnings_imported() {
-        let test = CodeActionTest::with_source(
-            r#"
-            import warnings
-
-            @<START>deprecated<END>("do not use")
-            def my_func(): ...
-        "#,
-        );
-
-        assert_snapshot!(test.code_actions(&UNRESOLVED_REFERENCE), @r#"
-        info[code-action]: import warnings.deprecated
-         --> main.py:4:2
-          |
-        2 | import warnings
+          -             reveal_type(1)
+        2 +             reveal_type(1)  # ty:ignore[undefined-reveal]
         3 |
-        4 | @deprecated("do not use")
-          |  ^^^^^^^^^^
-        5 | def my_func(): ...
-          |
-        help: This is a preferred code action
-        1 + from warnings import deprecated
-        2 | 
-        3 | import warnings
-        4 | 
-
-        info[code-action]: qualify warnings.deprecated
-         --> main.py:4:2
-          |
-        2 | import warnings
-        3 |
-        4 | @deprecated("do not use")
-          |  ^^^^^^^^^^
-        5 | def my_func(): ...
-          |
-        help: This is a preferred code action
-        1 | 
-        2 | import warnings
-        3 | 
-          - @deprecated("do not use")
-        4 + @warnings.deprecated("do not use")
-        5 | def my_func(): ...
-
-        info[code-action]: Ignore 'unresolved-reference' for this line
-         --> main.py:4:2
-          |
-        2 | import warnings
-        3 |
-        4 | @deprecated("do not use")
-          |  ^^^^^^^^^^
-        5 | def my_func(): ...
-          |
-        1 | 
-        2 | import warnings
-        3 | 
-          - @deprecated("do not use")
-        4 + @deprecated("do not use")  # ty:ignore[unresolved-reference]
-        5 | def my_func(): ...
-        "#);
-    }
-
-    // using `importlib.abc.ExecutionLoader` when no imports are in scope
-    #[test]
-    fn unresolved_loader() {
-        let test = CodeActionTest::with_source(
-            r#"
-            <START>ExecutionLoader<END>
-        "#,
-        );
-
-        assert_snapshot!(test.code_actions(&UNRESOLVED_REFERENCE), @r"
-        info[code-action]: import importlib.abc.ExecutionLoader
-         --> main.py:2:1
-          |
-        2 | ExecutionLoader
-          | ^^^^^^^^^^^^^^^
-          |
-        help: This is a preferred code action
-        1 + from importlib.abc import ExecutionLoader
-        2 | 
-        3 | ExecutionLoader
-
-        info[code-action]: Ignore 'unresolved-reference' for this line
-         --> main.py:2:1
-          |
-        2 | ExecutionLoader
-          | ^^^^^^^^^^^^^^^
-          |
-        1 | 
-          - ExecutionLoader
-        2 + ExecutionLoader  # ty:ignore[unresolved-reference]
-        ");
-    }
-
-    // using `importlib.abc.ExecutionLoader` when `import importlib` is in scope
-    //
-    // TODO: `importlib.abc` is available whenever `importlib` is, so qualifying
-    // `importlib.abc.ExecutionLoader` without adding imports is actually legal here!
-    #[test]
-    fn unresolved_loader_importlib_imported() {
-        let test = CodeActionTest::with_source(
-            r#"
-            import importlib
-            <START>ExecutionLoader<END>
-        "#,
-        );
-
-        assert_snapshot!(test.code_actions(&UNRESOLVED_REFERENCE), @r"
-        info[code-action]: import importlib.abc.ExecutionLoader
-         --> main.py:3:1
-          |
-        2 | import importlib
-        3 | ExecutionLoader
-          | ^^^^^^^^^^^^^^^
-          |
-        help: This is a preferred code action
-        1 + from importlib.abc import ExecutionLoader
-        2 | 
-        3 | import importlib
-        4 | ExecutionLoader
-
-        info[code-action]: Ignore 'unresolved-reference' for this line
-         --> main.py:3:1
-          |
-        2 | import importlib
-        3 | ExecutionLoader
-          | ^^^^^^^^^^^^^^^
-          |
-        1 | 
-        2 | import importlib
-          - ExecutionLoader
-        3 + ExecutionLoader  # ty:ignore[unresolved-reference]
-        ");
-    }
-
-    // Using `importlib.abc.ExecutionLoader` when `import importlib.abc` is in scope
-    #[test]
-    fn unresolved_loader_abc_imported() {
-        let test = CodeActionTest::with_source(
-            r#"
-            import importlib.abc
-            <START>ExecutionLoader<END>
-        "#,
-        );
-
-        assert_snapshot!(test.code_actions(&UNRESOLVED_REFERENCE), @r"
-        info[code-action]: import importlib.abc.ExecutionLoader
-         --> main.py:3:1
-          |
-        2 | import importlib.abc
-        3 | ExecutionLoader
-          | ^^^^^^^^^^^^^^^
-          |
-        help: This is a preferred code action
-        1 + from importlib.abc import ExecutionLoader
-        2 | 
-        3 | import importlib.abc
-        4 | ExecutionLoader
-
-        info[code-action]: qualify importlib.abc.ExecutionLoader
-         --> main.py:3:1
-          |
-        2 | import importlib.abc
-        3 | ExecutionLoader
-          | ^^^^^^^^^^^^^^^
-          |
-        help: This is a preferred code action
-        1 | 
-        2 | import importlib.abc
-          - ExecutionLoader
-        3 + importlib.abc.ExecutionLoader
-
-        info[code-action]: Ignore 'unresolved-reference' for this line
-         --> main.py:3:1
-          |
-        2 | import importlib.abc
-        3 | ExecutionLoader
-          | ^^^^^^^^^^^^^^^
-          |
-        1 | 
-        2 | import importlib.abc
-          - ExecutionLoader
-        3 + ExecutionLoader  # ty:ignore[unresolved-reference]
         ");
     }
 
@@ -708,7 +493,7 @@ mod tests {
 
             db.init_program().unwrap();
 
-            let mut cleansed = dedent(source).to_string();
+            let mut cleansed = source.to_string();
 
             let start = cleansed
                 .find("<START>")

crates/ty_ide/src/find_node.rs

@@ -1,5 +1,5 @@
-use crate::AnyNodeRef;
-use crate::visitor::source_order::{SourceOrderVisitor, TraversalSignal, walk_node};
+use ruff_python_ast::AnyNodeRef;
+use ruff_python_ast::visitor::source_order::{SourceOrderVisitor, TraversalSignal};
 use ruff_text_size::{Ranged, TextRange};
 use std::fmt;
 use std::fmt::Formatter;
@@ -11,7 +11,7 @@ use std::fmt::Formatter;
 ///
 /// ## Panics
 /// Panics if `range` is not contained within `root`.
-pub fn covering_node(root: AnyNodeRef, range: TextRange) -> CoveringNode {
+pub(crate) fn covering_node(root: AnyNodeRef, range: TextRange) -> CoveringNode {
     struct Visitor<'a> {
         range: TextRange,
         found: bool,
@@ -48,12 +48,15 @@ pub fn covering_node(root: AnyNodeRef, range: TextRange) -> CoveringNode {
         ancestors: Vec::new(),
     };
 
-    walk_node(&mut visitor, root);
+    root.visit_source_order(&mut visitor);
+    if visitor.ancestors.is_empty() {
+        visitor.ancestors.push(root);
+    }
     CoveringNode::from_ancestors(visitor.ancestors)
 }
 
 /// The node with a minimal range that fully contains the search range.
-pub struct CoveringNode<'a> {
+pub(crate) struct CoveringNode<'a> {
     /// The covering node, along with all of its ancestors up to the
     /// root. The root is always the first element and the covering
     /// node found is always the last node. This sequence is guaranteed
@@ -64,12 +67,12 @@ pub struct CoveringNode<'a> {
 impl<'a> CoveringNode<'a> {
     /// Creates a new `CoveringNode` from a list of ancestor nodes.
     /// The ancestors should be ordered from root to the covering node.
-    pub fn from_ancestors(ancestors: Vec<AnyNodeRef<'a>>) -> Self {
+    pub(crate) fn from_ancestors(ancestors: Vec<AnyNodeRef<'a>>) -> Self {
         Self { nodes: ancestors }
     }
 
     /// Returns the covering node found.
-    pub fn node(&self) -> AnyNodeRef<'a> {
+    pub(crate) fn node(&self) -> AnyNodeRef<'a> {
         *self
             .nodes
             .last()
@@ -77,7 +80,7 @@ impl<'a> CoveringNode<'a> {
     }
 
     /// Returns the node's parent.
-    pub fn parent(&self) -> Option<AnyNodeRef<'a>> {
+    pub(crate) fn parent(&self) -> Option<AnyNodeRef<'a>> {
         let penultimate = self.nodes.len().checked_sub(2)?;
         self.nodes.get(penultimate).copied()
     }
@@ -87,7 +90,7 @@ impl<'a> CoveringNode<'a> {
     ///
     /// The "first" here means that the node closest to a leaf is
     /// returned.
-    pub fn find_first(mut self, f: impl Fn(AnyNodeRef<'a>) -> bool) -> Result<Self, Self> {
+    pub(crate) fn find_first(mut self, f: impl Fn(AnyNodeRef<'a>) -> bool) -> Result<Self, Self> {
         let Some(index) = self.find_first_index(f) else {
             return Err(self);
         };
@@ -102,7 +105,7 @@ impl<'a> CoveringNode<'a> {
     /// the highest ancestor found satisfying the given predicate is
     /// returned. Note that this is *not* the same as finding the node
     /// closest to the root that satisfies the given predictate.
-    pub fn find_last(mut self, f: impl Fn(AnyNodeRef<'a>) -> bool) -> Result<Self, Self> {
+    pub(crate) fn find_last(mut self, f: impl Fn(AnyNodeRef<'a>) -> bool) -> Result<Self, Self> {
         let Some(mut index) = self.find_first_index(&f) else {
             return Err(self);
         };
@@ -115,7 +118,7 @@ impl<'a> CoveringNode<'a> {
 
     /// Returns an iterator over the ancestor nodes, starting with the node itself
     /// and walking towards the root.
-    pub fn ancestors(&self) -> impl DoubleEndedIterator<Item = AnyNodeRef<'a>> + '_ {
+    pub(crate) fn ancestors(&self) -> impl DoubleEndedIterator<Item = AnyNodeRef<'a>> + '_ {
         self.nodes.iter().copied().rev()
     }
 

crates/ty_ide/src/goto.rs

@@ -5,9 +5,9 @@ pub use crate::goto_type_definition::goto_type_definition;
 
 use std::borrow::Cow;
 
+use crate::find_node::covering_node;
 use crate::stub_mapping::StubMapper;
 use ruff_db::parsed::ParsedModuleRef;
-use ruff_python_ast::find_node::{CoveringNode, covering_node};
 use ruff_python_ast::token::{TokenKind, Tokens};
 use ruff_python_ast::{self as ast, AnyNodeRef};
 use ruff_text_size::{Ranged, TextRange, TextSize};
@@ -665,7 +665,7 @@ impl GotoTarget<'_> {
     /// Creates a `GotoTarget` from a `CoveringNode` and an offset within the node
     pub(crate) fn from_covering_node<'a>(
         model: &SemanticModel,
-        covering_node: &CoveringNode<'a>,
+        covering_node: &crate::find_node::CoveringNode<'a>,
         offset: TextSize,
         tokens: &Tokens,
     ) -> Option<GotoTarget<'a>> {

crates/ty_ide/src/goto_declaration.rs

@@ -386,29 +386,6 @@ FOO = 0
         ");
     }
 
-    #[test]
-    fn goto_declaration_from_import_rhs_is_module() {
-        let test = CursorTest::builder()
-            .source("lib/__init__.py", r#""#)
-            .source("lib/module.py", r#""#)
-            .source("main.py", r#"from lib import module<CURSOR>"#)
-            .build();
-
-        // Should resolve to the actual function definition, not the import statement
-        assert_snapshot!(test.goto_declaration(), @r"
-        info[goto-declaration]: Go to declaration
-         --> main.py:1:17
-          |
-        1 | from lib import module
-          |                 ^^^^^^ Clicking here
-          |
-        info: Found 1 declaration
-        --> lib/module.py:1:1
-         |
-         |
-        ");
-    }
-
     #[test]
     fn goto_declaration_from_import_as() {
         let test = CursorTest::builder()

crates/ty_ide/src/hover.rs

@@ -151,19 +151,14 @@ impl fmt::Display for DisplayHoverContent<'_, '_> {
                     Some(TypeVarVariance::Bivariant) => " (bivariant)",
                     None => "",
                 };
-
-                // Special types like `<special-form of whatever 'blahblah' with 'florps'>`
-                // render poorly with python syntax-highlighting but well as xml
-                let ty_string = ty
-                    .display_with(self.db, DisplaySettings::default().multiline())
-                    .to_string();
-                let syntax = if ty_string.starts_with('<') {
-                    "xml"
-                } else {
-                    "python"
-                };
                 self.kind
-                    .fenced_code_block(format!("{ty_string}{variance}"), syntax)
+                    .fenced_code_block(
+                        format!(
+                            "{}{variance}",
+                            ty.display_with(self.db, DisplaySettings::default().multiline())
+                        ),
+                        "python",
+                    )
                     .fmt(f)
             }
             HoverContent::Docstring(docstring) => docstring.render(self.kind).fmt(f),
@@ -187,42 +182,29 @@ mod tests {
         let test = cursor_test(
             r#"
         a = 10
-        """This is the docs for this value
-
-        Wow these are good docs!
-        """
 
         a<CURSOR>
         "#,
         );
 
-        assert_snapshot!(test.hover(), @r#"
+        assert_snapshot!(test.hover(), @r"
         Literal[10]
-        ---------------------------------------------
-        This is the docs for this value
-
-        Wow these are good docs!
-
         ---------------------------------------------
         ```python
         Literal[10]
         ```
-        ---
-        This is the docs for this value  
-          
-        Wow these are good docs!
         ---------------------------------------------
         info[hover]: Hovered content is
-         --> main.py:8:1
+         --> main.py:4:1
           |
-        6 | """
-        7 |
-        8 | a
+        2 | a = 10
+        3 |
+        4 | a
           | ^- Cursor offset
           | |
           | source
           |
-        "#);
+        ");
     }
 
     #[test]
@@ -376,7 +358,7 @@ mod tests {
         Everyone loves my class!!
 
         ---------------------------------------------
-        ```xml
+        ```python
         <class 'MyClass'>
         ```
         ---
@@ -438,7 +420,7 @@ mod tests {
         Everyone loves my class!!
 
         ---------------------------------------------
-        ```xml
+        ```python
         <class 'MyClass'>
         ```
         ---
@@ -498,7 +480,7 @@ mod tests {
         initializes MyClass (perfectly)
 
         ---------------------------------------------
-        ```xml
+        ```python
         <class 'MyClass'>
         ```
         ---
@@ -554,7 +536,7 @@ mod tests {
         initializes MyClass (perfectly)
 
         ---------------------------------------------
-        ```xml
+        ```python
         <class 'MyClass'>
         ```
         ---
@@ -613,7 +595,7 @@ mod tests {
         Everyone loves my class!!
 
         ---------------------------------------------
-        ```xml
+        ```python
         <class 'MyClass'>
         ```
         ---
@@ -716,10 +698,6 @@ mod tests {
 
             def __init__(a: int, b: str):
                 self.a = a
-                """This is the docs for this value
-
-                Wow these are good docs!
-                """
                 self.b: str = b
 
         foo = Foo()
@@ -735,10 +713,10 @@ mod tests {
         ```
         ---------------------------------------------
         info[hover]: Hovered content is
-          --> main.py:14:5
+          --> main.py:10:5
            |
-        13 | foo = Foo()
-        14 | foo.a
+         9 | foo = Foo()
+        10 | foo.a
            |     -
            |     |
            |     source
@@ -1200,13 +1178,13 @@ def ab(a: str): ...
             .build();
 
         assert_snapshot!(test.hover(), @r"
-        def ab(a: int) -> Unknown
+        (a: int) -> Unknown
         ---------------------------------------------
         the int overload
 
         ---------------------------------------------
         ```python
-        def ab(a: int) -> Unknown
+        (a: int) -> Unknown
         ```
         ---
         the int overload
@@ -1260,13 +1238,13 @@ def ab(a: str):
             .build();
 
         assert_snapshot!(test.hover(), @r#"
-        def ab(a: str) -> Unknown
+        (a: str) -> Unknown
         ---------------------------------------------
         the int overload
 
         ---------------------------------------------
         ```python
-        def ab(a: str) -> Unknown
+        (a: str) -> Unknown
         ```
         ---
         the int overload
@@ -1320,7 +1298,7 @@ def ab(a: int):
             .build();
 
         assert_snapshot!(test.hover(), @r"
-        def ab(
+        (
             a: int,
             b: int
         ) -> Unknown
@@ -1329,7 +1307,7 @@ def ab(a: int):
 
         ---------------------------------------------
         ```python
-        def ab(
+        (
             a: int,
             b: int
         ) -> Unknown
@@ -1386,13 +1364,13 @@ def ab(a: int):
             .build();
 
         assert_snapshot!(test.hover(), @r"
-        def ab(a: int) -> Unknown
+        (a: int) -> Unknown
         ---------------------------------------------
         the two arg overload
 
         ---------------------------------------------
         ```python
-        def ab(a: int) -> Unknown
+        (a: int) -> Unknown
         ```
         ---
         the two arg overload
@@ -1450,7 +1428,7 @@ def ab(a: int, *, c: int):
             .build();
 
         assert_snapshot!(test.hover(), @r"
-        def ab(
+        (
             a: int,
             *,
             b: int
@@ -1460,7 +1438,7 @@ def ab(a: int, *, c: int):
 
         ---------------------------------------------
         ```python
-        def ab(
+        (
             a: int,
             *,
             b: int
@@ -1522,7 +1500,7 @@ def ab(a: int, *, c: int):
             .build();
 
         assert_snapshot!(test.hover(), @r"
-        def ab(
+        (
             a: int,
             *,
             c: int
@@ -1532,7 +1510,7 @@ def ab(a: int, *, c: int):
 
         ---------------------------------------------
         ```python
-        def ab(
+        (
             a: int,
             *,
             c: int
@@ -1581,11 +1559,11 @@ def ab(a: int, *, c: int):
         );
 
         assert_snapshot!(test.hover(), @r#"
-        def foo(
+        (
             a: int,
             b
         ) -> Unknown
-        def foo(
+        (
             a: str,
             b
         ) -> Unknown
@@ -1594,11 +1572,11 @@ def ab(a: int, *, c: int):
 
         ---------------------------------------------
         ```python
-        def foo(
+        (
             a: int,
             b
         ) -> Unknown
-        def foo(
+        (
             a: str,
             b
         ) -> Unknown
@@ -1645,15 +1623,15 @@ def ab(a: int, *, c: int):
         );
 
         assert_snapshot!(test.hover(), @r#"
-        def foo(a: int) -> Unknown
-        def foo(a: str) -> Unknown
+        (a: int) -> Unknown
+        (a: str) -> Unknown
         ---------------------------------------------
         The first overload
 
         ---------------------------------------------
         ```python
-        def foo(a: int) -> Unknown
-        def foo(a: str) -> Unknown
+        (a: int) -> Unknown
+        (a: str) -> Unknown
         ```
         ---
         The first overload
@@ -1702,7 +1680,7 @@ def ab(a: int, *, c: int):
         Wow this module rocks.
 
         ---------------------------------------------
-        ```xml
+        ```python
         <module 'lib'>
         ```
         ---
@@ -2051,7 +2029,7 @@ def function():
         assert_snapshot!(test.hover(), @r"
         <class 'Click'>
         ---------------------------------------------
-        ```xml
+        ```python
         <class 'Click'>
         ```
         ---------------------------------------------
@@ -2256,7 +2234,7 @@ def function():
         Wow this module rocks.
 
         ---------------------------------------------
-        ```xml
+        ```python
         <module 'lib'>
         ```
         ---
@@ -2362,28 +2340,15 @@ def function():
         let test = cursor_test(
             r#"
             value<CURSOR> = 1
-            """This is the docs for this value
-
-            Wow these are good docs!
-            """
             "#,
         );
 
-        assert_snapshot!(test.hover(), @r#"
+        assert_snapshot!(test.hover(), @r"
         Literal[1]
-        ---------------------------------------------
-        This is the docs for this value
-
-        Wow these are good docs!
-
         ---------------------------------------------
         ```python
         Literal[1]
         ```
-        ---
-        This is the docs for this value  
-          
-        Wow these are good docs!
         ---------------------------------------------
         info[hover]: Hovered content is
          --> main.py:2:1
@@ -2392,9 +2357,8 @@ def function():
           | ^^^^^- Cursor offset
           | |
           | source
-        3 | """This is the docs for this value
           |
-        "#);
+        ");
     }
 
     #[test]
@@ -2402,15 +2366,7 @@ def function():
         let test = cursor_test(
             r#"
             value = 1
-            """This is the docs for this value
-
-            Wow these are good docs!
-            """
             value<CURSOR> += 2
-            """Other docs???
-
-            Is this allowed???
-            """
             "#,
         );
 
@@ -2418,34 +2374,23 @@ def function():
         // Showing the new value might be more intuitive for some users, but the actual 'use'
         // of the `value` symbol here in read-context is `1`. This comment mainly exists to
         // signal that it might be okay to revisit this in the future and reveal 3 instead.
-        assert_snapshot!(test.hover(), @r#"
+        assert_snapshot!(test.hover(), @r"
         Literal[1]
-        ---------------------------------------------
-        This is the docs for this value
-
-        Wow these are good docs!
-
         ---------------------------------------------
         ```python
         Literal[1]
         ```
-        ---
-        This is the docs for this value  
-          
-        Wow these are good docs!
         ---------------------------------------------
         info[hover]: Hovered content is
-         --> main.py:7:1
+         --> main.py:3:1
           |
-        5 | Wow these are good docs!
-        6 | """
-        7 | value += 2
+        2 | value = 1
+        3 | value += 2
           | ^^^^^- Cursor offset
           | |
           | source
-        8 | """Other docs???
           |
-        "#);
+        ");
     }
 
     #[test]
@@ -2454,47 +2399,29 @@ def function():
             r#"
             class C:
                 attr: int = 1
-                """This is the docs for this value
-
-                Wow these are good docs!
-                """
 
             C.attr<CURSOR> = 2
-            """Other docs???
-
-            Is this allowed???
-            """
             "#,
         );
 
-        assert_snapshot!(test.hover(), @r#"
+        assert_snapshot!(test.hover(), @r"
         Literal[2]
-        ---------------------------------------------
-        This is the docs for this value
-
-        Wow these are good docs!
-
         ---------------------------------------------
         ```python
         Literal[2]
         ```
-        ---
-        This is the docs for this value  
-          
-        Wow these are good docs!
         ---------------------------------------------
         info[hover]: Hovered content is
-          --> main.py:9:3
-           |
-         7 |     """
-         8 |
-         9 | C.attr = 2
-           |   ^^^^- Cursor offset
-           |   |
-           |   source
-        10 | """Other docs???
-           |
-        "#);
+         --> main.py:5:3
+          |
+        3 |     attr: int = 1
+        4 |
+        5 | C.attr = 2
+          |   ^^^^- Cursor offset
+          |   |
+          |   source
+          |
+        ");
     }
 
     #[test]
@@ -2503,49 +2430,31 @@ def function():
             r#"
             class C:
                 attr = 1
-                """This is the docs for this value
-
-                Wow these are good docs!
-                """
 
             C.attr<CURSOR> += 2
-            """Other docs???
-
-            Is this allowed???
-            """
             "#,
         );
 
         // See the comment in the `hover_augmented_assignment` test above. The same
         // reasoning applies here.
-        assert_snapshot!(test.hover(), @r#"
+        assert_snapshot!(test.hover(), @r"
         Unknown | Literal[1]
-        ---------------------------------------------
-        This is the docs for this value
-
-        Wow these are good docs!
-
         ---------------------------------------------
         ```python
         Unknown | Literal[1]
         ```
-        ---
-        This is the docs for this value  
-          
-        Wow these are good docs!
         ---------------------------------------------
         info[hover]: Hovered content is
-          --> main.py:9:3
-           |
-         7 |     """
-         8 |
-         9 | C.attr += 2
-           |   ^^^^- Cursor offset
-           |   |
-           |   source
-        10 | """Other docs???
-           |
-        "#);
+         --> main.py:5:3
+          |
+        3 |     attr = 1
+        4 |
+        5 | C.attr += 2
+          |   ^^^^- Cursor offset
+          |   |
+          |   source
+          |
+        ");
     }
 
     #[test]
@@ -2554,28 +2463,15 @@ def function():
             r#"
         class Foo:
             a<CURSOR>: int
-            """This is the docs for this value
-
-            Wow these are good docs!
-            """
         "#,
         );
 
-        assert_snapshot!(test.hover(), @r#"
+        assert_snapshot!(test.hover(), @r"
         int
-        ---------------------------------------------
-        This is the docs for this value
-
-        Wow these are good docs!
-
         ---------------------------------------------
         ```python
         int
         ```
-        ---
-        This is the docs for this value  
-          
-        Wow these are good docs!
         ---------------------------------------------
         info[hover]: Hovered content is
          --> main.py:3:5
@@ -2585,9 +2481,8 @@ def function():
           |     ^- Cursor offset
           |     |
           |     source
-        4 |     """This is the docs for this value
           |
-        "#);
+        ");
     }
 
     #[test]
@@ -2596,28 +2491,15 @@ def function():
             r#"
         class Foo:
             a<CURSOR>: int = 1
-            """This is the docs for this value
-
-            Wow these are good docs!
-            """
         "#,
         );
 
-        assert_snapshot!(test.hover(), @r#"
+        assert_snapshot!(test.hover(), @r"
         Literal[1]
-        ---------------------------------------------
-        This is the docs for this value
-
-        Wow these are good docs!
-
         ---------------------------------------------
         ```python
         Literal[1]
         ```
-        ---
-        This is the docs for this value  
-          
-        Wow these are good docs!
         ---------------------------------------------
         info[hover]: Hovered content is
          --> main.py:3:5
@@ -2627,52 +2509,7 @@ def function():
           |     ^- Cursor offset
           |     |
           |     source
-        4 |     """This is the docs for this value
           |
-        "#);
-    }
-
-    #[test]
-    fn hover_annotated_assignment_with_rhs_use() {
-        let test = cursor_test(
-            r#"
-        class Foo:
-            a: int = 1
-            """This is the docs for this value
-
-            Wow these are good docs!
-            """
-        
-        x = Foo()
-        x.a<CURSOR>
-        "#,
-        );
-
-        assert_snapshot!(test.hover(), @r"
-        int
-        ---------------------------------------------
-        This is the docs for this value
-
-        Wow these are good docs!
-
-        ---------------------------------------------
-        ```python
-        int
-        ```
-        ---
-        This is the docs for this value  
-          
-        Wow these are good docs!
-        ---------------------------------------------
-        info[hover]: Hovered content is
-          --> main.py:10:3
-           |
-         9 | x = Foo()
-        10 | x.a
-           |   ^- Cursor offset
-           |   |
-           |   source
-           |
         ");
     }
 
@@ -2683,28 +2520,15 @@ def function():
         class Foo:
             def __init__(self, a: int):
                 self.a<CURSOR>: int = a
-                """This is the docs for this value
-
-                Wow these are good docs!
-                """
         "#,
         );
 
-        assert_snapshot!(test.hover(), @r#"
+        assert_snapshot!(test.hover(), @r"
         int
-        ---------------------------------------------
-        This is the docs for this value
-
-        Wow these are good docs!
-
         ---------------------------------------------
         ```python
         int
         ```
-        ---
-        This is the docs for this value  
-          
-        Wow these are good docs!
         ---------------------------------------------
         info[hover]: Hovered content is
          --> main.py:4:14
@@ -2715,53 +2539,7 @@ def function():
           |              ^- Cursor offset
           |              |
           |              source
-        5 |         """This is the docs for this value
           |
-        "#);
-    }
-
-    #[test]
-    fn hover_annotated_attribute_assignment_use() {
-        let test = cursor_test(
-            r#"
-        class Foo:
-            def __init__(self, a: int):
-                self.a: int = a
-                """This is the docs for this value
-
-                Wow these are good docs!
-                """
-
-        x = Foo(1)
-        x.a<CURSOR>
-        "#,
-        );
-
-        assert_snapshot!(test.hover(), @r"
-        int
-        ---------------------------------------------
-        This is the docs for this value
-
-        Wow these are good docs!
-
-        ---------------------------------------------
-        ```python
-        int
-        ```
-        ---
-        This is the docs for this value  
-          
-        Wow these are good docs!
-        ---------------------------------------------
-        info[hover]: Hovered content is
-          --> main.py:11:3
-           |
-        10 | x = Foo(1)
-        11 | x.a
-           |   ^- Cursor offset
-           |   |
-           |   source
-           |
         ");
     }
 
@@ -3279,10 +3057,10 @@ def function():
         );
 
         assert_snapshot!(test.hover(), @r"
-        TypeVar
+        typing.TypeVar
         ---------------------------------------------
         ```python
-        TypeVar
+        typing.TypeVar
         ```
         ---------------------------------------------
         info[hover]: Hovered content is
@@ -3342,10 +3120,10 @@ def function():
         );
 
         assert_snapshot!(test.hover(), @r"
-        TypeVar
+        typing.TypeVar
         ---------------------------------------------
         ```python
-        TypeVar
+        typing.TypeVar
         ```
         ---------------------------------------------
         info[hover]: Hovered content is
@@ -3450,12 +3228,12 @@ def function():
         // TODO: We should only show the matching overload here.
         // https://github.com/astral-sh/ty/issues/73
         assert_snapshot!(test.hover(), @r"
-        def __add__(other: Test, /) -> Test
-        def __add__(other: Other, /) -> Test
+        (other: Test, /) -> Test
+        (other: Other, /) -> Test
         ---------------------------------------------
         ```python
-        def __add__(other: Test, /) -> Test
-        def __add__(other: Other, /) -> Test
+        (other: Test, /) -> Test
+        (other: Other, /) -> Test
         ```
         ---------------------------------------------
         info[hover]: Hovered content is
@@ -3565,7 +3343,7 @@ def function():
         assert_snapshot!(test.hover(), @r"
         <module 'mypackage.subpkg'>
         ---------------------------------------------
-        ```xml
+        ```python
         <module 'mypackage.subpkg'>
         ```
         ---------------------------------------------
@@ -3607,7 +3385,7 @@ def function():
         assert_snapshot!(test.hover(), @r"
         <module 'mypackage.subpkg'>
         ---------------------------------------------
-        ```xml
+        ```python
         <module 'mypackage.subpkg'>
         ```
         ---------------------------------------------
@@ -3691,7 +3469,7 @@ def function():
         assert_snapshot!(test.hover(), @r"
         <module 'mypackage.subpkg.submod'>
         ---------------------------------------------
-        ```xml
+        ```python
         <module 'mypackage.subpkg.submod'>
         ```
         ---------------------------------------------
@@ -3732,7 +3510,7 @@ def function():
         assert_snapshot!(test.hover(), @r"
         <module 'mypackage.subpkg'>
         ---------------------------------------------
-        ```xml
+        ```python
         <module 'mypackage.subpkg'>
         ```
         ---------------------------------------------

crates/ty_ide/src/importer.rs

@@ -745,17 +745,8 @@ impl ImportResponseKind<'_> {
     fn priority(&self) -> usize {
         match *self {
             ImportResponseKind::Unqualified { .. } => 0,
-            ImportResponseKind::Partial(_) => 1,
-            // N.B. When given the choice between adding a
-            // name to an existing `from ... import ...`
-            // statement and using an existing `import ...`
-            // in a qualified manner, we currently choose
-            // the former. Originally we preferred qualification,
-            // but there is some evidence that this violates
-            // expectations.
-            //
-            // Ref: https://github.com/astral-sh/ty/issues/1274#issuecomment-3352233790
-            ImportResponseKind::Qualified { .. } => 2,
+            ImportResponseKind::Qualified { .. } => 1,
+            ImportResponseKind::Partial(_) => 2,
         }
     }
 }
@@ -869,6 +860,7 @@ mod tests {
     use insta::assert_snapshot;
     use insta::internals::SettingsBindDropGuard;
 
+    use crate::find_node::covering_node;
     use crate::tests::{CursorTest, CursorTestBuilder, cursor_test};
     use ruff_db::diagnostic::{Diagnostic, DiagnosticFormat, DisplayDiagnosticConfig};
     use ruff_db::files::{File, FileRootKind, system_path_to_file};
@@ -876,7 +868,6 @@ mod tests {
     use ruff_db::source::source_text;
     use ruff_db::system::{DbWithWritableSystem, SystemPath, SystemPathBuf};
     use ruff_db::{Db, system};
-    use ruff_python_ast::find_node::covering_node;
     use ruff_python_codegen::Stylist;
     use ruff_python_trivia::textwrap::dedent;
     use ruff_text_size::TextSize;
@@ -1341,9 +1332,9 @@ import collections
         );
         assert_snapshot!(
             test.import("collections", "defaultdict"), @r"
-        from collections import OrderedDict, defaultdict
+        from collections import OrderedDict
         import collections
-        defaultdict
+        collections.defaultdict
         ");
     }
 

crates/ty_ide/src/inlay_hints.rs

@@ -6216,7 +6216,7 @@ mod tests {
         assert_snapshot!(test.inlay_hints(), @r#"
         from typing import Literal
 
-        a[: <special-form 'Literal["a", "b", "c"]'>] = Literal['a', 'b', 'c']
+        a[: <special form 'Literal["a", "b", "c"]'>] = Literal['a', 'b', 'c']
         ---------------------------------------------
         info[inlay-hint-location]: Inlay Hint Target
            --> stdlib/typing.pyi:351:1
@@ -6232,7 +6232,7 @@ mod tests {
           |
         2 | from typing import Literal
         3 |
-        4 | a[: <special-form 'Literal["a", "b", "c"]'>] = Literal['a', 'b', 'c']
+        4 | a[: <special form 'Literal["a", "b", "c"]'>] = Literal['a', 'b', 'c']
           |                    ^^^^^^^
           |
 
@@ -6250,7 +6250,7 @@ mod tests {
           |
         2 | from typing import Literal
         3 |
-        4 | a[: <special-form 'Literal["a", "b", "c"]'>] = Literal['a', 'b', 'c']
+        4 | a[: <special form 'Literal["a", "b", "c"]'>] = Literal['a', 'b', 'c']
           |                            ^^^
           |
 
@@ -6268,7 +6268,7 @@ mod tests {
           |
         2 | from typing import Literal
         3 |
-        4 | a[: <special-form 'Literal["a", "b", "c"]'>] = Literal['a', 'b', 'c']
+        4 | a[: <special form 'Literal["a", "b", "c"]'>] = Literal['a', 'b', 'c']
           |                                 ^^^
           |
 
@@ -6286,7 +6286,7 @@ mod tests {
           |
         2 | from typing import Literal
         3 |
-        4 | a[: <special-form 'Literal["a", "b", "c"]'>] = Literal['a', 'b', 'c']
+        4 | a[: <special form 'Literal["a", "b", "c"]'>] = Literal['a', 'b', 'c']
           |                                      ^^^
           |
         "#);
@@ -6635,9 +6635,26 @@ mod tests {
 
         assert_snapshot!(test.inlay_hints(), @r"
         from typing import Protocol, TypeVar
-        T = TypeVar([name=]'T')
-        Strange[: <special-form 'typing.Protocol[T]'>] = Protocol[T]
+        T[: typing.TypeVar] = TypeVar([name=]'T')
+        Strange[: <special form 'typing.Protocol[T]'>] = Protocol[T]
         ---------------------------------------------
+        info[inlay-hint-location]: Inlay Hint Target
+         --> main.py:3:1
+          |
+        2 | from typing import Protocol, TypeVar
+        3 | T = TypeVar('T')
+          | ^
+        4 | Strange = Protocol[T]
+          |
+        info: Source
+         --> main2.py:3:5
+          |
+        2 | from typing import Protocol, TypeVar
+        3 | T[: typing.TypeVar] = TypeVar([name=]'T')
+          |     ^^^^^^^^^^^^^^
+        4 | Strange[: <special form 'typing.Protocol[T]'>] = Protocol[T]
+          |
+
         info[inlay-hint-location]: Inlay Hint Target
            --> stdlib/typing.pyi:276:13
             |
@@ -6649,12 +6666,12 @@ mod tests {
         278 |             bound: Any | None = None,  # AnnotationForm
             |
         info: Source
-         --> main2.py:3:14
+         --> main2.py:3:32
           |
         2 | from typing import Protocol, TypeVar
-        3 | T = TypeVar([name=]'T')
-          |              ^^^^
-        4 | Strange[: <special-form 'typing.Protocol[T]'>] = Protocol[T]
+        3 | T[: typing.TypeVar] = TypeVar([name=]'T')
+          |                                ^^^^
+        4 | Strange[: <special form 'typing.Protocol[T]'>] = Protocol[T]
           |
 
         info[inlay-hint-location]: Inlay Hint Target
@@ -6670,8 +6687,8 @@ mod tests {
          --> main2.py:4:26
           |
         2 | from typing import Protocol, TypeVar
-        3 | T = TypeVar([name=]'T')
-        4 | Strange[: <special-form 'typing.Protocol[T]'>] = Protocol[T]
+        3 | T[: typing.TypeVar] = TypeVar([name=]'T')
+        4 | Strange[: <special form 'typing.Protocol[T]'>] = Protocol[T]
           |                          ^^^^^^^^^^^^^^^
           |
 
@@ -6687,124 +6704,18 @@ mod tests {
          --> main2.py:4:42
           |
         2 | from typing import Protocol, TypeVar
-        3 | T = TypeVar([name=]'T')
-        4 | Strange[: <special-form 'typing.Protocol[T]'>] = Protocol[T]
+        3 | T[: typing.TypeVar] = TypeVar([name=]'T')
+        4 | Strange[: <special form 'typing.Protocol[T]'>] = Protocol[T]
           |                                          ^
           |
-        ");
-    }
 
-    #[test]
-    fn test_paramspec_creation_inlay_hint() {
-        let mut test = inlay_hint_test(
-            "
-        from typing import ParamSpec
-        P = ParamSpec('P')",
-        );
-
-        assert_snapshot!(test.inlay_hints(), @r"
-        from typing import ParamSpec
-        P = ParamSpec([name=]'P')
         ---------------------------------------------
-        info[inlay-hint-location]: Inlay Hint Target
-           --> stdlib/typing.pyi:552:17
-            |
-        550 |             def __new__(
-        551 |                 cls,
-        552 |                 name: str,
-            |                 ^^^^
-        553 |                 *,
-        554 |                 bound: Any | None = None,  # AnnotationForm
-            |
+        info[inlay-hint-edit]: File after edits
         info: Source
-         --> main2.py:3:16
-          |
-        2 | from typing import ParamSpec
-        3 | P = ParamSpec([name=]'P')
-          |                ^^^^
-          |
-        ");
-    }
 
-    #[test]
-    fn test_typealiastype_creation_inlay_hint() {
-        let mut test = inlay_hint_test(
-            "
-        from typing_extensions import TypeAliasType
-        A = TypeAliasType('A', str)",
-        );
-
-        assert_snapshot!(test.inlay_hints(), @r#"
-        from typing_extensions import TypeAliasType
-        A = TypeAliasType([name=]'A', [value=]str)
-        ---------------------------------------------
-        info[inlay-hint-location]: Inlay Hint Target
-            --> stdlib/typing.pyi:2032:26
-             |
-        2030 |         """
-        2031 |
-        2032 |         def __new__(cls, name: str, value: Any, *, type_params: tuple[_TypeParameter, ...] = ()) -> Self: ...
-             |                          ^^^^
-        2033 |         @property
-        2034 |         def __value__(self) -> Any: ...  # AnnotationForm
-             |
-        info: Source
-         --> main2.py:3:20
-          |
-        2 | from typing_extensions import TypeAliasType
-        3 | A = TypeAliasType([name=]'A', [value=]str)
-          |                    ^^^^
-          |
-
-        info[inlay-hint-location]: Inlay Hint Target
-            --> stdlib/typing.pyi:2032:37
-             |
-        2030 |         """
-        2031 |
-        2032 |         def __new__(cls, name: str, value: Any, *, type_params: tuple[_TypeParameter, ...] = ()) -> Self: ...
-             |                                     ^^^^^
-        2033 |         @property
-        2034 |         def __value__(self) -> Any: ...  # AnnotationForm
-             |
-        info: Source
-         --> main2.py:3:32
-          |
-        2 | from typing_extensions import TypeAliasType
-        3 | A = TypeAliasType([name=]'A', [value=]str)
-          |                                ^^^^^
-          |
-        "#);
-    }
-
-    #[test]
-    fn test_typevartuple_creation_inlay_hint() {
-        let mut test = inlay_hint_test(
-            "
-        from typing_extensions import TypeVarTuple
-        Ts = TypeVarTuple('Ts')",
-        );
-
-        assert_snapshot!(test.inlay_hints(), @r"
-        from typing_extensions import TypeVarTuple
-        Ts = TypeVarTuple([name=]'Ts')
-        ---------------------------------------------
-        info[inlay-hint-location]: Inlay Hint Target
-           --> stdlib/typing.pyi:412:30
-            |
-        410 |             def has_default(self) -> bool: ...
-        411 |         if sys.version_info >= (3, 13):
-        412 |             def __new__(cls, name: str, *, default: Any = ...) -> Self: ...  # AnnotationForm
-            |                              ^^^^
-        413 |         elif sys.version_info >= (3, 12):
-        414 |             def __new__(cls, name: str) -> Self: ...
-            |
-        info: Source
-         --> main2.py:3:20
-          |
-        2 | from typing_extensions import TypeVarTuple
-        3 | Ts = TypeVarTuple([name=]'Ts')
-          |                    ^^^^
-          |
+        from typing import Protocol, TypeVar
+        T: typing.TypeVar = TypeVar('T')
+        Strange = Protocol[T]
         ");
     }