mirrors/ruff
1
0
Fork 0
mirror of https://github.com/astral-sh/ruff.git synced 2025-08-03 18:28:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Remove unwrap in os_error_alias.rs (#7583)

Browse source
This commit is contained in:
Charlie Marsh 2023-09-21 17:19:32 -04:00 • committed by GitHub
parent a51b0b02f0
commit f254aaa847
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

27
crates/ruff_linter/src/rules/pyupgrade/rules/os_error_alias.rs
View file

@ -93,16 +93,13 @@ fn atom_diagnostic(checker: &mut Checker, target: &Expr) {
}
/// Create a [`Diagnostic`] for a tuple of expressions.
fn tuple_diagnostic(checker: &mut Checker, target: &Expr, aliases: &[&Expr]) {
let mut diagnostic = Diagnostic::new(OSErrorAlias { name: None }, target.range());
fn tuple_diagnostic(checker: &mut Checker, tuple: &ast::ExprTuple, aliases: &[&Expr]) {
let mut diagnostic = Diagnostic::new(OSErrorAlias { name: None }, tuple.range());
if checker.patch(diagnostic.kind.rule()) {
if checker.semantic().is_builtin("OSError") {
let Expr::Tuple(ast::ExprTuple { elts, .. }) = target else {
panic!("Expected Expr::Tuple");
};
// Filter out any `OSErrors` aliases.
let mut remaining: Vec<Expr> = elts
let mut remaining: Vec<Expr> = tuple
.elts
.iter()
.filter_map(|elt| {
if aliases.contains(&elt) {
@ -114,7 +111,11 @@ fn tuple_diagnostic(checker: &mut Checker, target: &Expr, aliases: &[&Expr]) {
.collect();
// If `OSError` itself isn't already in the tuple, add it.
if elts.iter().all(|elt| !is_os_error(elt, checker.semantic())) {
if tuple
.elts
.iter()
.all(|elt| !is_os_error(elt, checker.semantic()))
{
let node = ast::ExprName {
id: "OSError".into(),
ctx: ExprContext::Load,
@ -135,8 +136,8 @@ fn tuple_diagnostic(checker: &mut Checker, target: &Expr, aliases: &[&Expr]) {
};
diagnostic.set_fix(Fix::automatic(Edit::range_replacement(
pad(content, target.range(), checker.locator()),
target.range(),
pad(content, tuple.range(), checker.locator()),
tuple.range(),
)));
}
}
@ -156,16 +157,16 @@ pub(crate) fn os_error_alias_handlers(checker: &mut Checker, handlers: &[ExceptH
atom_diagnostic(checker, expr);
}
}
Expr::Tuple(ast::ExprTuple { elts, .. }) => {
Expr::Tuple(tuple) => {
// List of aliases to replace with `OSError`.
let mut aliases: Vec<&Expr> = vec![];
for elt in elts {
for elt in &tuple.elts {
if is_alias(elt, checker.semantic()) {
aliases.push(elt);
}
}
if !aliases.is_empty() {
tuple_diagnostic(checker, expr, &aliases);
tuple_diagnostic(checker, tuple, &aliases);
}
}
_ => {}