Revert "Add all PEP-585 names to UP006 rule" (#15250)

Author: MichaReiser

crates/ruff/tests/integration_test.rs

@@ -2126,67 +2126,3 @@ unfixable = ["RUF"]
 
     Ok(())
 }
-
-#[test]
-fn verbose_show_failed_fix_errors() {
-    let mut cmd = RuffCheck::default()
-        .args(["--select", "UP006", "--preview", "-v"])
-        .build();
-
-    insta::with_settings!(
-            {
-                // the logs have timestamps we need to remove
-                filters => vec![(
-                    r"\[[\d:-]+]",
-                    ""
-                )]
-            },{
-    assert_cmd_snapshot!(cmd
-            .pass_stdin("import typing\nCallable = 'abc'\ndef g() -> typing.Callable: ..."),
-                @r###"
-    success: false
-    exit_code: 1
-    ----- stdout -----
-    -:3:12: UP006 Use `collections.abc.Callable` instead of `typing.Callable` for type annotation
-      |
-    1 | import typing
-    2 | Callable = 'abc'
-    3 | def g() -> typing.Callable: ...
-      |            ^^^^^^^^^^^^^^^ UP006
-      |
-      = help: Replace with `collections.abc.Callable`
-
-    Found 1 error.
-
-    ----- stderr -----
-    [ruff::resolve][DEBUG] Isolated mode, not reading any pyproject.toml
-    [ruff_diagnostics::diagnostic][DEBUG] Failed to create fix for NonPEP585Annotation: Unable to insert `Callable` into scope due to name conflict
-    "###);        }
-        );
-}
-
-#[test]
-fn no_verbose_hide_failed_fix_errors() {
-    let mut cmd = RuffCheck::default()
-        .args(["--select", "UP006", "--preview"])
-        .build();
-    assert_cmd_snapshot!(cmd
-        .pass_stdin("import typing\nCallable = 'abc'\ndef g() -> typing.Callable: ..."),
-            @r###"
-    success: false
-    exit_code: 1
-    ----- stdout -----
-    -:3:12: UP006 Use `collections.abc.Callable` instead of `typing.Callable` for type annotation
-      |
-    1 | import typing
-    2 | Callable = 'abc'
-    3 | def g() -> typing.Callable: ...
-      |            ^^^^^^^^^^^^^^^ UP006
-      |
-      = help: Replace with `collections.abc.Callable`
-
-    Found 1 error.
-
-    ----- stderr -----
-    "###);
-}

crates/ruff_linter/resources/test/fixtures/pyupgrade/UP006_0.py

@@ -64,22 +64,3 @@ def f(x: typing.Deque[str]) -> None:
 
 def f(x: typing.DefaultDict[str, str]) -> None:
     ...
-
-
-def f(x: typing.AbstractSet[str]) -> None:
-    ...
-
-
-def f(x: typing.Pattern[str]) -> None:
-    ...
-
-
-def f(x: typing.Sequence[str]) -> None:
-    ...
-
-
-from typing import Collection
-
-
-def f(x: typing.Collection[str]) -> None:
-    ...

crates/ruff_linter/resources/test/fixtures/pyupgrade/UP006_1.py

@@ -8,19 +8,3 @@
 
 def f(x: typing.DefaultDict[str, str]) -> None:
     ...
-
-
-from collections.abc import Set
-from typing_extensions import Awaitable
-
-
-def f(x: typing.AbstractSet[str]) -> None:
-    ...
-
-
-def f(x: Set) -> None:
-    ...
-
-
-def f(x: Awaitable) -> None:
-    ...

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

@@ -111,21 +111,6 @@ mod tests {
         Ok(())
     }
 
-    #[test_case(Rule::NonPEP585Annotation, Path::new("UP006_0.py"))]
-    #[test_case(Rule::NonPEP585Annotation, Path::new("UP006_1.py"))]
-    fn preview_rules(rule_code: Rule, path: &Path) -> Result<()> {
-        let snapshot = format!("preview__{}", path.to_string_lossy());
-        let diagnostics = test_path(
-            Path::new("pyupgrade").join(path).as_path(),
-            &settings::LinterSettings {
-                preview: PreviewMode::Enabled,
-                ..settings::LinterSettings::for_rule(rule_code)
-            },
-        )?;
-        assert_messages!(snapshot, diagnostics);
-        Ok(())
-    }
-
     #[test]
     fn async_timeout_error_alias_not_applied_py310() -> Result<()> {
         let diagnostics = test_path(

crates/ruff_linter/src/rules/pyupgrade/rules/use_pep585_annotation.rs

@@ -14,21 +14,6 @@ use crate::settings::types::PythonVersion;
 /// Checks for the use of generics that can be replaced with standard library
 /// variants based on [PEP 585].
 ///
-/// Under [preview mode](https://docs.astral.sh/ruff/preview),
-/// this rule triggers for all replacements listed
-/// in [PEP 585]. Otherwise, this rule only triggers for the following
-/// commonly occurring instances of modules present in the
-/// `typing` or `typing_extensions` package:
-///
-/// - `Dict`
-/// - `FrozenSet`
-/// - `List`
-/// - `Set`
-/// - `Tuple`
-/// - `Type`
-/// - `Deque`
-/// - `DefaultDict`
-///
 /// ## Why is this bad?
 /// [PEP 585] enabled collections in the Python standard library (like `list`)
 /// to be used as generics directly, instead of importing analogous members
@@ -96,9 +81,6 @@ pub(crate) fn use_pep585_annotation(
     expr: &Expr,
     replacement: &ModuleMember,
 ) {
-    if !checker.settings.preview.is_enabled() && !is_restricted_pep585_generic(replacement) {
-        return;
-    }
     let Some(from) = UnqualifiedName::from_expr(expr) else {
         return;
     };
@@ -156,11 +138,3 @@ pub(crate) fn use_pep585_annotation(
     }
     checker.diagnostics.push(diagnostic);
 }
-
-fn is_restricted_pep585_generic(module_member: &ModuleMember) -> bool {
-    matches!(
-        module_member,
-        ModuleMember::BuiltIn("dict" | "frozenset" | "list" | "set" | "tuple" | "type")
-            | ModuleMember::Member("collections", "deque" | "defaultdict")
-    )
-}

crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP006_0.py.snap

@@ -281,5 +281,3 @@ UP006_0.py:65:10: UP006 [*] Use `collections.defaultdict` instead of `typing.Def
 65    |-def f(x: typing.DefaultDict[str, str]) -> None:
    66 |+def f(x: defaultdict[str, str]) -> None:
 66 67 |     ...
-67 68 | 
-68 69 |

crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP006_1.py.snap

@@ -17,5 +17,3 @@ UP006_1.py:9:10: UP006 [*] Use `collections.defaultdict` instead of `typing.Defa
 9     |-def f(x: typing.DefaultDict[str, str]) -> None:
    9  |+def f(x: defaultdict[str, str]) -> None:
 10 10 |     ...
-11 11 | 
-12 12 |