diff --git a/crates/ruff_linter/resources/test/fixtures/tryceratops/TRY302.py b/crates/ruff_linter/resources/test/fixtures/tryceratops/TRY203.py similarity index 100% rename from crates/ruff_linter/resources/test/fixtures/tryceratops/TRY302.py rename to crates/ruff_linter/resources/test/fixtures/tryceratops/TRY203.py diff --git a/crates/ruff_linter/src/codes.rs b/crates/ruff_linter/src/codes.rs index 41e4482e42727..caa4af3312fcc 100644 --- a/crates/ruff_linter/src/codes.rs +++ b/crates/ruff_linter/src/codes.rs @@ -855,9 +855,9 @@ pub fn code_to_rule(linter: Linter, code: &str) -> Option<(RuleGroup, Rule)> { (Tryceratops, "004") => (RuleGroup::Stable, rules::tryceratops::rules::TypeCheckWithoutTypeError), (Tryceratops, "200") => (RuleGroup::Removed, rules::tryceratops::rules::ReraiseNoCause), (Tryceratops, "201") => (RuleGroup::Stable, rules::tryceratops::rules::VerboseRaise), + (Tryceratops, "203") => (RuleGroup::Stable, rules::tryceratops::rules::UselessTryExcept), (Tryceratops, "300") => (RuleGroup::Stable, rules::tryceratops::rules::TryConsiderElse), (Tryceratops, "301") => (RuleGroup::Stable, rules::tryceratops::rules::RaiseWithinTry), - (Tryceratops, "302") => (RuleGroup::Stable, rules::tryceratops::rules::UselessTryExcept), (Tryceratops, "400") => (RuleGroup::Stable, rules::tryceratops::rules::ErrorInsteadOfException), (Tryceratops, "401") => (RuleGroup::Stable, rules::tryceratops::rules::VerboseLogMessage), diff --git a/crates/ruff_linter/src/rule_redirects.rs b/crates/ruff_linter/src/rule_redirects.rs index 665edc004fa52..ab5ae7c7a7008 100644 --- a/crates/ruff_linter/src/rule_redirects.rs +++ b/crates/ruff_linter/src/rule_redirects.rs @@ -125,5 +125,7 @@ static REDIRECTS: Lazy> = Lazy::new(|| { ("PLW0117", "PLW0177"), // See: https://github.com/astral-sh/ruff/issues/12110 ("RUF025", "C420"), + // See: https://github.com/astral-sh/ruff/issues/13492 + ("TRY302", "TRY203"), ]) }); diff --git a/crates/ruff_linter/src/rules/tryceratops/mod.rs b/crates/ruff_linter/src/rules/tryceratops/mod.rs index 21eaa92962639..21f3a01382ddc 100644 --- a/crates/ruff_linter/src/rules/tryceratops/mod.rs +++ b/crates/ruff_linter/src/rules/tryceratops/mod.rs @@ -19,9 +19,9 @@ mod tests { #[test_case(Rule::RaiseVanillaArgs, Path::new("TRY003.py"))] #[test_case(Rule::TypeCheckWithoutTypeError, Path::new("TRY004.py"))] #[test_case(Rule::VerboseRaise, Path::new("TRY201.py"))] + #[test_case(Rule::UselessTryExcept, Path::new("TRY203.py"))] #[test_case(Rule::TryConsiderElse, Path::new("TRY300.py"))] #[test_case(Rule::RaiseWithinTry, Path::new("TRY301.py"))] - #[test_case(Rule::UselessTryExcept, Path::new("TRY302.py"))] #[test_case(Rule::ErrorInsteadOfException, Path::new("TRY400.py"))] #[test_case(Rule::VerboseLogMessage, Path::new("TRY401.py"))] fn rules(rule_code: Rule, path: &Path) -> Result<()> { diff --git a/crates/ruff_linter/src/rules/tryceratops/rules/useless_try_except.rs b/crates/ruff_linter/src/rules/tryceratops/rules/useless_try_except.rs index 755f849bc9522..e7deefb77fb40 100644 --- a/crates/ruff_linter/src/rules/tryceratops/rules/useless_try_except.rs +++ b/crates/ruff_linter/src/rules/tryceratops/rules/useless_try_except.rs @@ -38,7 +38,7 @@ impl Violation for UselessTryExcept { } } -/// TRY302 +/// TRY203 (previously TRY302) pub(crate) fn useless_try_except(checker: &mut Checker, handlers: &[ExceptHandler]) { if let Some(diagnostics) = handlers .iter() diff --git a/crates/ruff_linter/src/rules/tryceratops/snapshots/ruff_linter__rules__tryceratops__tests__useless-try-except_TRY302.py.snap b/crates/ruff_linter/src/rules/tryceratops/snapshots/ruff_linter__rules__tryceratops__tests__useless-try-except_TRY203.py.snap similarity index 65% rename from crates/ruff_linter/src/rules/tryceratops/snapshots/ruff_linter__rules__tryceratops__tests__useless-try-except_TRY302.py.snap rename to crates/ruff_linter/src/rules/tryceratops/snapshots/ruff_linter__rules__tryceratops__tests__useless-try-except_TRY203.py.snap index e8973359671da..6dc6ab7348c41 100644 --- a/crates/ruff_linter/src/rules/tryceratops/snapshots/ruff_linter__rules__tryceratops__tests__useless-try-except_TRY302.py.snap +++ b/crates/ruff_linter/src/rules/tryceratops/snapshots/ruff_linter__rules__tryceratops__tests__useless-try-except_TRY203.py.snap @@ -1,19 +1,19 @@ --- source: crates/ruff_linter/src/rules/tryceratops/mod.rs --- -TRY302.py:12:5: TRY302 Remove exception handler; error is immediately re-raised +TRY203.py:12:5: TRY203 Remove exception handler; error is immediately re-raised | 10 | try: 11 | process() 12 | except Exception: | _____^ 13 | | raise - | |_____________^ TRY302 + | |_____________^ TRY203 14 | 15 | def bad(): | -TRY302.py:18:5: TRY302 Remove exception handler; error is immediately re-raised +TRY203.py:18:5: TRY203 Remove exception handler; error is immediately re-raised | 16 | try: 17 | process() @@ -21,12 +21,12 @@ TRY302.py:18:5: TRY302 Remove exception handler; error is immediately re-raised | _____^ 19 | | raise 20 | | print("this code is pointless!") - | |________________________________________^ TRY302 + | |________________________________________^ TRY203 21 | 22 | def bad(): | -TRY302.py:25:5: TRY302 Remove exception handler; error is immediately re-raised +TRY203.py:25:5: TRY203 Remove exception handler; error is immediately re-raised | 23 | try: 24 | process() @@ -34,117 +34,115 @@ TRY302.py:25:5: TRY302 Remove exception handler; error is immediately re-raised | _____^ 26 | | # I am a comment, not a statement! 27 | | raise - | |_____________^ TRY302 + | |_____________^ TRY203 28 | 29 | def bad(): | -TRY302.py:32:5: TRY302 Remove exception handler; error is immediately re-raised +TRY203.py:32:5: TRY203 Remove exception handler; error is immediately re-raised | 30 | try: 31 | process() 32 | except Exception: | _____^ 33 | | raise - | |_____________^ TRY302 + | |_____________^ TRY203 34 | 35 | def bad(): | -TRY302.py:38:5: TRY302 Remove exception handler; error is immediately re-raised +TRY203.py:38:5: TRY203 Remove exception handler; error is immediately re-raised | 36 | try: 37 | process() 38 | except Exception as e: | _____^ 39 | | raise - | |_____________^ TRY302 + | |_____________^ TRY203 40 | 41 | def bad(): | -TRY302.py:44:5: TRY302 Remove exception handler; error is immediately re-raised +TRY203.py:44:5: TRY203 Remove exception handler; error is immediately re-raised | 42 | try: 43 | process() 44 | except Exception as e: | _____^ 45 | | raise e - | |_______________^ TRY302 + | |_______________^ TRY203 46 | 47 | def bad(): | -TRY302.py:50:5: TRY302 Remove exception handler; error is immediately re-raised +TRY203.py:50:5: TRY203 Remove exception handler; error is immediately re-raised | 48 | try: 49 | process() 50 | except MyException: | _____^ 51 | | raise - | |_____________^ TRY302 + | |_____________^ TRY203 52 | except Exception: 53 | raise | -TRY302.py:52:5: TRY302 Remove exception handler; error is immediately re-raised +TRY203.py:52:5: TRY203 Remove exception handler; error is immediately re-raised | 50 | except MyException: 51 | raise 52 | except Exception: | _____^ 53 | | raise - | |_____________^ TRY302 + | |_____________^ TRY203 54 | 55 | def bad(): | -TRY302.py:58:5: TRY302 Remove exception handler; error is immediately re-raised +TRY203.py:58:5: TRY203 Remove exception handler; error is immediately re-raised | 56 | try: 57 | process() 58 | except MyException as e: | _____^ 59 | | raise e - | |_______________^ TRY302 + | |_______________^ TRY203 60 | except Exception as e: 61 | raise e | -TRY302.py:60:5: TRY302 Remove exception handler; error is immediately re-raised +TRY203.py:60:5: TRY203 Remove exception handler; error is immediately re-raised | 58 | except MyException as e: 59 | raise e 60 | except Exception as e: | _____^ 61 | | raise e - | |_______________^ TRY302 + | |_______________^ TRY203 62 | 63 | def bad(): | -TRY302.py:66:5: TRY302 Remove exception handler; error is immediately re-raised +TRY203.py:66:5: TRY203 Remove exception handler; error is immediately re-raised | 64 | try: 65 | process() 66 | except MyException as ex: | _____^ 67 | | raise ex - | |________________^ TRY302 + | |________________^ TRY203 68 | except Exception as e: 69 | raise e | -TRY302.py:68:5: TRY302 Remove exception handler; error is immediately re-raised +TRY203.py:68:5: TRY203 Remove exception handler; error is immediately re-raised | 66 | except MyException as ex: 67 | raise ex 68 | except Exception as e: | _____^ 69 | | raise e - | |_______________^ TRY302 + | |_______________^ TRY203 70 | 71 | def fine(): | - - diff --git a/ruff.schema.json b/ruff.schema.json index 3f3cdefae955c..7412f47258dda 100644 --- a/ruff.schema.json +++ b/ruff.schema.json @@ -4009,11 +4009,11 @@ "TRY2", "TRY20", "TRY201", + "TRY203", "TRY3", "TRY30", "TRY300", "TRY301", - "TRY302", "TRY4", "TRY40", "TRY400",