Fix conflicts

Kampfkarren · Nov 11, 2023 · 077d01f · 077d01f
1 parent eeacd3d
commit 077d01f
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 14 deletions.
diff --git a/selene-lib/src/lints/roblox_incorrect_roact_usage.rs b/selene-lib/src/lints/roblox_incorrect_roact_usage.rs
@@ -34,17 +34,14 @@ fn is_lua_valid_table_key_identifier(string: &String) -> bool {
 
 fn get_lua_table_key_format(expression: &ast::Expression) -> String {
     match expression {
-        ast::Expression::Value { value, .. } => match &**value {
-            ast::Value::String(token) => {
-                let string = token.to_string();
-                if is_lua_valid_table_key_identifier(&string) {
-                    string[1..string.len() - 1].to_string()
-                } else {
-                    format!("[{}]", string)
-                }
+        ast::Expression::String(token) => {
+            let string = token.to_string();
+            if is_lua_valid_table_key_identifier(&string) {
+                string[1..string.len() - 1].to_string()
+            } else {
+                format!("[{}]", string)
             }
-            _ => format!("[{}]", expression),
-        },
+        }
         _ => format!("[{}]", expression),
     }
 }

diff --git a/selene-lib/src/lints/roblox_suspicious_udim2_new.rs b/selene-lib/src/lints/roblox_suspicious_udim2_new.rs
@@ -102,10 +102,7 @@ impl Visitor for UDim2CountVisitor {
                 }
 
                 let numbers_passed = arguments.iter().filter(|expression| {
-                    match expression {
-                        ast::Expression::Value { value, .. } => matches!(&**value, ast::Value::Number(_)),
-                        _ => false,
-                    }
+                    matches!(expression, ast::Expression::Number(_))
                 }).count();
 
                 // Prevents false positives for UDim2.new(UDim.new(), UDim.new())