Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[red-knot] Add type inference for basic for loops #13195

Merged
merged 5 commits into from
Sep 4, 2024
Merged

[red-knot] Add type inference for basic for loops #13195

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6c44e50
[red-knot] Add type inference for basic `for` loops
AlexWaygood Sep 1, 2024
a6e3fa9
Simplify signature of `Type::member`
AlexWaygood Sep 1, 2024
6d62ac2
Renamings
AlexWaygood Sep 2, 2024
3965883
Move things around
AlexWaygood Sep 2, 2024
1c68317
address review
AlexWaygood Sep 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Simplify signature of Type::member
  • Loading branch information
@AlexWaygood
AlexWaygood committed Sep 4, 2024
commit a6e3fa9541c970c76d4ba1c12fa1aebec464f7f9
17 changes: 7 additions & 10 deletions crates/red_knot_python_semantic/src/types.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -358,7 +358,7 @@ impl<'db> Type<'db> {
/// us to explicitly consider whether to handle an error or propagate
/// it up the call stack.
#[must_use]
pub fn member(&self, db: &'db dyn Db, name: &ast::name::Name) -> Type<'db> {
pub fn member(&self, db: &'db dyn Db, name: &str) -> Type<'db> {
match self {
Type::Any => Type::Any,
Type::Never => {
Expand Down Expand Up @@ -450,12 +450,10 @@ impl<'db> Type<'db> {
// `self` represents the type of the iterable;
// `__iter__` and `__next__` are both looked up on the class of the iterable:
let type_of_class = self.to_type_of_class(db);
let dunder_iter_method = type_of_class.member(db, &ast::name::Name::from("__iter__"));
let dunder_iter_method = type_of_class.member(db, "__iter__");
if !dunder_iter_method.is_unbound() {
let iterator_ty = dunder_iter_method.call(db)?;
let dunder_next_method = iterator_ty
.to_type_of_class(db)
.member(db, &ast::name::Name::from("__next__"));
let dunder_next_method = iterator_ty.to_type_of_class(db).member(db, "__next__");
return dunder_next_method.call(db);
}
// Although it's not considered great practice,
Expand All @@ -464,8 +462,7 @@ impl<'db> Type<'db> {
//
// TODO this is only valid if the `__getitem__` method is annotated as
// accepting `int` or `SupportsIndex`
let dunder_get_item_method =
type_of_class.member(db, &ast::name::Name::from("__getitem__"));
let dunder_get_item_method = type_of_class.member(db, "__getitem__");
dunder_get_item_method.call(db)
}

Expand Down Expand Up @@ -586,7 +583,7 @@ impl<'db> ClassType<'db> {
/// Returns the class member of this class named `name`.
///
/// The member resolves to a member of the class itself or any of its bases.
pub fn class_member(self, db: &'db dyn Db, name: &ast::name::Name) -> Type<'db> {
pub fn class_member(self, db: &'db dyn Db, name: &str) -> Type<'db> {
let member = self.own_class_member(db, name);
if !member.is_unbound() {
return member;
Expand All @@ -596,12 +593,12 @@ impl<'db> ClassType<'db> {
}

/// Returns the inferred type of the class member named `name`.
pub fn own_class_member(self, db: &'db dyn Db, name: &ast::name::Name) -> Type<'db> {
pub fn own_class_member(self, db: &'db dyn Db, name: &str) -> Type<'db> {
let scope = self.body_scope(db);
symbol_ty_by_name(db, scope, name)
}

pub fn inherited_class_member(self, db: &'db dyn Db, name: &ast::name::Name) -> Type<'db> {
pub fn inherited_class_member(self, db: &'db dyn Db, name: &str) -> Type<'db> {
for base in self.bases(db) {
let member = base.member(db, name);
if !member.is_unbound() {
Expand Down