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.

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

Add a new Binding::is_unused method #12729

Merged
merged 1 commit into from
Aug 7, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion crates/ruff_linter/src/checkers/ast/analyze/bindings.rs
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ pub(crate) fn bindings(checker: &mut Checker) {
for binding in &*checker.semantic.bindings {
if checker.enabled(Rule::UnusedVariable) {
if binding.kind.is_bound_exception()
&& !binding.is_used()
&& binding.is_unused()
&& !checker
.settings
.dummy_variable_rgx
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ use ruff_python_ast as ast;
use ruff_python_ast::helpers;
use ruff_python_ast::helpers::{NameFinder, StoredNameFinder};
use ruff_python_ast::visitor::Visitor;
use ruff_python_semantic::Binding;
use ruff_text_size::Ranged;

use crate::checkers::ast::Checker;
Expand Down Expand Up @@ -137,7 +138,7 @@ pub(crate) fn unused_loop_control_variable(checker: &mut Checker, stmt_for: &ast
.get_all(name)
.map(|binding_id| checker.semantic().binding(binding_id))
.filter(|binding| binding.start() >= expr.start())
.all(|binding| !binding.is_used())
.all(Binding::is_unused)
{
diagnostic.set_fix(Fix::unsafe_edit(Edit::range_replacement(
rename,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -298,7 +298,7 @@ fn call<'a>(
.get(arg.name.as_str())
.map(|binding_id| semantic.binding(binding_id))?;
if binding.kind.is_argument()
&& !binding.is_used()
&& binding.is_unused()
&& !dummy_variable_rgx.is_match(arg.name.as_str())
{
Some(Diagnostic::new(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ pub(crate) fn unused_annotation(
for (name, range) in scope.bindings().filter_map(|(name, binding_id)| {
let binding = checker.semantic().binding(binding_id);
if binding.kind.is_annotation()
&& !binding.is_used()
&& binding.is_unused()
&& !checker.settings.dummy_variable_rgx.is_match(name)
{
Some((name.to_string(), binding.range()))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -262,9 +262,9 @@ pub(crate) fn unused_variable(checker: &Checker, scope: &Scope, diagnostics: &mu
|| binding.kind.is_named_expr_assignment()
|| binding.kind.is_with_item_var())
&& (!binding.is_unpacked_assignment() || checker.settings.preview.is_enabled())
&& binding.is_unused()
&& !binding.is_nonlocal()
&& !binding.is_global()
&& !binding.is_used()
&& !checker.settings.dummy_variable_rgx.is_match(name)
&& !matches!(
name,
Expand Down
2 changes: 1 addition & 1 deletion crates/ruff_linter/src/rules/pylint/rules/no_self_use.rs
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ pub(crate) fn no_self_use(
if scope
.get("self")
.map(|binding_id| semantic.binding(binding_id))
.is_some_and(|binding| binding.kind.is_argument() && !binding.is_used())
.is_some_and(|binding| binding.kind.is_argument() && binding.is_unused())
{
diagnostics.push(Diagnostic::new(
NoSelfUse {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ pub(crate) fn sort_dunder_slots(checker: &Checker, binding: &Binding) -> Option<
if let Some(sorted_source_code) = display.generate_sorted_source_code(&items, checker) {
let edit = Edit::range_replacement(sorted_source_code, display.range());

let applicability = if display.kind.is_set_literal() || !binding.is_used() {
let applicability = if display.kind.is_set_literal() || binding.is_unused() {
Applicability::Safe
} else {
Applicability::Unsafe
Expand Down
11 changes: 10 additions & 1 deletion crates/ruff_python_semantic/src/binding.rs
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,18 @@ pub struct Binding<'a> {
}

impl<'a> Binding<'a> {
/// Return `true` if this [`Binding`] is unused.
///
/// This method is the opposite of [`Binding::is_used`].
pub fn is_unused(&self) -> bool {
self.references.is_empty()
}

/// Return `true` if this [`Binding`] is used.
///
/// This method is the opposite of [`Binding::is_unused`].
pub fn is_used(&self) -> bool {
!self.references.is_empty()
!self.is_unused()
}

/// Returns an iterator over all references for the current [`Binding`].
Expand Down
2 changes: 1 addition & 1 deletion crates/ruff_python_semantic/src/model.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1455,7 +1455,7 @@ impl<'a> SemanticModel<'a> {
.get_all(id)
.map(|binding_id| self.binding(binding_id))
.filter(|binding| binding.start() >= expr.start())
.all(|binding| !binding.is_used())
.all(Binding::is_unused)
}
_ => false,
}
Expand Down
Loading