fmt.

Author: autozimu

src/context.rs

@@ -1,11 +1,11 @@
-use serde::de::DeserializeOwned;
-use std::collections::HashMap;
-use serde_json::Value;
-use lsp_types::Position;
 use crate::viewport::Viewport;
 use crate::vim::Vim;
 use failure::Fallible;
 use lazycell::LazyCell;
+use lsp_types::Position;
+use serde::de::DeserializeOwned;
+use serde_json::Value;
+use std::collections::HashMap;
 
 pub struct Context {
     vim: Vim,
@@ -25,9 +25,9 @@ impl Context {
             bufname,
             language_id: LazyCell::new(),
             viewport: LazyCell::new(),
-	    position: LazyCell::new(),
-	    current_word: LazyCell::new(),
-	    text: LazyCell::new(),
+            position: LazyCell::new(),
+            current_word: LazyCell::new(),
+            text: LazyCell::new(),
             prepopulated: HashMap::new(),
         }
     }
@@ -45,45 +45,34 @@ impl Context {
         let expr = "&filetype";
 
         self.language_id.try_borrow_with(|| {
-            self.try_get(expr)?.map_or_else(|| {
-                self.vim.getbufvar(&self.bufname, expr)
-            }, Ok)
+            self.try_get(expr)?
+                .map_or_else(|| self.vim.getbufvar(&self.bufname, expr), Ok)
         })
     }
 
     pub fn get_viewport(&self) -> Fallible<&Viewport> {
         let expr = "LSP#viewport()";
 
-        self.viewport.try_borrow_with(|| {
-            self.try_get(expr)?.map_or_else(|| {
-                self.vim.eval(expr)
-            }, Ok)
-        })
+        self.viewport
+            .try_borrow_with(|| self.try_get(expr)?.map_or_else(|| self.vim.eval(expr), Ok))
     }
 
     pub fn get_position(&self) -> Fallible<&Position> {
         let expr = "LSP#position()";
 
-        self.position.try_borrow_with(|| {
-            self.try_get(expr)?.map_or_else(|| {
-                self.vim.eval(expr)
-            }, Ok)
-        })
+        self.position
+            .try_borrow_with(|| self.try_get(expr)?.map_or_else(|| self.vim.eval(expr), Ok))
     }
 
     pub fn get_current_word(&self) -> Fallible<&String> {
         let expr = "expand('<cword>')";
 
-	self.current_word.try_borrow_with(|| {
-            self.try_get(expr)?.map_or_else(|| {
-                self.vim.eval(expr)
-            }, Ok)
-	})
+        self.current_word
+            .try_borrow_with(|| self.try_get(expr)?.map_or_else(|| self.vim.eval(expr), Ok))
     }
 
     pub fn get_text(&self, start: &str, end: &str) -> Fallible<&Vec<String>> {
-	self.text.try_borrow_with(|| {
-	    self.vim.getbufline(&self.bufname, start, end)
-	})
+        self.text
+            .try_borrow_with(|| self.vim.getbufline(&self.bufname, start, end))
     }
 }

src/vim.rs

@@ -32,7 +32,8 @@ impl Vim {
     }
 
     pub fn getbufline(&self, bufname: &str, start: &str, end: &str) -> Fallible<Vec<String>> {
-	self.rpcclient.call("getbufline", json!([bufname, start, end]))
+        self.rpcclient
+            .call("getbufline", json!([bufname, start, end]))
     }
 
     pub fn echo(&self, message: impl AsRef<str>) -> Fallible<()> {