Fix false positive in write_literal and print_literal (numeric literals) #6408

pro-grammer1 · 2020-12-01T15:28:55Z

changelog: No longer lint numeric literals in [write_literal] and [print_literal].

Fixes #6335

…literals

rust-highfive · 2020-12-01T15:28:58Z

r? @ebroto

(rust-highfive has picked a reviewer for you, use r? to override)

pro-grammer1 · 2020-12-01T15:39:55Z

Fixes #6335

rustbot · 2020-12-01T15:46:17Z

Error: The feature major_change is not enabled in this repository.
To enable it add its section in the triagebot.toml in the root of the repository.

Please let @rust-lang/release know if you're having trouble with this bot.

ebroto

Just some nits.

Also, the reference file for the tests needs to be updated because the stderr files have changed, as we are not linting if the literals are ints/floats. To do this, you can run the tests/ui/update-all-references.sh script.

ebroto · 2020-12-08T22:45:25Z

clippy_lints/src/write.rs

+                ExprKind::Lit(lit)
+                    if match lit.kind {
+                        LitKind::Int(_, _) | LitKind::Float(_, _) => false,
+                        _ => true,
+                    } =>


Suggested change

ExprKind::Lit(lit)

if match lit.kind {

LitKind::Int(_, _) | LitKind::Float(_, _) => false,

_ => true,

} =>

