language-servers/ruff
1
0
Fork 0
mirror of https://github.com/astral-sh/ruff.git synced 2025-10-01 06:11:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Simplify Option<String> → Option<&str> conversion using as_deref (#1675)

Browse source 
Signed-off-by: Anders Kaseorg <andersk@mit.edu>
This commit is contained in:
Anders Kaseorg 2023-01-05 17:55:59 -08:00 • committed by GitHub
parent 1ad72261f1
commit 81b211d1b7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/checkers/ast.rs
View file

@ -933,7 +933,7 @@ where
if self.settings.enabled.contains(&CheckCode::PT013) { if self.settings.enabled.contains(&CheckCode::PT013) {
if let Some(check) = flake8_pytest_style::plugins::import_from( if let Some(check) = flake8_pytest_style::plugins::import_from(
stmt, stmt,
module.as_ref().map(String::as_str), module.as_deref(),
level.as_ref(), level.as_ref(),
) { ) {
self.add_check(check); self.add_check(check);
@ -999,7 +999,7 @@ where
self.add_check(Check::new( self.add_check(Check::new(
CheckKind::ImportStarNotPermitted(helpers::format_import_from( CheckKind::ImportStarNotPermitted(helpers::format_import_from(
level.as_ref(), level.as_ref(),
module.as_ref().map(String::as_str), module.as_deref(),
)), )),
Range::from_located(stmt), Range::from_located(stmt),
)); ));
@ -1010,7 +1010,7 @@ where
self.add_check(Check::new( self.add_check(Check::new(
CheckKind::ImportStarUsed(helpers::format_import_from( CheckKind::ImportStarUsed(helpers::format_import_from(
level.as_ref(), level.as_ref(),
module.as_ref().map(String::as_str), module.as_deref(),
)), )),
Range::from_located(stmt), Range::from_located(stmt),
)); ));
@ -1076,7 +1076,7 @@ where
if self.settings.enabled.contains(&CheckCode::T100) { if self.settings.enabled.contains(&CheckCode::T100) {
if let Some(check) = flake8_debugger::checks::debugger_import( if let Some(check) = flake8_debugger::checks::debugger_import(
stmt, stmt,
module.as_ref().map(String::as_str), module.as_deref(),
&alias.node.name, &alias.node.name,
) { ) {
self.add_check(check); self.add_check(check);
@ -2636,11 +2636,7 @@ where
} }
} }
if self.settings.enabled.contains(&CheckCode::UP025) { if self.settings.enabled.contains(&CheckCode::UP025) {
pyupgrade::plugins::rewrite_unicode_literal( pyupgrade::plugins::rewrite_unicode_literal(self, expr, kind.as_deref());
self,
expr,
kind.as_ref().map(String::as_str),
);
} }
} }
ExprKind::Lambda { args, body, .. } => { ExprKind::Lambda { args, body, .. } => {
@ -2978,7 +2974,7 @@ where
flake8_blind_except::plugins::blind_except( flake8_blind_except::plugins::blind_except(
self, self,
type_.as_deref(), type_.as_deref(),
name.as_ref().map(String::as_str), name.as_deref(),
body, body,
); );
} }
@ -3442,7 +3438,7 @@ impl<'a> Checker<'a> {
if let BindingKind::StarImportation(level, module) = &binding.kind { if let BindingKind::StarImportation(level, module) = &binding.kind {
from_list.push(helpers::format_import_from( from_list.push(helpers::format_import_from(
level.as_ref(), level.as_ref(),
module.as_ref().map(String::as_str), module.as_deref(),
)); ));
} }
} }
@ -3923,7 +3919,7 @@ impl<'a> Checker<'a> {
if let BindingKind::StarImportation(level, module) = &binding.kind { if let BindingKind::StarImportation(level, module) = &binding.kind {
from_list.push(helpers::format_import_from( from_list.push(helpers::format_import_from(
level.as_ref(), level.as_ref(),
module.as_ref().map(String::as_str), module.as_deref(),
)); ));
} }
} }