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

Jump to bottom

bootstrap and compiletest: Use size_of_val from the prelude instead of imported #138041

Merged
merged 1 commit into from
Mar 7, 2025
Merged

bootstrap and compiletest: Use size_of_val from the prelude instead of imported #138041

merged 1 commit into from
Mar 7, 2025

Conversation

thaliaarchi
Copy link
Contributor

Use std::mem::size_of_val from the prelude instead of importing or qualifying it.

This function was added to all preludes in Rust 1.80.

r? @jieyouxu

@rustbot rustbot added A-compiletest Area: The compiletest test runner A-testsuite Area: The testsuite used to check the correctness of rustc 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 Mar 5, 2025
@rustbot
Copy link
Collaborator

rustbot commented Mar 5, 2025

Some changes occurred in src/tools/compiletest

cc @jieyouxu

@rust-log-analyzer

This comment has been minimized.

Sign in to view
@thaliaarchi
Copy link
Contributor Author

Looks like a spurious, unrelated failure?

@thaliaarchi thaliaarchi force-pushed the use-prelude-size-of.boostrap-compiletest branch from 843ebe3 to 1cacddc Compare March 5, 2025 08:01
@thaliaarchi thaliaarchi mentioned this pull request Mar 5, 2025
Merged
@jieyouxu
Copy link
Member

jieyouxu commented Mar 5, 2025

Unrelated, gcc dist step network problem.

Thanks!
@bors r+ rollup

@bors
Copy link
Contributor

bors commented Mar 5, 2025

📌 Commit 1cacddc has been approved by jieyouxu

It is now in the queue for this repository.

@bors 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
jieyouxu added a commit to jieyouxu/rust that referenced this pull request Mar 5, 2025
@jieyouxu
Rollup merge of rust-lang#138041 - thaliaarchi:use-prelude-size-of.bo…
0b02900 
…ostrap-compiletest, r=jieyouxu

bootstrap and compiletest: Use `size_of_val` from the prelude instead of imported

Use `std::mem::size_of_val` from the prelude instead of importing or qualifying it.

This function was added to all preludes in Rust 1.80.

r? `@jieyouxu`
@jieyouxu jieyouxu mentioned this pull request Mar 5, 2025
Closed
bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 5, 2025
@bors
Auto merge of rust-lang#138059 - jieyouxu:rollup-wxy3xpx, r=jieyouxu
ee7cd30 
Rollup of 23 pull requests

Successful merges:

 - rust-lang#137303 (Remove `MaybeForgetReturn` suggestion)
 - rust-lang#137327 (Undeprecate env::home_dir)
 - rust-lang#137358 (Match Ergonomics 2024: add context and examples to the unstable book)
 - rust-lang#137534 ([rustdoc] hide item that is not marked as doc(inline) and whose src is doc(hidden))
 - rust-lang#137565 (Try to point of macro expansion from resolver and method errors if it involves macro var)
 - rust-lang#137637 (Check dyn flavor before registering upcast goal on wide pointer cast in MIR typeck)
 - rust-lang#137643 (Add DWARF test case for non-C-like `repr128` enums)
 - rust-lang#137744 (Re-add `Clone`-derive on `Thir`)
 - rust-lang#137758 (fix usage of ty decl macro fragments in attributes)
 - rust-lang#137764 (Ensure that negative auto impls are always applicable)
 - rust-lang#137772 (Fix char count in `Display` for `ByteStr`)
 - rust-lang#137798 (ci: use ubuntu 24 on arm large runner)
 - rust-lang#137802 (miri native-call support: all previously exposed provenance is accessible to the callee)
 - rust-lang#137805 (adjust Layout debug printing to match the internal field name)
 - rust-lang#137808 (Do not require that unsafe fields lack drop glue)
 - rust-lang#137820 (Clarify why InhabitedPredicate::instantiate_opt exists)
 - rust-lang#137825 (Provide more context on resolve error caused from incorrect RTN)
 - rust-lang#137910 (Improve error message for `AsyncFn` trait failure for RPIT)
 - rust-lang#137920 (interpret/provenance_map: consistently use range_is_empty)
 - rust-lang#138038 (Update `compiler-builtins` to 0.1.151)
 - rust-lang#138041 (bootstrap and compiletest: Use `size_of_val` from the prelude instead of imported)
 - rust-lang#138046 (trim channel value in `get_closest_merge_commit`)
 - rust-lang#138053 (Increase the max. custom try jobs requested to `20`)

r? `@ghost`
`@rustbot` modify labels: rollup
@jieyouxu
Copy link
Member

