mirrors/ruff
1
0
Fork 0
mirror of https://github.com/astral-sh/ruff.git synced 2025-09-26 11:59:35 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Rename RUF101 to RUF004 (#1020)

Browse source
This commit is contained in:
Charlie Marsh 2022-12-03 22:46:13 -05:00 • committed by GitHub
parent 8a3f29497b
commit c659cb86d9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 39 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

2
README.md
View file

@ -780,7 +780,7 @@ For more, see [Pylint](https://pypi.org/project/pylint/2.15.7/) on PyPI.
| RUF001 | AmbiguousUnicodeCharacterString | String contains ambiguous unicode character '𝐁' (did you mean 'B'?) | 🛠 | | RUF001 | AmbiguousUnicodeCharacterString | String contains ambiguous unicode character '𝐁' (did you mean 'B'?) | 🛠 |
| RUF002 | AmbiguousUnicodeCharacterDocstring | Docstring contains ambiguous unicode character '𝐁' (did you mean 'B'?) | 🛠 | | RUF002 | AmbiguousUnicodeCharacterDocstring | Docstring contains ambiguous unicode character '𝐁' (did you mean 'B'?) | 🛠 |
| RUF003 | AmbiguousUnicodeCharacterComment | Comment contains ambiguous unicode character '𝐁' (did you mean 'B'?) | | | RUF003 | AmbiguousUnicodeCharacterComment | Comment contains ambiguous unicode character '𝐁' (did you mean 'B'?) | |
| RUF101 | ConvertExitToSysExit | `exit()` is only available in the interpreter, use `sys.exit()` instead | 🛠 | | RUF004 | ConvertExitToSysExit | `exit()` is only available in the interpreter, use `sys.exit()` instead | 🛠 |
### Meta rules ### Meta rules

16
ruff_dev/src/generate_check_code_prefix.rs
View file

@ -57,13 +57,15 @@ pub fn main(cli: &Cli) -> Result<()> {
for i in 0..=code_suffix_len { for i in 0..=code_suffix_len {
let source = code_str[..code_prefix_len + i].to_string(); let source = code_str[..code_prefix_len + i].to_string();
let destination = alias[..alias_prefix_len + i].to_string(); let destination = alias[..alias_prefix_len + i].to_string();
prefix_to_codes.insert( if source != destination {
destination, prefix_to_codes.insert(
prefix_to_codes destination,
.get(&source) prefix_to_codes
.unwrap_or_else(|| panic!("Unknown CheckCode: {source:?}")) .get(&source)
.clone(), .unwrap_or_else(|| panic!("Unknown CheckCode: {source:?}"))
); .clone(),
);
}
} }
} }

2
src/check_ast.rs
View file

@ -1737,7 +1737,7 @@ where
} }
// Ruff // Ruff
if self.settings.enabled.contains(&CheckCode::RUF101) { if self.settings.enabled.contains(&CheckCode::RUF004) {
rules::plugins::convert_exit_to_sys_exit(self, func); rules::plugins::convert_exit_to_sys_exit(self, func);
} }
} }

8
src/checks.rs
View file

