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

gen clone for tuple enums

Browse Source
This commit is contained in:
Yoshua Wuyts 2021-08-10 15:07:13 +02:00
parent e0adb39de3
commit 2f866974d9
2 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
crates/ide_assists/src/handlers/replace_derive_with_manual_impl.rs
View File

@ -567,7 +567,7 @@ enum Foo {
impl Clone for Foo { impl Clone for Foo {
$0fn clone(&self) -> Self { $0fn clone(&self) -> Self {
match self { match self {
Self::Bar(arg1) => Self::Bar(arg1.clone()), Self::Bar(arg0) => Self::Bar(arg0.clone()),
Self::Baz => Self::Baz, Self::Baz => Self::Baz,
} }
} }

23
crates/ide_assists/src/utils/gen_trait_fn_body.rs
View File

@ -58,16 +58,29 @@ fn gen_clone_impl(adt: &ast::Adt, func: &ast::Fn) -> Option<()> {
let field = make::record_expr_field(name_ref, Some(method_call)); let field = make::record_expr_field(name_ref, Some(method_call));
fields.push(field); fields.push(field);
} }
let pattern = make::record_pat(variant_name.clone(), pats.into_iter()); let pat = make::record_pat(variant_name.clone(), pats.into_iter());
let fields = make::record_expr_field_list(fields); let fields = make::record_expr_field_list(fields);
let record_expr = make::record_expr(variant_name, fields).into(); let record_expr = make::record_expr(variant_name, fields).into();
arms.push(make::match_arm(Some(pat.into()), None, record_expr));
arms.push(make::match_arm(Some(pattern.into()), None, record_expr));
} }
// => match self { Self::Name(arg1) => Self::Name(arg1.clone()) } // => match self { Self::Name(arg1) => Self::Name(arg1.clone()) }
Some(ast::FieldList::TupleFieldList(list)) => todo!(), Some(ast::FieldList::TupleFieldList(list)) => {
let mut pats = vec![];
let mut fields = vec![];
for (i, _) in list.fields().enumerate() {
let field_name = format!("arg{}", i);
let pat = make::ident_pat(false, false, make::name(&field_name));
pats.push(pat.into());
let f_path = make::expr_path(make::ext::ident_path(&field_name));
fields.push(gen_clone_call(f_path));
}
let pat = make::tuple_struct_pat(variant_name.clone(), pats.into_iter());
let struct_name = make::expr_path(variant_name);
let tuple_expr = make::expr_call(struct_name, make::arg_list(fields));
arms.push(make::match_arm(Some(pat.into()), None, tuple_expr));
}
// => match self { Self::Name => Self::Name } // => match self { Self::Name => Self::Name }
None => { None => {