[red-knot] Future-proof Type::is_disjoint_from()#15262
Merged
AlexWaygood merged 2 commits intomainfrom Jan 5, 2025
Merged
Conversation
AlexWaygood
requested review from
MichaReiser,
carljm and
sharkdp
as code owners
Contributor
|
AlexWaygood
force-pushed
the
alex/known-instance-disjointness
branch
from
ab69315 to
c44a2e7
Compare
AlexWaygood
force-pushed
the
alex/future-proof-disjointness
branch
from
ee934fa to
a89c77b
Compare
AlexWaygood
force-pushed
the
alex/known-instance-disjointness
branch
from
c44a2e7 to
8cad5be
Compare
AlexWaygood
force-pushed
the
alex/future-proof-disjointness
branch
from
a89c77b to
79e5743
Compare
AlexWaygood
force-pushed
the
alex/known-instance-disjointness
branch
from
8cad5be to
deac0e4
Compare
AlexWaygood
force-pushed
the
alex/future-proof-disjointness
branch
from
79e5743 to
cdb3a78
Compare
AlexWaygood
force-pushed
the
alex/future-proof-disjointness
branch
from
cdb3a78 to
bee1e59
Compare
Co-authored-by: Carl Meyer <[email protected]>
dcreager
added a commit
that referenced
this pull request
Jan 6, 2025
* main: (60 commits) [`ruff`] Dataclass enums (`RUF049`) (#15299) Better error message when `--config` is given a table key and a non-inline-table value (#15266) Update pre-commit dependencies (#15289) Don't fix in ecosystem check (#15267) Update Rust crate itertools to 0.14.0 (#15287) Remove accidental empty block at the bottom of `split-static-string (SIM905)` doc (#15290) Update Rust crate clearscreen to v4 (#15288) Update Rust crate insta to v1.42.0 (#15286) Update NPM Development dependencies (#15285) Update dependency uuid to v11.0.4 (#15284) Update dependency ruff to v0.8.6 (#15283) Update Rust crate syn to v2.0.95 (#15282) Update Rust crate matchit to v0.8.6 (#15281) Update Rust crate bstr to v1.11.3 (#15280) [red-knot] Future-proof `Type::is_disjoint_from()` (#15262) [red-knot] Improve `Type::is_disjoint_from()` for `KnownInstanceType`s (#15261) [red-knot] Minor simplifications and improvements to constraint narrowing logic (#15270) Allow assigning ellipsis literal as parameter default value (#14982) [red-knot] fix control flow for assignment expressions in elif tests (#15274) [`refurb`] Mark fix as unsafe when the right-hand side is a string (`FURB171`) (#15273) ...
dcreager
added a commit
that referenced
this pull request
Jan 6, 2025
* main: (29 commits) [`ruff`] Dataclass enums (`RUF049`) (#15299) Better error message when `--config` is given a table key and a non-inline-table value (#15266) Update pre-commit dependencies (#15289) Don't fix in ecosystem check (#15267) Update Rust crate itertools to 0.14.0 (#15287) Remove accidental empty block at the bottom of `split-static-string (SIM905)` doc (#15290) Update Rust crate clearscreen to v4 (#15288) Update Rust crate insta to v1.42.0 (#15286) Update NPM Development dependencies (#15285) Update dependency uuid to v11.0.4 (#15284) Update dependency ruff to v0.8.6 (#15283) Update Rust crate syn to v2.0.95 (#15282) Update Rust crate matchit to v0.8.6 (#15281) Update Rust crate bstr to v1.11.3 (#15280) [red-knot] Future-proof `Type::is_disjoint_from()` (#15262) [red-knot] Improve `Type::is_disjoint_from()` for `KnownInstanceType`s (#15261) [red-knot] Minor simplifications and improvements to constraint narrowing logic (#15270) Allow assigning ellipsis literal as parameter default value (#14982) [red-knot] fix control flow for assignment expressions in elif tests (#15274) [`refurb`] Mark fix as unsafe when the right-hand side is a string (`FURB171`) (#15273) ...
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
2 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.
(This PR is stacked on top of #15261; review that first.)
Summary
Currently we hardcode a lot of knowledge about various classes' MROs into
Type::is_disjoint_from(). This is undesirable for two reasons:Literal["foo"]is a subtype oftyping.Sequence[str]andtyping.Iterable[str]; with the current wayis_disjoint_from()is written, we would have to manually update the function to take account of that.This PR reworks
Type::is_disjoint_from()to use genericis_subclass_of()methods rather than hardcoding knowledge of various classes' MROs. This fixes both the above issues, and also makesType::is_disjoint_from()more extensible for future improvements, such as incorporating knowledge of@finalclasses into the method.Test Plan
QUICKCHECK_TESTS=200000 cargo test -p red_knot_python_semantic -- --ignored types::property_tests::stableto verify that this doesn't introduce any new failures in the property tests