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

Box identifier

This commit is contained in:
Charlie Marsh 2024-02-08 23:41:47 -05:00
parent 8ec56277e9
commit a9d13e6bc9
118 changed files with 272 additions and 286 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
crates/ruff_linter/src/checkers/ast/mod.rs
View File

@ -904,7 +904,7 @@ where
range: _,
}) => {
if let Expr::Name(ast::ExprName { id, ctx, range: _ }) = func.as_ref() {
if id == "locals" && ctx.is_load() {
if &**id == "locals" && ctx.is_load() {
let scope = self.semantic.current_scope_mut();
scope.set_uses_locals();
}
@ -1073,7 +1073,7 @@ where
range: _,
} = keyword;
if let Some(id) = arg {
if id.as_str() == "bound" {
if &**id == "bound" {
self.visit_type_definition(value);
} else {
self.visit_non_type_definition(value);
@ -1755,21 +1755,21 @@ impl<'a> Checker<'a> {
&& match parent {
Stmt::Assign(ast::StmtAssign { targets, .. }) => {
if let Some(Expr::Name(ast::ExprName { id, .. })) = targets.first() {
id == "__all__"
&**id == "__all__"
} else {
false
}
}
Stmt::AugAssign(ast::StmtAugAssign { target, .. }) => {
if let Expr::Name(ast::ExprName { id, .. }) = target.as_ref() {
id == "__all__"
&**id == "__all__"
} else {
false
}
}
Stmt::AnnAssign(ast::StmtAnnAssign { target, .. }) => {
if let Expr::Name(ast::ExprName { id, .. }) = target.as_ref() {
id == "__all__"
&**id == "__all__"
} else {
false
}

2
crates/ruff_linter/src/checkers/imports.rs
View File

@ -46,7 +46,7 @@ fn extract_import_map(path: &Path, package: Option<&Path>, blocks: &[&Block]) ->
}) => {
let level = level.unwrap_or_default() as usize;
let module = if let Some(module) = module {
let module: &String = module.as_ref();
let module: &str = module.as_str();
if level == 0 {
Cow::Borrowed(module)
} else {

2
crates/ruff_linter/src/rules/airflow/rules/task_variable_name.rs
View File

@ -81,7 +81,7 @@ pub(crate) fn variable_name_task_id(
let ast::ExprStringLiteral { value: task_id, .. } = keyword.value.as_string_literal_expr()?;
// If the target name is the same as the task_id, no violation.
if task_id == id {
if task_id == &**id {
return None;
}

2
crates/ruff_linter/src/rules/flake8_annotations/helpers.rs
View File

@ -137,7 +137,7 @@ impl AutoPythonType {
)
.ok()?;
let expr = Expr::Name(ast::ExprName {
id: binding,
id: binding.into_boxed_str(),
range: TextRange::default(),
ctx: ExprContext::Load,
});

2
crates/ruff_linter/src/rules/flake8_bandit/rules/hardcoded_password_string.rs
View File

@ -52,7 +52,7 @@ impl Violation for HardcodedPasswordString {
fn password_target(target: &Expr) -> Option<&str> {
let target_name = match target {
// variable = "s3cr3t"
Expr::Name(ast::ExprName { id, .. }) => id.as_str(),
Expr::Name(ast::ExprName { id, .. }) => &**id,
// d["password"] = "s3cr3t"
Expr::Subscript(ast::ExprSubscript { slice, .. }) => match slice.as_ref() {
Expr::StringLiteral(ast::ExprStringLiteral { value, .. }) => value.to_str(),

2
crates/ruff_linter/src/rules/flake8_bandit/rules/jinja2_autoescape_false.rs
View File

@ -69,7 +69,7 @@ pub(crate) fn jinja2_autoescape_false(checker: &mut Checker, call: &ast::ExprCal
Expr::BooleanLiteral(ast::ExprBooleanLiteral { value: true, .. }) => (),
Expr::Call(ast::ExprCall { func, .. }) => {
if let Expr::Name(ast::ExprName { id, .. }) = func.as_ref() {
if id != "select_autoescape" {
if &**id != "select_autoescape" {
checker.diagnostics.push(Diagnostic::new(
Jinja2AutoescapeFalse { value: true },
keyword.range(),

2
crates/ruff_linter/src/rules/flake8_bandit/rules/ssl_with_bad_defaults.rs
View File

@ -64,7 +64,7 @@ pub(crate) fn ssl_with_bad_defaults(checker: &mut Checker, function_def: &StmtFu
if let Some(default) = &param.default {
match default.as_ref() {
Expr::Name(ast::ExprName { id, range, .. }) => {
if is_insecure_protocol(id.as_str()) {
if is_insecure_protocol(id) {
checker.diagnostics.push(Diagnostic::new(
SslWithBadDefaults {
protocol: id.to_string(),

4
crates/ruff_linter/src/rules/flake8_blind_except/rules/blind_except.rs
View File

@ -83,7 +83,7 @@ pub(crate) fn blind_except(
return;
};
if !matches!(id.as_str(), "BaseException" | "Exception") {
if !matches!(&**id, "BaseException" | "Exception") {
return;
}
@ -96,7 +96,7 @@ pub(crate) fn blind_except(
if let Stmt::Raise(ast::StmtRaise { exc, .. }) = stmt {
if let Some(exc) = exc {
if let Expr::Name(ast::ExprName { id, .. }) = exc.as_ref() {
name.is_some_and(|name| id == name)
name.is_some_and(|name| &**id == name)
} else {
false
}

2
crates/ruff_linter/src/rules/flake8_boolean_trap/helpers.rs
View File

@ -54,7 +54,7 @@ pub(super) fn is_allowed_func_def(name: &str) -> bool {
pub(super) fn allow_boolean_trap(call: &ast::ExprCall) -> bool {
let func_name = match call.func.as_ref() {
Expr::Attribute(ast::ExprAttribute { attr, .. }) => attr.as_str(),
Expr::Name(ast::ExprName { id, .. }) => id.as_str(),
Expr::Name(ast::ExprName { id, .. }) => &**id,
_ => return false,
};

4
crates/ruff_linter/src/rules/flake8_boolean_trap/rules/boolean_type_hint_positional_argument.rs
View File

@ -164,7 +164,7 @@ pub(crate) fn boolean_type_hint_positional_argument(
fn match_annotation_to_literal_bool(annotation: &Expr) -> bool {
match annotation {
// Ex) `True`
Expr::Name(name) => &name.id == "bool",
Expr::Name(name) => &*name.id == "bool",
// Ex) `"True"`
Expr::StringLiteral(ast::ExprStringLiteral { value, .. }) => value == "bool",
_ => false,
@ -176,7 +176,7 @@ fn match_annotation_to_literal_bool(annotation: &Expr) -> bool {
fn match_annotation_to_complex_bool(annotation: &Expr, semantic: &SemanticModel) -> bool {
match annotation {
// Ex) `bool`
Expr::Name(name) => &name.id == "bool",
Expr::Name(name) => &*name.id == "bool",
// Ex) `"bool"`
Expr::StringLiteral(ast::ExprStringLiteral { value, .. }) => value == "bool",
// Ex) `bool | int`

2
crates/ruff_linter/src/rules/flake8_bugbear/rules/assignment_to_os_environ.rs
View File

@ -63,7 +63,7 @@ pub(crate) fn assignment_to_os_environ(checker: &mut Checker, targets: &[Expr])
let Expr::Name(ast::ExprName { id, .. }) = value.as_ref() else {
return;
};
if id != "os" {
if &**id != "os" {
return;
}
checker

2
crates/ruff_linter/src/rules/flake8_bugbear/rules/cached_instance_method.rs
View File

@ -85,7 +85,7 @@ pub(crate) fn cached_instance_method(checker: &mut Checker, decorator_list: &[De
// TODO(charlie): This should take into account `classmethod-decorators` and
// `staticmethod-decorators`.
if let Expr::Name(ast::ExprName { id, .. }) = &decorator.expression {
if id == "classmethod" || id == "staticmethod" {
if &**id == "classmethod" || &**id == "staticmethod" {
return;
}
}

8
crates/ruff_linter/src/rules/flake8_bugbear/rules/function_uses_loop_variable.rs
View File

@ -131,7 +131,7 @@ impl<'a> Visitor<'a> for SuspiciousVariablesVisitor<'a> {
}) => {
match func.as_ref() {
Expr::Name(ast::ExprName { id, .. }) => {
if matches!(id.as_str(), "filter" | "reduce" | "map") {
if matches!(&**id, "filter" | "reduce" | "map") {
for arg in arguments.args.iter() {
if arg.is_lambda_expr() {
self.safe_functions.push(arg);
@ -142,7 +142,7 @@ impl<'a> Visitor<'a> for SuspiciousVariablesVisitor<'a> {
Expr::Attribute(ast::ExprAttribute { value, attr, .. }) => {
if attr == "reduce" {
if let Expr::Name(ast::ExprName { id, .. }) = value.as_ref() {
if id == "functools" {
if &**id == "functools" {
for arg in arguments.args.iter() {
if arg.is_lambda_expr() {
self.safe_functions.push(arg);
@ -209,7 +209,7 @@ impl<'a> Visitor<'a> for NamesFromAssignmentsVisitor<'a> {
fn visit_expr(&mut self, expr: &'a Expr) {
match expr {
Expr::Name(ast::ExprName { id, .. }) => {
self.names.push(id.as_str());
self.names.push(id);
}
Expr::Starred(ast::ExprStarred { value, .. }) => {
self.visit_expr(value);
@ -303,7 +303,7 @@ pub(crate) fn function_uses_loop_variable(checker: &mut Checker, node: &Node) {
// If a variable was used in a function or lambda body, and assigned in the
// loop, flag it.
for name in suspicious_variables {
if reassigned_in_loop.contains(&name.id.as_str()) {
if reassigned_in_loop.contains(&&*name.id) {
if !checker.flake8_bugbear_seen.contains(&name.range()) {
checker.flake8_bugbear_seen.push(name.range());
checker.diagnostics.push(Diagnostic::new(

2
crates/ruff_linter/src/rules/flake8_bugbear/rules/getattr_with_constant.rs
View File

@ -57,7 +57,7 @@ pub(crate) fn getattr_with_constant(
let Expr::Name(ast::ExprName { id, .. }) = func else {
return;
};
if id != "getattr" {
if &**id != "getattr" {
return;
}
let [obj, arg] = args else {

2
crates/ruff_linter/src/rules/flake8_bugbear/rules/raise_without_from_inside_except.rs
View File

@ -87,7 +87,7 @@ pub(crate) fn raise_without_from_inside_except(
if let Some(name) = name {
if exc
.as_name_expr()
.is_some_and(|ast::ExprName { id, .. }| name == id)
.is_some_and(|ast::ExprName { id, .. }| &**id == name)
{
continue;
}

2
crates/ruff_linter/src/rules/flake8_bugbear/rules/reuse_of_groupby_generator.rs
View File

@ -83,7 +83,7 @@ impl<'a> GroupNameFinder<'a> {
fn name_matches(&self, expr: &Expr) -> bool {
if let Expr::Name(ast::ExprName { id, .. }) = expr {
id == self.group_name
&**id == self.group_name
} else {
false
}

2
crates/ruff_linter/src/rules/flake8_bugbear/rules/setattr_with_constant.rs
View File

@ -71,7 +71,7 @@ pub(crate) fn setattr_with_constant(
let Expr::Name(ast::ExprName { id, .. }) = func else {
return;
};
if id != "setattr" {
if &**id != "setattr" {
return;
}
let [obj, name, value] = args else {

2
crates/ruff_linter/src/rules/flake8_bugbear/rules/static_key_dict_comprehension.rs
View File

@ -73,7 +73,7 @@ pub(crate) fn static_key_dict_comprehension(checker: &mut Checker, dict_comp: &a
fn is_constant(key: &Expr, names: &FxHashMap<&str, &ast::ExprName>) -> bool {
match key {
Expr::Tuple(ast::ExprTuple { elts, .. }) => elts.iter().all(|elt| is_constant(elt, names)),
Expr::Name(ast::ExprName { id, .. }) => !names.contains_key(id.as_str()),
Expr::Name(ast::ExprName { id, .. }) => !names.contains_key(&**id),
Expr::Attribute(ast::ExprAttribute { value, .. }) => is_constant(value, names),
Expr::Subscript(ast::ExprSubscript { value, slice, .. }) => {
is_constant(value, names) && is_constant(slice, names)

2
crates/ruff_linter/src/rules/flake8_bugbear/rules/unintentional_type_annotation.rs
View File

@ -54,7 +54,7 @@ pub(crate) fn unintentional_type_annotation(
}
Expr::Attribute(ast::ExprAttribute { value, .. }) => {
if let Expr::Name(ast::ExprName { id, .. }) = value.as_ref() {
if id != "self" {
if &**id != "self" {
checker
.diagnostics
.push(Diagnostic::new(UnintentionalTypeAnnotation, stmt.range()));

4
crates/ruff_linter/src/rules/flake8_bugbear/rules/unreliable_callable_check.rs
View File

@ -61,7 +61,7 @@ pub(crate) fn unreliable_callable_check(
let Expr::Name(ast::ExprName { id, .. }) = func else {
return;
};
if !matches!(id.as_str(), "hasattr" | "getattr") {
if !matches!(&**id, "hasattr" | "getattr") {
return;
}
let [obj, attr, ..] = args else {
@ -75,7 +75,7 @@ pub(crate) fn unreliable_callable_check(
}
let mut diagnostic = Diagnostic::new(UnreliableCallableCheck, expr.range());
if id == "hasattr" {
if &**id == "hasattr" {
if checker.semantic().is_builtin("callable") {
diagnostic.set_fix(Fix::safe_edit(Edit::range_replacement(
format!("callable({})", checker.locator().slice(obj)),

2
crates/ruff_linter/src/rules/flake8_bugbear/rules/zip_without_explicit_strict.rs
View File

@ -53,7 +53,7 @@ impl AlwaysFixableViolation for ZipWithoutExplicitStrict {
/// B905
pub(crate) fn zip_without_explicit_strict(checker: &mut Checker, call: &ast::ExprCall) {
if let Expr::Name(ast::ExprName { id, .. }) = call.func.as_ref() {
if id == "zip"
if &**id == "zip"
&& checker.semantic().is_builtin("zip")
&& call.arguments.find_keyword("strict").is_none()
&& !call

4
crates/ruff_linter/src/rules/flake8_comprehensions/rules/helpers.rs
View File

@ -13,7 +13,7 @@ pub(super) fn exactly_one_argument_with_matching_function<'a>(
return None;
}
let func = func.as_name_expr()?;
if func.id != name {
if &*func.id != name {
return None;
}
Some(arg)
@ -24,7 +24,7 @@ pub(super) fn first_argument_with_matching_function<'a>(
func: &Expr,
args: &'a [Expr],
) -> Option<&'a Expr> {
if func.as_name_expr().is_some_and(|func| func.id == name) {
if func.as_name_expr().is_some_and(|func| &*func.id == name) {
args.first()
} else {
None

6
crates/ruff_linter/src/rules/flake8_comprehensions/rules/unnecessary_call_around_sorted.rs
View File

@ -66,7 +66,7 @@ pub(crate) fn unnecessary_call_around_sorted(
let Some(outer) = func.as_name_expr() else {
return;
};
if !matches!(outer.id.as_str(), "list" | "reversed") {
if !matches!(&*outer.id, "list" | "reversed") {
return;
}
let Some(arg) = args.first() else {
@ -78,7 +78,7 @@ pub(crate) fn unnecessary_call_around_sorted(
let Some(inner) = func.as_name_expr() else {
return;
};
if inner.id != "sorted" {
if &*inner.id != "sorted" {
return;
}
if !checker.semantic().is_builtin(&inner.id) || !checker.semantic().is_builtin(&outer.id) {
@ -93,7 +93,7 @@ pub(crate) fn unnecessary_call_around_sorted(
diagnostic.try_set_fix(|| {
Ok(Fix::applicable_edit(
fixes::fix_unnecessary_call_around_sorted(expr, checker.locator(), checker.stylist())?,
if outer.id == "reversed" {
if &*outer.id == "reversed" {
Applicability::Unsafe
} else {
Applicability::Safe

4
crates/ruff_linter/src/rules/flake8_comprehensions/rules/unnecessary_collection_call.rs
View File

@ -68,7 +68,7 @@ pub(crate) fn unnecessary_collection_call(
let Some(func) = call.func.as_name_expr() else {
return;
};
let collection = match func.id.as_str() {
let collection = match &*func.id {
"dict"
if call.arguments.keywords.is_empty()
|| (!settings.allow_dict_calls_with_keyword_arguments
@ -87,7 +87,7 @@ pub(crate) fn unnecessary_collection_call(
}
_ => return,
};
if !checker.semantic().is_builtin(func.id.as_str()) {
if !checker.semantic().is_builtin(&func.id) {
return;
}

2
crates/ruff_linter/src/rules/flake8_comprehensions/rules/unnecessary_comprehension_any_all.rs
View File

@ -75,7 +75,7 @@ pub(crate) fn unnecessary_comprehension_any_all(
let Expr::Name(ast::ExprName { id, .. }) = func else {
return;
};
if !matches!(id.as_str(), "all" | "any") {
if !matches!(&**id, "all" | "any") {
return;
}
let [arg] = args else {

9
crates/ruff_linter/src/rules/flake8_comprehensions/rules/unnecessary_double_cast_or_process.rs
View File

@ -77,10 +77,7 @@ pub(crate) fn unnecessary_double_cast_or_process(
let Some(outer) = func.as_name_expr() else {
return;
};
if !matches!(
outer.id.as_str(),
"list" | "tuple" | "set" | "reversed" | "sorted"
) {
if !matches!(&*outer.id, "list" | "tuple" | "set" | "reversed" | "sorted") {
return;
}
let Some(arg) = args.first() else {
@ -105,7 +102,7 @@ pub(crate) fn unnecessary_double_cast_or_process(
// Avoid collapsing nested `sorted` calls with non-identical keyword arguments
// (i.e., `key`, `reverse`).
if inner.id == "sorted" && outer.id == "sorted" {
if &*inner.id == "sorted" && &*outer.id == "sorted" {
if inner_kw.len() != outer_kw.len() {
return;
}
@ -122,7 +119,7 @@ pub(crate) fn unnecessary_double_cast_or_process(
// Ex) `list(tuple(...))`
// Ex) `set(set(...))`
if matches!(
(outer.id.as_str(), inner.id.as_str()),
(&*outer.id, &*inner.id),
("set" | "sorted", "list" | "tuple" | "reversed" | "sorted")
| ("set", "set")
| ("list" | "tuple", "list" | "tuple")

4
crates/ruff_linter/src/rules/flake8_comprehensions/rules/unnecessary_map.rs
View File

@ -77,7 +77,7 @@ pub(crate) fn unnecessary_map(
return;
};
let object_type = match func.id.as_str() {
let object_type = match &*func.id {
"map" => ObjectType::Generator,
"list" => ObjectType::List,
"set" => ObjectType::Set,
@ -95,7 +95,7 @@ pub(crate) fn unnecessary_map(
if parent
.and_then(Expr::as_call_expr)
.and_then(|call| call.func.as_name_expr())
.is_some_and(|name| matches!(name.id.as_str(), "list" | "set" | "dict"))
.is_some_and(|name| matches!(&*name.id, "list" | "set" | "dict"))
{
return;
}

2
crates/ruff_linter/src/rules/flake8_comprehensions/rules/unnecessary_subscript_reversal.rs
View File

@ -47,7 +47,7 @@ pub(crate) fn unnecessary_subscript_reversal(checker: &mut Checker, call: &ast::
let Some(func) = call.func.as_name_expr() else {
return;
};
if !matches!(func.id.as_str(), "reversed" | "set" | "sorted") {
if !matches!(&*func.id, "reversed" | "set" | "sorted") {
return;
}
if !checker.semantic().is_builtin(&func.id) {

2
crates/ruff_linter/src/rules/flake8_django/rules/all_with_model_form.rs
View File

@ -72,7 +72,7 @@ pub(crate) fn all_with_model_form(checker: &mut Checker, class_def: &ast::StmtCl
let Expr::Name(ast::ExprName { id, .. }) = target else {
continue;
};
if id != "fields" {
if &**id != "fields" {
continue;
}
match value.as_ref() {

2
crates/ruff_linter/src/rules/flake8_django/rules/exclude_with_model_form.rs
View File

@ -70,7 +70,7 @@ pub(crate) fn exclude_with_model_form(checker: &mut Checker, class_def: &ast::St
let Expr::Name(ast::ExprName { id, .. }) = target else {
continue;
};
if id == "exclude" {
if &**id == "exclude" {
checker
.diagnostics
.push(Diagnostic::new(DjangoExcludeWithModelForm, target.range()));

2
crates/ruff_linter/src/rules/flake8_django/rules/model_without_dunder_str.rs
View File

@ -106,7 +106,7 @@ fn is_model_abstract(class_def: &ast::StmtClassDef) -> bool {
let Expr::Name(ast::ExprName { id, .. }) = target else {
continue;
};
if id != "abstract" {
if &**id != "abstract" {
continue;
}
if !is_const_true(value) {

2
crates/ruff_linter/src/rules/flake8_django/rules/unordered_body_content_in_model.rs
View File

@ -165,7 +165,7 @@ fn get_element_type(element: &Stmt, semantic: &SemanticModel) -> Option<ContentT
let Expr::Name(ast::ExprName { id, .. }) = expr else {
return None;
};
if id == "objects" {
if &**id == "objects" {
Some(ContentType::ManagerDeclaration)
} else {
None

2
crates/ruff_linter/src/rules/flake8_gettext/mod.rs
View File

@ -7,7 +7,7 @@ pub mod settings;
/// Returns true if the [`Expr`] is an internationalization function call.
pub(crate) fn is_gettext_func_call(func: &Expr, functions_names: &[String]) -> bool {
if let Expr::Name(ast::ExprName { id, .. }) = func {
functions_names.contains(id)
functions_names.iter().any(|name| name == &**id)
} else {
false
}

2
crates/ruff_linter/src/rules/flake8_pie/rules/duplicate_class_field_definition.rs
View File

@ -93,7 +93,7 @@ pub(crate) fn duplicate_class_field_definition(checker: &mut Checker, body: &[St
_ => continue,
}
if !seen_targets.insert(target.id.as_str()) {
if !seen_targets.insert(&*target.id) {
let mut diagnostic = Diagnostic::new(
DuplicateClassFieldDefinition {
name: target.id.to_string(),

4
crates/ruff_linter/src/rules/flake8_pie/rules/multiple_starts_ends_with.rs
View File

@ -120,7 +120,7 @@ pub(crate) fn multiple_starts_ends_with(checker: &mut Checker, expr: &Expr) {
}
duplicates
.entry((attr.as_str(), arg_name.as_str()))
.entry((&**attr, &**arg_name))
.or_insert_with(Vec::new)
.push(index);
}
@ -229,7 +229,7 @@ fn is_bound_to_tuple(arg: &Expr, semantic: &SemanticModel) -> bool {
return false;
};
let Some(binding_id) = semantic.lookup_symbol(id.as_str()) else {
let Some(binding_id) = semantic.lookup_symbol(id) else {
return false;
};

2
crates/ruff_linter/src/rules/flake8_pie/rules/unnecessary_range_start.rs
View File

@ -47,7 +47,7 @@ pub(crate) fn unnecessary_range_start(checker: &mut Checker, call: &ast::ExprCal
let Expr::Name(ast::ExprName { id, .. }) = call.func.as_ref() else {
return;
};
if id != "range" {
if &**id != "range" {
return;
};
if !checker.semantic().is_builtin("range") {

2
crates/ruff_linter/src/rules/flake8_pyi/rules/custom_type_var_return_type.rs
View File

@ -142,7 +142,7 @@ fn class_method(
// Don't error if the first argument is annotated with typing.Type[T].
// These are edge cases, and it's hard to give good error messages for them.
if value.id != "type" {
if &*value.id != "type" {
return false;
};

2
crates/ruff_linter/src/rules/flake8_pyi/rules/non_self_return_type.rs
View File

@ -264,7 +264,7 @@ fn is_name(expr: &Expr, name: &str) -> bool {
let Expr::Name(ast::ExprName { id, .. }) = expr else {
return false;
};
id.as_str() == name
&**id == name
}
/// Return `true` if the given expression resolves to `typing.Self`.

4
crates/ruff_linter/src/rules/flake8_pyi/rules/redundant_literal_union.rs
View File

@ -132,7 +132,7 @@ impl fmt::Display for ExprType {
/// `str`, `bytes`, or `complex`).
fn match_builtin_type(expr: &Expr, semantic: &SemanticModel) -> Option<ExprType> {
let name = expr.as_name_expr()?;
let result = match name.id.as_str() {
let result = match &*name.id {
"int" => ExprType::Int,
"bool" => ExprType::Bool,
"str" => ExprType::Str,
@ -141,7 +141,7 @@ fn match_builtin_type(expr: &Expr, semantic: &SemanticModel) -> Option<ExprType>
"complex" => ExprType::Complex,
_ => return None,
};
if !semantic.is_builtin(name.id.as_str()) {
if !semantic.is_builtin(&name.id) {
return None;
}
Some(result)

2
crates/ruff_linter/src/rules/flake8_pyi/rules/simple_defaults.rs
View File

@ -450,7 +450,7 @@ fn is_type_var_like_call(expr: &Expr, semantic: &SemanticModel) -> bool {
/// `__all__`).
fn is_special_assignment(target: &Expr, semantic: &SemanticModel) -> bool {
if let Expr::Name(ast::ExprName { id, .. }) = target {
match id.as_str() {
match &**id {
"__all__" => semantic.current_scope().kind.is_module(),
"__match_args__" | "__slots__" => semantic.current_scope().kind.is_class(),
_ => false,

2
crates/ruff_linter/src/rules/flake8_pyi/rules/unnecessary_type_union.rs
View File

@ -122,7 +122,7 @@ pub(crate) fn unnecessary_type_union<'a>(checker: &mut Checker, union: &'a Expr)
.into_iter()
.map(|type_member| {
Expr::Name(ast::ExprName {
id: type_member,
id: type_member.into_boxed_str(),
ctx: ExprContext::Load,
range: TextRange::default(),
})

2
crates/ruff_linter/src/rules/flake8_pyi/rules/unsupported_method_call_on_all.rs
View File

@ -47,7 +47,7 @@ pub(crate) fn unsupported_method_call_on_all(checker: &mut Checker, func: &Expr)
let Expr::Name(ast::ExprName { id, .. }) = value.as_ref() else {
return;
};
if id.as_str() != "__all__" {
if &**id != "__all__" {
return;
}
if !is_unsupported_method(attr.as_str()) {

12
crates/ruff_linter/src/rules/flake8_pytest_style/rules/assertion.rs
View File

@ -242,7 +242,7 @@ where
match expr {
Expr::Name(ast::ExprName { id, .. }) => {
if let Some(current_assert) = self.current_assert {
if id.as_str() == self.exception_name {
if &**id == self.exception_name {
self.errors.push(Diagnostic::new(
PytestAssertInExcept {
name: id.to_string(),
@ -419,7 +419,7 @@ fn to_pytest_raises_args<'a>(
if kwarg
.arg
.as_ref()
.is_some_and(|id| id.as_str() == "expected_exception") =>
.is_some_and(|id| &**id == "expected_exception") =>
{
Cow::Borrowed(checker.locator().slice(kwarg.value.range()))
}
@ -452,11 +452,11 @@ fn to_pytest_raises_args<'a>(
if kwarg1
.arg
.as_ref()
.is_some_and(|id| id.as_str() == "expected_exception")
.is_some_and(|id| &**id == "expected_exception")
&& kwarg2
.arg
.as_ref()
.is_some_and(|id| id.as_str() == "expected_regex") =>
.is_some_and(|id| &**id == "expected_regex") =>
{
Cow::Owned(format!(
"{}, match={}",
@ -469,11 +469,11 @@ fn to_pytest_raises_args<'a>(
if kwarg1
.arg
.as_ref()
.is_some_and(|id| id.as_str() == "expected_regex")
.is_some_and(|id| &**id == "expected_regex")
&& kwarg2
.arg
.as_ref()
.is_some_and(|id| id.as_str() == "expected_exception") =>
.is_some_and(|id| &**id == "expected_exception") =>
{
Cow::Owned(format!(
"{}, match={}",

2
crates/ruff_linter/src/rules/flake8_return/rules/function.rs
View File

@ -564,7 +564,7 @@ fn unnecessary_assign(checker: &mut Checker, stack: &Stack) {
continue;
}
if stack.non_locals.contains(assigned_id.as_str()) {
if stack.non_locals.contains(&**assigned_id) {
continue;
}

3
crates/ruff_linter/src/rules/flake8_self/rules/private_member_access.rs
View File

@ -77,7 +77,8 @@ pub(crate) fn private_member_access(checker: &mut Checker, expr: &Expr) {
.settings
.flake8_self
.ignore_names
.contains(attr.as_ref())
.iter()
.any(|name| name == attr.as_str())
{
return;
}

2
crates/ruff_linter/src/rules/flake8_simplify/rules/ast_bool_op.rs
View File

@ -323,7 +323,7 @@ fn isinstance_target<'a>(call: &'a Expr, semantic: &'a SemanticModel) -> Option<
let Expr::Name(ast::ExprName { id: func_name, .. }) = func.as_ref() else {
return None;
};
if func_name != "isinstance" {
if &**func_name != "isinstance" {
return None;
}
if !semantic.is_builtin("isinstance") {

2
crates/ruff_linter/src/rules/flake8_simplify/rules/ast_expr.rs
View File

@ -193,7 +193,7 @@ fn check_os_environ_subscript(checker: &mut Checker, expr: &Expr) {
let Expr::Name(ast::ExprName { id, .. }) = attr_value.as_ref() else {
return;
};
if id != "os" || attr != "environ" {
if &**id != "os" || attr != "environ" {
return;
}
let Expr::StringLiteral(ast::ExprStringLiteral { value: env_var, .. }) = slice.as_ref() else {

2
crates/ruff_linter/src/rules/flake8_simplify/rules/collapsible_if.rs
View File

@ -252,7 +252,7 @@ fn is_main_check(expr: &Expr) -> bool {
}) = expr
{
if let Expr::Name(ast::ExprName { id, .. }) = left.as_ref() {
if id == "__name__" {
if &**id == "__name__" {
if let [Expr::StringLiteral(ast::ExprStringLiteral { value, .. })] = &**comparators
{
if value == "__main__" {

14
crates/ruff_linter/src/rules/flake8_simplify/rules/key_in_dict.rs
View File

@ -3,7 +3,7 @@ use ruff_diagnostics::{Applicability, Edit};
use ruff_macros::{derive_message_formats, violation};
use ruff_python_ast::parenthesize::parenthesized_range;
use ruff_python_ast::AnyNodeRef;
use ruff_python_ast::{self as ast, Arguments, CmpOp, Comprehension, Expr};
use ruff_python_ast::{self as ast, CmpOp, Comprehension, Expr};
use ruff_python_semantic::analyze::typing;
use ruff_python_trivia::{SimpleTokenKind, SimpleTokenizer};
use ruff_text_size::{Ranged, TextRange};
@ -67,20 +67,21 @@ fn key_in_dict(
) {
let Expr::Call(ast::ExprCall {
func,
arguments: Arguments { args, keywords, .. },
arguments,
range: _,
}) = &right
else {
return;
};
if !(args.is_empty() && keywords.is_empty()) {
if !arguments.is_empty() {
return;
}
let Expr::Attribute(ast::ExprAttribute { attr, value, .. }) = func.as_ref() else {
return;
};
if attr != "keys" {
if &**attr != "keys" {
return;
}
@ -89,10 +90,7 @@ fn key_in_dict(
// def __contains__(self, key: object) -> bool:
// return key in self.keys()
// ```
if value
.as_name_expr()
.is_some_and(|name| matches!(name.id.as_str(), "self"))
{
if value.as_name_expr().is_some_and(|name| &*name.id == "self") {
return;
}

2
crates/ruff_linter/src/rules/flake8_simplify/rules/open_file_with_context_handler.rs
View File

@ -121,7 +121,7 @@ fn is_open(checker: &mut Checker, func: &Expr) -> bool {
}
// open(...)
Expr::Name(ast::ExprName { id, .. }) => {
id.as_str() == "open" && checker.semantic().is_builtin("open")
&**id == "open" && checker.semantic().is_builtin("open")
}
_ => false,
}

2
crates/ruff_linter/src/rules/flake8_simplify/rules/zip_dict_keys_and_values.rs
View File

@ -72,7 +72,7 @@ pub(crate) fn zip_dict_keys_and_values(checker: &mut Checker, expr: &ExprCall) {
}] if name.as_str() == "strict" => {}
_ => return,
};
if matches!(func.as_ref(), Expr::Name(ExprName { id, .. }) if id != "zip") {
if matches!(func.as_ref(), Expr::Name(ExprName { id, .. }) if &**id != "zip") {
return;
}
let [arg1, arg2] = &args[..] else {

4
crates/ruff_linter/src/rules/flake8_slots/rules/helpers.rs
View File

@ -7,7 +7,7 @@ pub(super) fn has_slots(body: &[Stmt]) -> bool {
Stmt::Assign(ast::StmtAssign { targets, .. }) => {
for target in targets {
if let Expr::Name(ast::ExprName { id, .. }) = target {
if id.as_str() == "__slots__" {
if &**id == "__slots__" {
return true;
}
}
@ -15,7 +15,7 @@ pub(super) fn has_slots(body: &[Stmt]) -> bool {
}
Stmt::AnnAssign(ast::StmtAnnAssign { target, .. }) => {
if let Expr::Name(ast::ExprName { id, .. }) = target.as_ref() {
if id.as_str() == "__slots__" {
if &**id == "__slots__" {
return true;
}
}

4
crates/ruff_linter/src/rules/flake8_unused_arguments/helpers.rs
View File

@ -13,11 +13,11 @@ fn is_empty_stmt(stmt: &Stmt) -> bool {
if let Some(exc) = exc {
match exc.as_ref() {
Expr::Name(ast::ExprName { id, .. }) => {
return id == "NotImplementedError" || id == "NotImplemented";
return &**id == "NotImplementedError" || &**id == "NotImplemented";
}
Expr::Call(ast::ExprCall { func, .. }) => {
if let Expr::Name(ast::ExprName { id, .. }) = func.as_ref() {
return id == "NotImplementedError" || id == "NotImplemented";
return &**id == "NotImplementedError" || &**id == "NotImplemented";
}
}
_ => {}

2
crates/ruff_linter/src/rules/pandas_vet/helpers.rs
View File

@ -37,7 +37,7 @@ pub(super) fn test_expression(expr: &Expr, semantic: &SemanticModel) -> Resoluti
match &semantic.binding(id).kind {
BindingKind::Argument => {
// Avoid, e.g., `self.values`.
if matches!(name.id.as_str(), "self" | "cls") {
if matches!(&*name.id, "self" | "cls") {
Resolution::IrrelevantBinding
} else {
Resolution::RelevantLocal

2
crates/ruff_linter/src/rules/pandas_vet/rules/assignment_to_df.rs
View File

@ -45,7 +45,7 @@ pub(crate) fn assignment_to_df(targets: &[Expr]) -> Option<Diagnostic> {
let Expr::Name(ast::ExprName { id, .. }) = target else {
return None;
};
if id != "df" {
if &**id != "df" {
return None;
}
Some(Diagnostic::new(PandasDfVariableName, target.range()))

2
crates/ruff_linter/src/rules/pandas_vet/rules/pd_merge.rs
View File

@ -58,7 +58,7 @@ impl Violation for PandasUseOfPdMerge {
pub(crate) fn use_of_pd_merge(checker: &mut Checker, func: &Expr) {
if let Expr::Attribute(ast::ExprAttribute { attr, value, .. }) = func {
if let Expr::Name(ast::ExprName { id, .. }) = value.as_ref() {
if id == "pd" && attr == "merge" {
if &**id == "pd" && attr == "merge" {
checker
.diagnostics
.push(Diagnostic::new(PandasUseOfPdMerge, func.range()));

2
crates/ruff_linter/src/rules/pep8_naming/rules/error_suffix_on_exception_name.rs
View File

@ -56,7 +56,7 @@ pub(crate) fn error_suffix_on_exception_name(
if !arguments.is_some_and(|arguments| {
arguments.args.iter().any(|base| {
if let Expr::Name(ast::ExprName { id, .. }) = &base {
id == "Exception" || id.ends_with("Error")
&**id == "Exception" || id.ends_with("Error")
} else {
false
}

4
crates/ruff_linter/src/rules/perflint/rules/unnecessary_list_cast.rs
View File

@ -72,7 +72,7 @@ pub(crate) fn unnecessary_list_cast(checker: &mut Checker, iter: &Expr, body: &[
return;
};
if !(id == "list" && checker.semantic().is_builtin("list")) {
if &**id != "list" || !checker.semantic().is_builtin("list") {
return;
}
@ -142,7 +142,7 @@ fn match_append(stmt: &Stmt, id: &str) -> bool {
let Some(ast::ExprName { id: target_id, .. }) = value.as_name_expr() else {
return false;
};
target_id == id
&**target_id == id
}
/// Generate a [`Fix`] to remove a `list` cast from an expression.

10
crates/ruff_linter/src/rules/pycodestyle/rules/type_comparison.rs
View File

@ -80,7 +80,7 @@ fn deprecated_type_comparison(checker: &mut Checker, compare: &ast::ExprCompare)
continue;
};
if !(id == "type" && checker.semantic().is_builtin("type")) {
if &**id != "type" || !checker.semantic().is_builtin("type") {
continue;
}
@ -94,7 +94,7 @@ fn deprecated_type_comparison(checker: &mut Checker, compare: &ast::ExprCompare)
continue;
};
if id == "type" && checker.semantic().is_builtin("type") {
if &**id == "type" && checker.semantic().is_builtin("type") {
// Allow comparison for types which are not obvious.
if arguments
.args
@ -128,7 +128,7 @@ fn deprecated_type_comparison(checker: &mut Checker, compare: &ast::ExprCompare)
Expr::Name(ast::ExprName { id, .. }) => {
// Ex) `type(obj) is int`
if matches!(
id.as_str(),
&**id,
"int"
| "str"
| "float"
@ -191,7 +191,7 @@ fn is_type(expr: &Expr, semantic: &SemanticModel) -> bool {
return false;
};
if !(id == "type" && semantic.is_builtin("type")) {
if &**id != "type" || !semantic.is_builtin("type") {
return false;
};
@ -204,7 +204,7 @@ fn is_type(expr: &Expr, semantic: &SemanticModel) -> bool {
Expr::Name(ast::ExprName { id, .. }) => {
// Ex) `type(obj) == int`
matches!(
id.as_str(),
&**id,
"bool"
| "bytearray"
| "bytes"

2
crates/ruff_linter/src/rules/pyflakes/rules/invalid_print_syntax.rs
View File

@ -61,7 +61,7 @@ pub(crate) fn invalid_print_syntax(checker: &mut Checker, left: &Expr) {
let Expr::Name(ast::ExprName { id, .. }) = &left else {
return;
};
if id != "print" {
if &**id != "print" {
return;
}
if !checker.semantic().is_builtin("print") {

4
crates/ruff_linter/src/rules/pyflakes/rules/raise_not_implemented.rs
View File

@ -54,13 +54,13 @@ fn match_not_implemented(expr: &Expr) -> Option<&Expr> {
match expr {
Expr::Call(ast::ExprCall { func, .. }) => {
if let Expr::Name(ast::ExprName { id, .. }) = func.as_ref() {
if id == "NotImplemented" {
if &**id == "NotImplemented" {
return Some(func);
}
}
}
Expr::Name(ast::ExprName { id, .. }) => {
if id == "NotImplemented" {
if &**id == "NotImplemented" {
return Some(expr);
}
}

2
crates/ruff_linter/src/rules/pyflakes/rules/strings.rs
View File

@ -747,7 +747,7 @@ pub(crate) fn string_dot_format_extra_named_arguments(
let missing: Vec<(usize, &str)> = keywords
.enumerate()
.filter_map(|(index, keyword)| {
if summary.keywords.contains(keyword.as_ref()) {
if summary.keywords.iter().any(|k| k == keyword.as_str()) {
None
} else {
Some((index, keyword.as_str()))

10
crates/ruff_linter/src/rules/pylint/helpers.rs
View File

@ -122,17 +122,17 @@ impl SequenceIndexVisitor<'_> {
// diagnostics.
match expr {
Expr::Name(ast::ExprName { id, .. }) => {
id == self.sequence_name || id == self.index_name || id == self.value_name
&**id == self.sequence_name || &**id == self.index_name || &**id == self.value_name
}
Expr::Subscript(ast::ExprSubscript { value, slice, .. }) => {
let Expr::Name(ast::ExprName { id, .. }) = value.as_ref() else {
return false;
};
if id == self.sequence_name {
if &**id == self.sequence_name {
let Expr::Name(ast::ExprName { id, .. }) = slice.as_ref() else {
return false;
};
if id == self.index_name {
if &**id == self.index_name {
return true;
}
}
@ -184,11 +184,11 @@ impl<'a> Visitor<'_> for SequenceIndexVisitor<'a> {
let Expr::Name(ast::ExprName { id, .. }) = value.as_ref() else {
return;
};
if id == self.sequence_name {
if &**id == self.sequence_name {
let Expr::Name(ast::ExprName { id, .. }) = slice.as_ref() else {
return;
};
if id == self.index_name {
if &**id == self.index_name {
self.accesses.push(*range);
}
}

2
crates/ruff_linter/src/rules/pylint/rules/bad_open_mode.rs
View File

@ -98,7 +98,7 @@ fn is_open(func: &Expr, semantic: &SemanticModel) -> Option<Kind> {
}
// Ex) `open(...)`
Expr::Name(ast::ExprName { id, .. }) => {
(id.as_str() == "open" && semantic.is_builtin("open")).then_some(Kind::Builtin)
(&**id == "open" && semantic.is_builtin("open")).then_some(Kind::Builtin)
}
_ => None,
}

2
crates/ruff_linter/src/rules/pylint/rules/comparison_with_itself.rs
View File

@ -107,7 +107,7 @@ pub(crate) fn comparison_with_itself(
// The call must be to pure function, like `id`.
if matches!(
left_func.id.as_str(),
&*left_func.id,
"id" | "len" | "type" | "int" | "bool" | "str" | "repr" | "bytes"
) && checker.semantic().is_builtin(&left_func.id)
{

2
crates/ruff_linter/src/rules/pylint/rules/eq_without_hash.rs
View File

@ -80,7 +80,7 @@ fn has_eq_without_hash(body: &[Stmt]) -> bool {
//
// __hash__ = None
// ```
if id == "__hash__" && value.is_none_literal_expr() {
if &**id == "__hash__" && value.is_none_literal_expr() {
has_hash = true;
}
}

4
crates/ruff_linter/src/rules/pylint/rules/nested_min_max.rs
View File

@ -71,9 +71,9 @@ impl MinMax {
let Expr::Name(ast::ExprName { id, .. }) = func else {
return None;
};
if id.as_str() == "min" && semantic.is_builtin("min") {
if &**id == "min" && semantic.is_builtin("min") {
Some(MinMax::Min)
} else if id.as_str() == "max" && semantic.is_builtin("max") {
} else if &**id == "max" && semantic.is_builtin("max") {
Some(MinMax::Max)
} else {
None

8
crates/ruff_linter/src/rules/pylint/rules/no_method_decorator.rs
View File

@ -100,7 +100,7 @@ fn get_undecorated_methods(
class_def: &ast::StmtClassDef,
method_type: &MethodType,
) {
let mut explicit_decorator_calls: HashMap<String, TextRange> = HashMap::default();
let mut explicit_decorator_calls: HashMap<Box<str>, TextRange> = HashMap::default();
let (method_name, diagnostic_type): (&str, DiagnosticKind) = match method_type {
MethodType::Classmethod => ("classmethod", NoClassmethodDecorator.into()),
@ -115,7 +115,7 @@ fn get_undecorated_methods(
}) = value.as_ref()
{
if let Expr::Name(ast::ExprName { id, .. }) = func.as_ref() {
if id == method_name && checker.semantic().is_builtin(method_name) {
if &**id == method_name && checker.semantic().is_builtin(method_name) {
if arguments.args.len() != 1 {
continue;
}
@ -130,7 +130,7 @@ fn get_undecorated_methods(
};
if let Expr::Name(ast::ExprName { id, .. }) = &arguments.args[0] {
if target_name == *id {
if target_name == **id {
explicit_decorator_calls.insert(id.clone(), stmt.range());
}
};
@ -158,7 +158,7 @@ fn get_undecorated_methods(
// if we find the decorator we're looking for, skip
if decorator_list.iter().any(|decorator| {
if let Expr::Name(ast::ExprName { id, .. }) = &decorator.expression {
if id == method_name && checker.semantic().is_builtin(method_name) {
if &**id == method_name && checker.semantic().is_builtin(method_name) {
return true;
}
}

12
crates/ruff_linter/src/rules/pylint/rules/non_slot_assignment.rs
View File

@ -108,7 +108,7 @@ fn is_attributes_not_in_slots(body: &[Stmt]) -> Vec<AttributeAssignment> {
continue;
};
if id == "__slots__" {
if &**id == "__slots__" {
slots.extend(slots_attributes(value));
}
}
@ -123,7 +123,7 @@ fn is_attributes_not_in_slots(body: &[Stmt]) -> Vec<AttributeAssignment> {
continue;
};
if id == "__slots__" {
if &**id == "__slots__" {
slots.extend(slots_attributes(value));
}
}
@ -134,7 +134,7 @@ fn is_attributes_not_in_slots(body: &[Stmt]) -> Vec<AttributeAssignment> {
continue;
};
if id == "__slots__" {
if &**id == "__slots__" {
slots.extend(slots_attributes(value));
}
}
@ -164,7 +164,7 @@ fn is_attributes_not_in_slots(body: &[Stmt]) -> Vec<AttributeAssignment> {
let Expr::Name(ast::ExprName { id, .. }) = attribute.value.as_ref() else {
continue;
};
if id == "self" && !slots.contains(attribute.attr.as_str()) {
if &**id == "self" && !slots.contains(attribute.attr.as_str()) {
assignments.push(AttributeAssignment {
name: &attribute.attr,
range: attribute.range(),
@ -180,7 +180,7 @@ fn is_attributes_not_in_slots(body: &[Stmt]) -> Vec<AttributeAssignment> {
let Expr::Name(ast::ExprName { id, .. }) = attribute.value.as_ref() else {
continue;
};
if id == "self" && !slots.contains(attribute.attr.as_str()) {
if &**id == "self" && !slots.contains(attribute.attr.as_str()) {
assignments.push(AttributeAssignment {
name: &attribute.attr,
range: attribute.range(),
@ -196,7 +196,7 @@ fn is_attributes_not_in_slots(body: &[Stmt]) -> Vec<AttributeAssignment> {
let Expr::Name(ast::ExprName { id, .. }) = attribute.value.as_ref() else {
continue;
};
if id == "self" && !slots.contains(attribute.attr.as_str()) {
if &**id == "self" && !slots.contains(attribute.attr.as_str()) {
assignments.push(AttributeAssignment {
name: &attribute.attr,
range: attribute.range(),

2
crates/ruff_linter/src/rules/pylint/rules/property_with_parameters.rs
View File

@ -55,7 +55,7 @@ pub(crate) fn property_with_parameters(
) {
if !decorator_list
.iter()
.any(|decorator| matches!(&decorator.expression, Expr::Name(ast::ExprName { id, .. }) if id == "property"))
.any(|decorator| matches!(&decorator.expression, Expr::Name(ast::ExprName { id, .. }) if &**id =="property"))
{
return;
}

2
crates/ruff_linter/src/rules/pylint/rules/repeated_isinstance_calls.rs
View File

@ -92,7 +92,7 @@ pub(crate) fn repeated_isinstance_calls(
else {
continue;
};
if !matches!(func.as_ref(), Expr::Name(ast::ExprName { id, .. }) if id == "isinstance") {
if !matches!(func.as_ref(), Expr::Name(ast::ExprName { id, .. }) if &**id =="isinstance") {
continue;
}
let [obj, types] = &args[..] else {

4
crates/ruff_linter/src/rules/pylint/rules/single_string_slots.rs
View File

@ -64,7 +64,7 @@ pub(crate) fn single_string_slots(checker: &mut Checker, class: &StmtClassDef) {
Stmt::Assign(ast::StmtAssign { targets, value, .. }) => {
for target in targets {
if let Expr::Name(ast::ExprName { id, .. }) = target {
if id.as_str() == "__slots__" {
if &**id == "__slots__" {
if matches!(value.as_ref(), Expr::StringLiteral(_) | Expr::FString(_)) {
checker
.diagnostics
@ -80,7 +80,7 @@ pub(crate) fn single_string_slots(checker: &mut Checker, class: &StmtClassDef) {
..
}) => {
if let Expr::Name(ast::ExprName { id, .. }) = target.as_ref() {
if id.as_str() == "__slots__" {
if &**id == "__slots__" {
if matches!(value.as_ref(), Expr::StringLiteral(_) | Expr::FString(_)) {
checker
.diagnostics

4
crates/ruff_linter/src/rules/pylint/rules/super_without_brackets.rs
View File

@ -68,11 +68,11 @@ pub(crate) fn super_without_brackets(checker: &mut Checker, func: &Expr) {
return;
};
if id.as_str() != "super" {
if &**id != "super" {
return;
}
if !checker.semantic().is_builtin(id.as_str()) {
if !checker.semantic().is_builtin(id) {
return;
}

4
crates/ruff_linter/src/rules/pylint/rules/sys_exit_alias.rs
View File

@ -62,11 +62,11 @@ pub(crate) fn sys_exit_alias(checker: &mut Checker, func: &Expr) {
return;
};
if !matches!(id.as_str(), "exit" | "quit") {
if !matches!(&**id, "exit" | "quit") {
return;
}
if !checker.semantic().is_builtin(id.as_str()) {
if !checker.semantic().is_builtin(id) {
return;
}

2
crates/ruff_linter/src/rules/pylint/rules/type_param_name_mismatch.rs
View File

@ -83,7 +83,7 @@ pub(crate) fn type_param_name_mismatch(checker: &mut Checker, value: &Expr, targ
return;
};
if var_name == param_name {
if &**var_name == param_name {
return;
}

4
crates/ruff_linter/src/rules/pylint/rules/unnecessary_dict_index_lookup.rs
View File

@ -128,7 +128,7 @@ fn dict_items<'a>(
let Expr::Attribute(ast::ExprAttribute { value, attr, .. }) = func.as_ref() else {
return None;
};
if attr != "items" {
if &**attr != "items" {
return None;
}
@ -154,7 +154,7 @@ fn dict_items<'a>(
// If either of the variable names are intentionally ignored by naming them `_`, then don't
// emit.
if index_name.id == "_" || value_name.id == "_" {
if &*index_name.id == "_" || &*value_name.id == "_" {
return None;
}

2
crates/ruff_linter/src/rules/pylint/rules/unnecessary_dunder_call.rs
View File

@ -95,7 +95,7 @@ pub(crate) fn unnecessary_dunder_call(checker: &mut Checker, call: &ast::ExprCal
if let Expr::Call(ast::ExprCall { func, .. }) = value.as_ref() {
if checker.semantic().is_builtin("super") {
if let Expr::Name(ast::ExprName { id, .. }) = func.as_ref() {
if id == "super" {
if &**id == "super" {
return;
}
}

6
crates/ruff_linter/src/rules/pylint/rules/unnecessary_lambda.rs
View File

@ -135,7 +135,7 @@ pub(crate) fn unnecessary_lambda(checker: &mut Checker, lambda: &ExprLambda) {
return;
};
if id.as_str() != kwarg.name.as_str() {
if **id != *kwarg.name {
return;
}
}
@ -157,7 +157,7 @@ pub(crate) fn unnecessary_lambda(checker: &mut Checker, lambda: &ExprLambda) {
return;
};
if id.as_str() != vararg.name.as_str() {
if **id != *vararg.name {
return;
}
}
@ -176,7 +176,7 @@ pub(crate) fn unnecessary_lambda(checker: &mut Checker, lambda: &ExprLambda) {
let Expr::Name(ast::ExprName { id, .. }) = arg else {
return;
};
if id.as_str() != param.name.as_str() {
if **id != *param.name {
return;
}
}

2
crates/ruff_linter/src/rules/pylint/rules/unnecessary_list_index_lookup.rs
View File

@ -150,7 +150,7 @@ fn enumerate_items<'a>(
// If either of the variable names are intentionally ignored by naming them `_`, then don't
// emit.
if index_name.id == "_" || value_name.id == "_" {
if &*index_name.id == "_" || &*value_name.id == "_" {
return None;
}

2
crates/ruff_linter/src/rules/pyupgrade/rules/convert_typed_dict_functional_to_class.rs
View File

@ -190,7 +190,7 @@ fn fields_from_dict_literal(keys: &[Option<Expr>], values: &[Expr]) -> Option<Ve
fn fields_from_dict_call(func: &Expr, keywords: &[Keyword]) -> Option<Vec<Stmt>> {
let ast::ExprName { id, .. } = func.as_name_expr()?;
if id != "dict" {
if &**id != "dict" {
return None;
}

2
crates/ruff_linter/src/rules/pyupgrade/rules/deprecated_unittest_alias.rs
View File

@ -88,7 +88,7 @@ pub(crate) fn deprecated_unittest_alias(checker: &mut Checker, expr: &Expr) {
let Expr::Name(ast::ExprName { id, .. }) = value.as_ref() else {
return;
};
if id != "self" {
if &**id != "self" {
return;
}
let mut diagnostic = Diagnostic::new(

2
crates/ruff_linter/src/rules/pyupgrade/rules/native_literals.rs
View File

@ -158,7 +158,7 @@ pub(crate) fn native_literals(
return;
}
let Ok(literal_type) = LiteralType::from_str(id.as_str()) else {
let Ok(literal_type) = LiteralType::from_str(id) else {
return;
};

2
crates/ruff_linter/src/rules/pyupgrade/rules/redundant_open_modes.rs
View File

@ -113,7 +113,7 @@ fn is_open_builtin(func: &Expr, semantic: &SemanticModel) -> bool {
let Some(ast::ExprName { id, .. }) = func.as_name_expr() else {
return false;
};
id.as_str() == OPEN_FUNC_NAME && semantic.is_builtin(id)
&**id == OPEN_FUNC_NAME && semantic.is_builtin(id)
}
#[derive(Debug, Copy, Clone)]

4
crates/ruff_linter/src/rules/pyupgrade/rules/super_call_with_parameters.rs
View File

@ -120,7 +120,7 @@ pub(crate) fn super_call_with_parameters(checker: &mut Checker, call: &ast::Expr
return;
};
if !(first_arg_id == parent_name.as_str() && second_arg_id == parent_arg.as_str()) {
if **first_arg_id != **parent_name || **second_arg_id != **parent_arg {
return;
}
@ -137,7 +137,7 @@ pub(crate) fn super_call_with_parameters(checker: &mut Checker, call: &ast::Expr
/// Returns `true` if a call is an argumented `super` invocation.
fn is_super_call_with_arguments(call: &ast::ExprCall) -> bool {
if let Expr::Name(ast::ExprName { id, .. }) = call.func.as_ref() {
id == "super" && !call.arguments.is_empty()
&**id == "super" && !call.arguments.is_empty()
} else {
false
}

11
crates/ruff_linter/src/rules/pyupgrade/rules/use_pep695_type_alias.rs
View File

@ -106,7 +106,7 @@ pub(crate) fn non_pep695_type_alias(checker: &mut Checker, stmt: &StmtAnnAssign)
// Type variables must be unique; filter while preserving order.
let vars = vars
.into_iter()
.unique_by(|TypeVar { name, .. }| name.id.as_str())
.unique_by(|TypeVar { name, .. }| &name.id)
.collect::<Vec<_>>();
let type_params = if vars.is_empty() {
@ -137,7 +137,12 @@ pub(crate) fn non_pep695_type_alias(checker: &mut Checker, stmt: &StmtAnnAssign)
})
};
let mut diagnostic = Diagnostic::new(NonPEP695TypeAlias { name: name.clone() }, stmt.range());
let mut diagnostic = Diagnostic::new(
NonPEP695TypeAlias {
name: name.to_string(),
},
stmt.range(),
);
let edit = Edit::range_replacement(
checker.generator().stmt(&Stmt::from(StmtTypeAlias {
@ -186,7 +191,7 @@ impl<'a> Visitor<'a> for TypeVarReferenceVisitor<'a> {
Expr::Name(name) if name.ctx.is_load() => {
let Some(Stmt::Assign(StmtAssign { value, .. })) = self
.semantic
.lookup_symbol(name.id.as_str())
.lookup_symbol(&name.id)
.and_then(|binding_id| {
self.semantic
.binding(binding_id)

4
crates/ruff_linter/src/rules/pyupgrade/rules/useless_metaclass_type.rs
View File

@ -51,13 +51,13 @@ pub(crate) fn useless_metaclass_type(
let [Expr::Name(ast::ExprName { id, .. })] = targets else {
return;
};
if id != "__metaclass__" {
if &**id != "__metaclass__" {
return;
}
let Expr::Name(ast::ExprName { id, .. }) = value else {
return;
};
if id != "type" {
if &**id != "type" {
return;
}

2
crates/ruff_linter/src/rules/pyupgrade/rules/useless_object_inheritance.rs
View File

@ -54,7 +54,7 @@ pub(crate) fn useless_object_inheritance(checker: &mut Checker, class_def: &ast:
let Expr::Name(ast::ExprName { id, .. }) = base else {
continue;
};
if id != "object" {
if &**id != "object" {
continue;
}
if !checker.semantic().is_builtin("object") {

2
crates/ruff_linter/src/rules/pyupgrade/rules/yield_in_for_loop.rs
View File

@ -100,7 +100,7 @@ pub(crate) fn yield_in_for_loop(checker: &mut Checker, stmt_for: &ast::StmtFor)
checker
.semantic()
.current_scope()
.get_all(name.id.as_str())
.get_all(&name.id)
.any(|binding_id| {
let binding = checker.semantic().binding(binding_id);
binding.references.iter().any(|reference_id| {

4
crates/ruff_linter/src/rules/refurb/helpers.rs
View File

@ -6,7 +6,7 @@ use ruff_text_size::TextRange;
pub(super) fn generate_method_call(name: &str, method: &str, generator: Generator) -> String {
// Construct `name`.
let var = ast::ExprName {
id: name.to_string(),
id: name.to_string().into_boxed_str(),
ctx: ast::ExprContext::Load,
range: TextRange::default(),
};
@ -43,7 +43,7 @@ pub(super) fn generate_none_identity_comparison(
) -> String {
// Construct `name`.
let var = ast::ExprName {
id: name.to_string(),
id: name.to_string().into_boxed_str(),
ctx: ast::ExprContext::Load,
range: TextRange::default(),
};

4
crates/ruff_linter/src/rules/refurb/rules/isinstance_type_none.rs
View File

@ -51,7 +51,7 @@ pub(crate) fn isinstance_type_none(checker: &mut Checker, call: &ast::ExprCall)
let Expr::Name(ast::ExprName { id, .. }) = call.func.as_ref() else {
return;
};
if id.as_str() != "isinstance" {
if &**id != "isinstance" {
return;
}
if !checker.semantic().is_builtin(id) {
@ -94,7 +94,7 @@ fn is_none(expr: &Expr) -> bool {
func, arguments, ..
}) if arguments.len() == 1 => {
if let Expr::Name(ast::ExprName { id, .. }) = func.as_ref() {
if id.as_str() == "type" {
if &**id == "type" {
return matches!(arguments.args.first(), Some(Expr::NoneLiteral(_)));
}
}

7
crates/ruff_linter/src/rules/refurb/rules/read_whole_file.rs
View File

@ -141,7 +141,8 @@ fn find_file_open<'a>(
..
} = item.context_expr.as_call_expr()?;
if func.as_name_expr()?.id != "open" {
let func = func.as_name_expr()?;
if &*func.id != "open" {
return None;
}
@ -168,7 +169,7 @@ fn find_file_open<'a>(
// Now we need to find what is this variable bound to...
let scope = semantic.current_scope();
let bindings: Vec<BindingId> = scope.get_all(var.id.as_str()).collect();
let bindings: Vec<BindingId> = scope.get_all(&var.id).collect();
let binding = bindings
.iter()
@ -315,7 +316,7 @@ fn make_suggestion(open: &FileOpen<'_>, generator: Generator) -> SourceCodeSnipp
ReadMode::Bytes => "read_bytes",
};
let name = ast::ExprName {
id: method_name.to_string(),
id: method_name.to_string().into_boxed_str(),
ctx: ast::ExprContext::Load,
range: TextRange::default(),
};

2
crates/ruff_linter/src/rules/refurb/rules/reimplemented_operator.rs
View File

@ -327,7 +327,7 @@ fn is_same_expression(arg: &ast::ParameterWithDefault, expr: &Expr) -> bool {
if arg.default.is_some() {
false
} else if let Expr::Name(name) = expr {
name.id == arg.parameter.name.as_str()
&*name.id == arg.parameter.name.as_str()
} else {
false
}

4
crates/ruff_linter/src/rules/refurb/rules/reimplemented_starmap.rs
View File

@ -297,7 +297,7 @@ fn try_construct_call(
/// Construct the call to `itertools.starmap` for suggestion.
fn construct_starmap_call(starmap_binding: String, iter: &Expr, func: &Expr) -> ast::ExprCall {
let starmap = ast::ExprName {
id: starmap_binding,
id: starmap_binding.into_boxed_str(),
ctx: ast::ExprContext::Load,
range: TextRange::default(),
};
@ -315,7 +315,7 @@ fn construct_starmap_call(starmap_binding: String, iter: &Expr, func: &Expr) ->
/// Wrap given function call with yet another call.
fn wrap_with_call_to(call: ast::ExprCall, func_name: &str) -> ast::ExprCall {
let name = ast::ExprName {
id: func_name.to_string(),
id: func_name.to_string().into_boxed_str(),
ctx: ast::ExprContext::Load,
range: TextRange::default(),
};

4
crates/ruff_linter/src/rules/refurb/rules/type_none_comparison.rs
View File

@ -94,7 +94,7 @@ pub(crate) fn type_none_comparison(checker: &mut Checker, compare: &ast::ExprCom
// Get the name of the other object (or `None` if both were `None`).
let other_arg_name = match other_arg {
Expr::Name(ast::ExprName { id, .. }) => id.as_str(),
Expr::Name(ast::ExprName { id, .. }) => &**id,
Expr::NoneLiteral { .. } => "None",
_ => return,
};
@ -137,7 +137,7 @@ fn type_call_arg<'a>(expr: &'a Expr, semantic: &'a SemanticModel) -> Option<&'a
// The function itself must be the builtin `type`.
let ast::ExprName { id, .. } = func.as_name_expr()?;
if id.as_str() != "type" || !semantic.is_builtin(id) {
if &**id != "type" || !semantic.is_builtin(id) {
return None;
}

8
crates/ruff_linter/src/rules/refurb/rules/unnecessary_enumerate.rs
View File

@ -106,7 +106,7 @@ pub(crate) fn unnecessary_enumerate(checker: &mut Checker, stmt_for: &ast::StmtF
let Expr::Name(ast::ExprName { id, .. }) = func.as_ref() else {
return;
};
if id != "enumerate" {
if &**id != "enumerate" {
return;
};
if !checker.semantic().is_builtin("enumerate") {
@ -236,7 +236,7 @@ impl fmt::Display for EnumerateSubset {
fn generate_range_len_call(name: &str, generator: Generator) -> String {
// Construct `name`.
let var = ast::ExprName {
id: name.to_string(),
id: name.to_string().into_boxed_str(),
ctx: ast::ExprContext::Load,
range: TextRange::default(),
};
@ -244,7 +244,7 @@ fn generate_range_len_call(name: &str, generator: Generator) -> String {
let len = ast::ExprCall {
func: Box::new(
ast::ExprName {
id: "len".to_string(),
id: "len".to_string().into_boxed_str(),
ctx: ast::ExprContext::Load,
range: TextRange::default(),
}
@ -261,7 +261,7 @@ fn generate_range_len_call(name: &str, generator: Generator) -> String {
let range = ast::ExprCall {
func: Box::new(
ast::ExprName {
id: "range".to_string(),
id: "range".to_string().into_boxed_str(),
ctx: ast::ExprContext::Load,
range: TextRange::default(),
}

2
crates/ruff_linter/src/rules/ruff/rules/explicit_f_string_type_conversion.rs
View File

@ -104,7 +104,7 @@ pub(crate) fn explicit_f_string_type_conversion(checker: &mut Checker, f_string:
continue;
};
if !matches!(id.as_str(), "str" | "repr" | "ascii") {
if !matches!(&**id, "str" | "repr" | "ascii") {
continue;
};

2
crates/ruff_linter/src/rules/ruff/rules/helpers.rs
View File

@ -10,7 +10,7 @@ use ruff_python_semantic::{analyze, BindingKind, Modules, SemanticModel};
pub(super) fn is_special_attribute(value: &Expr) -> bool {
if let Expr::Name(ast::ExprName { id, .. }) = value {
matches!(
id.as_str(),
&**id,
"__slots__" | "__dict__" | "__weakref__" | "__annotations__"
)
} else {

2
crates/ruff_linter/src/rules/ruff/rules/implicit_optional.rs
View File

@ -145,7 +145,7 @@ fn generate_fix(checker: &Checker, conversion_type: ConversionType, expr: &Expr)
let new_expr = Expr::Subscript(ast::ExprSubscript {
range: TextRange::default(),
value: Box::new(Expr::Name(ast::ExprName {
id: binding,
id: binding.into_boxed_str(),
ctx: ast::ExprContext::Store,
range: TextRange::default(),
})),

4
crates/ruff_linter/src/rules/ruff/rules/missing_fstring_syntax.rs
View File

@ -130,7 +130,7 @@ fn should_be_fstring(
}
for arg in args.iter() {
if let ast::Expr::Name(ast::ExprName { id, .. }) = arg {
arg_names.insert(id.as_str());
arg_names.insert(&**id);
}
}
}
@ -147,7 +147,7 @@ fn should_be_fstring(
.filter_map(|element| element.as_expression())
{
if let ast::Expr::Name(ast::ExprName { id, .. }) = element.expression.as_ref() {
if arg_names.contains(id.as_str()) {
if arg_names.contains(&**id) {
return false;
}
if semantic

4
crates/ruff_linter/src/rules/ruff/rules/mutable_fromkeys_value.rs
View File

@ -76,7 +76,7 @@ pub(crate) fn mutable_fromkeys_value(checker: &mut Checker, call: &ast::ExprCall
let Some(name_expr) = value.as_name_expr() else {
return;
};
if name_expr.id != "dict" {
if &*name_expr.id != "dict" {
return;
}
if !checker.semantic().is_builtin("dict") {
@ -104,7 +104,7 @@ pub(crate) fn mutable_fromkeys_value(checker: &mut Checker, call: &ast::ExprCall
fn generate_dict_comprehension(keys: &Expr, value: &Expr, generator: Generator) -> String {
// Construct `key`.
let key = ast::ExprName {
id: "key".to_string(),
id: "key".to_string().into_boxed_str(),
ctx: ast::ExprContext::Load,
range: TextRange::default(),
};

Some files were not shown because too many files have changed in this diff Show More