various clippy fixes #121543

onur-ozkan · 2024-02-24T12:09:55Z

We need to keep the order of the given clippy lint rules before passing them.
Since clap doesn't offer any useful interface for this purpose out of the box,
we have to handle it manually.

Additionally, this PR makes -D rules work as expected. Previously, lint rules were limited to -W. By enabling -D, clippy began to complain numerous lines in the tree, all of which have been resolved in this PR as well.

Fixes #121481
cc @matthiaskrgr

rustbot · 2024-02-24T12:10:03Z

r? @clubby789

rustbot has assigned @clubby789.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

rustbot · 2024-02-24T12:10:04Z

This PR modifies src/bootstrap/src/core/config.

If appropriate, please update CONFIG_CHANGE_HISTORY in src/bootstrap/src/utils/change_tracker.rs.

matthiaskrgr · 2024-02-24T12:49:30Z

Looks good so far :) thanks!
Side note: it seems that -D and -F do not have any effect, probably due to --cap-lints warn which we also pass?

matthiaskrgr · 2024-02-24T12:52:09Z

src/bootstrap/src/core/build_steps/check.rs

        args.extend(ignored_lints.iter().map(|lint| format!("-Aclippy::{}", lint)));
-        let mut clippy_lint_levels: Vec<String> = Vec::new();
-        allow.iter().for_each(|v| clippy_lint_levels.push(format!("-A{}", v)));
-        deny.iter().for_each(|v| clippy_lint_levels.push(format!("-D{}", v)));
-        warn.iter().for_each(|v| clippy_lint_levels.push(format!("-W{}", v)));
-        forbid.iter().for_each(|v| clippy_lint_levels.push(format!("-F{}", v)));
-        args.extend(clippy_lint_levels);
+        args.extend(get_clippy_rules_in_order(&all_args, allow, deny, warn, forbid));


like this, the manual lints passed to x.py clippy will always override the ignored lints.

I'm not sure if we have any other options than either make x.py always override the ignored lints or make the ignored lints always override the manual ones, so the way it is currently seems to be the less painful option..?

7745deb should be appropriate solution I think?

onur-ozkan · 2024-02-24T13:10:00Z

Side note: it seems that -D and -F do not have any effect, probably due to --cap-lints warn which we also pass?

6e8042b should fix that.

onur-ozkan · 2024-02-24T14:35:40Z

Now clippy complains a lot of stuff because the -D rules have never been functional before. I will switch back this PR to S-waiting-on-review label once I resolve the lint errors in the tree.

rustbot · 2024-03-14T18:05:12Z

Some changes occurred to the CTFE / Miri engine

cc @rust-lang/miri

This PR changes Stable MIR

cc @oli-obk, @celinval, @spastorino, @ouz-a

Some changes occurred in match lowering

cc @Nadrieril

Some changes occurred to the CTFE / Miri engine

cc @rust-lang/miri

compiler/rustc_metadata/src/rmeta/encoder.rs

onur-ozkan · 2024-03-14T18:07:53Z

@rustbot ready

compiler/rustc_const_eval/src/interpret/intern.rs

compiler/rustc_middle/src/hir/map/mod.rs

compiler/rustc_middle/src/mir/interpret/mod.rs

oli-obk · 2024-03-16T21:04:59Z

compiler/rustc_middle/src/mir/interpret/mod.rs

