Some clippy fixes in the compiler #110124

Nilstrieb · 2023-04-09T21:10:53Z

Best reviewed commit-by-commit 📎.

This pattern is fine for arena allocators.

Nothing was really incorrect before, but it did get nicer.

rustbot · 2023-04-09T21:10:59Z

r? @jackh726

(rustbot has picked a reviewer for you, use r? to override)

rustbot · 2023-04-09T21:11:03Z

These commits modify compiler targets.
(See the Target Tier Policy.)

Some changes occurred to the CTFE / Miri engine

cc @rust-lang/miri

rustc_macros::diagnostics was changed

cc @davidtwco, @compiler-errors, @JohnTitor, @TaKO8Ki

compiler/rustc_arena/src/lib.rs

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

compiler-errors

r=me

compiler/rustc_session/src/parse.rs

compiler/rustc_resolve/src/late.rs

compiler/rustc_middle/src/traits/mod.rs

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

compiler/rustc_macros/src/diagnostics/fluent.rs

compiler/rustc_data_structures/src/profiling.rs

The shadowing lead to an incorrect comparison. Rename it and compare it properly. compiler-errors told me that I should just include the fix here without a test.

Exhaustively destructure and ignore `()`

Nilstrieb · 2023-04-09T21:23:07Z

I removed the Don't assume that io::{Read, Write} writes/reads all commit since that seems to be causing an ICE that I can't be bothered to further investigate, the code is fine as-is even though it technically relies on unspecified details of Read,Write.

saethlin · 2023-04-09T21:24:44Z

How do we repro the ICE? Seems worth someone writing an issue

Nilstrieb · 2023-04-09T21:28:48Z

I used read_exact but there aren't enough bytes in the data to fill the buffer, returning an error. read just returned as many bytes as there are, which is the desired behavior here. The code isn't wrong so it's fine to leave it, but it should maybe be rewritten in the future to not do it like that, not that it's very important.
a90bd02df386787c621cdfcc17b96a8e3ecb13e9

Co-authored-by: Michael Goulet <michael@errs.io>

compiler-errors · 2023-04-10T00:39:18Z

Ok, looking at a90bd02, I think it makes sense that the read_all would fail -- we're trying to read at most a u128 from the source buffer, but not necessarily a u128, so source is not necessarily at least sizeof(u128) long. Anyways, looks fine now.

r? @compiler-errors @bors r+

bors · 2023-04-10T00:39:20Z

📌 Commit 9fc1555 has been approved by compiler-errors

It is now in the queue for this repository.

scottmcm · 2023-04-10T02:20:36Z

compiler/rustc_data_structures/src/stack.rs

@@ -5,7 +5,7 @@ const RED_ZONE: usize = 100 * 1024; // 100k

 // Only the first stack that is pushed, grows exponentially (2^n * STACK_PER_RECURSION) from then
 // on. This flag has performance relevant characteristics. Don't set it too high.
-const STACK_PER_RECURSION: usize = 1 * 1024 * 1024; // 1MB
+const STACK_PER_RECURSION: usize = 1024 * 1024; // 1MB


TBH, I think clippy is wrong to complain about this. Especially in a const, there's absolutely nothing wrong with a 1 *, and representing "X MB" as X * 1024 * 1024 is fine.

Maybe use 1 << 20? That's also clearly 1 MiB, and hopefully clippy wouldn't whine about it.

I wish I agreed 1 << 20 was obviously 1 MB. Maybe I'm just uncommonly bad at all these bit twiddling operations.

(For context: k is a decimal shift by 3, M is a decimal shift by 6, etc. The elementary school "move the decimal point" is, essentially, a shift. So M ≡ 10⁶, aka "<<₁₀ 6". And similarly Mi ≡ 2²⁰, aka << 20. So "kebi", "mebi", "gibi", "tebi", etc are "<< 10", "<< 20", "<< 30", "<< 40", etc.)

