nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-02-05 11:33:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

cargo fmt

Browse Source
This commit is contained in:
Domantas Jadenkus 2021-02-13 22:51:48 +02:00
parent 36e8a55bee
commit 7f100fff92
4 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
crates/assists/src/handlers/generate_from_impl_for_enum.rs
View File

@ -3,7 +3,7 @@ use ide_db::RootDatabase;
use syntax::ast::{self, AstNode, NameOwner};
use test_utils::mark;
use crate::{AssistContext, AssistId, AssistKind, Assists, utils::generate_trait_impl_text};
use crate::{utils::generate_trait_impl_text, AssistContext, AssistId, AssistKind, Assists};
// Assist: generate_from_impl_for_enum
//

2
crates/assists/src/handlers/generate_impl.rs
View File

@ -1,6 +1,6 @@
use syntax::ast::{self, AstNode, NameOwner};
use crate::{AssistContext, AssistId, AssistKind, Assists, utils::generate_impl_text};
use crate::{utils::generate_impl_text, AssistContext, AssistId, AssistKind, Assists};
// Assist: generate_impl
//

22
crates/assists/src/handlers/replace_derive_with_manual_impl.rs
View File

@ -1,9 +1,20 @@
use ide_db::helpers::mod_path_to_ast;
use ide_db::imports_locator;
use itertools::Itertools;
use syntax::{SyntaxKind::{IDENT, WHITESPACE}, TextSize, ast::{self, AstNode, NameOwner, make}};
use syntax::{
ast::{self, make, AstNode, NameOwner},
SyntaxKind::{IDENT, WHITESPACE},
TextSize,
};
use crate::{AssistId, AssistKind, assist_context::{AssistBuilder, AssistContext, Assists}, utils::{Cursor, DefaultMethods, add_trait_assoc_items_to_impl, filter_assoc_items, generate_trait_impl_text, render_snippet}};
use crate::{
assist_context::{AssistBuilder, AssistContext, Assists},
utils::{
add_trait_assoc_items_to_impl, filter_assoc_items, generate_trait_impl_text,
render_snippet, Cursor, DefaultMethods,
},
AssistId, AssistKind,
};
// Assist: replace_derive_with_manual_impl
//
@ -105,10 +116,9 @@ fn add_assist(
update_attribute(builder, &input, &trait_name, &attr);
let trait_path = format!("{}", trait_path);
match (ctx.config.snippet_cap, impl_def_with_items) {
(None, _) => builder.insert(
insert_pos,
generate_trait_impl_text(adt, &trait_path, ""),
),
(None, _) => {
builder.insert(insert_pos, generate_trait_impl_text(adt, &trait_path, ""))
}
(Some(cap), None) => builder.insert_snippet(
cap,
insert_pos,

7
crates/assists/src/utils.rs
View File

@ -380,11 +380,8 @@ fn generate_impl_text_inner(adt: &ast::Adt, trait_text: Option<&str>, code: &str
let type_params = adt.generic_param_list();
let mut buf = String::with_capacity(code.len());
buf.push_str("\n\n");
adt
.attrs()
.filter(|attr| {
attr.as_simple_call().map(|(name, _arg)| name == "cfg").unwrap_or(false)
})
adt.attrs()
.filter(|attr| attr.as_simple_call().map(|(name, _arg)| name == "cfg").unwrap_or(false))
.for_each(|attr| buf.push_str(format!("{}\n", attr.to_string()).as_str()));
buf.push_str("impl");
if let Some(type_params) = &type_params {