mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Auto merge of #15397 - lnicola:fallible-generate-delegate-trait, r=lnicola

Browse Source 
fix: Remove unwraps from "Generate delegate trait"

Fixes #15388

This is untested and purely mechanical, maybe some of those `unwrap`s actually made sense, but it probably doesn't hurt to avoid them.
This commit is contained in:
bors 2023-08-05 16:24:49 +00:00
commit 5e1394eb37
1 changed files with 36 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
crates/ide-assists/src/handlers/generate_delegate_trait.rs
View File

@ -213,7 +213,9 @@ pub(crate) fn delegate(&self, field: Field, acc: &mut Assists, ctx: &AssistConte
// continue; // continue;
// } // }
let signature = delegee.signature(db); let signature = delegee.signature(db);
let delegate = generate_impl(ctx, self, &field.ty, &field.name, delegee); let Some(delegate) = generate_impl(ctx, self, &field.ty, &field.name, delegee) else {
continue;
};
acc.add_group( acc.add_group(
&GroupLabel("Delegate trait impl for field...".to_owned()), &GroupLabel("Delegate trait impl for field...".to_owned()),
@ -237,7 +239,7 @@ fn generate_impl(
field_ty: &ast::Type, field_ty: &ast::Type,
field_name: &String, field_name: &String,
delegee: &Delegee, delegee: &Delegee,
) -> ast::Impl { ) -> Option<ast::Impl> {
let delegate: ast::Impl; let delegate: ast::Impl;
let source: ast::Impl; let source: ast::Impl;
let genpar: Option<ast::GenericParamList>; let genpar: Option<ast::GenericParamList>;
@ -247,7 +249,7 @@ fn generate_impl(
match delegee { match delegee {
Delegee::Bound(delegee) => { Delegee::Bound(delegee) => {
let in_file = ctx.sema.source(delegee.0.to_owned()).unwrap(); let in_file = ctx.sema.source(delegee.0.to_owned())?;
let source: ast::Trait = in_file.value; let source: ast::Trait = in_file.value;
delegate = make::impl_trait( delegate = make::impl_trait(
@ -293,15 +295,15 @@ fn generate_impl(
None => {} None => {}
}; };
let target = ctx.sema.scope(strukt.strukt.syntax()).unwrap(); let target = ctx.sema.scope(strukt.strukt.syntax())?;
let source = ctx.sema.scope(source.syntax()).unwrap(); let source = ctx.sema.scope(source.syntax())?;
let transform = let transform =
PathTransform::trait_impl(&target, &source, delegee.0, delegate.clone()); PathTransform::trait_impl(&target, &source, delegee.0, delegate.clone());
transform.apply(&delegate.syntax()); transform.apply(&delegate.syntax());
} }
Delegee::Impls(delegee) => { Delegee::Impls(delegee) => {
let in_file = ctx.sema.source(delegee.1.to_owned()).unwrap(); let in_file = ctx.sema.source(delegee.1.to_owned())?;
source = in_file.value; source = in_file.value;
delegate = make::impl_trait( delegate = make::impl_trait(
delegee.0.is_unsafe(db), delegee.0.is_unsafe(db),
@ -341,8 +343,8 @@ fn generate_impl(
} }
}); });
let target = ctx.sema.scope(strukt.strukt.syntax()).unwrap(); let target = ctx.sema.scope(strukt.strukt.syntax())?;
let source = ctx.sema.scope(source.syntax()).unwrap(); let source = ctx.sema.scope(source.syntax())?;
let transform = let transform =
PathTransform::trait_impl(&target, &source, delegee.0, delegate.clone()); PathTransform::trait_impl(&target, &source, delegee.0, delegate.clone());
@ -350,7 +352,7 @@ fn generate_impl(
} }
} }
delegate Some(delegate)
} }
fn process_assoc_item( fn process_assoc_item(
@ -359,19 +361,19 @@ fn process_assoc_item(
base_name: &str, base_name: &str,
) -> Option<ast::AssocItem> { ) -> Option<ast::AssocItem> {
match item { match item {
AssocItem::Const(c) => Some(const_assoc_item(c, qual_path_ty)), AssocItem::Const(c) => const_assoc_item(c, qual_path_ty),
AssocItem::Fn(f) => Some(func_assoc_item(f, qual_path_ty, base_name)), AssocItem::Fn(f) => func_assoc_item(f, qual_path_ty, base_name),
AssocItem::MacroCall(_) => { AssocItem::MacroCall(_) => {
// FIXME : Handle MacroCall case. // FIXME : Handle MacroCall case.
// return Some(macro_assoc_item(mac, qual_path_ty)); // macro_assoc_item(mac, qual_path_ty)
None None
} }
AssocItem::TypeAlias(ta) => Some(ty_assoc_item(ta, qual_path_ty)), AssocItem::TypeAlias(ta) => ty_assoc_item(ta, qual_path_ty),
} }
} }
fn const_assoc_item(item: syntax::ast::Const, qual_path_ty: ast::Path) -> AssocItem { fn const_assoc_item(item: syntax::ast::Const, qual_path_ty: ast::Path) -> Option<AssocItem> {
let path_expr_segment = make::path_from_text(item.name().unwrap().to_string().as_str()); let path_expr_segment = make::path_from_text(item.name()?.to_string().as_str());
// We want rhs of the const assignment to be a qualified path // We want rhs of the const assignment to be a qualified path
// The general case for const assigment can be found [here](`https://doc.rust-lang.org/reference/items/constant-items.html`) // The general case for const assigment can be found [here](`https://doc.rust-lang.org/reference/items/constant-items.html`)
@ -380,19 +382,19 @@ fn const_assoc_item(item: syntax::ast::Const, qual_path_ty: ast::Path) -> AssocI
// FIXME : We can't rely on `make::path_qualified` for now but it would be nice to replace the following with it. // FIXME : We can't rely on `make::path_qualified` for now but it would be nice to replace the following with it.
// make::path_qualified(qual_path_ty, path_expr_segment.as_single_segment().unwrap()); // make::path_qualified(qual_path_ty, path_expr_segment.as_single_segment().unwrap());
let qualpath = qualpath(qual_path_ty, path_expr_segment); let qualpath = qualpath(qual_path_ty, path_expr_segment);
let inner = make::item_const( let inner =
item.visibility(), make::item_const(item.visibility(), item.name()?, item.ty()?, make::expr_path(qualpath))
item.name().unwrap(), .clone_for_update();
item.ty().unwrap(),
make::expr_path(qualpath),
)
.clone_for_update();
AssocItem::Const(inner) Some(AssocItem::Const(inner))
} }
fn func_assoc_item(item: syntax::ast::Fn, qual_path_ty: Path, base_name: &str) -> AssocItem { fn func_assoc_item(
let path_expr_segment = make::path_from_text(item.name().unwrap().to_string().as_str()); item: syntax::ast::Fn,
qual_path_ty: Path,
base_name: &str,
) -> Option<AssocItem> {
let path_expr_segment = make::path_from_text(item.name()?.to_string().as_str());
let qualpath = qualpath(qual_path_ty, path_expr_segment); let qualpath = qualpath(qual_path_ty, path_expr_segment);
let call = match item.param_list() { let call = match item.param_list() {
@ -415,7 +417,7 @@ fn func_assoc_item(item: syntax::ast::Fn, qual_path_ty: Path, base_name: &str) -
if param_count > 0 { if param_count > 0 {
// Add SelfParam and a TOKEN::COMMA // Add SelfParam and a TOKEN::COMMA
ted::insert_all( ted::insert_all(
Position::after(args.l_paren_token().unwrap()), Position::after(args.l_paren_token()?),
vec![ vec![
NodeOrToken::Node(tail_expr_self.syntax().clone_for_update()), NodeOrToken::Node(tail_expr_self.syntax().clone_for_update()),
NodeOrToken::Token(make::token(SyntaxKind::WHITESPACE)), NodeOrToken::Token(make::token(SyntaxKind::WHITESPACE)),
@ -425,7 +427,7 @@ fn func_assoc_item(item: syntax::ast::Fn, qual_path_ty: Path, base_name: &str) -
} else { } else {
// Add SelfParam only // Add SelfParam only
ted::insert( ted::insert(
Position::after(args.l_paren_token().unwrap()), Position::after(args.l_paren_token()?),
NodeOrToken::Node(tail_expr_self.syntax().clone_for_update()), NodeOrToken::Node(tail_expr_self.syntax().clone_for_update()),
); );
} }
@ -444,10 +446,10 @@ fn func_assoc_item(item: syntax::ast::Fn, qual_path_ty: Path, base_name: &str) -
let body = make::block_expr(vec![], Some(call)).clone_for_update(); let body = make::block_expr(vec![], Some(call)).clone_for_update();
let func = make::fn_( let func = make::fn_(
item.visibility(), item.visibility(),
item.name().unwrap(), item.name()?,
item.generic_param_list(), item.generic_param_list(),
item.where_clause(), item.where_clause(),
item.param_list().unwrap(), item.param_list()?,
body, body,
item.ret_type(), item.ret_type(),
item.async_token().is_some(), item.async_token().is_some(),
@ -456,14 +458,14 @@ fn func_assoc_item(item: syntax::ast::Fn, qual_path_ty: Path, base_name: &str) -
) )
.clone_for_update(); .clone_for_update();
AssocItem::Fn(func.indent(edit::IndentLevel(1)).clone_for_update()) Some(AssocItem::Fn(func.indent(edit::IndentLevel(1)).clone_for_update()))
} }
fn ty_assoc_item(item: syntax::ast::TypeAlias, qual_path_ty: Path) -> AssocItem { fn ty_assoc_item(item: syntax::ast::TypeAlias, qual_path_ty: Path) -> Option<AssocItem> {
let path_expr_segment = make::path_from_text(item.name().unwrap().to_string().as_str()); let path_expr_segment = make::path_from_text(item.name()?.to_string().as_str());
let qualpath = qualpath(qual_path_ty, path_expr_segment); let qualpath = qualpath(qual_path_ty, path_expr_segment);
let ty = make::ty_path(qualpath); let ty = make::ty_path(qualpath);
let ident = item.name().unwrap().to_string(); let ident = item.name()?.to_string();
let alias = make::ty_alias( let alias = make::ty_alias(
ident.as_str(), ident.as_str(),
@ -474,7 +476,7 @@ fn ty_assoc_item(item: syntax::ast::TypeAlias, qual_path_ty: Path) -> AssocItem
) )
.clone_for_update(); .clone_for_update();
AssocItem::TypeAlias(alias) Some(AssocItem::TypeAlias(alias))
} }
fn qualpath(qual_path_ty: ast::Path, path_expr_seg: ast::Path) -> ast::Path { fn qualpath(qual_path_ty: ast::Path, path_expr_seg: ast::Path) -> ast::Path {