From 30bc3b93bec06256350b66869f2885ee71c3bedd Mon Sep 17 00:00:00 2001 From: Evgenii P Date: Sat, 3 Aug 2019 01:16:20 +0700 Subject: rustfmt --- crates/ra_hir/src/source_binder.rs | 23 +++++++++++++---------- crates/ra_hir/src/ty/method_resolution.rs | 12 +++++++++--- crates/ra_ide_api/src/completion/complete_dot.rs | 12 ++++++------ 3 files changed, 28 insertions(+), 19 deletions(-) diff --git a/crates/ra_hir/src/source_binder.rs b/crates/ra_hir/src/source_binder.rs index 8496b143a..67cb19615 100644 --- a/crates/ra_hir/src/source_binder.rs +++ b/crates/ra_hir/src/source_binder.rs @@ -23,8 +23,8 @@ use crate::{ scope::{ExprScopes, ScopeId}, BodySourceMap, }, - ty::method_resolution::implements_trait, ids::LocationCtx, + ty::method_resolution::implements_trait, AsName, AstId, Const, Crate, DefWithBody, Either, Enum, Function, HirDatabase, HirFileId, MacroDef, Module, Name, Path, PerNs, Resolver, Static, Struct, Trait, Ty, }; @@ -414,22 +414,25 @@ impl SourceAnalyzer { /// This function is used in `.await` syntax completion. pub fn impls_future(&self, db: &impl HirDatabase, ty: Ty) -> bool { // Search for std::future::Future trait in scope - let future_trait = self.resolver.traits_in_scope(db) + let future_trait = self + .resolver + .traits_in_scope(db) .into_iter() .filter(|t| { - let std = t.module(db).parent(db) - .and_then(|m| m - .name(db) - .and_then(|n| Some(n.to_string() == "std"))) + let std = t + .module(db) + .parent(db) + .and_then(|m| m.name(db).and_then(|n| Some(n.to_string() == "std"))) .unwrap_or(false); - let future = t.module(db).name(db) + let future = t + .module(db) + .name(db) .and_then(|n| Some(n.to_string() == "future")) .unwrap_or(false); - let future_trait = t.name(db) - .and_then(|n| Some(n.to_string() == "Future")) - .unwrap_or(false); + let future_trait = + t.name(db).and_then(|n| Some(n.to_string() == "Future")).unwrap_or(false); std && future && future_trait }) diff --git a/crates/ra_hir/src/ty/method_resolution.rs b/crates/ra_hir/src/ty/method_resolution.rs index 2e2f88138..8731d6ba4 100644 --- a/crates/ra_hir/src/ty/method_resolution.rs +++ b/crates/ra_hir/src/ty/method_resolution.rs @@ -15,7 +15,7 @@ use crate::{ resolve::Resolver, traits::TraitItem, ty::primitive::{FloatBitness, UncertainFloatTy, UncertainIntTy}, - ty::{Ty, TypeCtor, traits::Solution}, + ty::{traits::Solution, Ty, TypeCtor}, Crate, Function, HirDatabase, Module, Name, Trait, }; @@ -255,14 +255,20 @@ fn iterate_inherent_methods( None } -pub(crate) fn implements_trait(ty: &Canonical, db: &impl HirDatabase, resolver: &Resolver, krate: Crate, trait_: Trait) -> bool { +pub(crate) fn implements_trait( + ty: &Canonical, + db: &impl HirDatabase, + resolver: &Resolver, + krate: Crate, + trait_: Trait, +) -> bool { let env = lower::trait_env(db, resolver); let goal = generic_implements_goal(db, env.clone(), trait_, ty.clone()); let solution = db.trait_solve(krate, goal); if let Some(solution) = solution { if let Solution::Unique(_) = solution { - return true + return true; } } diff --git a/crates/ra_ide_api/src/completion/complete_dot.rs b/crates/ra_ide_api/src/completion/complete_dot.rs index b6579be63..1dbbdb1bc 100644 --- a/crates/ra_ide_api/src/completion/complete_dot.rs +++ b/crates/ra_ide_api/src/completion/complete_dot.rs @@ -1,14 +1,14 @@ use hir::{AdtDef, Ty, TypeCtor}; -use crate::{completion::{ - completion_context::CompletionContext, - completion_item::Completions, -}, CompletionItem}; +use crate::completion::completion_item::{Builder, CompletionKind}; +use crate::{ + completion::{completion_context::CompletionContext, completion_item::Completions}, + CompletionItem, +}; use ra_syntax::ast::AstNode; +use ra_syntax::TextRange; use ra_text_edit::TextEditBuilder; use rustc_hash::FxHashSet; -use crate::completion::completion_item::{Builder, CompletionKind}; -use ra_syntax::TextRange; /// Applies postfix edition but with CompletionKind::Reference fn postfix_reference(ctx: &CompletionContext, label: &str, detail: &str, snippet: &str) -> Builder { -- cgit v1.2.3