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_analysis/src/imp.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_analysis/src/imp.rs')
-rw-r--r-- | crates/ra_analysis/src/imp.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crates/ra_analysis/src/imp.rs b/crates/ra_analysis/src/imp.rs index 32e9bb6d7..196627539 100644 --- a/crates/ra_analysis/src/imp.rs +++ b/crates/ra_analysis/src/imp.rs | |||
@@ -426,12 +426,12 @@ impl AnalysisImpl { | |||
426 | .text() | 426 | .text() |
427 | .slice(range_search) | 427 | .slice(range_search) |
428 | .to_string() | 428 | .to_string() |
429 | .matches(",") | 429 | .matches(',') |
430 | .count(); | 430 | .count(); |
431 | 431 | ||
432 | // If we have a method call eat the first param since it's just self. | 432 | // If we have a method call eat the first param since it's just self. |
433 | if has_self { | 433 | if has_self { |
434 | commas = commas + 1; | 434 | commas += 1; |
435 | } | 435 | } |
436 | 436 | ||
437 | current_parameter = Some(commas); | 437 | current_parameter = Some(commas); |