Cyclic0007/ruff
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename CallDunderResult to CallDunderOutcome

Browse Source
This commit is contained in:
Micha Reiser
2025-02-13 10:05:53 +01:00
parent 49302911c4
commit df9847cce4
3 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
crates/red_knot_python_semantic/src/types.rs
View File

@@ -36,7 +36,7 @@ use crate::stdlib::{builtins_symbol, known_module_symbol, typing_extensions_symb
use crate::suppression::check_suppressions;
use crate::symbol::{Boundness, Symbol};
use crate::types::call::{
bind_call, CallArguments, CallBinding, CallDunderResult, CallOutcome, StaticAssertionErrorKind,
bind_call, CallArguments, CallBinding, CallDunderOutcome, CallOutcome, StaticAssertionErrorKind,
};
use crate::types::class_base::ClassBase;
use crate::types::diagnostic::INVALID_TYPE_FORM;
@@ -1927,9 +1927,9 @@ impl<'db> Type<'db> {
let return_ty = match self.call_dunder(db, "__len__", &CallArguments::positional([*self])) {
// TODO: emit a diagnostic
CallDunderResult::MethodNotAvailable => return None,
CallDunderOutcome::MethodNotAvailable => return None,
CallDunderResult::CallOutcome(outcome) => outcome.return_type(db)?,
CallDunderOutcome::Call(outcome) => outcome.return_type(db)?,
};
non_negative_int_literal(db, return_ty)
@@ -2099,14 +2099,14 @@ impl<'db> Type<'db> {
instance_ty @ Type::Instance(_) => {
match instance_ty.call_dunder(db, "__call__", &arguments.with_self(instance_ty)) {
CallDunderResult::CallOutcome(CallOutcome::NotCallable { .. }) => {
CallDunderOutcome::Call(CallOutcome::NotCallable { .. }) => {
// Turn "`<type of illegal '__call__'>` not callable" into
// "`X` not callable"
CallOutcome::NotCallable {
not_callable_ty: self,
}
}
CallDunderResult::CallOutcome(outcome) => match outcome {
CallDunderOutcome::Call(outcome) => match outcome {
// Turn "possibly unbound object of type `Literal['__call__']`"
// into "`X` not callable (possibly unbound `__call__` method)"
CallOutcome::PossiblyUnboundDunder { call_outcome, .. } => {
@@ -2118,7 +2118,7 @@ impl<'db> Type<'db> {
outcome => outcome,
},
CallDunderResult::MethodNotAvailable => {
CallDunderOutcome::MethodNotAvailable => {
// Turn "`X.__call__` unbound" into "`X` not callable"
CallOutcome::NotCallable {
not_callable_ty: self,
@@ -2198,20 +2198,20 @@ impl<'db> Type<'db> {
db: &'db dyn Db,
name: &str,
arguments: &CallArguments<'_, 'db>,
) -> CallDunderResult<'db> {
) -> CallDunderOutcome<'db> {
match self.to_meta_type(db).member(db, name) {
Symbol::Type(callable_ty, Boundness::Bound) => {
CallDunderResult::CallOutcome(callable_ty.call(db, arguments))
CallDunderOutcome::Call(callable_ty.call(db, arguments))
}
Symbol::Type(callable_ty, Boundness::PossiblyUnbound) => {
CallDunderResult::CallOutcome(CallOutcome::PossiblyUnboundDunder {
CallDunderOutcome::Call(CallOutcome::PossiblyUnboundDunder {
called_ty: self,
call_outcome: Box::new(callable_ty.call(db, arguments)),
})
}
Symbol::Unbound => CallDunderResult::MethodNotAvailable,
Symbol::Unbound => CallDunderOutcome::MethodNotAvailable,
}
}
@@ -2233,7 +2233,7 @@ impl<'db> Type<'db> {
let dunder_iter_result =
self.call_dunder(db, "__iter__", &CallArguments::positional([self]));
match dunder_iter_result {
CallDunderResult::CallOutcome(ref call_outcome) => {
CallDunderOutcome::Call(ref call_outcome) => {
let Some(iterator_ty) = call_outcome.return_type(db) else {
return IterationOutcome::NotIterable {
not_iterable_ty: self,
@@ -2258,7 +2258,7 @@ impl<'db> Type<'db> {
}
};
}
CallDunderResult::MethodNotAvailable => {}
CallDunderOutcome::MethodNotAvailable => {}
}
// Although it's not considered great practice,

8
crates/red_knot_python_semantic/src/types/call.rs
View File

@@ -355,15 +355,15 @@ impl<'db> CallOutcome<'db> {
}
}
pub(super) enum CallDunderResult<'db> {
CallOutcome(CallOutcome<'db>),
pub(super) enum CallDunderOutcome<'db> {
Call(CallOutcome<'db>),
MethodNotAvailable,
}
impl<'db> CallDunderResult<'db> {
impl<'db> CallDunderOutcome<'db> {
pub(super) fn return_type(&self, db: &'db dyn Db) -> Option<Type<'db>> {
match self {
Self::CallOutcome(outcome) => {
Self::Call(outcome) => {
// TODO: Always call `outcome.return_type`, see https://github.com/astral-sh/ruff/issues/16123
if outcome.is_possibly_unbound_dunder() {
None

4
crates/red_knot_python_semantic/src/types/infer.rs
View File

@@ -64,7 +64,7 @@ use crate::types::mro::MroErrorKind;
use crate::types::unpacker::{UnpackResult, Unpacker};
use crate::types::{
builtins_symbol, global_symbol, symbol, symbol_from_bindings, symbol_from_declarations,
todo_type, typing_extensions_symbol, Boundness, CallDunderResult, Class, ClassLiteralType,
todo_type, typing_extensions_symbol, Boundness, CallDunderOutcome, Class, ClassLiteralType,
DynamicType, FunctionType, InstanceType, IntersectionBuilder, IntersectionType,
IterationOutcome, KnownClass, KnownFunction, KnownInstanceType, MetaclassCandidate,
MetaclassErrorKind, SliceLiteralType, SubclassOfType, Symbol, SymbolAndQualifiers, Truthiness,
@@ -3567,7 +3567,7 @@ impl<'db> TypeInferenceBuilder<'db> {
}
};
if let CallDunderResult::CallOutcome(call) = operand_type.call_dunder(
if let CallDunderOutcome::Call(call) = operand_type.call_dunder(
self.db(),
unary_dunder_method,
&CallArguments::positional([operand_type]),