Merge pull request #1478 from matthiaskrgr/clippy_4

fix a couple of clippy/rustc warnings

Author: Xanewok

Cargo.lock

@@ -31,7 +31,7 @@ rls-vfs = "0.8"
 
 cargo = { git = "https://github.com/rust-lang/cargo", rev = "d56af31df1fbe45105ccd3b633297b2bc61e7405" }
 cargo_metadata = "0.7"
-clippy_lints = { git = "https://github.com/rust-lang/rust-clippy", rev = "60a609acaed3bf2b3ec6ab995bccf0f03bc26060", optional = true }
+clippy_lints = { git = "https://github.com/rust-lang/rust-clippy", rev = "71be6f62fa920c0bd10cdf3a29aeb8c6719a8075", optional = true }
 env_logger = "0.6"
 failure = "0.1.1"
 home = "0.3"

Cargo.toml

@@ -92,13 +92,13 @@ impl Rustfmt {
 
                 // Rustfmt represents an added line as start_line == end_line, new_text == "",
                 // which is a no-op, so we need to add a terminating newline.
-                if start_line == end_line && new_text.len() == 0 {
+                if start_line == end_line && new_text.is_empty() {
                     new_text.push_str(newline);
                 }
 
                 // Line deletions are represented as start_line != end_line, new_text == "".
                 // If we're not deleting a line, there should always be a terminating newline.
-                let delete_only = start_line != end_line && new_text.len() == 0;
+                let delete_only = start_line != end_line && new_text.is_empty();
                 if !delete_only && !new_text.ends_with(newline) {
                     new_text.push_str(newline);
                 }

rls/src/actions/format.rs

@@ -40,7 +40,7 @@ mod child_process;
 // however we only call `Runtime::block_on` and whenever we do it, there are no
 // active borrows in scope.
 type Messages = Rc<RefCell<Vec<Value>>>;
-type Channels = Rc<RefCell<Vec<(Box<Fn(&Value) -> bool>, oneshot::Sender<Value>)>>>;
+type Channels = Rc<RefCell<Vec<(Box<dyn Fn(&Value) -> bool>, oneshot::Sender<Value>)>>>;
 
 type LspFramed<T> = tokio::codec::Framed<T, LspCodec>;