Stabilize checking additional key expression types in SIM910 (#22976)

Added in #20343

Author: ntBre

crates/ruff_linter/src/preview.rs

@@ -201,11 +201,6 @@ pub(crate) const fn is_future_required_preview_generics_enabled(settings: &Linte
     settings.preview.is_enabled()
 }
 
-// https://github.com/astral-sh/ruff/pull/20343
-pub(crate) const fn is_sim910_expanded_key_support_enabled(settings: &LinterSettings) -> bool {
-    settings.preview.is_enabled()
-}
-
 // https://github.com/astral-sh/ruff/pull/20169
 pub(crate) const fn is_fix_builtin_open_enabled(settings: &LinterSettings) -> bool {
     settings.preview.is_enabled()

crates/ruff_linter/src/rules/flake8_simplify/mod.rs

@@ -59,7 +59,6 @@ mod tests {
         Ok(())
     }
 
-    #[test_case(Rule::DictGetWithNoneDefault, Path::new("SIM910.py"))]
     #[test_case(Rule::EnumerateForLoop, Path::new("SIM113.py"))]
     fn preview_rules(rule_code: Rule, path: &Path) -> Result<()> {
         let snapshot = format!(

crates/ruff_linter/src/rules/flake8_simplify/rules/ast_expr.rs

@@ -270,11 +270,6 @@ pub(crate) fn dict_get_with_none_default(checker: &Checker, expr: &Expr) {
     let Some(key) = args.first() else {
         return;
     };
-    if !crate::preview::is_sim910_expanded_key_support_enabled(checker.settings()) {
-        if !(key.is_literal_expr() || key.is_name_expr()) {
-            return;
-        }
-    }
     let Some(default) = args.get(1) else {
         return;
     };

crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM910_SIM910.py.snap

@@ -171,6 +171,83 @@ help: Replace `dict.get("Cat", None)` with `dict.get("Cat")`
 59 | 
 60 | # https://github.com/astral-sh/ruff/issues/20341
 
+SIM910 [*] Use `ages.get(key_source.get("Thomas", "Tom"))` instead of `ages.get(key_source.get("Thomas", "Tom"), None)`
+  --> SIM910.py:64:7
+   |
+62 | ages = {"Tom": 23, "Maria": 23, "Dog": 11}
+63 | key_source = {"Thomas": "Tom"}
+64 | age = ages.get(key_source.get("Thomas", "Tom"), None)
+   |       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+65 |
+66 | # Property access as key
+   |
+help: Replace `ages.get(key_source.get("Thomas", "Tom"), None)` with `ages.get(key_source.get("Thomas", "Tom"))`
+61 | # Method call as key
+62 | ages = {"Tom": 23, "Maria": 23, "Dog": 11}
+63 | key_source = {"Thomas": "Tom"}
+   - age = ages.get(key_source.get("Thomas", "Tom"), None)
+64 + age = ages.get(key_source.get("Thomas", "Tom"))
+65 | 
+66 | # Property access as key
+67 | class Data:
+
+SIM910 [*] Use `ages.get(data.name)` instead of `ages.get(data.name, None)`
+  --> SIM910.py:73:7
+   |
+71 | data = Data()
+72 | ages = {"Tom": 23, "Maria": 23, "Dog": 11}
+73 | age = ages.get(data.name, None)
+   |       ^^^^^^^^^^^^^^^^^^^^^^^^^
+74 |
+75 | # Complex expression as key
+   |
+help: Replace `ages.get(data.name, None)` with `ages.get(data.name)`
+70 | 
+71 | data = Data()
+72 | ages = {"Tom": 23, "Maria": 23, "Dog": 11}
+   - age = ages.get(data.name, None)
+73 + age = ages.get(data.name)
+74 | 
+75 | # Complex expression as key
+76 | ages = {"Tom": 23, "Maria": 23, "Dog": 11}
+
+SIM910 [*] Use `ages.get("Tom" if True else "Maria")` instead of `ages.get("Tom" if True else "Maria", None)`
+  --> SIM910.py:77:7
+   |
+75 | # Complex expression as key
+76 | ages = {"Tom": 23, "Maria": 23, "Dog": 11}
+77 | age = ages.get("Tom" if True else "Maria", None)
+   |       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+78 |
+79 | # Function call as key
+   |
+help: Replace `ages.get("Tom" if True else "Maria", None)` with `ages.get("Tom" if True else "Maria")`
+74 | 
+75 | # Complex expression as key
+76 | ages = {"Tom": 23, "Maria": 23, "Dog": 11}
+   - age = ages.get("Tom" if True else "Maria", None)
+77 + age = ages.get("Tom" if True else "Maria")
+78 | 
+79 | # Function call as key
+80 | def get_key():
+
+SIM910 [*] Use `ages.get(get_key())` instead of `ages.get(get_key(), None)`
+  --> SIM910.py:84:7
+   |
+83 | ages = {"Tom": 23, "Maria": 23, "Dog": 11}
+84 | age = ages.get(get_key(), None)
+   |       ^^^^^^^^^^^^^^^^^^^^^^^^^
+   |
+help: Replace `ages.get(get_key(), None)` with `ages.get(get_key())`
+81 |     return "Tom"
+82 | 
+83 | ages = {"Tom": 23, "Maria": 23, "Dog": 11}
+   - age = ages.get(get_key(), None)
+84 + age = ages.get(get_key())
+85 | 
+86 | 
+87 | age = ages.get(
+
 SIM910 [*] Use `dict.get()` without default value
   --> SIM910.py:87:7
    |