From ed3d93b875f25da6f81b8a107a8c200311240627 Mon Sep 17 00:00:00 2001 From: Alan Du Date: Tue, 4 Jun 2019 02:38:13 -0400 Subject: Fix clippy::single_char_pattern --- crates/ra_assists/src/introduce_variable.rs | 4 ++-- crates/ra_hir/src/expr/validation.rs | 7 ++----- crates/ra_project_model/src/lib.rs | 2 +- crates/ra_syntax/src/ast/extensions.rs | 2 +- 4 files changed, 6 insertions(+), 9 deletions(-) diff --git a/crates/ra_assists/src/introduce_variable.rs b/crates/ra_assists/src/introduce_variable.rs index fb7333c8c..28467d341 100644 --- a/crates/ra_assists/src/introduce_variable.rs +++ b/crates/ra_assists/src/introduce_variable.rs @@ -57,9 +57,9 @@ pub(crate) fn introduce_variable(mut ctx: AssistCtx) -> Option if text.starts_with("\r\n") { buf.push_str("\r\n"); buf.push_str(text.trim_start_matches("\r\n")); - } else if text.starts_with("\n") { + } else if text.starts_with('\n') { buf.push_str("\n"); - buf.push_str(text.trim_start_matches("\n")); + buf.push_str(text.trim_start_matches('\n')); } else { buf.push_str(text); } diff --git a/crates/ra_hir/src/expr/validation.rs b/crates/ra_hir/src/expr/validation.rs index 592f558f2..a1b2641da 100644 --- a/crates/ra_hir/src/expr/validation.rs +++ b/crates/ra_hir/src/expr/validation.rs @@ -31,11 +31,8 @@ impl<'a, 'b> ExprValidator<'a, 'b> { pub(crate) fn validate_body(&mut self, db: &impl HirDatabase) { let body = self.func.body(db); for e in body.exprs() { - match e { - (id, Expr::StructLit { path, fields, spread }) => { - self.validate_struct_literal(id, path, fields, spread, db) - } - _ => (), + if let (id, Expr::StructLit { path, fields, spread }) = e { + self.validate_struct_literal(id, path, fields, spread, db); } } } diff --git a/crates/ra_project_model/src/lib.rs b/crates/ra_project_model/src/lib.rs index 63eb7041e..4ae7f685c 100644 --- a/crates/ra_project_model/src/lib.rs +++ b/crates/ra_project_model/src/lib.rs @@ -70,7 +70,7 @@ impl ProjectRoot { }) }; - let hidden = dir_path.components().any(|c| c.as_str().starts_with(".")); + let hidden = dir_path.components().any(|c| c.as_str().starts_with('.')); !is_ignored && !hidden } diff --git a/crates/ra_syntax/src/ast/extensions.rs b/crates/ra_syntax/src/ast/extensions.rs index e4c99784c..930b2d9fa 100644 --- a/crates/ra_syntax/src/ast/extensions.rs +++ b/crates/ra_syntax/src/ast/extensions.rs @@ -78,7 +78,7 @@ impl ast::Attr { if attr.kind() == IDENT { let key = attr.as_token()?.text().clone(); let val_node = tt_node.children_with_tokens().find(|t| t.kind() == STRING)?; - let val = val_node.as_token()?.text().trim_start_matches("\"").trim_end_matches("\""); + let val = val_node.as_token()?.text().trim_start_matches('"').trim_end_matches('"'); Some((key, SmolStr::new(val))) } else { None -- cgit v1.2.3