From 04a35784df4cf267a8bbce6d5542869ed1a52fcb Mon Sep 17 00:00:00 2001
From: Mikhail Rakhmanov <rakhmanov.m@gmail.com>
Date: Fri, 22 May 2020 22:43:52 +0200
Subject: Formatting and remove unused imports

---
 crates/ra_assists/src/assist_context.rs            | 30 ++++++++++++----------
 .../handlers/extract_struct_from_enum_variant.rs   |  7 +++--
 2 files changed, 21 insertions(+), 16 deletions(-)

(limited to 'crates/ra_assists/src')

diff --git a/crates/ra_assists/src/assist_context.rs b/crates/ra_assists/src/assist_context.rs
index 6291c68de..52bc7820e 100644
--- a/crates/ra_assists/src/assist_context.rs
+++ b/crates/ra_assists/src/assist_context.rs
@@ -2,7 +2,7 @@
 
 use algo::find_covering_element;
 use hir::Semantics;
-use ra_db::{FileId, FileRange, FilePosition};
+use ra_db::{FileId, FileRange};
 use ra_fmt::{leading_indent, reindent};
 use ra_ide_db::{
     source_change::{SourceChange, SourceFileEdit},
@@ -173,16 +173,20 @@ impl Assists {
         Some(())
     }
 
-    fn add_impl_multiple_files(&mut self, label: Assist, f: impl FnOnce(&mut AssistDirector)) -> Option<()> {
+    fn add_impl_multiple_files(
+        &mut self,
+        label: Assist,
+        f: impl FnOnce(&mut AssistDirector),
+    ) -> Option<()> {
         let change_label = label.label.clone();
         if !self.resolve {
-            return None
+            return None;
         }
         let mut director = AssistDirector::new(change_label.clone());
         f(&mut director);
         let changes = director.finish();
-        let file_edits: Vec<SourceFileEdit> = changes.into_iter()
-            .map(|mut change| change.source_file_edits.pop().unwrap()).collect();
+        let file_edits: Vec<SourceFileEdit> =
+            changes.into_iter().map(|mut change| change.source_file_edits.pop().unwrap()).collect();
 
         let source_change = SourceChange {
             source_file_edits: file_edits,
@@ -291,16 +295,12 @@ impl AssistBuilder {
 pub(crate) struct AssistDirector {
     source_changes: Vec<SourceChange>,
     builders: FxHashMap<FileId, AssistBuilder>,
-    change_label: String 
-} 
+    change_label: String,
+}
 
 impl AssistDirector {
     fn new(change_label: String) -> AssistDirector {
-        AssistDirector {
-            source_changes: vec![],
-            builders: FxHashMap::default(),
-            change_label
-        }
+        AssistDirector { source_changes: vec![], builders: FxHashMap::default(), change_label }
     }
 
     pub(crate) fn perform(&mut self, file_id: FileId, f: impl FnOnce(&mut AssistBuilder)) {
@@ -309,8 +309,10 @@ impl AssistDirector {
     }
 
     fn finish(mut self) -> Vec<SourceChange> {
-        for (file_id, builder) in self.builders.into_iter().collect::<Vec<(FileId, AssistBuilder)>>() {
-            self.source_changes.push(builder.finish());    
+        for (file_id, builder) in
+            self.builders.into_iter().collect::<Vec<(FileId, AssistBuilder)>>()
+        {
+            self.source_changes.push(builder.finish());
         }
         self.source_changes
     }
diff --git a/crates/ra_assists/src/handlers/extract_struct_from_enum_variant.rs b/crates/ra_assists/src/handlers/extract_struct_from_enum_variant.rs
index 6e19a6feb..57907a503 100644
--- a/crates/ra_assists/src/handlers/extract_struct_from_enum_variant.rs
+++ b/crates/ra_assists/src/handlers/extract_struct_from_enum_variant.rs
@@ -16,9 +16,9 @@ use crate::{
 };
 use ast::{ArgListOwner, VisibilityOwner};
 use hir::{EnumVariant, Module, ModuleDef};
+use ra_db::FileId;
 use ra_fmt::leading_indent;
 use rustc_hash::FxHashSet;
-use ra_db::FileId;
 
 // Assist extract_struct_from_enum
 //
@@ -229,7 +229,10 @@ fn list_with_visibility(list: &str) -> String {
 #[cfg(test)]
 mod tests {
 
-    use crate::{utils::FamousDefs, tests::{check_assist, check_assist_not_applicable}};
+    use crate::{
+        tests::{check_assist, check_assist_not_applicable},
+        utils::FamousDefs,
+    };
 
     use super::*;
 
-- 
cgit v1.2.3