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.

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

Rollup of 17 pull requests #138127

Merged
merged 38 commits into from
Mar 7, 2025
Merged

Conversation

compiler-errors
Copy link
Member

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

yaahc and others added 30 commits March 3, 2025 13:24
Intended for e.g. rolling reviewers for adding new targets.
…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.
so that it doesn't get removed again
Stabilizes `copy_from_slice` method on `[T]`
Co-authored-by: Rémy Rakic <[email protected]>
Whenever running citool, it leaves behind a target directory. Ignore
this like we do for other tools.
Add timestamp to unstable feature usage metrics

part of rust-lang#129485

with this we should be able to temporarily enable metrics on docs.rs to gather a nice test dataset for the initial PoC dashboard

r? ```@estebank```
…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``
…youxu

trim channel value in `get_closest_merge_commit`

This was a silly bug which caused `git_upstream_merge_base` to never work because it was `nightly\n` not `nightly`.
…ywiser

triagebot: add a `compiler_leads` ad-hoc group

Intended for e.g. rolling reviewers for [adding new targets](https://forge.rust-lang.org/compiler/proposals-and-stabilization.html#targets).

rust-lang/rust-forge side doc update: rust-lang/rust-forge#815

r? ghost (for testing)

cc ``@davidtwco`` or ``@wesleywiser``
…=jieyouxu

Remove - from xtensa targets cpu names

This PR removes the `-` from the Xtensa CPU names as it was updated in LLVM, see esp-rs#252
…rieb

Use final path segment for diagnostic

Test changes should prove the effect of this PR; we want to mention the *function name* not the arbitrary first segment of the path.
Reduce the noise of bootstrap changelog warnings in --dry-run mode

Presently x.py displays "There have been changes to x.py since you last updated:" note only once when run normally, but on every invocation when run with `--dry-run`.
The disparity is not exactly intentonal, but just a historical accident.
It was made to be printed once in rust-lang#117815 via storing `.last-warned-change-id` on disk in `{config.out}/bootstrap` (i.e. `build/bootstrap`) directory.
But that didn't quite work for `--dry-run`, since `{config.out}/bootsrap` points to `build/tmp-dry-run/bootstrap` which *isn't* created in dry-run mode, so file creation fails.
This got fixed in rust-lang#118789 and now `--dry-run` does not save `.last-warned-change-id` at all. (Nor does it read it, since it cannot know to read from non-dry-run location)

This PR simply stops displaying the changelog altogether in --dry-run mode.

<details>
<summary>previous attempt (outdated)</summary>
This PR takes a different approach, and instead of not-writing the stamp in `--dry-run` mode it instead tries harder to yes-write it, and, specifically, creates `build/tmp-dry-run/bootstrap` directory to do so. If neccessary (i.e. if there are changes newer than the `change-id` stamp of config.toml to warn about).
Note that `build/tmp-dry-run/` was *already* being created, so making an extra `boostrap` sub-folder should not meaningfully pollute the build dir.
</details>

(Apologies for the, perhaps, excessively wordy PR, I'm new to this)
Move `yield` expressions behind their own feature gate

In order to make progress with the `iter!` macro (e.g. in rust-lang#137725), we need `yield` expressions to be available without the `coroutines` feature. This PR moves `yield` to be guarded by the `yield_expr` feature so that we can stabilize that independently (or at least, concurrently with the `iter_macro` feature). Note that once `yield` is stable, it will still be an error to use `yield` expressions outside something like a generator or coroutine, and these features remain unstable.

r? `@oli-obk`
Git ignore citool's target directory

Whenever running citool, it leaves behind a target directory. Ignore this like we do for other tools.
…aethlin

Fix broken link to Miri intrinsics in documentation

This PR updates an outdated link in the library/core/src/intrinsics/mod.rs file. The previous link, pointing to the Miri repository's src/shims/intrinsics directory, has been replaced with the correct one: https://github.com/rust-lang/miri/tree/master/src/intrinsics. This ensures that users can access the appropriate resources for the relevant intrinsic functions.
…tions, r=compiler-errors

Mention me (WaffleLapkin) when changes to `rustc_codegen_ssa` occur

My employer is writing a rustc backend and it's my job to resolve conflicts with upstream so I'd like to know when `rustc_codegen_ssa` is being changed =)
[llvm/PassWrapper] use `size_t` when building arg strings

While we're unlikely to ever overflow `int` in this case, it's still more proper to use `size_t` consistently when dealing with buffer lengths. If nothing else, this fixes a few `-Wsign-compare` warnings.
@rustbot rustbot added A-compiletest Area: The compiletest test runner A-meta Area: Issues & PRs about the rust-lang/rust repository itself A-run-make Area: port run-make Makefiles to rmake.rs 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) T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-infra Relevant to the infrastructure team, which will review and decide on the PR/issue. T-libs Relevant to the library team, which will review and decide on the PR/issue. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. T-rustdoc-frontend Relevant to the rustdoc-frontend team, which will review and decide on the web UI/UX output. rollup A PR which is a rollup labels Mar 6, 2025
@compiler-errors
Copy link
Member Author

@bors r+ rollup=never p=9

@bors
Copy link
Contributor

bors commented Mar 6, 2025

📌 Commit e6d1856 has been approved by compiler-errors

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 6, 2025
@bors
Copy link
Contributor

bors commented Mar 7, 2025

⌛ Testing commit e6d1856 with merge 91a0e16...

@bors
Copy link
Contributor

bors commented Mar 7, 2025

☀️ Test successful - checks-actions
Approved by: compiler-errors
Pushing 91a0e16 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Mar 7, 2025
@bors bors merged commit 91a0e16 into rust-lang:master Mar 7, 2025
7 checks passed
@rustbot rustbot added this to the 1.87.0 milestone Mar 7, 2025
@rust-timer
Copy link
Collaborator

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#137827 Add timestamp to unstable feature usage metrics bcba4b0e263a55a7d0706f017bab92c2ec69b8cb (link)
#138041 bootstrap and compiletest: Use size_of_val from the prelu… f1f68470bba0453a84619f368a44c3e5a0ca58c7 (link)
#138046 trim channel value in get_closest_merge_commit 46839a910cd3c725abaa5376a5f142971e95de82 (link)
#138053 Increase the max. custom try jobs requested to 20 9ce89052010f1076606b17caf802bce2c1a8b1e2 (link)
#138061 triagebot: add a compiler_leads ad-hoc group 47a687ec5dbc1b2f3f8bd5cebec1d07d00e64a4b (link)
#138064 Remove - from xtensa targets cpu names 22fb01d5a2cf0af2f5dcfca0335ee70d3efeb796 (link)
#138075 Use final path segment for diagnostic 8a3be11ae008378d93d97b7aefe48f8abbdaaf72 (link)
#138078 Reduce the noise of bootstrap changelog warnings in --dry-r… 88a5e752a8e3c21c1d8a2f7d59ece17dcbcc536e (link)
#138081 Move yield expressions behind their own feature gate bb716596591b97d693b3283376e967538ae033fd (link)
#138090 librustdoc: flatten nested ifs 4539593b121553fa2ab5ce9d03c8f24207b4c305 (link)
#138092 Re-add DynSend and DynSync impls for TyCtxt 7fb1dccc17c5b7efc1ed0289eb4adba8f754514b (link)
#138094 a small borrowck cleanup 826e1ca2e9954bf8a9130ccc5345726979f52c24 (link)
#138098 Stabilize feature const_copy_from_slice d4139af5fce16e6e8a871617de3e40e8ad74cf55 (link)
#138103 Git ignore citool's target directory 46882fbbf1f9756e150c20489570c6016c080b88 (link)
#138105 Fix broken link to Miri intrinsics in documentation 979cbc54ffc04270ea085f9c1bb88175e7f83a06 (link)
#138108 Mention me (WaffleLapkin) when changes to `rustc_codegen_ss… da6b66dcad8a68ac0e49df57379a470e94d1130b (link)
#138117 [llvm/PassWrapper] use size_t when building arg strings 2360a20160fef540935e05504ea0e1530922a29f (link)

previous master: 98a48781fe

In the case of a perf regression, run the following command for each PR you suspect might be the cause: @rust-timer build $SHA

@rust-timer
Copy link
Collaborator

Finished benchmarking commit (91a0e16): comparison URL.

Overall result: no relevant changes - no action needed

@rustbot label: -perf-regression

Instruction count

This benchmark run did not return any relevant results for this metric.

Max RSS (memory usage)

Results (primary 0.1%)

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)
2.3% [2.3%, 2.3%] 1
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
-2.1% [-2.1%, -2.1%] 1
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) 0.1% [-2.1%, 2.3%] 2

Cycles

This benchmark run did not return any relevant results for this metric.

Binary size

This benchmark run did not return any relevant results for this metric.

Bootstrap: 773.206s -> 765.289s (-1.02%)
Artifact size: 362.10 MiB -> 362.07 MiB (-0.01%)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-compiletest Area: The compiletest test runner A-meta Area: Issues & PRs about the rust-lang/rust repository itself A-run-make Area: port run-make Makefiles to rmake.rs A-testsuite Area: The testsuite used to check the correctness of rustc merged-by-bors This PR was explicitly merged by bors. rollup A PR which is a rollup 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) T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-infra Relevant to the infrastructure team, which will review and decide on the PR/issue. T-libs Relevant to the library team, which will review and decide on the PR/issue. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. T-rustdoc-frontend Relevant to the rustdoc-frontend team, which will review and decide on the web UI/UX output.
Projects
None yet
Development

Successfully merging this pull request may close these issues.