Translate remaining tests

tests/support/client.rs

@@ -155,8 +155,9 @@ impl RlsHandle {
             "params": params,
         }));
 
-        let msg = self.wait_for_message(move |val| val["id"] == id && val.get("result").is_some());
+        let msg = self.wait_for_message(move |val| val["id"] == id);
 
+        // TODO: Bubble up errors
         R::Result::deserialize(&msg["result"])
             .unwrap_or_else(|_| panic!("Can't deserialize results: {:?}", msg))
     }
@@ -187,7 +188,7 @@ impl RlsHandle {
 
     /// Enqueues a channel that is notified and consumed when a given predicate
     /// `f` is true for a received message.
-    fn future_msg(
+    pub fn future_msg(
         &mut self,
         f: impl Fn(&Value) -> bool + 'static,
     ) -> impl Future<Item = Value, Error = oneshot::Canceled> {
@@ -219,6 +220,7 @@ impl RlsHandle {
     }
 
     /// Blocks until the processing (building + indexing) is done by the RLS.
+    #[allow(clippy::bool_comparison)]
     pub fn wait_for_indexing(&mut self) {
         self.wait_for_message(|msg| {
             msg["params"]["title"] == "Indexing" && msg["params"]["done"] == true

tests/support/paths.rs

@@ -2,6 +2,7 @@
 
 use std::cell::Cell;
 use std::env;
+use std::ffi::OsStr;
 use std::fs;
 use std::io::{self, ErrorKind};
 use std::path::{Path, PathBuf};
@@ -38,7 +39,7 @@ fn global_root() -> PathBuf {
     // `target`. If, however, `cargo test --target $target` is used then the
     // output is `target/$target/debug/foo`, so our path is pointing at
     // `target/$target`. Here we conditionally pop the `$target` name.
-    if path.file_name().and_then(|s| s.to_str()) != Some("target") {
+    if path.file_name().and_then(OsStr::to_str) != Some("target") {
         path.pop();
     }