From 3aaf46afa13b6fcbfdc36d8eb0cce48196d824a7 Mon Sep 17 00:00:00 2001 From: Kevin DeLorey <2295721+kdelorey@users.noreply.github.com> Date: Tue, 11 Feb 2020 09:40:08 -0600 Subject: Formatted changes. --- crates/ra_assists/src/handlers/add_missing_impl_members.rs | 4 ++-- crates/ra_assists/src/utils.rs | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'crates/ra_assists') diff --git a/crates/ra_assists/src/handlers/add_missing_impl_members.rs b/crates/ra_assists/src/handlers/add_missing_impl_members.rs index 4c937b154..ab21388c8 100644 --- a/crates/ra_assists/src/handlers/add_missing_impl_members.rs +++ b/crates/ra_assists/src/handlers/add_missing_impl_members.rs @@ -6,8 +6,8 @@ use ra_syntax::{ use crate::{ ast_transform::{self, AstTransform, QualifyPaths, SubstituteTypeParams}, - Assist, AssistCtx, AssistId, utils::{get_missing_impl_items, resolve_target_trait}, + Assist, AssistCtx, AssistId, }; #[derive(PartialEq)] @@ -129,7 +129,7 @@ fn add_missing_impl_members_inner( ast::ImplItem::FnDef(def) => match mode { AddMissingImplMembersMode::DefaultMethodsOnly => def.body().is_some(), AddMissingImplMembersMode::NoDefaultMethods => def.body().is_none(), - } + }, _ => mode == AddMissingImplMembersMode::NoDefaultMethods, }) .collect::>(); diff --git a/crates/ra_assists/src/utils.rs b/crates/ra_assists/src/utils.rs index 7628933fb..461f01536 100644 --- a/crates/ra_assists/src/utils.rs +++ b/crates/ra_assists/src/utils.rs @@ -9,14 +9,13 @@ use hir::db::HirDatabase; use rustc_hash::FxHashSet; -/// Generate a collection of associated items that are missing from a +/// Generate a collection of associated items that are missing from a /// `impl Trait for` block. pub fn get_missing_impl_items( db: &impl HirDatabase, analyzer: &hir::SourceAnalyzer, impl_block: &ast::ImplBlock, ) -> Vec { - // Names must be unique between constants and functions. However, type aliases // may share the same name as a function or constant. let mut impl_fns_consts = FxHashSet::default(); @@ -53,9 +52,10 @@ pub fn get_missing_impl_items( .filter(|i| match i { hir::AssocItem::Function(f) => !impl_fns_consts.contains(&f.name(db).to_string()), hir::AssocItem::TypeAlias(t) => !impl_type.contains(&t.name(db).to_string()), - hir::AssocItem::Const(c) => { - c.name(db).map(|n| !impl_fns_consts.contains(&n.to_string())).unwrap_or_default() - } + hir::AssocItem::Const(c) => c + .name(db) + .map(|n| !impl_fns_consts.contains(&n.to_string())) + .unwrap_or_default(), }) .map(|i| i.clone()) .collect() -- cgit v1.2.3