Skip to content

Commit c18ce9a

Browse files
committed
Auto merge of rust-lang#15429 - alibektas:deunwrap/generate_delegate_methods, r=Veykril
minor : Deunwrap generate_delegate_methods rust-lang#15398 subtask 8
2 parents 0b2a241 + c81a068 commit c18ce9a

File tree

1 file changed

+4
-5
lines changed

1 file changed

+4
-5
lines changed

crates/ide-assists/src/handlers/generate_delegate_methods.rs

+4-5
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,9 @@ pub(crate) fn generate_delegate_methods(acc: &mut Assists, ctx: &AssistContext<'
9595
let Some(impl_def) = find_struct_impl(ctx, &adt, std::slice::from_ref(&name)) else {
9696
continue;
9797
};
98+
99+
let field = make::ext::field_from_idents(["self", &field_name])?;
100+
98101
acc.add_group(
99102
&GroupLabel("Generate delegate methods…".to_owned()),
100103
AssistId("generate_delegate_methods", AssistKind::Generate),
@@ -115,11 +118,7 @@ pub(crate) fn generate_delegate_methods(acc: &mut Assists, ctx: &AssistContext<'
115118
Some(list) => convert_param_list_to_arg_list(list),
116119
None => make::arg_list([]),
117120
};
118-
let tail_expr = make::expr_method_call(
119-
make::ext::field_from_idents(["self", &field_name]).unwrap(), // This unwrap is ok because we have at least 1 arg in the list
120-
make::name_ref(&name),
121-
arg_list,
122-
);
121+
let tail_expr = make::expr_method_call(field, make::name_ref(&name), arg_list);
123122
let ret_type = method_source.ret_type();
124123
let is_async = method_source.async_token().is_some();
125124
let is_const = method_source.const_token().is_some();

0 commit comments

Comments
 (0)