Python
/
ruff
mirror of https://github.com/astral-sh/ruff
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove `Statements#parent` (#6392) 

Discussed in
https://github.com/astral-sh/ruff/pull/6351#discussion_r1284997065.
This commit is contained in:
Charlie Marsh 2023-08-07 11:41:02 -04:00 committed by GitHub
parent e4a4660925
commit 9328606843
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 12 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
crates/ruff/src/rules/flake8_type_checking/rules/runtime_import_in_type_checking_block.rs
View File

@ -199,7 +199,7 @@ fn fix_imports(
imports: &[ImportBinding],
) -> Result<Fix> {
let statement = checker.semantic().statement(statement_id);
let parent = checker.semantic().parent_statement(statement);
let parent = checker.semantic().parent_statement(statement_id);
let member_names: Vec<Cow<'_, str>> = imports
.iter()

2
crates/ruff/src/rules/flake8_type_checking/rules/typing_only_runtime_import.rs
View File

@ -408,7 +408,7 @@ fn fix_imports(
imports: &[ImportBinding],
) -> Result<Fix> {
let statement = checker.semantic().statement(statement_id);
let parent = checker.semantic().parent_statement(statement);
let parent = checker.semantic().parent_statement(statement_id);
let member_names: Vec<Cow<'_, str>> = imports
.iter()

2
crates/ruff/src/rules/pyflakes/rules/unused_import.rs
View File

@ -233,7 +233,7 @@ fn fix_imports(
imports: &[ImportBinding],
) -> Result<Fix> {
let statement = checker.semantic().statement(statement_id);
let parent = checker.semantic().parent_statement(statement);
let parent = checker.semantic().parent_statement(statement_id);
let member_names: Vec<Cow<'_, str>> = imports
.iter()

6
crates/ruff/src/rules/pyflakes/rules/unused_variable.rs
View File

@ -325,9 +325,9 @@ pub(crate) fn unused_variable(checker: &Checker, scope: &Scope, diagnostics: &mu
{
let mut diagnostic = Diagnostic::new(UnusedVariable { name }, range);
if checker.patch(diagnostic.kind.rule()) {
if let Some(source) = source {
let statement = checker.semantic().statement(source);
let parent = checker.semantic().parent_statement(statement);
if let Some(statement_id) = source {
let statement = checker.semantic().statement(statement_id);
let parent = checker.semantic().parent_statement(statement_id);
if let Some(fix) = remove_unused_variable(statement, parent, range, checker) {
diagnostic.set_fix(fix);
}

6
crates/ruff_python_semantic/src/model.rs
View File

@ -940,8 +940,10 @@ impl<'a> SemanticModel<'a> {
/// Given a [`Stmt`], return its parent, if any.
#[inline]
pub fn parent_statement(&self, statement: &'a Stmt) -> Option<&'a Stmt> {
self.statements.parent(statement)
pub fn parent_statement(&self, statement_id: StatementId) -> Option<&'a Stmt> {
self.statements
.parent_id(statement_id)
.map(|id| self.statements[id])
}
/// Set the [`Globals`] for the current [`Scope`].

11
crates/ruff_python_semantic/src/statements.rs
View File

@ -1,10 +1,10 @@
use std::ops::Index;
use ruff_index::{newtype_index, IndexVec};
use ruff_python_ast::Stmt;
use rustc_hash::FxHashMap;
use ruff_index::{newtype_index, IndexVec};
use ruff_python_ast::types::RefEquality;
use ruff_python_ast::Stmt;
/// Id uniquely identifying a statement AST node.
///
@ -65,13 +65,6 @@ impl<'a> Statements<'a> {
self.statements[statement_id].parent
}
/// Return the parent of the given statement.
pub fn parent(&self, statement: &'a Stmt) -> Option<&'a Stmt> {
let statement_id = self.statement_to_id.get(&RefEquality(statement))?;
let parent_id = self.statements[*statement_id].parent?;
Some(self[parent_id])
}
/// Return the depth of the statement.
#[inline]
pub(crate) fn depth(&self, id: StatementId) -> u32 {