1 files changed, 12 insertions, 47 deletions

diff --git a/crates/ra_lsp_server/src/conv.rs b/crates/ra_lsp_server/src/conv.rs
index 981385466..20077a48a 100644
--- a/crates/ra_lsp_server/src/conv.rs
+++ b/crates/ra_lsp_server/src/conv.rs
@@ -82,11 +82,8 @@ impl ConvWith for CompletionItem {
     fn conv_with(mut self, ctx: &LineIndex) -> ::lsp_types::CompletionItem {
         let atom_text_edit = AtomTextEdit::replace(self.source_range(), self.insert_text());
         let text_edit = (&atom_text_edit).conv_with(ctx);
-        let additional_text_edits = if let Some(edit) = self.take_text_edit() {
-            Some(edit.conv_with(ctx))
-        } else {
-            None
-        };
+        let additional_text_edits =
+            if let Some(edit) = self.take_text_edit() { Some(edit.conv_with(ctx)) } else { None };
 
         let mut res = lsp_types::CompletionItem {
             label: self.label().to_string(),
@@ -112,10 +109,7 @@ impl ConvWith for Position {
     type Output = TextUnit;
 
     fn conv_with(self, line_index: &LineIndex) -> TextUnit {
-        let line_col = LineCol {
-            line: self.line as u32,
-            col_utf16: self.character as u32,
-        };
+        let line_col = LineCol { line: self.line as u32, col_utf16: self.character as u32 };
         line_index.offset(line_col)
     }
 }
@@ -135,10 +129,7 @@ impl ConvWith for TextRange {
     type Output = Range;
 
     fn conv_with(self, line_index: &LineIndex) -> Range {
-        Range::new(
-            self.start().conv_with(line_index),
-            self.end().conv_with(line_index),
-        )
+        Range::new(self.start().conv_with(line_index), self.end().conv_with(line_index))
     }
 }
 
@@ -147,10 +138,7 @@ impl ConvWith for Range {
     type Output = TextRange;
 
     fn conv_with(self, line_index: &LineIndex) -> TextRange {
-        TextRange::from_to(
-            self.start.conv_with(line_index),
-            self.end.conv_with(line_index),
-        )
+        TextRange::from_to(self.start.conv_with(line_index), self.end.conv_with(line_index))
     }
 }
 
@@ -303,11 +291,7 @@ impl TryConvWith for SourceChange {
             changes: None,
             document_changes: Some(DocumentChanges::Operations(document_changes)),
         };
-        Ok(req::SourceChange {
-            label: self.label,
-            workspace_edit,
-            cursor_position,
-        })
+        Ok(req::SourceChange { label: self.label, workspace_edit, cursor_position })
     }
 }
 
@@ -320,16 +304,8 @@ impl TryConvWith for SourceFileEdit {
             version: None,
         };
         let line_index = world.analysis().file_line_index(self.file_id);
-        let edits = self
-            .edit
-            .as_atoms()
-            .iter()
-            .map_conv_with(&line_index)
-            .collect();
-        Ok(TextDocumentEdit {
-            text_document,
-            edits,
-        })
+        let edits = self.edit.as_atoms().iter().map_conv_with(&line_index).collect();
+        Ok(TextDocumentEdit { text_document, edits })
     }
 }
 
@@ -342,18 +318,10 @@ impl TryConvWith for FileSystemEdit {
                 let uri = world.path_to_uri(source_root, &path)?;
                 ResourceOp::Create(CreateFile { uri, options: None })
             }
-            FileSystemEdit::MoveFile {
-                src,
-                dst_source_root,
-                dst_path,
-            } => {
+            FileSystemEdit::MoveFile { src, dst_source_root, dst_path } => {
                 let old_uri = world.file_id_to_uri(src)?;
                 let new_uri = world.path_to_uri(dst_source_root, &dst_path)?;
-                ResourceOp::Rename(RenameFile {
-                    old_uri,
-                    new_uri,
-                    options: None,
-                })
+                ResourceOp::Rename(RenameFile { old_uri, new_uri, options: None })
             }
         };
         Ok(res)
@@ -381,11 +349,8 @@ pub fn to_location_link(
 
     let target_range = target.info.full_range().conv_with(&tgt_line_index);
 
-    let target_selection_range = target
-        .info
-        .focus_range()
-        .map(|it| it.conv_with(&tgt_line_index))
-        .unwrap_or(target_range);
+    let target_selection_range =
+        target.info.focus_range().map(|it| it.conv_with(&tgt_line_index)).unwrap_or(target_range);
 
     let res = LocationLink {
         origin_selection_range: Some(target.range.conv_with(line_index)),