@ -290,7 +290,7 @@ pub enum CheckCode {
RUF001, RUF001,
RUF002, RUF002,
RUF003, RUF003,
RUF101, RUF004,
// Meta // Meta
M001, M001,
// pygrep-hooks // pygrep-hooks
@ -1112,7 +1112,7 @@ impl CheckCode {
CheckCode::RUF001 => CheckKind::AmbiguousUnicodeCharacterString('𝐁', 'B'), CheckCode::RUF001 => CheckKind::AmbiguousUnicodeCharacterString('𝐁', 'B'),
CheckCode::RUF002 => CheckKind::AmbiguousUnicodeCharacterDocstring('𝐁', 'B'), CheckCode::RUF002 => CheckKind::AmbiguousUnicodeCharacterDocstring('𝐁', 'B'),
CheckCode::RUF003 => CheckKind::AmbiguousUnicodeCharacterComment('𝐁', 'B'), CheckCode::RUF003 => CheckKind::AmbiguousUnicodeCharacterComment('𝐁', 'B'),
CheckCode::RUF101 => CheckKind::ConvertExitToSysExit, CheckCode::RUF004 => CheckKind::ConvertExitToSysExit,
// Meta // Meta
CheckCode::M001 => CheckKind::UnusedNOQA(None), CheckCode::M001 => CheckKind::UnusedNOQA(None),
} }
@ -1323,7 +1323,7 @@ impl CheckCode {
CheckCode::RUF001 => CheckCategory::Ruff, CheckCode::RUF001 => CheckCategory::Ruff,
CheckCode::RUF002 => CheckCategory::Ruff, CheckCode::RUF002 => CheckCategory::Ruff,
CheckCode::RUF003 => CheckCategory::Ruff, CheckCode::RUF003 => CheckCategory::Ruff,
CheckCode::RUF101 => CheckCategory::Ruff, CheckCode::RUF004 => CheckCategory::Ruff,
CheckCode::S101 => CheckCategory::Flake8Bandit, CheckCode::S101 => CheckCategory::Flake8Bandit,
CheckCode::S102 => CheckCategory::Flake8Bandit, CheckCode::S102 => CheckCategory::Flake8Bandit,
CheckCode::S104 => CheckCategory::Flake8Bandit, CheckCode::S104 => CheckCategory::Flake8Bandit,
@ -1627,7 +1627,7 @@ impl CheckKind {
CheckKind::AmbiguousUnicodeCharacterString(..) => &CheckCode::RUF001, CheckKind::AmbiguousUnicodeCharacterString(..) => &CheckCode::RUF001,
CheckKind::AmbiguousUnicodeCharacterDocstring(..) => &CheckCode::RUF002, CheckKind::AmbiguousUnicodeCharacterDocstring(..) => &CheckCode::RUF002,
CheckKind::AmbiguousUnicodeCharacterComment(..) => &CheckCode::RUF003, CheckKind::AmbiguousUnicodeCharacterComment(..) => &CheckCode::RUF003,
CheckKind::ConvertExitToSysExit => &CheckCode::RUF101, CheckKind::ConvertExitToSysExit => &CheckCode::RUF004,
// Meta // Meta
CheckKind::UnusedNOQA(_) => &CheckCode::M001, CheckKind::UnusedNOQA(_) => &CheckCode::M001,
} }

28
src/checks_gen.rs
View file

