mirrors/ruff
1
0
Fork 0
mirror of https://github.com/astral-sh/ruff.git synced 2025-08-15 16:10:17 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Implement iter(), len() and is_empty() for all display-literal AST nodes (#12807)

Browse source
This commit is contained in:
Alex Waygood 2024-08-12 11:39:28 +01:00 • committed by GitHub
parent a99a45868c
commit aa0db338d9
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
56 changed files with 304 additions and 240 deletions
Download patch file Download diff file Expand all files Collapse all files

23
crates/ruff_python_semantic/src/analyze/typing.rs
View file

@ -151,7 +151,7 @@ pub fn to_pep604_operator(
fn quoted_annotation(slice: &Expr) -> bool {
match slice {
Expr::StringLiteral(_) => true,
Expr::Tuple(ast::ExprTuple { elts, .. }) => elts.iter().any(quoted_annotation),
Expr::Tuple(tuple) => tuple.iter().any(quoted_annotation),
_ => false,
}
}
@ -160,7 +160,7 @@ pub fn to_pep604_operator(
fn starred_annotation(slice: &Expr) -> bool {
match slice {
Expr::Starred(_) => true,
Expr::Tuple(ast::ExprTuple { elts, .. }) => elts.iter().any(starred_annotation),
Expr::Tuple(tuple) => tuple.iter().any(starred_annotation),
_ => false,
}
}
@ -237,9 +237,9 @@ pub fn is_immutable_annotation(
if is_immutable_generic_type(qualified_name.segments()) {
true
} else if matches!(qualified_name.segments(), ["typing", "Union"]) {
if let Expr::Tuple(ast::ExprTuple { elts, .. }) = slice.as_ref() {
elts.iter().all(|elt| {
is_immutable_annotation(elt, semantic, extend_immutable_calls)
if let Expr::Tuple(tuple) = &**slice {
tuple.iter().all(|element| {
is_immutable_annotation(element, semantic, extend_immutable_calls)
})
} else {
false
@ -399,11 +399,12 @@ where
// Ex) Union[x, y]
if let Expr::Subscript(ast::ExprSubscript { value, slice, .. }) = expr {
if semantic.match_typing_expr(value, "Union") {
if let Expr::Tuple(ast::ExprTuple { elts, .. }) = slice.as_ref() {
if let Expr::Tuple(tuple) = &**slice {
// Traverse each element of the tuple within the union recursively to handle cases
// such as `Union[..., Union[...]]
elts.iter()
.for_each(|elt| inner(func, semantic, elt, Some(expr)));
tuple
.iter()
.for_each(|elem| inner(func, semantic, elem, Some(expr)));
return;
}
}
@ -438,11 +439,11 @@ where
if let Expr::Subscript(ast::ExprSubscript { value, slice, .. }) = expr {
if semantic.match_typing_expr(value, "Literal") {
match &**slice {
Expr::Tuple(ast::ExprTuple { elts, .. }) => {
Expr::Tuple(tuple) => {
// Traverse each element of the tuple within the literal recursively to handle cases
// such as `Literal[..., Literal[...]]
for elt in elts {
inner(func, semantic, elt, Some(expr));
for element in tuple {
inner(func, semantic, element, Some(expr));
}
}
other => {

4
crates/ruff_python_semantic/src/model.rs
View file

@ -1432,9 +1432,7 @@ impl<'a> SemanticModel<'a> {
/// variable to be "used" if it's shadowed by another variable with usages.
pub fn is_unused(&self, expr: &Expr) -> bool {
match expr {
Expr::Tuple(ast::ExprTuple { elts, .. }) => {
elts.iter().all(|expr| self.is_unused(expr))
}
Expr::Tuple(tuple) => tuple.iter().all(|expr| self.is_unused(expr)),
Expr::Name(ast::ExprName { id, .. }) => {
// Treat a variable as used if it has any usages, _or_ it's shadowed by another variable
// with usages.