7 files changed, 19 insertions, 46 deletions

diff --git a/crates/ra_ide_api/src/completion/complete_dot.rs b/crates/ra_ide_api/src/completion/complete_dot.rs
index bad51cc51..a673dbdcf 100644
--- a/crates/ra_ide_api/src/completion/complete_dot.rs
+++ b/crates/ra_ide_api/src/completion/complete_dot.rs
@@ -25,9 +25,7 @@ pub(super) fn complete_dot(acc: &mut Completions, ctx: &CompletionContext) {
 fn complete_fields(acc: &mut Completions, ctx: &CompletionContext, receiver: Ty) {
     for receiver in receiver.autoderef(ctx.db) {
         match receiver {
-            Ty::Adt {
-                def_id, ref substs, ..
-            } => {
+            Ty::Adt { def_id, ref substs, .. } => {
                 match def_id {
                     AdtDef::Struct(s) => {
                         for field in s.fields(ctx.db) {
diff --git a/crates/ra_ide_api/src/completion/complete_fn_param.rs b/crates/ra_ide_api/src/completion/complete_fn_param.rs
index 8d4df4ea1..43532226f 100644
--- a/crates/ra_ide_api/src/completion/complete_fn_param.rs
+++ b/crates/ra_ide_api/src/completion/complete_fn_param.rs
@@ -43,13 +43,12 @@ pub(super) fn complete_fn_param(acc: &mut Completions, ctx: &CompletionContext)
         node: &'a N,
         params: &mut FxHashMap<String, (u32, &'a ast::Param)>,
     ) {
-        node.functions()
-            .filter_map(|it| it.param_list())
-            .flat_map(|it| it.params())
-            .for_each(|param| {
+        node.functions().filter_map(|it| it.param_list()).flat_map(|it| it.params()).for_each(
+            |param| {
                 let text = param.syntax().text().to_string();
                 params.entry(text).or_insert((0, param)).0 += 1;
-            })
+            },
+        )
     }
 }
 
diff --git a/crates/ra_ide_api/src/completion/complete_path.rs b/crates/ra_ide_api/src/completion/complete_path.rs
index 0b9948d4b..c47a14e9f 100644
--- a/crates/ra_ide_api/src/completion/complete_path.rs
+++ b/crates/ra_ide_api/src/completion/complete_path.rs
@@ -31,14 +31,10 @@ pub(super) fn complete_path(acc: &mut Completions, ctx: &CompletionContext) {
         hir::ModuleDef::Enum(e) => {
             e.variants(ctx.db).into_iter().for_each(|variant| {
                 if let Some(name) = variant.name(ctx.db) {
-                    let detail_types = variant
-                        .fields(ctx.db)
-                        .into_iter()
-                        .map(|field| field.ty(ctx.db));
-                    let detail = join(detail_types)
-                        .separator(", ")
-                        .surround_with("(", ")")
-                        .to_string();
+                    let detail_types =
+                        variant.fields(ctx.db).into_iter().map(|field| field.ty(ctx.db));
+                    let detail =
+                        join(detail_types).separator(", ").surround_with("(", ")").to_string();
 
                     CompletionItem::new(
                         CompletionKind::Reference,
diff --git a/crates/ra_ide_api/src/completion/complete_postfix.rs b/crates/ra_ide_api/src/completion/complete_postfix.rs
index e3a739d6d..10a3c8db7 100644
--- a/crates/ra_ide_api/src/completion/complete_postfix.rs
+++ b/crates/ra_ide_api/src/completion/complete_postfix.rs
@@ -17,11 +17,7 @@ use ra_text_edit::TextEditBuilder;
 
 fn postfix_snippet(ctx: &CompletionContext, label: &str, snippet: &str) -> Builder {
     let replace_range = ctx.source_range();
-    let receiver_range = ctx
-        .dot_receiver
-        .expect("no receiver available")
-        .syntax()
-        .range();
+    let receiver_range = ctx.dot_receiver.expect("no receiver available").syntax().range();
     let delete_range = TextRange::from_to(receiver_range.start(), replace_range.start());
     let mut builder = TextEditBuilder::default();
     builder.delete(delete_range);
diff --git a/crates/ra_ide_api/src/completion/complete_scope.rs b/crates/ra_ide_api/src/completion/complete_scope.rs
index 8674b1e66..445788407 100644
--- a/crates/ra_ide_api/src/completion/complete_scope.rs
+++ b/crates/ra_ide_api/src/completion/complete_scope.rs
@@ -7,13 +7,9 @@ pub(super) fn complete_scope(acc: &mut Completions, ctx: &CompletionContext) {
     let names = ctx.resolver.all_names();
 
     names.into_iter().for_each(|(name, res)| {
-        CompletionItem::new(
-            CompletionKind::Reference,
-            ctx.source_range(),
-            name.to_string(),
-        )
-        .from_resolution(ctx, &res)
-        .add_to(acc)
+        CompletionItem::new(CompletionKind::Reference, ctx.source_range(), name.to_string())
+            .from_resolution(ctx, &res)
+            .add_to(acc)
     });
 }
 
diff --git a/crates/ra_ide_api/src/completion/completion_context.rs b/crates/ra_ide_api/src/completion/completion_context.rs
index 8abab0221..82bd4d606 100644
--- a/crates/ra_ide_api/src/completion/completion_context.rs
+++ b/crates/ra_ide_api/src/completion/completion_context.rs
@@ -108,12 +108,8 @@ impl<'a> CompletionContext<'a> {
     }
     fn classify_name_ref(&mut self, original_file: &'a SourceFile, name_ref: &ast::NameRef) {
         let name_range = name_ref.syntax().range();
-        let top_node = name_ref
-            .syntax()
-            .ancestors()
-            .take_while(|it| it.range() == name_range)
-            .last()
-            .unwrap();
+        let top_node =
+            name_ref.syntax().ancestors().take_while(|it| it.range() == name_range).last().unwrap();
 
         match top_node.parent().map(|it| it.kind()) {
             Some(SOURCE_FILE) | Some(ITEM_LIST) => {
diff --git a/crates/ra_ide_api/src/completion/completion_item.rs b/crates/ra_ide_api/src/completion/completion_item.rs
index 92e6e78bf..7b8972af0 100644
--- a/crates/ra_ide_api/src/completion/completion_item.rs
+++ b/crates/ra_ide_api/src/completion/completion_item.rs
@@ -105,10 +105,7 @@ impl CompletionItem {
     }
     /// What string is used for filtering.
     pub fn lookup(&self) -> &str {
-        self.lookup
-            .as_ref()
-            .map(|it| it.as_str())
-            .unwrap_or_else(|| self.label())
+        self.lookup.as_ref().map(|it| it.as_str()).unwrap_or_else(|| self.label())
     }
 
     pub fn insert_text_format(&self) -> InsertTextFormat {
@@ -214,10 +211,7 @@ impl Builder {
     ) -> Builder {
         use hir::ModuleDef::*;
 
-        let def = resolution
-            .as_ref()
-            .take_types()
-            .or_else(|| resolution.as_ref().take_values());
+        let def = resolution.as_ref().take_types().or_else(|| resolution.as_ref().take_values());
         let def = match def {
             None => return self,
             Some(it) => it,
@@ -323,10 +317,8 @@ pub(crate) fn check_completion(test_name: &str, code: &str, kind: CompletionKind
     };
     let completions = completions(&analysis.db, position).unwrap();
     let completion_items: Vec<CompletionItem> = completions.into();
-    let mut kind_completions: Vec<CompletionItem> = completion_items
-        .into_iter()
-        .filter(|c| c.completion_kind == kind)
-        .collect();
+    let mut kind_completions: Vec<CompletionItem> =
+        completion_items.into_iter().filter(|c| c.completion_kind == kind).collect();
     kind_completions.sort_by_key(|c| c.label.clone());
     assert_debug_snapshot_matches!(test_name, kind_completions);
 }