compiler: Use `size_of` from the prelude instead of imported #138040

thaliaarchi · 2025-03-05T07:27:08Z

Use std::mem::{size_of, size_of_val, align_of, align_of_val} from the prelude instead of importing or qualifying them. Apply this change across the compiler.

These functions were added to all preludes in Rust 1.80.

r? @compiler-errors

rustbot · 2025-03-05T07:27:14Z

This PR changes Stable MIR

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

Some changes occurred in const_evaluatable.rs

cc @BoxyUwU

Some changes occurred in compiler/rustc_codegen_gcc

cc @antoyo, @GuillaumeGomez

Some changes occurred to the CTFE / Miri interpreter

cc @rust-lang/miri, @RalfJung, @oli-obk, @lcnr

compiler-errors · 2025-03-05T07:30:21Z

compiler/rustc_ast_lowering/src/path.rs

@@ -155,7 +155,7 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
        }

        // Simple case, either no projections, or only fully-qualified.
-        // E.g., `std::mem::size_of` or `<I as Iterator>::Item`.


this is just a random example of a multi segment path, so please choose another one. maybe std::iter::zip or something?

I just reverted that

compiler-errors · 2025-03-05T07:30:54Z

compiler/rustc_data_structures/src/aligned.rs

@@ -15,10 +13,10 @@ pub const fn align_of<T: ?Sized + Aligned>() -> Alignment {
 /// # Safety
 ///
 /// `Self::ALIGN` must be equal to the alignment of `Self`. For sized types it
-/// is [`mem::align_of<Self>()`], for unsized types it depends on the type, for


put turbofish here

I did add a turbofish. It's now align_of::<Self>(). You replied on the deleted line, so maybe you missed that?

compiler-errors · 2025-03-05T07:34:19Z

Few nits then I can approve.

compiler-errors · 2025-03-05T07:54:11Z

@bors r+ rollup

bors · 2025-03-05T07:54:13Z

📌 Commit 3efe87b has been approved by compiler-errors

It is now in the queue for this repository.

workingjubilee · 2025-03-05T08:33:47Z

needs rustfmt
@bors r-

compiler-errors · 2025-03-05T14:13:14Z

@bors r+ rollup

bors · 2025-03-05T14:13:16Z

📌 Commit bcb1dbf has been approved by compiler-errors

It is now in the queue for this repository.

compiler-errors · 2025-03-05T14:16:10Z

hold up ci is broken

@bors r-

thaliaarchi · 2025-03-05T22:40:52Z

Since I missed a #[cfg(not(feature = "nightly"))] gate, I manually reviewed everything again. The imports are good in all configurations.

thaliaarchi · 2025-03-06T18:52:20Z

@rustbot review

Use `std::mem::{size_of, size_of_val, align_of, align_of_val}` from the prelude instead of importing or qualifying them. These functions were added to all preludes in Rust 1.80.

rustbot · 2025-03-07T22:14:26Z

Some changes occurred in compiler/rustc_codegen_ssa

cc @WaffleLapkin

thaliaarchi · 2025-03-07T22:18:51Z

I don't know why that ping went out now, instead of before, since that push didn't change the changes to rustc_codegen_ssa. Anyways, that push was a style thing, reducing the diff, not correctness.

WaffleLapkin · 2025-03-08T12:47:17Z

The ping went out because it was just configured in #138108.

@bors r=compiler-errors

bors · 2025-03-08T12:47:19Z

📌 Commit 38fad98 has been approved by compiler-errors

It is now in the queue for this repository.

…mpiler, r=compiler-errors compiler: Use `size_of` from the prelude instead of imported Use `std::mem::{size_of, size_of_val, align_of, align_of_val}` from the prelude instead of importing or qualifying them. Apply this change across the compiler. These functions were added to all preludes in Rust 1.80. r? `@compiler-errors`

Rollup of 16 pull requests Successful merges: - rust-lang#122790 (Apply dllimport in ThinLTO) - rust-lang#136127 (Allow `*const W<dyn A> -> *const dyn A` ptr cast) - rust-lang#136968 (Turn order dependent trait objects future incompat warning into a hard error) - rust-lang#137147 (Add exclude to config.toml) - rust-lang#137319 (Stabilize `const_vec_string_slice`) - rust-lang#137885 (tidy: add triagebot checks) - rust-lang#138040 (compiler: Use `size_of` from the prelude instead of imported) - rust-lang#138052 (strip `-Wlinker-messages` wrappers from `rust-lld` rmake test) - rust-lang#138084 (Use workspace lints for crates in `compiler/`) - rust-lang#138158 (Move more layouting logic to `rustc_abi`) - rust-lang#138160 (depend more on attr_data_structures and move find_attr! there) - rust-lang#138192 (crashes: couple more tests) - rust-lang#138216 (bootstrap: Fix stack printing when a step cycle is detected) - rust-lang#138232 (Reduce verbosity of GCC build log) - rust-lang#138233 (Windows: Don't link std (and run-make) against advapi32, except on win7) - rust-lang#138242 (Revert "Don't test new error messages with the stage 0 compiler") r? `@ghost` `@rustbot` modify labels: rollup

…iaskrgr Rollup of 12 pull requests Successful merges: - rust-lang#136127 (Allow `*const W<dyn A> -> *const dyn A` ptr cast) - rust-lang#136968 (Turn order dependent trait objects future incompat warning into a hard error) - rust-lang#137319 (Stabilize `const_vec_string_slice`) - rust-lang#137885 (tidy: add triagebot checks) - rust-lang#138040 (compiler: Use `size_of` from the prelude instead of imported) - rust-lang#138084 (Use workspace lints for crates in `compiler/`) - rust-lang#138158 (Move more layouting logic to `rustc_abi`) - rust-lang#138160 (depend more on attr_data_structures and move find_attr! there) - rust-lang#138192 (crashes: couple more tests) - rust-lang#138216 (bootstrap: Fix stack printing when a step cycle is detected) - rust-lang#138232 (Reduce verbosity of GCC build log) - rust-lang#138242 (Revert "Don't test new error messages with the stage 0 compiler") r? `@ghost` `@rustbot` modify labels: rollup

Rollup merge of rust-lang#138040 - thaliaarchi:use-prelude-size-of.compiler, r=compiler-errors compiler: Use `size_of` from the prelude instead of imported Use `std::mem::{size_of, size_of_val, align_of, align_of_val}` from the prelude instead of importing or qualifying them. Apply this change across the compiler. These functions were added to all preludes in Rust 1.80. r? ``@compiler-errors``

…mpiler, r=compiler-errors compiler: Use `size_of` from the prelude instead of imported Use `std::mem::{size_of, size_of_val, align_of, align_of_val}` from the prelude instead of importing or qualifying them. Apply this change across the compiler. These functions were added to all preludes in Rust 1.80. r? ``@compiler-errors``

rustbot assigned compiler-errors Mar 5, 2025

compiler-errors reviewed Mar 5, 2025

View reviewed changes

This comment has been minimized.

Sign in to view

thaliaarchi force-pushed the use-prelude-size-of.compiler branch from b46c1a2 to 3efe87b Compare March 5, 2025 07:51

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 5, 2025

This comment has been minimized.

Sign in to view

bors 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-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Mar 5, 2025

thaliaarchi force-pushed the use-prelude-size-of.compiler branch from 3efe87b to bcb1dbf Compare March 5, 2025 08:46

thaliaarchi mentioned this pull request Mar 5, 2025

library: Use size_of from the prelude instead of imported #138034

Merged

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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Mar 5, 2025

bors 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-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Mar 5, 2025

thaliaarchi force-pushed the use-prelude-size-of.compiler branch from bcb1dbf to 1444614 Compare March 5, 2025 22:39

rustbot removed the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Mar 6, 2025

rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Mar 6, 2025

thaliaarchi requested a review from compiler-errors March 7, 2025 21:32

compiler: Use size_of from the prelude instead of imported

38fad98

Use `std::mem::{size_of, size_of_val, align_of, align_of_val}` from the prelude instead of importing or qualifying them. These functions were added to all preludes in Rust 1.80.

thaliaarchi force-pushed the use-prelude-size-of.compiler branch from 1444614 to 38fad98 Compare March 7, 2025 22:14

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 8, 2025

jieyouxu mentioned this pull request Mar 9, 2025

Rollup of 16 pull requests #138255

Closed

matthiaskrgr mentioned this pull request Mar 9, 2025

Rollup of 12 pull requests #138267

Merged

bors merged commit c666287 into rust-lang:master Mar 9, 2025
6 checks passed

rustbot added this to the 1.87.0 milestone Mar 9, 2025

thaliaarchi deleted the use-prelude-size-of.compiler branch March 9, 2025 19:41

cuviper mentioned this pull request Mar 11, 2025

Convert ShardedHashMap to use hashbrown::HashTable #137701

Merged

compiler: Use size_of from the prelude instead of imported #138040

compiler: Use size_of from the prelude instead of imported #138040

Uh oh!

Conversation

thaliaarchi commented Mar 5, 2025

Uh oh!

rustbot commented Mar 5, 2025

Uh oh!

compiler-errors Mar 5, 2025

Choose a reason for hiding this comment

Uh oh!

thaliaarchi Mar 5, 2025

Choose a reason for hiding this comment

Uh oh!

compiler-errors Mar 5, 2025

Choose a reason for hiding this comment

Uh oh!

thaliaarchi Mar 5, 2025

Choose a reason for hiding this comment

Uh oh!

compiler-errors Mar 5, 2025

Choose a reason for hiding this comment

Uh oh!

compiler-errors commented Mar 5, 2025

Uh oh!

This comment has been minimized.

compiler-errors commented Mar 5, 2025

Uh oh!

bors commented Mar 5, 2025

Uh oh!

This comment has been minimized.

workingjubilee commented Mar 5, 2025

Uh oh!

compiler-errors commented Mar 5, 2025

Uh oh!

bors commented Mar 5, 2025

Uh oh!

compiler-errors commented Mar 5, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

thaliaarchi commented Mar 5, 2025

Uh oh!

thaliaarchi commented Mar 6, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

rustbot commented Mar 7, 2025

Uh oh!

thaliaarchi commented Mar 7, 2025

Uh oh!

WaffleLapkin commented Mar 8, 2025

Uh oh!

bors commented Mar 8, 2025

Uh oh!

Uh oh!

Uh oh!

compiler: Use `size_of` from the prelude instead of imported #138040

compiler: Use `size_of` from the prelude instead of imported #138040

compiler-errors commented Mar 5, 2025 •

edited

Loading

thaliaarchi commented Mar 6, 2025 •

edited

Loading