@@ -671,11 +671,11 @@ pub fn read_target_uint(endianness: Endian, mut source: &[u8]) -> Result<u128, i
    // So we do not read exactly 16 bytes into the u128, just the "payload".
    let uint = match endianness {
        Endian::Little => {
-            source.read(&mut buf)?;
+            let _ = source.read(&mut buf)?;


read_exact here, too?

I already tried that and got failures in CI https://github.com/rust-lang/rust/actions/runs/8307751008/job/22737303335#step:27:1679. And that actually makes sense as trying to fill entire [0u8; std::mem::size_of::<u128>()] will fail for most cases.

right, you need to use the same [16 - source.len()..] logic used in the Endian::Big branch (or even better, move that logic before the match endianess

I believe this is to cover the logic for the "most significant byte" and we shouldn't do the same in Little branch.

Ah makes sense. Then you need to slice ..source.len() before using read_exact

Tho maybe we should just use one of the slice copying functions instead of using the Read trait

compiler/stable_mir/src/mir/alloc.rs

bors · 2024-03-17T16:02:47Z

☔ The latest upstream changes (presumably #122637) made this pull request unmergeable. Please resolve the merge conflicts.

We need to keep the order of the given clippy lint rules before passing them. Since clap doesn't offer any useful interface for this purpose out of the box, we have to handle it manually. Signed-off-by: onur-ozkan <work@onurozkan.dev>

Signed-off-by: onur-ozkan <work@onurozkan.dev>

Previously, when passing lint rules manually using `x clippy ..`, ignored lints would override manual ones. This change corrects the order by passing ignored lints after the manual ones. Signed-off-by: onur-ozkan <work@onurozkan.dev>

Signed-off-by: onur-ozkan <work@onurozkan.dev>

compiler/rustc_middle/src/mir/interpret/mod.rs

Signed-off-by: onur-ozkan <work@onurozkan.dev>

oli-obk · 2024-03-19T21:20:16Z

@bors r+ rollup

bors · 2024-03-19T21:20:18Z

📌 Commit 81d7d7a has been approved by oli-obk

It is now in the queue for this repository.

…iaskrgr Rollup of 6 pull requests Successful merges: - rust-lang#121543 (various clippy fixes) - rust-lang#122540 (Do not use `?`-induced skewing of type inference in the compiler) - rust-lang#122730 (Expose `ucred::peer_cred` on QNX targets to enable dist builds) - rust-lang#122732 (Remove redundant coroutine captures note) - rust-lang#122739 (Add "put" as a confusable for insert on hash map/set) - rust-lang#122748 (Reduce `pub` usage in `rustc_session`.) r? `@ghost` `@rustbot` modify labels: rollup

Rollup merge of rust-lang#121543 - onur-ozkan:clippy-args, r=oli-obk various clippy fixes We need to keep the order of the given clippy lint rules before passing them. Since clap doesn't offer any useful interface for this purpose out of the box, we have to handle it manually. Additionally, this PR makes `-D` rules work as expected. Previously, lint rules were limited to `-W`. By enabling `-D`, clippy began to complain numerous lines in the tree, all of which have been resolved in this PR as well. Fixes rust-lang#121481 cc `@matthiaskrgr`

rustbot assigned clubby789 Feb 24, 2024

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) labels Feb 24, 2024

matthiaskrgr reviewed Feb 24, 2024

View reviewed changes

This comment has been minimized.

Sign in to view

onur-ozkan force-pushed the clippy-args branch from 6e8042b to 1a2e189 Compare February 24, 2024 13:40

This comment has been minimized.

Sign in to view

onur-ozkan added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Feb 24, 2024

onur-ozkan marked this pull request as draft February 24, 2024 14:35

onur-ozkan changed the title ~~reorder clippy rules to their original order before passing them~~ various clippy fixes Feb 24, 2024

This comment has been minimized.

Sign in to view

This was referenced Feb 24, 2024

ignore clippy lints in symbolize/gimli/stash.rs rust-lang/backtrace-rs#586

Merged

WIP: enhancing x test tidy with lint checks #121696

Closed

onur-ozkan force-pushed the clippy-args branch from c12f9c2 to 835d4b2 Compare March 14, 2024 18:04

onur-ozkan marked this pull request as ready for review March 14, 2024 18:05

onur-ozkan commented Mar 14, 2024

View reviewed changes

compiler/rustc_metadata/src/rmeta/encoder.rs Outdated Show resolved Hide resolved

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Mar 14, 2024

oli-obk reviewed Mar 14, 2024

View reviewed changes

compiler/rustc_const_eval/src/interpret/intern.rs Show resolved Hide resolved

oli-obk reviewed Mar 14, 2024

View reviewed changes

compiler/rustc_middle/src/hir/map/mod.rs Show resolved Hide resolved

oli-obk reviewed Mar 14, 2024

View reviewed changes

compiler/rustc_middle/src/mir/interpret/mod.rs Outdated Show resolved Hide resolved

onur-ozkan force-pushed the clippy-args branch from 9241997 to 2cb109a Compare March 16, 2024 11:57

onur-ozkan force-pushed the clippy-args branch from 33bd5f2 to 3b7ca5c Compare March 16, 2024 12:20

This comment has been minimized.

Sign in to view

onur-ozkan force-pushed the clippy-args branch from 3b7ca5c to ce9ca9e Compare March 16, 2024 12:30

This comment has been minimized.

Sign in to view

onur-ozkan force-pushed the clippy-args branch from ce9ca9e to f6188ec Compare March 16, 2024 12:44

oli-obk reviewed Mar 16, 2024

View reviewed changes

compiler/stable_mir/src/mir/alloc.rs Outdated Show resolved Hide resolved

oli-obk reviewed Mar 16, 2024

View reviewed changes

compiler/stable_mir/src/mir/alloc.rs Outdated Show resolved Hide resolved

onur-ozkan added 4 commits March 18, 2024 00:10

add unit test: order_of_clippy_rules

b43dc06

Signed-off-by: onur-ozkan <work@onurozkan.dev>

pass ignored lints after manual ones

1945e8f

Previously, when passing lint rules manually using `x clippy ..`, ignored lints would override manual ones. This change corrects the order by passing ignored lints after the manual ones. Signed-off-by: onur-ozkan <work@onurozkan.dev>

use --cap-lints only when deny and forbid rules are not specified

a61bf30

Signed-off-by: onur-ozkan <work@onurozkan.dev>

onur-ozkan force-pushed the clippy-args branch from f6188ec to 1606827 Compare March 17, 2024 21:14

This comment has been minimized.

Sign in to view

onur-ozkan force-pushed the clippy-args branch from 1606827 to d5b98ff Compare March 17, 2024 21:32

oli-obk reviewed Mar 19, 2024

View reviewed changes

compiler/rustc_middle/src/mir/interpret/mod.rs Outdated Show resolved Hide resolved

This comment has been minimized.

Sign in to view

onur-ozkan force-pushed the clippy-args branch from 539b009 to 81d7d7a Compare March 19, 2024 21:11

resolve clippy errors

81d7d7a

Signed-off-by: onur-ozkan <work@onurozkan.dev>

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Mar 19, 2024

matthiaskrgr mentioned this pull request Mar 20, 2024

Rollup of 6 pull requests #122763

Merged

bors merged commit 4f3050b into rust-lang:master Mar 20, 2024
11 checks passed

rustbot added this to the 1.79.0 milestone Mar 20, 2024

onur-ozkan deleted the clippy-args branch March 20, 2024 17:56

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

various clippy fixes #121543

various clippy fixes #121543

onur-ozkan commented Feb 24, 2024 •

edited

rustbot commented Feb 24, 2024

rustbot commented Feb 24, 2024

matthiaskrgr commented Feb 24, 2024

matthiaskrgr Feb 24, 2024

onur-ozkan Feb 24, 2024

onur-ozkan commented Feb 24, 2024

This comment has been minimized.

This comment has been minimized.

onur-ozkan commented Feb 24, 2024 •

edited

This comment has been minimized.

rustbot commented Mar 14, 2024

onur-ozkan commented Mar 14, 2024

This comment has been minimized.

This comment has been minimized.

oli-obk Mar 16, 2024

onur-ozkan Mar 16, 2024

oli-obk Mar 18, 2024

onur-ozkan Mar 18, 2024

oli-obk Mar 18, 2024

bors commented Mar 17, 2024

This comment has been minimized.

This comment has been minimized.

oli-obk commented Mar 19, 2024

bors commented Mar 19, 2024

various clippy fixes #121543

various clippy fixes #121543

Conversation

onur-ozkan commented Feb 24, 2024 • edited

rustbot commented Feb 24, 2024

rustbot commented Feb 24, 2024

matthiaskrgr commented Feb 24, 2024

matthiaskrgr Feb 24, 2024

Choose a reason for hiding this comment

onur-ozkan Feb 24, 2024

Choose a reason for hiding this comment

onur-ozkan commented Feb 24, 2024

This comment has been minimized.

This comment has been minimized.

onur-ozkan commented Feb 24, 2024 • edited

This comment has been minimized.

rustbot commented Mar 14, 2024

onur-ozkan commented Mar 14, 2024

This comment has been minimized.

This comment has been minimized.

oli-obk Mar 16, 2024

Choose a reason for hiding this comment

onur-ozkan Mar 16, 2024

Choose a reason for hiding this comment

oli-obk Mar 18, 2024

Choose a reason for hiding this comment

onur-ozkan Mar 18, 2024

Choose a reason for hiding this comment

oli-obk Mar 18, 2024

Choose a reason for hiding this comment

bors commented Mar 17, 2024

This comment has been minimized.

This comment has been minimized.

oli-obk commented Mar 19, 2024

bors commented Mar 19, 2024

onur-ozkan commented Feb 24, 2024 •

edited

onur-ozkan commented Feb 24, 2024 •

edited