Merged
Conversation
MichaReiser
requested review from
AlexWaygood,
carljm and
sharkdp
as code owners
MichaReiser
force-pushed
the
micha/extract-class-instance-from-types
branch
from
4fa1aa8 to
355fa1a
Compare
sharkdp
approved these changes
Feb 24, 2025
Contributor
sharkdp
left a comment
sharkdp
left a comment
There was a problem hiding this comment.
Thanks — and sorry for already introducing merge conflicts.
Member
Author
|
Oh no, what did you change 😆 |
MichaReiser
force-pushed
the
micha/extract-class-instance-from-types
branch
from
355fa1a to
92b108f
Compare
AlexWaygood
reviewed
Feb 24, 2025
Comment on lines
-57
to
+55
| .map_or(Self::unknown(), |ClassLiteralType { class }| { | ||
| Self::Class(class) | ||
| }) | ||
| .map_or(Self::unknown(), |literal| Self::Class(literal.class())) |
Member
There was a problem hiding this comment.
hrm, I preferred the code the way it was here -- I find unpacking the inner Class more readable when it comes to ClassLiteralType :/
it makes it easier for me to distinguish the concepts of a class-literal type (a set that has exactly one inhabitant) and the underlying class (the sole member of that set at runtime)
Member
There was a problem hiding this comment.
That said, there probably would be benefits to treating the class field as fully opaque to external modules in the long term. And this probably gets us closer to that
dcreager
added a commit
that referenced
this pull request
Feb 25, 2025
* main: (38 commits) [red-knot] Use arena-allocated association lists for narrowing constraints (#16306) [red-knot] Rewrite `Type::try_iterate()` to improve type inference and diagnostic messages (#16321) Add issue templates (#16213) Normalize inconsistent markdown headings in docstrings (#16364) [red-knot] Better diagnostics for method calls (#16362) [red-knot] Add argfile and windows glob path support (#16353) [red-knot] Handle pipe-errors gracefully (#16354) Rename `venv-path` to `python` (#16347) [red-knot] Fixup some formatting in `infer.rs` (#16348) [red-knot] Restrict visibility of more things in `class.rs` (#16346) [red-knot] Add diagnostic for class-object access to pure instance variables (#16036) Add `per-file-target-version` option (#16257) [PLW1507] Mark fix unsafe (#16343) [red-knot] Add a test to ensure that `KnownClass::try_from_file_and_name()` is kept up to date (#16326) Extract class and instance types (#16337) Re-order changelog entries for 0.9.7 (#16344) [red-knot] Add support for `@classmethod`s (#16305) Update Salsa (#16338) Update Salsa part 1 (#16340) Upgrade Rust toolchain to 1.85.0 (#16339) ...
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
3 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
This is a first step towards reudcing the size of
types.rs.It moves all types related to classes and instances into a new
class.rsTest Plan
This PR contains no behavior changes.