[ty] make StaticClassLiteral::explicit_bases converge better in cycles#23601
Merged
AlexWaygood merged 2 commits intomainfrom Mar 2, 2026
Merged
[ty] make StaticClassLiteral::explicit_bases converge better in cycles#23601AlexWaygood merged 2 commits intomainfrom
StaticClassLiteral::explicit_bases converge better in cycles#23601AlexWaygood merged 2 commits intomainfrom
Conversation
Typing conformance resultsNo changes detected ✅ |
Memory usage reportMemory usage unchanged ✅ |
|
308d06b to
27bbe24
Compare
|
| Lint rule | Added | Removed | Changed |
|---|---|---|---|
invalid-await |
0 | 40 | 0 |
invalid-argument-type |
0 | 1 | 0 |
invalid-return-type |
0 | 1 | 0 |
| Total | 0 | 42 | 0 |
dcreager
approved these changes
Feb 27, 2026
Member
dcreager
left a comment
There was a problem hiding this comment.
lgtm, modulo @AlexWaygood's comments
carljm
added a commit
that referenced
this pull request
Mar 2, 2026
* main: (30 commits) [ty] Introduce `types::bool`, `types::context_manager` and `types::iteration` (#23681) [ty] Move `KnownInstanceType`, and related types, to a new `known_instance.rs` submodule (#23680) [ty] Add `invalid-enum-member-annotation` lint rule (#23648) [`ruff`] Fix false positive for `re.split` with empty string pattern (`RUF055`) (#23634) [ty] Move `UnionType` and `IntersectionType` to a new `types::set_theoretic` submodule (#23678) [ty] Add unbound type variable detection in annotations (#23641) [ty] Remove `specialize_constrained` from constraint set module (#23677) [ty] Add partial support and validation for `Unpack` when used with tuple types (#23651) Update prek dependencies (#23661) [ty] make `StaticClassLiteral::explicit_bases` converge better in cycles (#23601) Improvements to CLAUDE.md (#23633) [ty] Move subscript logic out of `builder.rs` (#23653) Update Artifact GitHub Actions dependencies (#23676) Update actions/attest-build-provenance to 4.1.0 (#23654) Update Rust crate clearscreen to v4.0.5 (#23664) fix renovate `actions/*-artifact` updates (#23675) Update Rust crate clap to v4.5.60 (#23663) Update Rust crate unicode-ident to v1.0.24 (#23668) Update Rust crate anyhow to v1.0.102 (#23662) Update Rust crate pyproject-toml to v0.13.7 (#23666) ...
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fixes astral-sh/ty#2637. This PR adds a minimized test case derived from that issue. It creates a complicated cycle with multiple cycle heads, which also involves a tricky Salsa behavior that comes up when a query oscillates between being a cycle head and not being one.
The fix here is to improve the cycle behavior of
StaticClassLiteral::explicit_bases. Previously itscycle_initialreturned an empty list, but an empty list of bases causes assignability checks to fail, where a temporarily-Divergentbase class would succeed. Returning a list ofDivergentbases behaves better. The newcycle_fnwasn't necessary to fix this case, but it seemed like a good idea to also make sure these types enjoy the same "monotonic widening" that we apply to avoid oscillations in other places.