From 5db663d61fb8b006e3b84ef3bcc9cddbe94e5f49 Mon Sep 17 00:00:00 2001
From: Alan Du <alanhdu@gmail.com>
Date: Tue, 16 Oct 2018 11:45:10 -0400
Subject: Clippy lint:  single-character string constant

---
 crates/ra_lsp_server/src/main_loop/handlers.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'crates/ra_lsp_server/src/main_loop')

diff --git a/crates/ra_lsp_server/src/main_loop/handlers.rs b/crates/ra_lsp_server/src/main_loop/handlers.rs
index c25b63852..49bd7895a 100644
--- a/crates/ra_lsp_server/src/main_loop/handlers.rs
+++ b/crates/ra_lsp_server/src/main_loop/handlers.rs
@@ -160,8 +160,8 @@ pub fn handle_workspace_symbol(
     params: req::WorkspaceSymbolParams,
     token: JobToken,
 ) -> Result<Option<Vec<SymbolInformation>>> {
-    let all_symbols = params.query.contains("#");
-    let libs = params.query.contains("*");
+    let all_symbols = params.query.contains('#');
+    let libs = params.query.contains('*');
     let query = {
         let query: String = params
             .query
-- 
cgit v1.2.3


From 2ae9dfa812ccf18867373f77a106161378a6d91d Mon Sep 17 00:00:00 2001
From: Alan Du <alanhdu@gmail.com>
Date: Tue, 16 Oct 2018 13:31:16 -0400
Subject: clippy: Fix new_ret_no_self

---
 crates/ra_lsp_server/src/main_loop/mod.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'crates/ra_lsp_server/src/main_loop')

diff --git a/crates/ra_lsp_server/src/main_loop/mod.rs b/crates/ra_lsp_server/src/main_loop/mod.rs
index a11baf4aa..2623ab84e 100644
--- a/crates/ra_lsp_server/src/main_loop/mod.rs
+++ b/crates/ra_lsp_server/src/main_loop/mod.rs
@@ -355,7 +355,7 @@ impl<'a> PoolDispatcher<'a> {
         };
         match req.cast::<R>() {
             Ok((id, params)) => {
-                let (handle, token) = JobHandle::new();
+                let (handle, token) = JobHandle::new_pair();
                 let world = self.world.snapshot();
                 let sender = self.sender.clone();
                 self.pool.spawn(move || {
-- 
cgit v1.2.3


From a5da770ec60a73abcc5350f25146be973540063f Mon Sep 17 00:00:00 2001
From: Alan Du <alanhdu@gmail.com>
Date: Wed, 17 Oct 2018 19:25:37 -0400
Subject: Fix function calls

---
 crates/ra_lsp_server/src/main_loop/handlers.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'crates/ra_lsp_server/src/main_loop')

diff --git a/crates/ra_lsp_server/src/main_loop/handlers.rs b/crates/ra_lsp_server/src/main_loop/handlers.rs
index 49bd7895a..3e58e6f54 100644
--- a/crates/ra_lsp_server/src/main_loop/handlers.rs
+++ b/crates/ra_lsp_server/src/main_loop/handlers.rs
@@ -289,8 +289,8 @@ pub fn handle_runnables(
                 .filter_map(|ws| {
                     let tgt = ws.target_by_root(path)?;
                     Some((
-                        tgt.package(ws).name(ws).clone(),
-                        tgt.name(ws).clone(),
+                        tgt.package(ws).name(ws),
+                        tgt.name(ws),
                         tgt.kind(ws),
                     ))
                 })
-- 
cgit v1.2.3


From 0857c22f263ff18418f939b57a7a2ab3f8aac2c1 Mon Sep 17 00:00:00 2001
From: Alan Du <alanhdu@gmail.com>
Date: Sat, 20 Oct 2018 12:29:25 -0400
Subject: Revert "clippy: Fix new_ret_no_self"

This reverts commit 2ae9dfa812ccf18867373f77a106161378a6d91d.
---
 crates/ra_lsp_server/src/main_loop/mod.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'crates/ra_lsp_server/src/main_loop')

diff --git a/crates/ra_lsp_server/src/main_loop/mod.rs b/crates/ra_lsp_server/src/main_loop/mod.rs
index 2623ab84e..a11baf4aa 100644
--- a/crates/ra_lsp_server/src/main_loop/mod.rs
+++ b/crates/ra_lsp_server/src/main_loop/mod.rs
@@ -355,7 +355,7 @@ impl<'a> PoolDispatcher<'a> {
         };
         match req.cast::<R>() {
             Ok((id, params)) => {
-                let (handle, token) = JobHandle::new_pair();
+                let (handle, token) = JobHandle::new();
                 let world = self.world.snapshot();
                 let sender = self.sender.clone();
                 self.pool.spawn(move || {
-- 
cgit v1.2.3