Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[refurb] Handle non-finite decimals in verbose-decimal-constructor (FURB157) #14596

Merged
merged 11 commits into from
Dec 3, 2024
Merged

[refurb] Handle non-finite decimals in verbose-decimal-constructor (FURB157) #14596

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
e3e98fc
update fixture
dylwil3 Nov 26, 2024
3021500
handle non-finite decimals
dylwil3 Nov 26, 2024
cea3f17
update snapshot
dylwil3 Nov 26, 2024
7ba2cb2
remove dbg
dylwil3 Nov 26, 2024
f945385
as_str to borrow
dylwil3 Nov 26, 2024
25beaed
remove riddle
dylwil3 Nov 26, 2024
a2c82df
revert to as_str
dylwil3 Nov 26, 2024
f1b96ad
update snapshot
dylwil3 Nov 26, 2024
697b5ba
fix typo in fixture
dylwil3 Dec 1, 2024
2beb6f2
update snapshot
dylwil3 Dec 1, 2024
f5d4676
avoid allocation
dylwil3 Dec 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions crates/ruff_linter/resources/test/fixtures/refurb/FURB157.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,3 +42,15 @@
Decimal("_") # Ok
Decimal(" ") # Ok
Decimal("10000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000") # Ok

# Non-finite variants
# https://github.com/astral-sh/ruff/issues/14587
Decimal(float(" nan ")) # Decimal(" nan ")
Decimal(float(" +nan ")) # Decimal(" +nan ")
Decimal(float(" -nan ")) # Decimal(" nan "), notice the difference!
dylwil3 marked this conversation as resolved.
Show resolved Hide resolved
Decimal(float(" inf ")) # Decimal(" inf ")
Decimal(float(" +inf ")) # Decimal(" +inf ")
Decimal(float(" -inf ")) # Decimal(" -inf ")
Decimal(float(" infinity ")) # Decimal(" infinity ")
Decimal(float(" +infinity ")) # Decimal(" +infinity ")
Decimal(float(" -infinity ")) # Decimal(" -infinity ")
21 changes: 18 additions & 3 deletions crates/ruff_linter/src/rules/refurb/rules/verbose_decimal_constructor.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,14 +152,29 @@ pub(crate) fn verbose_decimal_constructor(checker: &mut Checker, call: &ast::Exp
let Some(float) = float.as_string_literal_expr() else {
return;
};

let normalized_float_string = float.value.to_str().trim().to_lowercase();

if !matches!(
float.value.to_str().to_lowercase().as_str(),
"inf" | "-inf" | "infinity" | "-infinity" | "nan"
normalized_float_string.as_str(),
dylwil3 marked this conversation as resolved.
Show resolved Hide resolved
"inf"
| "+inf"
| "-inf"
| "infinity"
| "+infinity"
| "-infinity"
| "nan"
| "+nan"
| "-nan"
) {
return;
}
dylwil3 marked this conversation as resolved.
Show resolved Hide resolved

let replacement = checker.locator().slice(float).to_string();
let mut replacement = checker.locator().slice(float).to_string();
// `Decimal(float("-nan")) == Decimal("nan")`
if &normalized_float_string == "-nan" {
replacement.remove(replacement.find('-').unwrap());
}
let mut diagnostic = Diagnostic::new(
VerboseDecimalConstructor {
replacement: replacement.clone(),
Expand Down
181 changes: 180 additions & 1 deletion ...ter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB157_FURB157.py.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
---
source: crates/ruff_linter/src/rules/refurb/mod.rs
snapshot_kind: text
---
FURB157.py:5:9: FURB157 [*] Verbose expression in `Decimal` constructor
|
Expand Down Expand Up @@ -207,3 +206,183 @@ FURB157.py:24:9: FURB157 [*] Verbose expression in `Decimal` constructor
25 25 |
26 26 | # Ok
27 27 | Decimal("2e-4")

FURB157.py:48:9: FURB157 [*] Verbose expression in `Decimal` constructor
|
46 | # Non-finite variants
47 | # https://github.com/astral-sh/ruff/issues/14587
48 | Decimal(float(" nan ")) # Decimal(" nan ")
| ^^^^^^^^^^^^^^ FURB157
49 | Decimal(float(" +nan ")) # Decimal(" +nan ")
50 | Decimal(float(" -nan ")) # Decimal(" nan "), notice the difference!
|
= help: Replace with `" nan "`

ℹ Safe fix
45 45 |
46 46 | # Non-finite variants
47 47 | # https://github.com/astral-sh/ruff/issues/14587
48 |-Decimal(float(" nan ")) # Decimal(" nan ")
48 |+Decimal(" nan ") # Decimal(" nan ")
49 49 | Decimal(float(" +nan ")) # Decimal(" +nan ")
50 50 | Decimal(float(" -nan ")) # Decimal(" nan "), notice the difference!
51 51 | Decimal(float(" inf ")) # Decimal(" inf ")

FURB157.py:49:9: FURB157 [*] Verbose expression in `Decimal` constructor
|
47 | # https://github.com/astral-sh/ruff/issues/14587
48 | Decimal(float(" nan ")) # Decimal(" nan ")
49 | Decimal(float(" +nan ")) # Decimal(" +nan ")
| ^^^^^^^^^^^^^^^ FURB157
50 | Decimal(float(" -nan ")) # Decimal(" nan "), notice the difference!
51 | Decimal(float(" inf ")) # Decimal(" inf ")
|
= help: Replace with `" +nan "`

ℹ Safe fix
46 46 | # Non-finite variants
47 47 | # https://github.com/astral-sh/ruff/issues/14587
48 48 | Decimal(float(" nan ")) # Decimal(" nan ")
49 |-Decimal(float(" +nan ")) # Decimal(" +nan ")
49 |+Decimal(" +nan ") # Decimal(" +nan ")
50 50 | Decimal(float(" -nan ")) # Decimal(" nan "), notice the difference!
51 51 | Decimal(float(" inf ")) # Decimal(" inf ")
52 52 | Decimal(float(" +inf ")) # Decimal(" +inf ")

FURB157.py:50:9: FURB157 [*] Verbose expression in `Decimal` constructor
|
48 | Decimal(float(" nan ")) # Decimal(" nan ")
49 | Decimal(float(" +nan ")) # Decimal(" +nan ")
50 | Decimal(float(" -nan ")) # Decimal(" nan "), notice the difference!
| ^^^^^^^^^^^^^^^ FURB157
51 | Decimal(float(" inf ")) # Decimal(" inf ")
52 | Decimal(float(" +inf ")) # Decimal(" +inf ")
|
= help: Replace with `" nan "`

ℹ Safe fix
47 47 | # https://github.com/astral-sh/ruff/issues/14587
48 48 | Decimal(float(" nan ")) # Decimal(" nan ")
49 49 | Decimal(float(" +nan ")) # Decimal(" +nan ")
50 |-Decimal(float(" -nan ")) # Decimal(" nan "), notice the difference!
50 |+Decimal(" nan ") # Decimal(" nan "), notice the difference!
51 51 | Decimal(float(" inf ")) # Decimal(" inf ")
52 52 | Decimal(float(" +inf ")) # Decimal(" +inf ")
53 53 | Decimal(float(" -inf ")) # Decimal(" -inf ")

FURB157.py:51:9: FURB157 [*] Verbose expression in `Decimal` constructor
|
49 | Decimal(float(" +nan ")) # Decimal(" +nan ")
50 | Decimal(float(" -nan ")) # Decimal(" nan "), notice the difference!
51 | Decimal(float(" inf ")) # Decimal(" inf ")
| ^^^^^^^^^^^^^^ FURB157
52 | Decimal(float(" +inf ")) # Decimal(" +inf ")
53 | Decimal(float(" -inf ")) # Decimal(" -inf ")
|
= help: Replace with `" inf "`

ℹ Safe fix
48 48 | Decimal(float(" nan ")) # Decimal(" nan ")
49 49 | Decimal(float(" +nan ")) # Decimal(" +nan ")
50 50 | Decimal(float(" -nan ")) # Decimal(" nan "), notice the difference!
51 |-Decimal(float(" inf ")) # Decimal(" inf ")
51 |+Decimal(" inf ") # Decimal(" inf ")
52 52 | Decimal(float(" +inf ")) # Decimal(" +inf ")
53 53 | Decimal(float(" -inf ")) # Decimal(" -inf ")
54 54 | Decimal(float(" infinity ")) # Decimal(" infinity ")

FURB157.py:52:9: FURB157 [*] Verbose expression in `Decimal` constructor
|
50 | Decimal(float(" -nan ")) # Decimal(" nan "), notice the difference!
51 | Decimal(float(" inf ")) # Decimal(" inf ")
52 | Decimal(float(" +inf ")) # Decimal(" +inf ")
| ^^^^^^^^^^^^^^^ FURB157
53 | Decimal(float(" -inf ")) # Decimal(" -inf ")
54 | Decimal(float(" infinity ")) # Decimal(" infinity ")
|
= help: Replace with `" +inf "`

ℹ Safe fix
49 49 | Decimal(float(" +nan ")) # Decimal(" +nan ")
50 50 | Decimal(float(" -nan ")) # Decimal(" nan "), notice the difference!
51 51 | Decimal(float(" inf ")) # Decimal(" inf ")
52 |-Decimal(float(" +inf ")) # Decimal(" +inf ")
52 |+Decimal(" +inf ") # Decimal(" +inf ")
53 53 | Decimal(float(" -inf ")) # Decimal(" -inf ")
54 54 | Decimal(float(" infinity ")) # Decimal(" infinity ")
55 55 | Decimal(float(" +infinity ")) # Decimal(" +infinity ")

FURB157.py:53:9: FURB157 [*] Verbose expression in `Decimal` constructor
|
51 | Decimal(float(" inf ")) # Decimal(" inf ")
52 | Decimal(float(" +inf ")) # Decimal(" +inf ")
53 | Decimal(float(" -inf ")) # Decimal(" -inf ")
| ^^^^^^^^^^^^^^^ FURB157
54 | Decimal(float(" infinity ")) # Decimal(" infinity ")
55 | Decimal(float(" +infinity ")) # Decimal(" +infinity ")
|
= help: Replace with `" -inf "`

ℹ Safe fix
50 50 | Decimal(float(" -nan ")) # Decimal(" nan "), notice the difference!
51 51 | Decimal(float(" inf ")) # Decimal(" inf ")
52 52 | Decimal(float(" +inf ")) # Decimal(" +inf ")
53 |-Decimal(float(" -inf ")) # Decimal(" -inf ")
53 |+Decimal(" -inf ") # Decimal(" -inf ")
54 54 | Decimal(float(" infinity ")) # Decimal(" infinity ")
55 55 | Decimal(float(" +infinity ")) # Decimal(" +infinity ")
56 56 | Decimal(float(" -infinity ")) # Decimal(" -infinity ")

FURB157.py:54:9: FURB157 [*] Verbose expression in `Decimal` constructor
|
52 | Decimal(float(" +inf ")) # Decimal(" +inf ")
53 | Decimal(float(" -inf ")) # Decimal(" -inf ")
54 | Decimal(float(" infinity ")) # Decimal(" infinity ")
| ^^^^^^^^^^^^^^^^^^^ FURB157
55 | Decimal(float(" +infinity ")) # Decimal(" +infinity ")
56 | Decimal(float(" -infinity ")) # Decimal(" -infinity ")
|
= help: Replace with `" infinity "`

ℹ Safe fix
51 51 | Decimal(float(" inf ")) # Decimal(" inf ")
52 52 | Decimal(float(" +inf ")) # Decimal(" +inf ")
53 53 | Decimal(float(" -inf ")) # Decimal(" -inf ")
54 |-Decimal(float(" infinity ")) # Decimal(" infinity ")
54 |+Decimal(" infinity ") # Decimal(" infinity ")
55 55 | Decimal(float(" +infinity ")) # Decimal(" +infinity ")
56 56 | Decimal(float(" -infinity ")) # Decimal(" -infinity ")

FURB157.py:55:9: FURB157 [*] Verbose expression in `Decimal` constructor
|
53 | Decimal(float(" -inf ")) # Decimal(" -inf ")
54 | Decimal(float(" infinity ")) # Decimal(" infinity ")
55 | Decimal(float(" +infinity ")) # Decimal(" +infinity ")
| ^^^^^^^^^^^^^^^^^^^^ FURB157
56 | Decimal(float(" -infinity ")) # Decimal(" -infinity ")
|
= help: Replace with `" +infinity "`

ℹ Safe fix
52 52 | Decimal(float(" +inf ")) # Decimal(" +inf ")
53 53 | Decimal(float(" -inf ")) # Decimal(" -inf ")
54 54 | Decimal(float(" infinity ")) # Decimal(" infinity ")
55 |-Decimal(float(" +infinity ")) # Decimal(" +infinity ")
55 |+Decimal(" +infinity ") # Decimal(" +infinity ")
56 56 | Decimal(float(" -infinity ")) # Decimal(" -infinity ")

FURB157.py:56:9: FURB157 [*] Verbose expression in `Decimal` constructor
|
54 | Decimal(float(" infinity ")) # Decimal(" infinity ")
55 | Decimal(float(" +infinity ")) # Decimal(" +infinity ")
56 | Decimal(float(" -infinity ")) # Decimal(" -infinity ")
| ^^^^^^^^^^^^^^^^^^^^ FURB157
|
= help: Replace with `" -infinity "`

ℹ Safe fix
53 53 | Decimal(float(" -inf ")) # Decimal(" -inf ")
54 54 | Decimal(float(" infinity ")) # Decimal(" infinity ")
55 55 | Decimal(float(" +infinity ")) # Decimal(" +infinity ")
56 |-Decimal(float(" -infinity ")) # Decimal(" -infinity ")
56 |+Decimal(" -infinity ") # Decimal(" -infinity ")
Loading