diff options
author | bors[bot] <bors[bot]@users.noreply.github.com> | 2018-10-22 22:14:38 +0100 |
---|---|---|
committer | bors[bot] <bors[bot]@users.noreply.github.com> | 2018-10-22 22:14:38 +0100 |
commit | 27694abd9473c53cee4549dfe5ef5d28d0c01bed (patch) | |
tree | 6f51587dc28fc8fe28c0971a810541421ea2d829 /crates/ra_lsp_server/src/server_world.rs | |
parent | 5a64b9a811554473e65db7e7ae515079ca48c70b (diff) | |
parent | dc9ce8ff7494f641c7102785cdef95489f2fc3d6 (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/server_world.rs')
-rw-r--r-- | crates/ra_lsp_server/src/server_world.rs | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/crates/ra_lsp_server/src/server_world.rs b/crates/ra_lsp_server/src/server_world.rs index 35ff65ea1..69b2a1cd1 100644 --- a/crates/ra_lsp_server/src/server_world.rs +++ b/crates/ra_lsp_server/src/server_world.rs | |||
@@ -73,9 +73,7 @@ impl ServerWorldState { | |||
73 | events | 73 | events |
74 | .into_iter() | 74 | .into_iter() |
75 | .map(|event| { | 75 | .map(|event| { |
76 | let text = match event.kind { | 76 | let FileEventKind::Add(text) = event.kind; |
77 | FileEventKind::Add(text) => text, | ||
78 | }; | ||
79 | (event.path, text) | 77 | (event.path, text) |
80 | }) | 78 | }) |
81 | .map(|(path, text)| (pm.get_or_insert(path, Root::Lib), text)) | 79 | .map(|(path, text)| (pm.get_or_insert(path, Root::Lib), text)) |