@ -329,9 +329,7 @@ pub enum CheckCodePrefix {
RUF001, RUF001,
RUF002, RUF002,
RUF003, RUF003,
RUF1, RUF004,
RUF10,
RUF101,
S, S,
S1, S1,
S10, S10,
@ -1291,16 +1289,24 @@ impl CheckCodePrefix {
CheckCode::RUF001, CheckCode::RUF001,
CheckCode::RUF002, CheckCode::RUF002,
CheckCode::RUF003, CheckCode::RUF003,
CheckCode::RUF101, CheckCode::RUF004,
],
CheckCodePrefix::RUF0 => vec![
CheckCode::RUF001,
CheckCode::RUF002,
CheckCode::RUF003,
CheckCode::RUF004,
],
CheckCodePrefix::RUF00 => vec![
CheckCode::RUF001,
CheckCode::RUF002,
CheckCode::RUF003,
CheckCode::RUF004,
], ],
CheckCodePrefix::RUF0 => vec![CheckCode::RUF001, CheckCode::RUF002, CheckCode::RUF003],
CheckCodePrefix::RUF00 => vec![CheckCode::RUF001, CheckCode::RUF002, CheckCode::RUF003],
CheckCodePrefix::RUF001 => vec![CheckCode::RUF001], CheckCodePrefix::RUF001 => vec![CheckCode::RUF001],
CheckCodePrefix::RUF002 => vec![CheckCode::RUF002], CheckCodePrefix::RUF002 => vec![CheckCode::RUF002],
CheckCodePrefix::RUF003 => vec![CheckCode::RUF003], CheckCodePrefix::RUF003 => vec![CheckCode::RUF003],
CheckCodePrefix::RUF1 => vec![CheckCode::RUF101], CheckCodePrefix::RUF004 => vec![CheckCode::RUF004],
CheckCodePrefix::RUF10 => vec![CheckCode::RUF101],
CheckCodePrefix::RUF101 => vec![CheckCode::RUF101],
CheckCodePrefix::S => vec![ CheckCodePrefix::S => vec![
CheckCode::S101, CheckCode::S101,
CheckCode::S102, CheckCode::S102,
@ -1953,9 +1959,7 @@ impl CheckCodePrefix {
CheckCodePrefix::RUF001 => SuffixLength::Three, CheckCodePrefix::RUF001 => SuffixLength::Three,
CheckCodePrefix::RUF002 => SuffixLength::Three, CheckCodePrefix::RUF002 => SuffixLength::Three,
CheckCodePrefix::RUF003 => SuffixLength::Three, CheckCodePrefix::RUF003 => SuffixLength::Three,
CheckCodePrefix::RUF1 => SuffixLength::One, CheckCodePrefix::RUF004 => SuffixLength::Three,
CheckCodePrefix::RUF10 => SuffixLength::Two,
CheckCodePrefix::RUF101 => SuffixLength::Three,
CheckCodePrefix::S => SuffixLength::Zero, CheckCodePrefix::S => SuffixLength::Zero,
CheckCodePrefix::S1 => SuffixLength::One, CheckCodePrefix::S1 => SuffixLength::One,
CheckCodePrefix::S10 => SuffixLength::Two, CheckCodePrefix::S10 => SuffixLength::Two,

14
src/rules/mod.rs
View file

@ -18,13 +18,13 @@ mod tests {
#[test_case(CheckCode::RUF001, Path::new("RUF001.py"); "RUF001")] #[test_case(CheckCode::RUF001, Path::new("RUF001.py"); "RUF001")]
#[test_case(CheckCode::RUF002, Path::new("RUF002.py"); "RUF002")] #[test_case(CheckCode::RUF002, Path::new("RUF002.py"); "RUF002")]
#[test_case(CheckCode::RUF003, Path::new("RUF003.py"); "RUF003")] #[test_case(CheckCode::RUF003, Path::new("RUF003.py"); "RUF003")]
#[test_case(CheckCode::RUF101, Path::new("RUF101_0.py"); "RUF101_0")] #[test_case(CheckCode::RUF004, Path::new("RUF004_0.py"); "RUF004_0")]
#[test_case(CheckCode::RUF101, Path::new("RUF101_1.py"); "RUF101_1")] #[test_case(CheckCode::RUF004, Path::new("RUF004_1.py"); "RUF004_1")]
#[test_case(CheckCode::RUF101, Path::new("RUF101_2.py"); "RUF101_2")] #[test_case(CheckCode::RUF004, Path::new("RUF004_2.py"); "RUF004_2")]
#[test_case(CheckCode::RUF101, Path::new("RUF101_3.py"); "RUF101_3")] #[test_case(CheckCode::RUF004, Path::new("RUF004_3.py"); "RUF004_3")]
#[test_case(CheckCode::RUF101, Path::new("RUF101_4.py"); "RUF101_4")] #[test_case(CheckCode::RUF004, Path::new("RUF004_4.py"); "RUF004_4")]
#[test_case(CheckCode::RUF101, Path::new("RUF101_5.py"); "RUF101_5")] #[test_case(CheckCode::RUF004, Path::new("RUF004_5.py"); "RUF004_5")]
#[test_case(CheckCode::RUF101, Path::new("RUF101_6.py"); "RUF101_6")] #[test_case(CheckCode::RUF004, Path::new("RUF004_6.py"); "RUF004_6")]
fn checks(check_code: CheckCode, path: &Path) -> Result<()> { fn checks(check_code: CheckCode, path: &Path) -> Result<()> {
let snapshot = format!("{}_{}", check_code.as_ref(), path.to_string_lossy()); let snapshot = format!("{}_{}", check_code.as_ref(), path.to_string_lossy());
let mut checks = test_path( let mut checks = test_path(

2
src/rules/plugins/convert_exit_to_sys_exit.rs
View file

@ -64,7 +64,7 @@ fn get_member_import_name_alias(checker: &Checker, module: &str, member: &str) -
}) })
} }
/// RUF101 /// RUF004
pub fn convert_exit_to_sys_exit(checker: &mut Checker, func: &Expr) { pub fn convert_exit_to_sys_exit(checker: &mut Checker, func: &Expr) {
if let ExprKind::Name { id, .. } = &func.node { if let ExprKind::Name { id, .. } = &func.node {
if id == "exit" { if id == "exit" {