[flake8-boolean-trap] Stabilize lint bool suprtypes in boolean-type-hint-positional-argument (FBT001) (#18520)

Feel free to complain about the rephrasing in the docs!

Author: dylwil3

crates/ruff_linter/src/preview.rs

@@ -23,11 +23,6 @@ pub(crate) const fn is_suspicious_function_reference_enabled(settings: &LinterSe
     settings.preview.is_enabled()
 }
 
-// https://github.com/astral-sh/ruff/pull/7501
-pub(crate) const fn is_bool_subtype_of_annotation_enabled(settings: &LinterSettings) -> bool {
-    settings.preview.is_enabled()
-}
-
 // https://github.com/astral-sh/ruff/pull/10759
 pub(crate) const fn is_comprehension_with_min_max_sum_enabled(settings: &LinterSettings) -> bool {
     settings.preview.is_enabled()

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

@@ -12,7 +12,6 @@ mod tests {
 
     use crate::registry::Rule;
     use crate::settings::LinterSettings;
-    use crate::settings::types::PreviewMode;
     use crate::test::test_path;
     use crate::{assert_messages, settings};
 
@@ -29,24 +28,6 @@ mod tests {
         Ok(())
     }
 
-    #[test_case(Rule::BooleanTypeHintPositionalArgument, Path::new("FBT.py"))]
-    fn preview_rules(rule_code: Rule, path: &Path) -> Result<()> {
-        let snapshot = format!(
-            "preview__{}_{}",
-            rule_code.noqa_code(),
-            path.to_string_lossy()
-        );
-        let diagnostics = test_path(
-            Path::new("flake8_boolean_trap").join(path).as_path(),
-            &settings::LinterSettings {
-                preview: PreviewMode::Enabled,
-                ..settings::LinterSettings::for_rule(rule_code)
-            },
-        )?;
-        assert_messages!(snapshot, diagnostics);
-        Ok(())
-    }
-
     #[test]
     fn extend_allowed_callable() -> Result<()> {
         let diagnostics = test_path(

crates/ruff_linter/src/rules/flake8_boolean_trap/rules/boolean_type_hint_positional_argument.rs

@@ -7,12 +7,12 @@ use ruff_python_semantic::analyze::visibility;
 
 use crate::Violation;
 use crate::checkers::ast::Checker;
-use crate::preview::is_bool_subtype_of_annotation_enabled;
 use crate::rules::flake8_boolean_trap::helpers::is_allowed_func_def;
 
 /// ## What it does
 /// Checks for the use of boolean positional arguments in function definitions,
-/// as determined by the presence of a `bool` type hint.
+/// as determined by the presence of a type hint containing `bool` as an
+/// evident subtype - e.g. `bool`, `bool | int`, `typing.Optional[bool]`, etc.
 ///
 /// ## Why is this bad?
 /// Calling a function with boolean positional arguments is confusing as the
@@ -30,9 +30,6 @@ use crate::rules::flake8_boolean_trap::helpers::is_allowed_func_def;
 /// Dunder methods that define operators are exempt from this rule, as are
 /// setters and `@override` definitions.
 ///
-/// In [preview], this rule will also flag annotations that include boolean
-/// variants, like `bool | int`.
-///
 /// ## Example
 ///
 /// ```python
@@ -96,8 +93,6 @@ use crate::rules::flake8_boolean_trap::helpers::is_allowed_func_def;
 /// ## References
 /// - [Python documentation: Calls](https://docs.python.org/3/reference/expressions.html#calls)
 /// - [_How to Avoid “The Boolean Trap”_ by Adam Johnson](https://adamj.eu/tech/2021/07/10/python-type-hints-how-to-avoid-the-boolean-trap/)
-///
-/// [preview]: https://docs.astral.sh/ruff/preview/
 #[derive(ViolationMetadata)]
 pub(crate) struct BooleanTypeHintPositionalArgument;
 
@@ -128,14 +123,8 @@ pub(crate) fn boolean_type_hint_positional_argument(
         let Some(annotation) = parameter.annotation() else {
             continue;
         };
-        if is_bool_subtype_of_annotation_enabled(checker.settings) {
-            if !match_annotation_to_complex_bool(annotation, checker.semantic()) {
-                continue;
-            }
-        } else {
-            if !match_annotation_to_literal_bool(annotation) {
-                continue;
-            }
+        if !match_annotation_to_complex_bool(annotation, checker.semantic()) {
+            continue;
         }
 
         // Allow Boolean type hints in setters.
@@ -161,17 +150,6 @@ pub(crate) fn boolean_type_hint_positional_argument(
     }
 }
 
-/// Returns `true` if the annotation is a boolean type hint (e.g., `bool`).
-fn match_annotation_to_literal_bool(annotation: &Expr) -> bool {
-    match annotation {
-        // Ex) `True`
-        Expr::Name(name) => &name.id == "bool",
-        // Ex) `"True"`
-        Expr::StringLiteral(ast::ExprStringLiteral { value, .. }) => value == "bool",
-        _ => false,
-    }
-}
-
 /// Returns `true` if the annotation is a boolean type hint (e.g., `bool`), or a type hint that
 /// includes boolean as a variant (e.g., `bool | int`).
 fn match_annotation_to_complex_bool(annotation: &Expr, semantic: &SemanticModel) -> bool {

crates/ruff_linter/src/rules/flake8_boolean_trap/snapshots/ruff_linter__rules__flake8_boolean_trap__tests__FBT001_FBT.py.snap

@@ -1,6 +1,5 @@
 ---
 source: crates/ruff_linter/src/rules/flake8_boolean_trap/mod.rs
-snapshot_kind: text
 ---
 FBT.py:4:5: FBT001 Boolean-typed positional argument in function definition
   |
@@ -89,3 +88,17 @@ FBT.py:90:19: FBT001 Boolean-typed positional argument in function definition
    |                   ^^^^^ FBT001
 91 |         pass
    |
+
+FBT.py:100:10: FBT001 Boolean-typed positional argument in function definition
+    |
+100 | def func(x: Union[list, Optional[int | str | float | bool]]):
+    |          ^ FBT001
+101 |     pass
+    |
+
+FBT.py:104:10: FBT001 Boolean-typed positional argument in function definition
+    |
+104 | def func(x: bool | str):
+    |          ^ FBT001
+105 |     pass
+    |