Merge remote-tracking branch 'origin/main' into dcreager/non-non-inferable

* origin/main:
  [ty] Add (unused) `inferable` parameter to type property methods (#20865)
  Run macos tests on macos (#20889)
  Remove `release` CI job (#20887)
  [ty] CI: Faster ecosystem analysis (#20886)
  Remove `strip` from release profile (#20885)
  [ty] Sync vendored typeshed stubs (#20876)
  [ty] Add some completion ranking improvements (#20807)
  Improved error recovery for unclosed strings (including f- and t-strings) (#20848)
  Enable lto=fat (#20863)
  [`pyupgrade`] Extend `UP019` to detect `typing_extensions.Text` (`UP019`) (#20825)
  [`flake8-bugbear`] Omit annotation in preview fix for `B006` (#20877)
  fix(docs): Fix typo in `RUF015` description (#20873)
  [ty] Improve and extend tests for instance attributes redeclared in subclasses (#20866)
  [ty] Ignore slow seeds as a temporary measure (#20870)
  Remove parentheses around multiple exception types on Python 3.14+ (#20768)
  Update Black tests (#20794)

Author: dcreager

.github/workflows/ci.yaml

@@ -142,7 +142,7 @@ jobs:
         env:
           MERGE_BASE: ${{ steps.merge_base.outputs.sha }}
         run: |
-          if git diff --quiet "${MERGE_BASE}...HEAD" -- 'python/py_fuzzer/**' \
+          if git diff --quiet "${MERGE_BASE}...HEAD" -- 'python/py-fuzzer/**' \
           ; then
               echo "changed=false" >> "$GITHUB_OUTPUT"
           else
@@ -361,6 +361,37 @@ jobs:
           cargo nextest run --all-features --profile ci
           cargo test --all-features --doc
 
+  cargo-test-macos:
+    name: "cargo test (macos)"
+    runs-on: macos-latest
+    needs: determine_changes
+    if: ${{ !contains(github.event.pull_request.labels.*.name, 'no-test') && (needs.determine_changes.outputs.code == 'true' || github.ref == 'refs/heads/main') }}
+    timeout-minutes: 20
+    steps:
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        with:
+          persist-credentials: false
+      - uses: Swatinem/rust-cache@f13886b937689c021905a6b90929199931d60db1 # v2.8.1
+      - name: "Install Rust toolchain"
+        run: rustup show
+      - name: "Install mold"
+        uses: rui314/setup-mold@725a8794d15fc7563f59595bd9556495c0564878 # v1
+      - name: "Install cargo nextest"
+        uses: taiki-e/install-action@522492a8c115f1b6d4d318581f09638e9442547b # v2.62.21
+        with:
+          tool: cargo-nextest
+      - name: "Install uv"
+        uses: astral-sh/setup-uv@d0cc045d04ccac9d8b7881df0226f9e82c39688e # v6.8.0
+        with:
+          enable-cache: "true"
+      - name: "Run tests"
+        shell: bash
+        env:
+          NEXTEST_PROFILE: "ci"
+        run: |
+          cargo nextest run --all-features --profile ci
+          cargo test --all-features --doc
+
   cargo-test-wasm:
     name: "cargo test (wasm)"
     runs-on: ubuntu-latest
@@ -391,23 +422,6 @@ jobs:
           cd crates/ty_wasm
           wasm-pack test --node
 
-  cargo-build-release:
-    name: "cargo build (release)"
-    runs-on: macos-latest
-    if: ${{ github.ref == 'refs/heads/main' }}
-    timeout-minutes: 20
-    steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
-        with:
-          persist-credentials: false
-      - uses: Swatinem/rust-cache@f13886b937689c021905a6b90929199931d60db1 # v2.8.1
-      - name: "Install Rust toolchain"
-        run: rustup show
-      - name: "Install mold"
-        uses: rui314/setup-mold@725a8794d15fc7563f59595bd9556495c0564878 # v1
-      - name: "Build"
-        run: cargo build --release --locked
-
   cargo-build-msrv:
     name: "cargo build (msrv)"
     runs-on: depot-ubuntu-latest-8
@@ -721,7 +735,7 @@ jobs:
       - name: "Install Rust toolchain"
         run: rustup show
       - name: "Run ty completion evaluation"
-        run: cargo run --release --package ty_completion_eval -- all --threshold 0.1 --tasks /tmp/completion-evaluation-tasks.csv
+        run: cargo run --release --package ty_completion_eval -- all --threshold 0.4 --tasks /tmp/completion-evaluation-tasks.csv
       - name: "Ensure there are no changes"
         run: diff ./crates/ty_completion_eval/completion-evaluation-tasks.csv /tmp/completion-evaluation-tasks.csv
 

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

@@ -64,12 +64,12 @@ jobs:
 
           cd ..
 
-          uv tool install "git+https://github.com/astral-sh/ecosystem-analyzer@279f8a15b0e7f77213bf9096dbc2335a19ef89c5"
+          uv tool install "git+https://github.com/astral-sh/ecosystem-analyzer@908758da02a73ef3f3308e1dbb2248510029bbe4"
 
           ecosystem-analyzer \
             --repository ruff \
             diff \
-            --profile=release \
+            --profile=profiling \
             --projects-old ruff/projects_old.txt \
             --projects-new ruff/projects_new.txt \
             --old old_commit \

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

@@ -49,13 +49,13 @@ jobs:
 
           cd ..
 
-          uv tool install "git+https://github.com/astral-sh/ecosystem-analyzer@279f8a15b0e7f77213bf9096dbc2335a19ef89c5"
+          uv tool install "git+https://github.com/astral-sh/ecosystem-analyzer@908758da02a73ef3f3308e1dbb2248510029bbe4"
 
           ecosystem-analyzer \
             --verbose \
             --repository ruff \
             analyze \
-            --profile=release \
+            --profile=profiling \
             --projects ruff/crates/ty_python_semantic/resources/primer/good.txt \
             --output ecosystem-diagnostics.json
 

Cargo.toml

@@ -268,12 +268,7 @@ large_stack_arrays = "allow"
 
 
 [profile.release]
-# Note that we set these explicitly, and these values
-# were chosen based on a trade-off between compile times
-# and runtime performance[1].
-#
-# [1]: https://github.com/astral-sh/ruff/pull/9031
-lto = "thin"
+lto = "fat"
 codegen-units = 16
 
 # Some crates don't change as much but benefit more from
@@ -283,6 +278,8 @@ codegen-units = 16
 codegen-units = 1
 [profile.release.package.ruff_python_ast]
 codegen-units = 1
+[profile.release.package.salsa]
+codegen-units = 1
 
 [profile.dev.package.insta]
 opt-level = 3
@@ -298,11 +295,30 @@ opt-level = 3
 [profile.dev.package.ruff_python_parser]
 opt-level = 1
 
+# This profile is meant to mimic the `release` profile as closely as
+# possible, but using settings that are more beneficial for iterative
+# development. That is, the `release` profile is intended for actually
+# building the release, where as `profiling` is meant for building ty/ruff
+# for running benchmarks.
+#
+# The main differences here are to avoid stripping debug information
+# and disabling fat lto. This does result in a mismatch between our release
+# configuration and our benchmarking configuration, which is unfortunate.
+# But compile times with `lto = fat` are completely untenable.
+#
+# This setup does risk that we are measuring something in benchmarks
+# that we aren't shipping, but in order to make those two the same, we'd
+# either need to make compile times way worse for development, or take
+# a hit to binary size and a slight hit to runtime performance in our
+# release builds.
+#
 # Use the `--profile profiling` flag to show symbols in release mode.
 # e.g. `cargo build --profile profiling`
 [profile.profiling]
 inherits = "release"
-debug = 1
+strip = false
+debug = "full"
+lto = false
 
 # The profile that 'cargo dist' will build with.
 [profile.dist]

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

@@ -1,10 +1,10 @@
-# The lexer doesn't emit a string token if it's unterminated
+# The lexer emits a string token if it's unterminated
 "a" "b
 "a" "b" "c
 "a" """b
 c""" "d
 
-# For f-strings, the `FStringRanges` won't contain the range for
+# This is also true for
 # unterminated f-strings.
 f"a" f"b
 f"a" f"b" f"c

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

@@ -18,3 +18,20 @@ def print_third_word(word: Hello.Text) -> None:
 
 def print_fourth_word(word: Goodbye) -> None:
     print(word)
+    
+
+import typing_extensions
+import typing_extensions as TypingExt
+from typing_extensions import Text as TextAlias
+
+
+def print_fifth_word(word: typing_extensions.Text) -> None:
+    print(word)
+
+
+def print_sixth_word(word: TypingExt.Text) -> None:
+    print(word)
+
+
+def print_seventh_word(word: TextAlias) -> None:
+    print(word)

crates/ruff_linter/src/preview.rs

@@ -265,3 +265,7 @@ pub(crate) const fn is_fix_read_whole_file_enabled(settings: &LinterSettings) ->
 pub(crate) const fn is_fix_write_whole_file_enabled(settings: &LinterSettings) -> bool {
     settings.preview.is_enabled()
 }
+
+pub(crate) const fn is_typing_extensions_str_alias_enabled(settings: &LinterSettings) -> bool {
+    settings.preview.is_enabled()
+}

crates/ruff_linter/src/rules/flake8_bugbear/rules/mutable_argument_default.rs

@@ -188,16 +188,10 @@ fn move_initialization(
     content.push_str(stylist.line_ending().as_str());
     content.push_str(stylist.indentation());
     if is_b006_unsafe_fix_preserve_assignment_expr_enabled(checker.settings()) {
-        let annotation = if let Some(ann) = parameter.annotation() {
-            format!(": {}", locator.slice(ann))
-        } else {
-            String::new()
-        };
         let _ = write!(
             &mut content,
-            "{}{} = {}",
+            "{} = {}",
             parameter.parameter.name(),
-            annotation,
             locator.slice(
                 parenthesized_range(
                     default.into(),

crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__preview__B006_B006_5.py.snap

@@ -16,7 +16,7 @@ help: Replace with `None`; initialize within function
 5  + def import_module_wrong(value: dict[str, str] = None):
 6  |     import os
 7  +     if value is None:
-8  +         value: dict[str, str] = {}
+8  +         value = {}
 9  | 
 10 | 
 11 | def import_module_with_values_wrong(value: dict[str, str] = {}):
@@ -38,7 +38,7 @@ help: Replace with `None`; initialize within function
 10 |     import os
 11 | 
 12 +     if value is None:
-13 +         value: dict[str, str] = {}
+13 +         value = {}
 14 |     return 2
 15 | 
 16 | 
@@ -62,7 +62,7 @@ help: Replace with `None`; initialize within function
 17 |     import sys
 18 |     import itertools
 19 +     if value is None:
-20 +         value: dict[str, str] = {}
+20 +         value = {}
 21 | 
 22 | 
 23 | def from_import_module_wrong(value: dict[str, str] = {}):
@@ -83,7 +83,7 @@ help: Replace with `None`; initialize within function
 21 + def from_import_module_wrong(value: dict[str, str] = None):
 22 |     from os import path
 23 +     if value is None:
-24 +         value: dict[str, str] = {}
+24 +         value = {}
 25 | 
 26 | 
 27 | def from_imports_module_wrong(value: dict[str, str] = {}):
@@ -106,7 +106,7 @@ help: Replace with `None`; initialize within function
 26 |     from os import path
 27 |     from sys import version_info
 28 +     if value is None:
-29 +         value: dict[str, str] = {}
+29 +         value = {}
 30 | 
 31 | 
 32 | def import_and_from_imports_module_wrong(value: dict[str, str] = {}):
@@ -129,7 +129,7 @@ help: Replace with `None`; initialize within function
 31 |     import os
 32 |     from sys import version_info
 33 +     if value is None:
-34 +         value: dict[str, str] = {}
+34 +         value = {}
 35 | 
 36 | 
 37 | def import_docstring_module_wrong(value: dict[str, str] = {}):
@@ -152,7 +152,7 @@ help: Replace with `None`; initialize within function
 36 |     """Docstring"""
 37 |     import os
 38 +     if value is None:
-39 +         value: dict[str, str] = {}
+39 +         value = {}
 40 | 
 41 | 
 42 | def import_module_wrong(value: dict[str, str] = {}):
@@ -175,7 +175,7 @@ help: Replace with `None`; initialize within function
 41 |     """Docstring"""
 42 |     import os; import sys
 43 +     if value is None:
-44 +         value: dict[str, str] = {}
+44 +         value = {}
 45 | 
 46 | 
 47 | def import_module_wrong(value: dict[str, str] = {}):
@@ -197,7 +197,7 @@ help: Replace with `None`; initialize within function
 45 + def import_module_wrong(value: dict[str, str] = None):
 46 |     """Docstring"""
 47 +     if value is None:
-48 +         value: dict[str, str] = {}
+48 +         value = {}
 49 |     import os; import sys; x = 1
 50 | 
 51 | 
@@ -220,7 +220,7 @@ help: Replace with `None`; initialize within function
 51 |     """Docstring"""
 52 |     import os; import sys
 53 +     if value is None:
-54 +         value: dict[str, str] = {}
+54 +         value = {}
 55 | 
 56 | 
 57 | def import_module_wrong(value: dict[str, str] = {}):
@@ -241,7 +241,7 @@ help: Replace with `None`; initialize within function
 55 + def import_module_wrong(value: dict[str, str] = None):
 56 |     import os; import sys
 57 +     if value is None:
-58 +         value: dict[str, str] = {}
+58 +         value = {}
 59 | 
 60 | 
 61 | def import_module_wrong(value: dict[str, str] = {}):
@@ -261,7 +261,7 @@ help: Replace with `None`; initialize within function
    - def import_module_wrong(value: dict[str, str] = {}):
 59 + def import_module_wrong(value: dict[str, str] = None):
 60 +     if value is None:
-61 +         value: dict[str, str] = {}
+61 +         value = {}
 62 |     import os; import sys; x = 1
 63 | 
 64 | 
@@ -282,7 +282,7 @@ help: Replace with `None`; initialize within function
 63 + def import_module_wrong(value: dict[str, str] = None):
 64 |     import os; import sys
 65 +     if value is None:
-66 +         value: dict[str, str] = {}
+66 +         value = {}
 67 | 
 68 | 
 69 | def import_module_wrong(value: dict[str, str] = {}): import os

crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__preview__B006_B006_8.py.snap

@@ -51,7 +51,7 @@ help: Replace with `None`; initialize within function
 10 + def baz(a: list = None):
 11 |     """This one raises a different exception"""
 12 +     if a is None:
-13 +         a: list = []
+13 +         a = []
 14 |     raise IndexError()
 15 | 
 16 |