aboutsummaryrefslogtreecommitdiff
path: root/crates/ra_syntax/src/ast
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_syntax/src/ast
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_syntax/src/ast')
-rw-r--r--crates/ra_syntax/src/ast/mod.rs5
1 files changed, 2 insertions, 3 deletions
diff --git a/crates/ra_syntax/src/ast/mod.rs b/crates/ra_syntax/src/ast/mod.rs
index 34958b6cb..900426a8a 100644
--- a/crates/ra_syntax/src/ast/mod.rs
+++ b/crates/ra_syntax/src/ast/mod.rs
@@ -259,9 +259,8 @@ impl<'a, N: AstNode<'a>> Iterator for AstChildren<'a, N> {
259 type Item = N; 259 type Item = N;
260 fn next(&mut self) -> Option<N> { 260 fn next(&mut self) -> Option<N> {
261 loop { 261 loop {
262 match N::cast(self.inner.next()?) { 262 if let Some(n) = N::cast(self.inner.next()?) {
263 Some(n) => return Some(n), 263 return Some(n);
264 None => (),
265 } 264 }
266 } 265 }
267 } 266 }