From 7f100fff92ab4944f3d49cf7ffdcd91fc3578936 Mon Sep 17 00:00:00 2001 From: Domantas Jadenkus Date: Sat, 13 Feb 2021 22:51:48 +0200 Subject: cargo fmt --- .../src/handlers/generate_from_impl_for_enum.rs | 2 +- crates/assists/src/handlers/generate_impl.rs | 2 +- .../handlers/replace_derive_with_manual_impl.rs | 24 +++++++++++++++------- crates/assists/src/utils.rs | 7 ++----- 4 files changed, 21 insertions(+), 14 deletions(-) (limited to 'crates/assists/src') diff --git a/crates/assists/src/handlers/generate_from_impl_for_enum.rs b/crates/assists/src/handlers/generate_from_impl_for_enum.rs index fac2447c9..d9388a737 100644 --- a/crates/assists/src/handlers/generate_from_impl_for_enum.rs +++ b/crates/assists/src/handlers/generate_from_impl_for_enum.rs @@ -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 // diff --git a/crates/assists/src/handlers/generate_impl.rs b/crates/assists/src/handlers/generate_impl.rs index e2762e5d2..050bcd4e2 100644 --- a/crates/assists/src/handlers/generate_impl.rs +++ b/crates/assists/src/handlers/generate_impl.rs @@ -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 // diff --git a/crates/assists/src/handlers/replace_derive_with_manual_impl.rs b/crates/assists/src/handlers/replace_derive_with_manual_impl.rs index 7f44d752f..c69bc5cac 100644 --- a/crates/assists/src/handlers/replace_derive_with_manual_impl.rs +++ b/crates/assists/src/handlers/replace_derive_with_manual_impl.rs @@ -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 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 syntax::{ + ast::{self, make, AstNode, NameOwner}, + SyntaxKind::{IDENT, WHITESPACE}, + TextSize, +}; + +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, diff --git a/crates/assists/src/utils.rs b/crates/assists/src/utils.rs index b51d703db..98c4462bb 100644 --- a/crates/assists/src/utils.rs +++ b/crates/assists/src/utils.rs @@ -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 { -- cgit v1.2.3