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

Remove commented out conflicts

Browse Source
This commit is contained in:
Ryo Yoshida 2023-06-11 17:11:24 +09:00
parent d091991491
commit ed8c58a3b1
No known key found for this signature in database
GPG Key ID: E25698A930586171
1 changed files with 0 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
crates/ide-assists/src/handlers/replace_derive_with_manual_impl.rs
View File

@ -199,24 +199,8 @@ fn impl_def_from_trait(
node node
}; };
// <<<<<<< HEAD
// let trait_items = trait_items
// .into_iter()
// .map(|it| {
// if sema.hir_file_for(it.syntax()).is_macro() {
// if let Some(it) = ast::AssocItem::cast(insert_ws_into(it.syntax().clone())) {
// return it;
// }
// }
// it.clone_for_update()
// })
// .collect();
// let first_assoc_item =
// add_trait_assoc_items_to_impl(sema, trait_items, trait_, &impl_def, target_scope);
// =======
let first_assoc_item = let first_assoc_item =
add_trait_assoc_items_to_impl(sema, &trait_items, trait_, &impl_def, target_scope); add_trait_assoc_items_to_impl(sema, &trait_items, trait_, &impl_def, target_scope);
// >>>>>>> fix(assist): derive source scope from syntax node to be transformed
// Generate a default `impl` function body for the derived trait. // Generate a default `impl` function body for the derived trait.
if let ast::AssocItem::Fn(ref func) = first_assoc_item { if let ast::AssocItem::Fn(ref func) = first_assoc_item {