simplify with starts/ends_with

Author: jonboh

clippy_lints/src/struct_fields.rs

@@ -1,5 +1,5 @@
 use clippy_utils::diagnostics::{span_lint_and_help, span_lint_hir};
-use clippy_utils::str_utils::{count_match_end, count_match_start, to_snake_case};
+use clippy_utils::str_utils::to_snake_case;
 use rustc_hir::{FieldDef, ItemKind, VariantData};
 use rustc_lint::{LateContext, LateLintPass};
 use rustc_session::{declare_tool_lint, impl_lint_pass};
@@ -122,12 +122,8 @@ fn check_fields(cx: &LateContext<'_>, threshold: u64, fields: &[FieldDef<'_>], i
 fn check_struct_start(cx: &LateContext<'_>, item_name: &str, field: &FieldDef<'_>) {
     let item_name_snake = to_snake_case(item_name);
     let name = field.ident.name.as_str();
-    let item_name_chars = item_name_snake.chars().count();
 
-    if count_match_start(&item_name_snake, name).char_count == item_name_chars
-        && name.chars().nth(item_name_chars).map_or(false, |c| !c.is_lowercase())
-        && name.chars().nth(item_name_chars + 1).map_or(false, |c| !c.is_numeric())
-    {
+    if name.starts_with(&item_name_snake) {
         span_lint_hir(
             cx,
             STRUCT_FIELD_NAMES,
@@ -141,9 +137,8 @@ fn check_struct_start(cx: &LateContext<'_>, item_name: &str, field: &FieldDef<'_
 fn check_struct_end(cx: &LateContext<'_>, item_name: &str, field: &FieldDef<'_>) {
     let item_name_snake = to_snake_case(item_name);
     let name = field.ident.name.as_str();
-    let item_name_chars = item_name_snake.chars().count();
 
-    if count_match_end(&item_name_snake, name).char_count == item_name_chars {
+    if name.ends_with(&item_name_snake) {
         span_lint_hir(
             cx,
             STRUCT_FIELD_NAMES,