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

View File

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

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 level = level.unwrap_or_default() as usize;
let module = if let Some(module) = module { let module = if let Some(module) = module {
let module: &String = module.as_ref(); let module: &str = module.as_str();
if level == 0 { if level == 0 {
Cow::Borrowed(module) Cow::Borrowed(module)
} else { } else {

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()?; 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 the target name is the same as the task_id, no violation.
if task_id == id { if task_id == &**id {
return None; return None;
} }

View File

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

View File

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

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::BooleanLiteral(ast::ExprBooleanLiteral { value: true, .. }) => (),
Expr::Call(ast::ExprCall { func, .. }) => { Expr::Call(ast::ExprCall { func, .. }) => {
if let Expr::Name(ast::ExprName { id, .. }) = func.as_ref() { if let Expr::Name(ast::ExprName { id, .. }) = func.as_ref() {
if id != "select_autoescape" { if &**id != "select_autoescape" {
checker.diagnostics.push(Diagnostic::new( checker.diagnostics.push(Diagnostic::new(
Jinja2AutoescapeFalse { value: true }, Jinja2AutoescapeFalse { value: true },
keyword.range(), keyword.range(),

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 { if let Some(default) = &param.default {
match default.as_ref() { match default.as_ref() {
Expr::Name(ast::ExprName { id, range, .. }) => { Expr::Name(ast::ExprName { id, range, .. }) => {
if is_insecure_protocol(id.as_str()) { if is_insecure_protocol(id) {
checker.diagnostics.push(Diagnostic::new( checker.diagnostics.push(Diagnostic::new(
SslWithBadDefaults { SslWithBadDefaults {
protocol: id.to_string(), protocol: id.to_string(),

View File

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

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 { pub(super) fn allow_boolean_trap(call: &ast::ExprCall) -> bool {
let func_name = match call.func.as_ref() { let func_name = match call.func.as_ref() {
Expr::Attribute(ast::ExprAttribute { attr, .. }) => attr.as_str(), Expr::Attribute(ast::ExprAttribute { attr, .. }) => attr.as_str(),
Expr::Name(ast::ExprName { id, .. }) => id.as_str(), Expr::Name(ast::ExprName { id, .. }) => &**id,
_ => return false, _ => return false,
}; };

View File

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

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 { let Expr::Name(ast::ExprName { id, .. }) = value.as_ref() else {
return; return;
}; };
if id != "os" { if &**id != "os" {
return; return;
} }
checker checker

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 // TODO(charlie): This should take into account `classmethod-decorators` and
// `staticmethod-decorators`. // `staticmethod-decorators`.
if let Expr::Name(ast::ExprName { id, .. }) = &decorator.expression { if let Expr::Name(ast::ExprName { id, .. }) = &decorator.expression {
if id == "classmethod" || id == "staticmethod" { if &**id == "classmethod" || &**id == "staticmethod" {
return; return;
} }
} }

View File

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

View File

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

View File

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

View File

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

View File

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

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 { fn is_constant(key: &Expr, names: &FxHashMap<&str, &ast::ExprName>) -> bool {
match key { match key {
Expr::Tuple(ast::ExprTuple { elts, .. }) => elts.iter().all(|elt| is_constant(elt, names)), 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::Attribute(ast::ExprAttribute { value, .. }) => is_constant(value, names),
Expr::Subscript(ast::ExprSubscript { value, slice, .. }) => { Expr::Subscript(ast::ExprSubscript { value, slice, .. }) => {
is_constant(value, names) && is_constant(slice, names) is_constant(value, names) && is_constant(slice, names)

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

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 { let Some(func) = call.func.as_name_expr() else {
return; return;
}; };
if !matches!(func.id.as_str(), "reversed" | "set" | "sorted") { if !matches!(&*func.id, "reversed" | "set" | "sorted") {
return; return;
} }
if !checker.semantic().is_builtin(&func.id) { if !checker.semantic().is_builtin(&func.id) {

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 { let Expr::Name(ast::ExprName { id, .. }) = target else {
continue; continue;
}; };
if id != "fields" { if &**id != "fields" {
continue; continue;
} }
match value.as_ref() { match value.as_ref() {

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 { let Expr::Name(ast::ExprName { id, .. }) = target else {
continue; continue;
}; };
if id == "exclude" { if &**id == "exclude" {
checker checker
.diagnostics .diagnostics
.push(Diagnostic::new(DjangoExcludeWithModelForm, target.range())); .push(Diagnostic::new(DjangoExcludeWithModelForm, target.range()));

View File

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

View File

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

View File

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

View File

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

View File

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

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 { let Expr::Name(ast::ExprName { id, .. }) = call.func.as_ref() else {
return; return;
}; };
if id != "range" { if &**id != "range" {
return; return;
}; };
if !checker.semantic().is_builtin("range") { if !checker.semantic().is_builtin("range") {

View File

@ -142,7 +142,7 @@ fn class_method(
// Don't error if the first argument is annotated with typing.Type[T]. // 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. // 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; return false;
}; };

View File

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

View File

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

View File

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

View File

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

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 { let Expr::Name(ast::ExprName { id, .. }) = value.as_ref() else {
return; return;
}; };
if id.as_str() != "__all__" { if &**id != "__all__" {
return; return;
} }
if !is_unsupported_method(attr.as_str()) { if !is_unsupported_method(attr.as_str()) {

View File

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

View File

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

View File

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

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 { let Expr::Name(ast::ExprName { id: func_name, .. }) = func.as_ref() else {
return None; return None;
}; };
if func_name != "isinstance" { if &**func_name != "isinstance" {
return None; return None;
} }
if !semantic.is_builtin("isinstance") { if !semantic.is_builtin("isinstance") {

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 { let Expr::Name(ast::ExprName { id, .. }) = attr_value.as_ref() else {
return; return;
}; };
if id != "os" || attr != "environ" { if &**id != "os" || attr != "environ" {
return; return;
} }
let Expr::StringLiteral(ast::ExprStringLiteral { value: env_var, .. }) = slice.as_ref() else { let Expr::StringLiteral(ast::ExprStringLiteral { value: env_var, .. }) = slice.as_ref() else {

View File

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

View File

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

View File

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

View File

@ -72,7 +72,7 @@ pub(crate) fn zip_dict_keys_and_values(checker: &mut Checker, expr: &ExprCall) {
}] if name.as_str() == "strict" => {} }] if name.as_str() == "strict" => {}
_ => return, _ => 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; return;
} }
let [arg1, arg2] = &args[..] else { let [arg1, arg2] = &args[..] else {

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

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 { let Expr::Name(ast::ExprName { id, .. }) = &left else {
return; return;
}; };
if id != "print" { if &**id != "print" {
return; return;
} }
if !checker.semantic().is_builtin("print") { if !checker.semantic().is_builtin("print") {

View File

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

View File

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

View File

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

View File

@ -98,7 +98,7 @@ fn is_open(func: &Expr, semantic: &SemanticModel) -> Option<Kind> {
} }
// Ex) `open(...)` // Ex) `open(...)`
Expr::Name(ast::ExprName { id, .. }) => { 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, _ => None,
} }

View File

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

View File

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

View File

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

View File

@ -100,7 +100,7 @@ fn get_undecorated_methods(
class_def: &ast::StmtClassDef, class_def: &ast::StmtClassDef,
method_type: &MethodType, 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 { let (method_name, diagnostic_type): (&str, DiagnosticKind) = match method_type {
MethodType::Classmethod => ("classmethod", NoClassmethodDecorator.into()), MethodType::Classmethod => ("classmethod", NoClassmethodDecorator.into()),
@ -115,7 +115,7 @@ fn get_undecorated_methods(
}) = value.as_ref() }) = value.as_ref()
{ {
if let Expr::Name(ast::ExprName { id, .. }) = func.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 { if arguments.args.len() != 1 {
continue; continue;
} }
@ -130,7 +130,7 @@ fn get_undecorated_methods(
}; };
if let Expr::Name(ast::ExprName { id, .. }) = &arguments.args[0] { 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()); 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 we find the decorator we're looking for, skip
if decorator_list.iter().any(|decorator| { if decorator_list.iter().any(|decorator| {
if let Expr::Name(ast::ExprName { id, .. }) = &decorator.expression { 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; return true;
} }
} }

View File

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

View File

@ -55,7 +55,7 @@ pub(crate) fn property_with_parameters(
) { ) {
if !decorator_list if !decorator_list
.iter() .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; return;
} }

View File

@ -92,7 +92,7 @@ pub(crate) fn repeated_isinstance_calls(
else { else {
continue; 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; continue;
} }
let [obj, types] = &args[..] else { let [obj, types] = &args[..] else {

View File

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

View File

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

View File

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

View File

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

View File

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

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 let Expr::Call(ast::ExprCall { func, .. }) = value.as_ref() {
if checker.semantic().is_builtin("super") { if checker.semantic().is_builtin("super") {
if let Expr::Name(ast::ExprName { id, .. }) = func.as_ref() { if let Expr::Name(ast::ExprName { id, .. }) = func.as_ref() {
if id == "super" { if &**id == "super" {
return; return;
} }
} }

View File

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

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

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>> { fn fields_from_dict_call(func: &Expr, keywords: &[Keyword]) -> Option<Vec<Stmt>> {
let ast::ExprName { id, .. } = func.as_name_expr()?; let ast::ExprName { id, .. } = func.as_name_expr()?;
if id != "dict" { if &**id != "dict" {
return None; return None;
} }

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 { let Expr::Name(ast::ExprName { id, .. }) = value.as_ref() else {
return; return;
}; };
if id != "self" { if &**id != "self" {
return; return;
} }
let mut diagnostic = Diagnostic::new( let mut diagnostic = Diagnostic::new(

View File

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

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 { let Some(ast::ExprName { id, .. }) = func.as_name_expr() else {
return false; return false;
}; };
id.as_str() == OPEN_FUNC_NAME && semantic.is_builtin(id) &**id == OPEN_FUNC_NAME && semantic.is_builtin(id)
} }
#[derive(Debug, Copy, Clone)] #[derive(Debug, Copy, Clone)]

View File

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

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. // Type variables must be unique; filter while preserving order.
let vars = vars let vars = vars
.into_iter() .into_iter()
.unique_by(|TypeVar { name, .. }| name.id.as_str()) .unique_by(|TypeVar { name, .. }| &name.id)
.collect::<Vec<_>>(); .collect::<Vec<_>>();
let type_params = if vars.is_empty() { 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( let edit = Edit::range_replacement(
checker.generator().stmt(&Stmt::from(StmtTypeAlias { 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() => { Expr::Name(name) if name.ctx.is_load() => {
let Some(Stmt::Assign(StmtAssign { value, .. })) = self let Some(Stmt::Assign(StmtAssign { value, .. })) = self
.semantic .semantic
.lookup_symbol(name.id.as_str()) .lookup_symbol(&name.id)
.and_then(|binding_id| { .and_then(|binding_id| {
self.semantic self.semantic
.binding(binding_id) .binding(binding_id)

View File

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

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 { let Expr::Name(ast::ExprName { id, .. }) = base else {
continue; continue;
}; };
if id != "object" { if &**id != "object" {
continue; continue;
} }
if !checker.semantic().is_builtin("object") { if !checker.semantic().is_builtin("object") {

View File

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

View File

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

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 { let Expr::Name(ast::ExprName { id, .. }) = call.func.as_ref() else {
return; return;
}; };
if id.as_str() != "isinstance" { if &**id != "isinstance" {
return; return;
} }
if !checker.semantic().is_builtin(id) { if !checker.semantic().is_builtin(id) {
@ -94,7 +94,7 @@ fn is_none(expr: &Expr) -> bool {
func, arguments, .. func, arguments, ..
}) if arguments.len() == 1 => { }) if arguments.len() == 1 => {
if let Expr::Name(ast::ExprName { id, .. }) = func.as_ref() { 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(_))); return matches!(arguments.args.first(), Some(Expr::NoneLiteral(_)));
} }
} }

View File

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

View File

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

View File

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

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`). // Get the name of the other object (or `None` if both were `None`).
let other_arg_name = match other_arg { let other_arg_name = match other_arg {
Expr::Name(ast::ExprName { id, .. }) => id.as_str(), Expr::Name(ast::ExprName { id, .. }) => &**id,
Expr::NoneLiteral { .. } => "None", Expr::NoneLiteral { .. } => "None",
_ => return, _ => 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`. // The function itself must be the builtin `type`.
let ast::ExprName { id, .. } = func.as_name_expr()?; 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; return None;
} }

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 { let Expr::Name(ast::ExprName { id, .. }) = func.as_ref() else {
return; return;
}; };
if id != "enumerate" { if &**id != "enumerate" {
return; return;
}; };
if !checker.semantic().is_builtin("enumerate") { 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 { fn generate_range_len_call(name: &str, generator: Generator) -> String {
// Construct `name`. // Construct `name`.
let var = ast::ExprName { let var = ast::ExprName {
id: name.to_string(), id: name.to_string().into_boxed_str(),
ctx: ast::ExprContext::Load, ctx: ast::ExprContext::Load,
range: TextRange::default(), range: TextRange::default(),
}; };
@ -244,7 +244,7 @@ fn generate_range_len_call(name: &str, generator: Generator) -> String {
let len = ast::ExprCall { let len = ast::ExprCall {
func: Box::new( func: Box::new(
ast::ExprName { ast::ExprName {
id: "len".to_string(), id: "len".to_string().into_boxed_str(),
ctx: ast::ExprContext::Load, ctx: ast::ExprContext::Load,
range: TextRange::default(), range: TextRange::default(),
} }
@ -261,7 +261,7 @@ fn generate_range_len_call(name: &str, generator: Generator) -> String {
let range = ast::ExprCall { let range = ast::ExprCall {
func: Box::new( func: Box::new(
ast::ExprName { ast::ExprName {
id: "range".to_string(), id: "range".to_string().into_boxed_str(),
ctx: ast::ExprContext::Load, ctx: ast::ExprContext::Load,
range: TextRange::default(), range: TextRange::default(),
} }

View File

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

View File

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

View File

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

View File

@ -130,7 +130,7 @@ fn should_be_fstring(
} }
for arg in args.iter() { for arg in args.iter() {
if let ast::Expr::Name(ast::ExprName { id, .. }) = arg { 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()) .filter_map(|element| element.as_expression())
{ {
if let ast::Expr::Name(ast::ExprName { id, .. }) = element.expression.as_ref() { 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; return false;
} }
if semantic if semantic

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 { let Some(name_expr) = value.as_name_expr() else {
return; return;
}; };
if name_expr.id != "dict" { if &*name_expr.id != "dict" {
return; return;
} }
if !checker.semantic().is_builtin("dict") { 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 { fn generate_dict_comprehension(keys: &Expr, value: &Expr, generator: Generator) -> String {
// Construct `key`. // Construct `key`.
let key = ast::ExprName { let key = ast::ExprName {
id: "key".to_string(), id: "key".to_string().into_boxed_str(),
ctx: ast::ExprContext::Load, ctx: ast::ExprContext::Load,
range: TextRange::default(), range: TextRange::default(),
}; };

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