[red-knot] Improve Type::is_disjoint_from() for KnownInstanceTypes#15261
Merged
AlexWaygood merged 3 commits intomainfrom Jan 5, 2025
Merged
[red-knot] Improve Type::is_disjoint_from() for KnownInstanceTypes#15261AlexWaygood merged 3 commits intomainfrom
Type::is_disjoint_from() for KnownInstanceTypes#15261AlexWaygood merged 3 commits intomainfrom
Conversation
AlexWaygood
requested review from
MichaReiser,
carljm and
sharkdp
as code owners
Contributor
|
Member
Author
|
Argh, no. This does create new property test failures. I must have had a fluky success locally. |
Member
Author
|
Okay, I fixed the new bug surfaced by the property tests. This time it was that we weren't recognising |
AlexWaygood
force-pushed
the
alex/known-instance-disjointness
branch
2 times, most recently
from
c44a2e7 to
8cad5be
Compare
AlexWaygood
force-pushed
the
alex/known-instance-disjointness
branch
from
8cad5be to
deac0e4
Compare
carljm
approved these changes
Jan 5, 2025
Comment on lines
1211
to
1216
| | (Type::Tuple(_), Type::KnownInstance(known_instance)) => KnownClass::Tuple | ||
| .to_class_literal(db) | ||
| .into_class_literal() | ||
| .is_some_and(|ClassLiteralType { class: tuple_class }| { | ||
| !known_instance.class().is_subclass_of(db, tuple_class) | ||
| }), |
Contributor
There was a problem hiding this comment.
Would it be less repetitive to delegate this to "the known instance type is disjoint from KnownClass::Tuple.to_instance(), which would end up in the prior case?
Member
Author
There was a problem hiding this comment.
Ahh, great catch! I've pushed that change. (I checked that it doesn't cause any new property test failures, as well.)
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.
Summary
Two things are fixed here:
KnownInstance::TypingLiteral) that was an instance oftyping._SpecialForm, we currently don't recognise that this type is disjoint from a classFoothat is a subclass oftyping._SpecialForm. This is a bit theoretical, asKnownInstances in our model are generally instances of classes that cannot be subclassed (at least, not easily). However, fixing this bug revealed (thanks to the property tests) that...Type::Tuple([])to be disjoint fromType::KnownInstance(KnownInstanceType::TypingLiteral).Test Plan
Type::Tuple([])is now considered disjoint fromType::KnownInstance(KnownInstanceType::TypingLiteral).QUICKCHECK_TESTS=200000 cargo test -p red_knot_python_semantic -- --ignored types::property_tests::stableto ensure that there are no new failures in the property tests