Skip to content

Commit fe2a777

Browse files
committed
Fix PYI034's import_self too
1 parent 3adf072 commit fe2a777

File tree

2 files changed

+7
-8
lines changed

2 files changed

+7
-8
lines changed

crates/ruff_linter/src/rules/flake8_pyi/rules/custom_type_var_return_type.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -301,9 +301,7 @@ fn replace_custom_typevar_with_self(
301301
}
302302

303303
match replace_typevar_usages_with_self(parameters, typevar_name) {
304-
Ok(mut edits) => {
305-
all_edits.append(&mut edits)
306-
}
304+
Ok(mut edits) => all_edits.append(&mut edits),
307305
Err(mut edits) => {
308306
fix_applicability = Applicability::Unsafe;
309307
all_edits.append(&mut edits)
@@ -332,7 +330,9 @@ fn import_self(checker: &Checker, return_range: TextRange) -> Option<Edit> {
332330
let request = ImportRequest::import_from(source_module, "Self");
333331

334332
let position = return_range.start();
335-
let (edit, ..) = importer.get_or_import_symbol(&request, position, semantic).ok()?;
333+
let (edit, ..) = importer
334+
.get_or_import_symbol(&request, position, semantic)
335+
.ok()?;
336336

337337
Some(edit)
338338
}

crates/ruff_linter/src/rules/flake8_pyi/rules/non_self_return_type.rs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -200,10 +200,9 @@ fn add_diagnostic(
200200
let (importer, semantic) = (checker.importer(), checker.semantic());
201201
let request = ImportRequest::import_from(source_module, "Self");
202202

203-
let Ok((edit, ..)) = importer.get_or_import_symbol(&request, range.start(), semantic)
204-
else {
205-
return None;
206-
};
203+
let (edit, ..) = importer
204+
.get_or_import_symbol(&request, range.start(), semantic)
205+
.ok()?;
207206

208207
Some(edit)
209208
}

0 commit comments

Comments
 (0)