ExprKind::Lit(lit) if !matches!(lit.kind, LitKind::Int(..) | LitKind::Float(..)) => {

We can simplify using matches!()

ebroto · 2020-12-08T22:46:31Z

clippy_lints/src/write.rs

+                        if match lit.kind {
+                            LitKind::Int(_, _) | LitKind::Float(_, _) => false,
+                            _ => true,
+                        };


Suggested change

if match lit.kind {

LitKind::Int(_, _) | LitKind::Float(_, _) => false,

_ => true,

};

if !matches!(lit.kind, LitKind::Int(..) | LitKind::Float(..));

Same here

giraffate · 2020-12-22T23:41:12Z

ping from triage @pro-grammer1. There seems to be some fixes left to be done. Do you have any questions on how to preceed here?

giraffate · 2021-01-05T23:30:02Z

ping from triage @pro-grammer1. According to the triage procedure, I close this because there has no activity in 2 weeks from previous ping. If you have more time to work on this, feel free to reopen.

pro-grammer1 · 2021-01-17T09:05:02Z

I've made the changes, so I would like to reopen this.

giraffate · 2021-01-17T13:52:26Z

Thanks for taking time to work on this! I reopen this.

…t shouldn't fail

pro-grammer1 · 2021-01-18T09:19:30Z

I've made the suggested changes and updated the tests. Is there anything else I should do?

flip1995

Oli was faster, but I have a comment anyway 😄

flip1995 · 2021-01-21T14:08:13Z

tests/ui/crashes/ice-3891.stderr

  --> $DIR/ice-3891.rs:2:5
   |
 LL |     1x;
   |     ^^ invalid suffix `x`
   |
-   = help: the suffix must be one of the integral types (`u32`, `isize`, etc)
+   = help: the suffix must be one of the numeric types (`u32`, `isize`, `f32`, etc.)


Why did this change? This is a rustc lint and should be unaffected by a Clippy PR. (rebase gone wrong?)

I was wondering the same thing... but since CI is passing... I guess this is the lack of a rebase? (master has this change already) Like this change will go away when rebased over master. Though that does make me wonder how git managed to not treat this as a conflict... I guess because the change is exactly the same.

oli-obk · 2021-01-21T14:19:11Z

@bors r+

bors · 2021-01-21T14:19:12Z

📌 Commit 32b2a3f has been approved by oli-obk

bors · 2021-01-21T14:23:30Z

⌛ Testing commit 32b2a3f with merge 7b50a4e...

bors · 2021-01-21T14:34:16Z

☀️ Test successful - checks-action_dev_test, checks-action_remark_test, checks-action_test
Approved by: oli-obk
Pushing 7b50a4e to master...

Fix false positive in write_literal and print_literal due to numeric …

415394c

…literals

rust-highfive assigned ebroto Dec 1, 2020

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties label Dec 1, 2020

pro-grammer1 marked this pull request as ready for review December 1, 2020 15:40

pro-grammer1 changed the title ~~Fix false positive in write_literal and print_literal due to numeric literals~~ Fix false positive in write_literal and print_literal (numeric literals) Dec 1, 2020

ebroto suggested changes Dec 8, 2020

View reviewed changes

ebroto added S-waiting-on-author Status: This is awaiting some action from the author. (Use `@rustbot ready` to update this status) and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties labels Dec 8, 2020

giraffate closed this Jan 5, 2021

giraffate added S-inactive-closed Status: Closed due to inactivity and removed S-waiting-on-author Status: This is awaiting some action from the author. (Use `@rustbot ready` to update this status) labels Jan 5, 2021

Run tests/ui/update-all-references.sh and refactor match into matches!

0d542b7

giraffate reopened this Jan 17, 2021

giraffate added S-waiting-on-author Status: This is awaiting some action from the author. (Use `@rustbot ready` to update this status) and removed S-inactive-closed Status: Closed due to inactivity labels Jan 17, 2021

pro-grammer1 added 4 commits January 17, 2021 18:01

Replace another instance of match with matches

2af642d

Negate results of matches!

ab155b1

Remove numeric literals from print_literal and write_literal tests

fb2a06d

Add numeric literals to the write_literal and print_literal tests tha…

32b2a3f

…t shouldn't fail

oli-obk assigned oli-obk and unassigned ebroto Jan 21, 2021

flip1995 reviewed Jan 21, 2021

View reviewed changes

bors merged commit 7b50a4e into rust-lang:master Jan 21, 2021

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix false positive in write_literal and print_literal (numeric literals) #6408

Fix false positive in write_literal and print_literal (numeric literals) #6408

pro-grammer1 commented Dec 1, 2020 •

edited by flip1995

Loading

rust-highfive commented Dec 1, 2020

pro-grammer1 commented Dec 1, 2020

rustbot commented Dec 1, 2020

ebroto left a comment

ebroto Dec 8, 2020

ebroto Dec 8, 2020

giraffate commented Dec 22, 2020

giraffate commented Jan 5, 2021

pro-grammer1 commented Jan 17, 2021

giraffate commented Jan 17, 2021

pro-grammer1 commented Jan 18, 2021

flip1995 left a comment

flip1995 Jan 21, 2021

oli-obk Jan 21, 2021

oli-obk commented Jan 21, 2021

bors commented Jan 21, 2021

bors commented Jan 21, 2021

bors commented Jan 21, 2021

Fix false positive in write_literal and print_literal (numeric literals) #6408

Fix false positive in write_literal and print_literal (numeric literals) #6408

Conversation

pro-grammer1 commented Dec 1, 2020 • edited by flip1995 Loading

rust-highfive commented Dec 1, 2020

pro-grammer1 commented Dec 1, 2020

rustbot commented Dec 1, 2020

ebroto left a comment

Choose a reason for hiding this comment

ebroto Dec 8, 2020

Choose a reason for hiding this comment

ebroto Dec 8, 2020

Choose a reason for hiding this comment

giraffate commented Dec 22, 2020

giraffate commented Jan 5, 2021

pro-grammer1 commented Jan 17, 2021

giraffate commented Jan 17, 2021

pro-grammer1 commented Jan 18, 2021

flip1995 left a comment

Choose a reason for hiding this comment

flip1995 Jan 21, 2021

Choose a reason for hiding this comment

oli-obk Jan 21, 2021

Choose a reason for hiding this comment

oli-obk commented Jan 21, 2021

bors commented Jan 21, 2021

bors commented Jan 21, 2021

bors commented Jan 21, 2021

pro-grammer1 commented Dec 1, 2020 •

edited by flip1995

Loading