From b11492e94028554961bfa00e55e826d0ab77da82 Mon Sep 17 00:00:00 2001 From: Charlie Marsh Date: Thu, 6 Jul 2023 22:49:19 -0400 Subject: [PATCH] Fix remaining Copyright rule references (#5577) --- crates/ruff/src/codes.rs | 4 ++-- crates/ruff/src/registry.rs | 4 ++-- crates/ruff/src/rules/flake8_copyright/mod.rs | 2 +- crates/ruff/src/settings/options.rs | 2 +- crates/ruff_macros/src/rule_namespace.rs | 8 ++++---- ruff.schema.json | 2 +- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/crates/ruff/src/codes.rs b/crates/ruff/src/codes.rs index 280007374b..bb6081db96 100644 --- a/crates/ruff/src/codes.rs +++ b/crates/ruff/src/codes.rs @@ -389,8 +389,8 @@ pub fn code_to_rule(linter: Linter, code: &str) -> Option<(RuleGroup, Rule)> { (Flake8Simplify, "401") => (RuleGroup::Unspecified, rules::flake8_simplify::rules::IfElseBlockInsteadOfDictGet), (Flake8Simplify, "910") => (RuleGroup::Unspecified, rules::flake8_simplify::rules::DictGetWithNoneDefault), - // copyright - (Copyright, "001") => (RuleGroup::Nursery, rules::flake8_copyright::rules::MissingCopyrightNotice), + // flake8-copyright + (Flake8Copyright, "001") => (RuleGroup::Nursery, rules::flake8_copyright::rules::MissingCopyrightNotice), // pyupgrade (Pyupgrade, "001") => (RuleGroup::Unspecified, rules::pyupgrade::rules::UselessMetaclassType), diff --git a/crates/ruff/src/registry.rs b/crates/ruff/src/registry.rs index 29d1da806f..4ff731653b 100644 --- a/crates/ruff/src/registry.rs +++ b/crates/ruff/src/registry.rs @@ -82,9 +82,9 @@ pub enum Linter { /// [flake8-commas](https://pypi.org/project/flake8-commas/) #[prefix = "COM"] Flake8Commas, - /// Copyright-related rules + /// [flake8-copyright](https://pypi.org/project/flake8-copyright/) #[prefix = "CPY"] - Copyright, + Flake8Copyright, /// [flake8-comprehensions](https://pypi.org/project/flake8-comprehensions/) #[prefix = "C4"] Flake8Comprehensions, diff --git a/crates/ruff/src/rules/flake8_copyright/mod.rs b/crates/ruff/src/rules/flake8_copyright/mod.rs index 576d9daedf..6e2a39c4cb 100644 --- a/crates/ruff/src/rules/flake8_copyright/mod.rs +++ b/crates/ruff/src/rules/flake8_copyright/mod.rs @@ -1,4 +1,4 @@ -//! Rules related to copyright notices. +//! Rules from [flake8-copyright](https://pypi.org/project/flake8-copyright/). pub(crate) mod rules; pub mod settings; diff --git a/crates/ruff/src/settings/options.rs b/crates/ruff/src/settings/options.rs index f003b6bb5a..697b630491 100644 --- a/crates/ruff/src/settings/options.rs +++ b/crates/ruff/src/settings/options.rs @@ -498,7 +498,7 @@ pub struct Options { /// Options for the `flake8-comprehensions` plugin. pub flake8_comprehensions: Option, #[option_group] - /// Options for the `copyright` plugin. + /// Options for the `flake8-copyright` plugin. pub flake8_copyright: Option, #[option_group] /// Options for the `flake8-errmsg` plugin. diff --git a/crates/ruff_macros/src/rule_namespace.rs b/crates/ruff_macros/src/rule_namespace.rs index 811033f8ea..79ae54c19d 100644 --- a/crates/ruff_macros/src/rule_namespace.rs +++ b/crates/ruff_macros/src/rule_namespace.rs @@ -21,9 +21,9 @@ pub(crate) fn derive_impl(input: DeriveInput) -> syn::Result "Ruff-specific rules", Self::Numpy => "NumPy-specific rules", Self::Copyright => "Copyright-related rules", ); - let mut url_match_arms = - quote!(Self::Ruff => None, Self::Numpy => None, Self::Copyright => None, ); + let mut name_match_arms = + quote!(Self::Ruff => "Ruff-specific rules", Self::Numpy => "NumPy-specific rules", ); + let mut url_match_arms = quote!(Self::Ruff => None, Self::Numpy => None, ); let mut all_prefixes = HashSet::new(); @@ -69,7 +69,7 @@ pub(crate) fn derive_impl(input: DeriveInput) -> syn::Result #name,}); url_match_arms.extend(quote! {Self::#variant_ident => Some(#url),}); diff --git a/ruff.schema.json b/ruff.schema.json index 1a688b4386..e906e89423 100644 --- a/ruff.schema.json +++ b/ruff.schema.json @@ -199,7 +199,7 @@ ] }, "flake8-copyright": { - "description": "Options for the `copyright` plugin.", + "description": "Options for the `flake8-copyright` plugin.", "anyOf": [ { "$ref": "#/definitions/Flake8CopyrightOptions"