Apply suggestion

Author: kjeremy

crates/rust-analyzer/src/conv.rs

@@ -307,42 +307,51 @@ impl ConvWith<&WorldSnapshot> for &'static str {
     type Output = (SemanticTokenType, Vec<SemanticTokenModifier>);
 
     fn conv_with(self, _world: &WorldSnapshot) -> (SemanticTokenType, Vec<SemanticTokenModifier>) {
-        match self {
-            tags::FIELD => (SemanticTokenType::MEMBER, vec![]),
-            tags::FUNCTION => (SemanticTokenType::FUNCTION, vec![]),
-            tags::MODULE => (SemanticTokenType::NAMESPACE, vec![]),
-            tags::CONSTANT => (
-                SemanticTokenType::VARIABLE,
-                vec![SemanticTokenModifier::STATIC, SemanticTokenModifier::READONLY],
-            ),
-            tags::MACRO => (SemanticTokenType::MACRO, vec![]),
+        let token_type: SemanticTokenType = match self {
+            tags::FIELD => SemanticTokenType::MEMBER,
+            tags::FUNCTION => SemanticTokenType::FUNCTION,
+            tags::MODULE => SemanticTokenType::NAMESPACE,
+            tags::CONSTANT => {
+                return (
+                    SemanticTokenType::VARIABLE,
+                    vec![SemanticTokenModifier::STATIC, SemanticTokenModifier::READONLY],
+                )
+            }
+            tags::MACRO => SemanticTokenType::MACRO,
 
-            tags::VARIABLE => (SemanticTokenType::VARIABLE, vec![SemanticTokenModifier::READONLY]),
-            tags::VARIABLE_MUT => (SemanticTokenType::VARIABLE, vec![]),
+            tags::VARIABLE => {
+                return (SemanticTokenType::VARIABLE, vec![SemanticTokenModifier::READONLY])
+            }
+            tags::VARIABLE_MUT => SemanticTokenType::VARIABLE,
 
-            tags::TYPE => (SemanticTokenType::TYPE, vec![]),
-            tags::TYPE_BUILTIN => (SemanticTokenType::TYPE, vec![]),
-            tags::TYPE_SELF => (SemanticTokenType::TYPE, vec![SemanticTokenModifier::REFERENCE]),
-            tags::TYPE_PARAM => (SemanticTokenType::TYPE_PARAMETER, vec![]),
+            tags::TYPE => SemanticTokenType::TYPE,
+            tags::TYPE_BUILTIN => SemanticTokenType::TYPE,
+            tags::TYPE_SELF => {
+                return (SemanticTokenType::TYPE, vec![SemanticTokenModifier::REFERENCE])
+            }
+            tags::TYPE_PARAM => SemanticTokenType::TYPE_PARAMETER,
             tags::TYPE_LIFETIME => {
-                (SemanticTokenType::LABEL, vec![SemanticTokenModifier::REFERENCE])
+                return (SemanticTokenType::LABEL, vec![SemanticTokenModifier::REFERENCE])
             }
 
-            tags::LITERAL_BYTE => (SemanticTokenType::NUMBER, vec![]),
-            tags::LITERAL_NUMERIC => (SemanticTokenType::NUMBER, vec![]),
-            tags::LITERAL_CHAR => (SemanticTokenType::NUMBER, vec![]),
+            tags::LITERAL_BYTE => SemanticTokenType::NUMBER,
+            tags::LITERAL_NUMERIC => SemanticTokenType::NUMBER,
+            tags::LITERAL_CHAR => SemanticTokenType::NUMBER,
 
             tags::LITERAL_COMMENT => {
-                (SemanticTokenType::COMMENT, vec![SemanticTokenModifier::DOCUMENTATION])
+                return (SemanticTokenType::COMMENT, vec![SemanticTokenModifier::DOCUMENTATION])
             }
-            tags::LITERAL_STRING => (SemanticTokenType::STRING, vec![]),
-            tags::LITERAL_ATTRIBUTE => (SemanticTokenType::KEYWORD, vec![]),
 
-            tags::KEYWORD => (SemanticTokenType::KEYWORD, vec![]),
-            tags::KEYWORD_UNSAFE => (SemanticTokenType::KEYWORD, vec![]),
-            tags::KEYWORD_CONTROL => (SemanticTokenType::KEYWORD, vec![]),
+            tags::LITERAL_STRING => SemanticTokenType::STRING,
+            tags::LITERAL_ATTRIBUTE => SemanticTokenType::KEYWORD,
+
+            tags::KEYWORD => SemanticTokenType::KEYWORD,
+            tags::KEYWORD_UNSAFE => SemanticTokenType::KEYWORD,
+            tags::KEYWORD_CONTROL => SemanticTokenType::KEYWORD,
             unknown => panic!("Unknown semantic token: {}", unknown),
-        }
+        };
+
+        (token_type, vec![])
     }
 }