Rollup of 6 pull requests Successful merges: - rust-lang#109724 (prioritize param env candidates if they don't guide type inference) - rust-lang#110021 (Fix a couple ICEs in the new `CastKind::Transmute` code) - rust-lang#110044 (Avoid some manual slice length calculation) - rust-lang#110115 (compiletest: Use remap-path-prefix only in CI) - rust-lang#110121 (Fix `x check --stage 1` when download-rustc is enabled) - rust-lang#110124 (Some clippy fixes in the compiler) Failed merges: - rust-lang#109752 (Stall auto trait assembly in new solver for int/float vars) r? `@ghost` `@rustbot` modify labels: rollup

Nilstrieb added 6 commits April 9, 2023 21:59

Some simple clippy::perf fixes

f058d05

Use HashMap entry APIs more

54e1309

Box large enum variants

f00366d

Allow clippy::from_mut_ref

968be98

This pattern is fine for arena allocators.

Allow modulo_one on function using cfg consts

0a0968b

Small clippy::correctness fixes

07cd382

Nothing was really incorrect before, but it did get nicer.

rustbot assigned jackh726 Apr 9, 2023

saethlin reviewed Apr 9, 2023

View reviewed changes

compiler/rustc_arena/src/lib.rs Show resolved Hide resolved

saethlin reviewed Apr 9, 2023

View reviewed changes

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

compiler-errors reviewed Apr 9, 2023

View reviewed changes

Nilstrieb added 7 commits April 9, 2023 23:22

Properly compare previously shadowed values

1c75724

The shadowing lead to an incorrect comparison. Rename it and compare it properly. compiler-errors told me that I should just include the fix here without a test.

Delete useless loop

5a90de8

Improve `Allocation::hash

6fceb0f

Exhaustively destructure and ignore `()`

Fix some clippy::complexity

81c320e

Remove identity casts

4b4948c

Convert manual loop into while let

e5defd0

Simply Abi::fmt

5853c28

fixup! Improve `Allocation::hash

cab94d2

Nilstrieb force-pushed the branch from 5f72dad to cab94d2 Compare April 9, 2023 21:29

Inline format_args

73417b1

Co-authored-by: Michael Goulet <michael@errs.io>

Remove turbofish

9fc1555

rustbot assigned compiler-errors and unassigned jackh726 Apr 10, 2023

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 Apr 10, 2023

scottmcm reviewed Apr 10, 2023

View reviewed changes

Dylan-DPC mentioned this pull request Apr 10, 2023

Rollup of 6 pull requests #110137

Merged

bors merged commit 97921ab into rust-lang:master Apr 10, 2023

rustbot added this to the 1.70.0 milestone Apr 10, 2023

Nilstrieb deleted the 📎-told-me-so branch April 10, 2023 11:50

lcnr removed the WG-trait-system-refactor The Rustc Trait System Refactor Initiative label Apr 17, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Some clippy fixes in the compiler #110124

Some clippy fixes in the compiler #110124

Nilstrieb commented Apr 9, 2023

rustbot commented Apr 9, 2023

rustbot commented Apr 9, 2023

compiler-errors left a comment

Nilstrieb commented Apr 9, 2023

saethlin commented Apr 9, 2023

Nilstrieb commented Apr 9, 2023

compiler-errors commented Apr 10, 2023

bors commented Apr 10, 2023

scottmcm Apr 10, 2023

saethlin Apr 10, 2023

scottmcm Apr 10, 2023 •

edited

Loading

Some clippy fixes in the compiler #110124

Some clippy fixes in the compiler #110124

Conversation

Nilstrieb commented Apr 9, 2023

rustbot commented Apr 9, 2023

rustbot commented Apr 9, 2023

compiler-errors left a comment

Choose a reason for hiding this comment

Nilstrieb commented Apr 9, 2023

saethlin commented Apr 9, 2023

Nilstrieb commented Apr 9, 2023

compiler-errors commented Apr 10, 2023

bors commented Apr 10, 2023

scottmcm Apr 10, 2023

Choose a reason for hiding this comment

saethlin Apr 10, 2023

Choose a reason for hiding this comment

scottmcm Apr 10, 2023 • edited Loading

Choose a reason for hiding this comment

scottmcm Apr 10, 2023 •

edited

Loading