fix the rest of the nits

This commit is contained in:
DropDemBits 2023-07-11 17:29:21 -04:00
parent f9a144f0ed
commit a9889a0f1c
No known key found for this signature in database
GPG Key ID: 7FE02A6C1EDFA075
3 changed files with 18 additions and 20 deletions

View File

@ -205,13 +205,15 @@ pub(crate) fn add_missing_match_arms(acc: &mut Assists, ctx: &AssistContext<'_>)
// having any hidden variants means that we need a catch-all arm
needs_catch_all_arm |= has_hidden_variants;
let missing_arms = missing_pats.filter_map(|(pat, hidden)| {
// filter out hidden patterns because they're handled by the catch-all arm
(!hidden).then(|| {
let missing_arms = missing_pats
.filter(|(_, hidden)| {
// filter out hidden patterns because they're handled by the catch-all arm
!hidden
})
.map(|(pat, _)| {
make::match_arm(iter::once(pat), None, make::ext::expr_todo())
.clone_for_update()
})
});
});
let catch_all_arm = new_match_arm_list
.arms()

View File

@ -100,14 +100,14 @@ fn add_vis_to_referenced_record_field(acc: &mut Assists, ctx: &AssistContext<'_>
let target_module = parent.module(ctx.db());
let in_file_source = record_field_def.source(ctx.db())?;
let (vis_owner, target): (ast::AnyHasVisibility, TextRange) = match in_file_source.value {
let (vis_owner, target) = match in_file_source.value {
hir::FieldSource::Named(it) => {
let s = it.syntax();
(ast::AnyHasVisibility::cast(s.clone()).unwrap(), s.text_range())
let range = it.syntax().text_range();
(ast::AnyHasVisibility::new(it), range)
}
hir::FieldSource::Pos(it) => {
let s = it.syntax();
(ast::AnyHasVisibility::cast(s.clone()).unwrap(), s.text_range())
let range = it.syntax().text_range();
(ast::AnyHasVisibility::new(it), range)
}
};
@ -152,12 +152,8 @@ fn target_data_for_def(
let source = x.source(db)?;
let in_file_syntax = source.syntax();
let file_id = in_file_syntax.file_id;
let syntax = in_file_syntax.value;
Some((
ast::AnyHasVisibility::cast(syntax.clone()).unwrap(),
syntax.text_range(),
file_id.original_file(db.upcast()),
))
let range = in_file_syntax.value.text_range();
Some((ast::AnyHasVisibility::new(source.value), range, file_id.original_file(db.upcast())))
}
let target_name;
@ -198,8 +194,8 @@ fn target_data_for_def(
target_name = m.name(db);
let in_file_source = m.declaration_source(db)?;
let file_id = in_file_source.file_id.original_file(db.upcast());
let syntax = in_file_source.value.syntax();
(ast::AnyHasVisibility::cast(syntax.clone()).unwrap(), syntax.text_range(), file_id)
let range = in_file_source.value.syntax().text_range();
(ast::AnyHasVisibility::new(in_file_source.value), range, file_id)
}
// FIXME
hir::ModuleDef::Macro(_) => return None,

View File

@ -67,11 +67,11 @@ pub(crate) fn promote_local_to_const(acc: &mut Assists, ctx: &AssistContext<'_>)
cov_mark::hit!(promote_local_non_const);
return None;
}
let target = let_stmt.syntax().text_range();
acc.add(
AssistId("promote_local_to_const", AssistKind::Refactor),
"Promote local to constant",
target,
let_stmt.syntax().text_range(),
|edit| {
let name = to_upper_snake_case(&name.to_string());
let usages = Definition::Local(local).usages(&ctx.sema).all();