jieyouxu commented Mar 5, 2025 •
edited
Loading

There's a cfg(windows)-gated use std::mem in job.rs.

@bors r-

@bors 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
bootstrap and compiletest: Use size_of_val from the prelude instead o…
c85d3f6 
…f imported

Use `std::mem::size_of_val` from the prelude instead of importing or
qualifying it.

This function was added to all preludes in Rust 1.80.
@thaliaarchi thaliaarchi force-pushed the use-prelude-size-of.boostrap-compiletest branch from 1cacddc to c85d3f6 Compare March 5, 2025 19:12
@thaliaarchi
Copy link
Contributor Author

Well that's embarrassing

@jieyouxu
Copy link
Member

jieyouxu commented Mar 5, 2025

Don't worry, happens very frequently to me too when I don't feel like testing both linux and windows locally.

@jieyouxu
Copy link
Member

jieyouxu commented Mar 5, 2025

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Mar 5, 2025

📌 Commit c85d3f6 has been approved by jieyouxu

It is now in the queue for this repository.

@bors 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
Noratrieb added a commit to Noratrieb/rust that referenced this pull request Mar 6, 2025
@Noratrieb
Rollup merge of rust-lang#138041 - thaliaarchi:use-prelude-size-of.bo…
4628726 
…ostrap-compiletest, r=jieyouxu

bootstrap and compiletest: Use `size_of_val` from the prelude instead of imported

Use `std::mem::size_of_val` from the prelude instead of importing or qualifying it.

This function was added to all preludes in Rust 1.80.

r? `@jieyouxu`
@Noratrieb Noratrieb mentioned this pull request Mar 6, 2025
Closed
@compiler-errors compiler-errors mentioned this pull request Mar 6, 2025
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 7, 2025
@bors
Auto merge of rust-lang#138127 - compiler-errors:rollup-kcarqrz, r=co…
91a0e16 
…mpiler-errors

Rollup of 17 pull requests

Successful merges:

 - rust-lang#137827 (Add timestamp to unstable feature usage metrics)
 - rust-lang#138041 (bootstrap and compiletest: Use `size_of_val` from the prelude instead of imported)
 - rust-lang#138046 (trim channel value in `get_closest_merge_commit`)
 - rust-lang#138053 (Increase the max. custom try jobs requested to `20`)
 - rust-lang#138061 (triagebot: add a `compiler_leads` ad-hoc group)
 - rust-lang#138064 (Remove - from xtensa targets cpu names)
 - rust-lang#138075 (Use final path segment for diagnostic)
 - rust-lang#138078 (Reduce the noise of bootstrap changelog warnings in --dry-run mode)
 - rust-lang#138081 (Move `yield` expressions behind their own feature gate)
 - rust-lang#138090 (`librustdoc`: flatten nested ifs)
 - rust-lang#138092 (Re-add `DynSend` and `DynSync` impls for `TyCtxt`)
 - rust-lang#138094 (a small borrowck cleanup)
 - rust-lang#138098 (Stabilize feature `const_copy_from_slice`)
 - rust-lang#138103 (Git ignore citool's target directory)
 - rust-lang#138105 (Fix broken link to Miri intrinsics in documentation)
 - rust-lang#138108 (Mention me (WaffleLapkin) when changes to `rustc_codegen_ssa` occur)
 - rust-lang#138117 ([llvm/PassWrapper] use `size_t` when building arg strings)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 65b5a23 into rust-lang:master Mar 7, 2025
6 checks passed
@rustbot rustbot added this to the 1.87.0 milestone Mar 7, 2025
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Mar 7, 2025
@rust-timer
Unrolled build for rust-lang#138041
f1f6847 
Rollup merge of rust-lang#138041 - thaliaarchi:use-prelude-size-of.boostrap-compiletest, r=jieyouxu

bootstrap and compiletest: Use `size_of_val` from the prelude instead of imported

Use `std::mem::size_of_val` from the prelude instead of importing or qualifying it.

This function was added to all preludes in Rust 1.80.

r? ``@jieyouxu``
@thaliaarchi thaliaarchi deleted the use-prelude-size-of.boostrap-compiletest branch March 7, 2025 06:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@jieyouxu jieyouxu

Labels
A-compiletest Area: The compiletest test runner A-testsuite Area: The testsuite used to check the correctness of rustc S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap)
Projects
None yet
Milestone
1.87.0
Development

Successfully merging this pull request may close these issues.
5 participants
@thaliaarchi @rustbot @rust-log-analyzer @jieyouxu @bors