aboutsummaryrefslogtreecommitdiff
path: root/crates/ra_lsp_server/src/main_loop
diff options
context:
space:
mode:
authorbors[bot] <bors[bot]@users.noreply.github.com>2018-10-22 22:14:38 +0100
committerbors[bot] <bors[bot]@users.noreply.github.com>2018-10-22 22:14:38 +0100
commit27694abd9473c53cee4549dfe5ef5d28d0c01bed (patch)
tree6f51587dc28fc8fe28c0971a810541421ea2d829 /crates/ra_lsp_server/src/main_loop
parent5a64b9a811554473e65db7e7ae515079ca48c70b (diff)
parentdc9ce8ff7494f641c7102785cdef95489f2fc3d6 (diff)
Merge #138
138: Fix some clippy lints r=matklad a=alanhdu I went ahead and fixed all the clippy lints (there were a couple I thought would be better unfixed and added `cfg` statements to allow them) and also re-enabled clippy and rustfmt in CI. They were disabled with `no time to explain, disable clippy checks`, so hopefully this won't go against whatever the reason at the time was :laughing:. One question about the CI though: right now, it's an allowed failure that runs against the latest nightly each time. Would it be better to pin it to a specific nightly (or use the `beta` versions) to lower the churn? Co-authored-by: Alan Du <[email protected]>
Diffstat (limited to 'crates/ra_lsp_server/src/main_loop')
-rw-r--r--crates/ra_lsp_server/src/main_loop/handlers.rs8
1 files changed, 4 insertions, 4 deletions
diff --git a/crates/ra_lsp_server/src/main_loop/handlers.rs b/crates/ra_lsp_server/src/main_loop/handlers.rs
index f5dff4c80..11f34eb93 100644
--- a/crates/ra_lsp_server/src/main_loop/handlers.rs
+++ b/crates/ra_lsp_server/src/main_loop/handlers.rs
@@ -154,8 +154,8 @@ pub fn handle_workspace_symbol(
154 world: ServerWorld, 154 world: ServerWorld,
155 params: req::WorkspaceSymbolParams, 155 params: req::WorkspaceSymbolParams,
156) -> Result<Option<Vec<SymbolInformation>>> { 156) -> Result<Option<Vec<SymbolInformation>>> {
157 let all_symbols = params.query.contains("#"); 157 let all_symbols = params.query.contains('#');
158 let libs = params.query.contains("*"); 158 let libs = params.query.contains('*');
159 let query = { 159 let query = {
160 let query: String = params 160 let query: String = params
161 .query 161 .query
@@ -279,8 +279,8 @@ pub fn handle_runnables(
279 .filter_map(|ws| { 279 .filter_map(|ws| {
280 let tgt = ws.target_by_root(path)?; 280 let tgt = ws.target_by_root(path)?;
281 Some(( 281 Some((
282 tgt.package(ws).name(ws).clone(), 282 tgt.package(ws).name(ws),
283 tgt.name(ws).clone(), 283 tgt.name(ws),
284 tgt.kind(ws), 284 tgt.kind(ws),
285 )) 285 ))
286 }) 286 })