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_syntax/src/lexer | |
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_syntax/src/lexer')
-rw-r--r-- | crates/ra_syntax/src/lexer/ptr.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crates/ra_syntax/src/lexer/ptr.rs b/crates/ra_syntax/src/lexer/ptr.rs index fa79d8862..4c291b9c4 100644 --- a/crates/ra_syntax/src/lexer/ptr.rs +++ b/crates/ra_syntax/src/lexer/ptr.rs | |||
@@ -31,7 +31,7 @@ impl<'s> Ptr<'s> { | |||
31 | /// For example, 0 will return the current token, 1 will return the next, etc. | 31 | /// For example, 0 will return the current token, 1 will return the next, etc. |
32 | pub fn nth(&self, n: u32) -> Option<char> { | 32 | pub fn nth(&self, n: u32) -> Option<char> { |
33 | let mut chars = self.chars().peekable(); | 33 | let mut chars = self.chars().peekable(); |
34 | chars.by_ref().skip(n as usize).next() | 34 | chars.by_ref().nth(n as usize) |
35 | } | 35 | } |
36 | 36 | ||
37 | /// Checks whether the current character is `c`. | 37 | /// Checks whether the current character is `c`. |