about summary refs log tree commit diff
diff options
context:
space:
mode:
authorroife <roifewu@gmail.com>2024-02-03 13:46:16 +0800
committerroife <roifewu@gmail.com>2024-02-03 13:46:16 +0800
commitfb9fd513f57ea6939c20829286b2c44398c35d2d (patch)
treeae7c33687c8175d9f6fe4c646b00a98a7c20ae70
parent015ac1095417a61f293ca46b7f320ac935176c83 (diff)
downloadrust-fb9fd513f57ea6939c20829286b2c44398c35d2d.tar.gz
rust-fb9fd513f57ea6939c20829286b2c44398c35d2d.zip
Remove wildcard usage for patterns
-rw-r--r--clippy_lints/src/methods/unnecessary_fallible_conversions.rs21
1 files changed, 8 insertions, 13 deletions
diff --git a/clippy_lints/src/methods/unnecessary_fallible_conversions.rs b/clippy_lints/src/methods/unnecessary_fallible_conversions.rs
index 72bd8f7e000..bb23ae5f843 100644
--- a/clippy_lints/src/methods/unnecessary_fallible_conversions.rs
+++ b/clippy_lints/src/methods/unnecessary_fallible_conversions.rs
@@ -52,23 +52,18 @@ impl FunctionKind {
     }
 
     fn machine_applicable_sugg(&self, primary_span: Span, unwrap_span: Span) -> Vec<(Span, String)> {
-        use FunctionKind::*;
-        use SpansKind::*;
-
-        let (trait_name, fn_name) = {
-            let (a, b) = match self {
-                TryFromFunction(_) => ("From", "from"),
-                TryIntoFunction(_) | TryIntoMethod => ("Into", "into"),
-            };
-            (a.to_string(), b.to_string())
+        let (trait_name, fn_name) = match self {
+            FunctionKind::TryFromFunction(_) => ("From".to_owned(), "from".to_owned()),
+            FunctionKind::TryIntoFunction(_) | FunctionKind::TryIntoMethod => ("Into".to_owned(), "into".to_owned()),
         };
 
         let mut sugg = match *self {
-            TryFromFunction(Some(spans)) | TryIntoFunction(Some(spans)) => match spans {
-                TraitFn { trait_span, fn_span } => vec![(trait_span, trait_name), (fn_span, fn_name)],
-                Fn { fn_span } => vec![(fn_span, fn_name)],
+            FunctionKind::TryFromFunction(Some(spans)) | FunctionKind::TryIntoFunction(Some(spans)) => match spans {
+                SpansKind::TraitFn { trait_span, fn_span } => vec![(trait_span, trait_name), (fn_span, fn_name)],
+                SpansKind::Fn { fn_span } => vec![(fn_span, fn_name)],
             },
-            TryIntoMethod => vec![(primary_span, fn_name)],
+            FunctionKind::TryIntoMethod => vec![(primary_span, fn_name)],
+            // Or the suggestion is not machine-applicable
             _ => unreachable!(),
         };