mirror of
https://github.com/astral-sh/ruff.git
synced 2025-08-04 02:38:25 +00:00
Return a slice in StmtClassDef#bases
(#6311)
Slices are strictly more flexible, since you can always convert to an iterator, etc., but not the other way around. Suggested in https://github.com/astral-sh/ruff/pull/6259#discussion_r1282730994.
This commit is contained in:
parent
718e3945e3
commit
2fa508793f
6 changed files with 16 additions and 15 deletions
|
@ -79,6 +79,7 @@ pub(crate) fn builtin_attribute_shadowing(
|
|||
// subscripting and not through attribute access.
|
||||
if class_def
|
||||
.bases()
|
||||
.iter()
|
||||
.any(|base| checker.semantic().match_typing_expr(base, "TypedDict"))
|
||||
{
|
||||
return;
|
||||
|
|
|
@ -58,7 +58,7 @@ pub(crate) fn non_unique_enums(checker: &mut Checker, parent: &Stmt, body: &[Stm
|
|||
return;
|
||||
};
|
||||
|
||||
if !parent.bases().any(|expr| {
|
||||
if !parent.bases().iter().any(|expr| {
|
||||
checker
|
||||
.semantic()
|
||||
.resolve_call_path(expr)
|
||||
|
|
|
@ -223,6 +223,7 @@ pub(crate) fn unused_private_protocol(
|
|||
|
||||
if !class_def
|
||||
.bases()
|
||||
.iter()
|
||||
.any(|base| checker.semantic().match_typing_expr(base, "Protocol"))
|
||||
{
|
||||
continue;
|
||||
|
@ -309,6 +310,7 @@ pub(crate) fn unused_private_typed_dict(
|
|||
|
||||
if !class_def
|
||||
.bases()
|
||||
.iter()
|
||||
.any(|base| checker.semantic().match_typing_expr(base, "TypedDict"))
|
||||
{
|
||||
continue;
|
||||
|
|
|
@ -39,7 +39,7 @@ fn runtime_evaluated_base_class(base_classes: &[String], semantic: &SemanticMode
|
|||
return false;
|
||||
};
|
||||
|
||||
class_def.bases().any(|base| {
|
||||
class_def.bases().iter().any(|base| {
|
||||
semantic.resolve_call_path(base).is_some_and(|call_path| {
|
||||
base_classes
|
||||
.iter()
|
||||
|
|
|
@ -167,21 +167,19 @@ pub struct StmtClassDef {
|
|||
|
||||
impl StmtClassDef {
|
||||
/// Return an iterator over the bases of the class.
|
||||
pub fn bases(&self) -> impl Iterator<Item = &Expr> {
|
||||
self.arguments
|
||||
.as_ref()
|
||||
.map(|arguments| &arguments.args)
|
||||
.into_iter()
|
||||
.flatten()
|
||||
pub fn bases(&self) -> &[Expr] {
|
||||
match &self.arguments {
|
||||
Some(arguments) => &arguments.args,
|
||||
None => &[],
|
||||
}
|
||||
}
|
||||
|
||||
/// Return an iterator over the metaclass keywords of the class.
|
||||
pub fn keywords(&self) -> impl Iterator<Item = &Keyword> {
|
||||
self.arguments
|
||||
.as_ref()
|
||||
.map(|arguments| &arguments.keywords)
|
||||
.into_iter()
|
||||
.flatten()
|
||||
pub fn keywords(&self) -> &[Keyword] {
|
||||
match &self.arguments {
|
||||
Some(arguments) => &arguments.keywords,
|
||||
None => &[],
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -42,7 +42,7 @@ pub fn classify(
|
|||
FunctionType::StaticMethod
|
||||
} else if matches!(name, "__new__" | "__init_subclass__" | "__class_getitem__")
|
||||
// Special-case class method, like `__new__`.
|
||||
|| class_def.bases().any(|expr| {
|
||||
|| class_def.bases().iter().any(|expr| {
|
||||
// The class itself extends a known metaclass, so all methods are class methods.
|
||||
semantic
|
||||
.resolve_call_path(map_callable(expr))
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue