Skip to content

Rollup of 7 pull requests #139101

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

Merged
merged 18 commits into from
Mar 29, 2025
Merged

Rollup of 7 pull requests #139101

merged 18 commits into from
Mar 29, 2025

Conversation

matthiaskrgr
Copy link
Member

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

jieyouxu and others added 18 commits March 19, 2025 15:02
Because they would imply `--cfg={true,false}` otherwise, and the test
writer has to use `cfg(r#true)` and `cfg(r#false)` in the test.
The default stack size for the main thread is 1 MB as specified by linker options.
However, the default stack size for threads was only 64 kB.

This is surprisingly small and thus we increase it to 1 MB to match the
main thread.
Change the syntax to include parameter names and a trailing semicolon.

Motivation:
- Mirror the `syscall!` macro.
- Allow rustfmt to format it (when wrapped in parentheses).
- For better documentation (having the parameter names available in
  the source code is a bit nicer).
- Allow future improvements to this macro where we can sometimes use the
  symbol directly when it's statically known to be available.
A name like "report_error" suggests that the error in question might be
user facing. Use "bug" to make it clear that the error in question will
be an ICE.
In rust-lang#124902, mem-categorization got merged into ExprUseVisitor itself.
Adjust the comments that have become misleading or confusing following
this change.
Replace debug! calls that output a worse version of what #[instrument]
does.
Co-authored-by: Daniel Henry-Mantilla <[email protected]>
…, r=wesleywiser

Reject `{true,false}` as revision names

Because they would imply `--cfg={true,false}` otherwise, and the test writer has to use `cfg(r#true)` and `cfg(r#false)` in the test.

Closes rust-lang#138663.
…ze, r=alexcrichton

wasm: increase default thread stack size to 1 MB

The default stack size for the [main thread is 1 MB as specified by linker options](https://github.com/rust-lang/rust/blob/38cf49dde8a5b0b284bb6dffd423d223c9f8f7a3/compiler/rustc_target/src/spec/base/wasm.rs#L14).
However, the default stack size for threads was only 64 kB.

This is surprisingly small and thus we increase it to 1 MB to match the main thread.
…, r=ibraheemdev

Change the syntax of the internal `weak!` macro

Change the syntax to include parameter names and a trailing semicolon.

Motivation:
- Mirror the `syscall!` macro.
- Allow rustfmt to format it (when wrapped in parentheses, and when not inside `cfg_if!`).
- For better documentation (having the parameter names available in the source code is a bit nicer).
- Allow a future improvement to this macro where we can sometimes use the symbol directly when it's statically known to be available (and thus need the parameter names to be available), see rust-lang#136868.

r? libs
…tmcm

use `try_fold` instead of `fold`

Small cleanup, applies the [`manual_try_fold`](https://rust-lang.github.io/rust-clippy/master/index.html#manual_try_fold) clippy lint.
…leywiser

use `slice::contains` where applicable

Applies the [`manual_contains`](https://rust-lang.github.io/rust-clippy/master/index.html#manual_contains) clippy lint, plus some small drive-bys.
…up, r=compiler-errors

Various cleanup in ExprUseVisitor

These are the non-behavior-changing commits from rust-lang#138961.
Add more tests for pin!().

This adds the tests suggested by `@danielhenrymantilla` in this comment: rust-lang#138717 (comment) by
@rustbot rustbot added A-attributes Area: Attributes (`#[…]`, `#![…]`) A-compiletest Area: The compiletest test runner A-testsuite Area: The testsuite used to check the correctness of rustc O-unix Operating system: Unix-like O-wasi Operating system: Wasi, Webassembly System Interface O-wasm Target: WASM (WebAssembly), http://webassembly.org/ 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-libs Relevant to the library team, which will review and decide on the PR/issue. rollup A PR which is a rollup labels Mar 29, 2025
@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=5

@bors
Copy link
Collaborator

bors commented Mar 29, 2025

📌 Commit 8b7088a has been approved by matthiaskrgr

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 29, 2025
@bors
Copy link
Collaborator

bors commented Mar 29, 2025

⌛ Testing commit 8b7088a with merge 5cc6072...

@bors
Copy link
Collaborator

bors commented Mar 29, 2025

☀️ Test successful - checks-actions
Approved by: matthiaskrgr
Pushing 5cc6072 to master...

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

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#138692 Reject {true,false} as revision names af5422d74466cffd16ea7ed469de3de06fc31b48 (link)
#138757 wasm: increase default thread stack size to 1 MB 771b28e53fe268c82a612342b3c5cb9bbd301c21 (link)
#138988 Change the syntax of the internal weak! macro 709ec22f4e789550f0b3b3e74c32395689a5f4a4 (link)
#139056 use try_fold instead of fold 29c3fcb949ed8ea4cfb8189d64863288ce10def4 (link)
#139057 use slice::contains where applicable 6fe2c746f43e3c68db4d9fcac3fa1a810a182f1c (link)
#139086 Various cleanup in ExprUseVisitor 37fef146367d09fe15a99c879e3318e525cd0e38 (link)
#139097 Add more tests for pin!(). 4eb2e68836f1323fae92686c47d106f8e35953a8 (link)

previous master: 898916595c

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

Copy link

What is this? This is an experimental post-merge analysis report that shows differences in test outcomes between the merged PR and its parent PR.

Comparing 8989165 (parent) -> 5cc6072 (this PR)

Test differences

Show 9 test diffs

Stage 0

  • header::tests::test_forbidden_revisions: [missing] -> pass (J0)
  • pin_macro::transitive_extension: [missing] -> pass (J0)

Stage 1

  • [ui] tests/ui/pin-macro/pin_move.rs: [missing] -> pass (J1)
  • pin_macro::transitive_extension: [missing] -> pass (J2)

Stage 2

  • [ui] tests/ui/pin-macro/pin_move.rs: [missing] -> pass (J3)

Additionally, 4 doctest diffs were found. These are ignored, as they are noisy.

Job group index

  • J0: mingw-check
  • J1: x86_64-gnu-llvm-18-3, x86_64-gnu-llvm-19-3
  • J2: aarch64-apple, aarch64-gnu, arm-android, armhf-gnu, dist-i586-gnu-i586-i686-musl, i686-gnu-1, i686-gnu-nopt-1, i686-msvc-1, test-various, x86_64-apple-1, x86_64-gnu, x86_64-gnu-aux, x86_64-gnu-llvm-18-1, x86_64-gnu-llvm-18-2, x86_64-gnu-llvm-18-3, x86_64-gnu-llvm-19-1, x86_64-gnu-llvm-19-2, x86_64-gnu-llvm-19-3, x86_64-gnu-nopt, x86_64-gnu-stable, x86_64-mingw-1, x86_64-msvc-1
  • J3: aarch64-apple, aarch64-gnu, arm-android, armhf-gnu, dist-i586-gnu-i586-i686-musl, i686-gnu-1, i686-gnu-nopt-1, i686-msvc-1, test-various, x86_64-apple-2, x86_64-gnu, x86_64-gnu-llvm-18-1, x86_64-gnu-llvm-18-2, x86_64-gnu-llvm-19-1, x86_64-gnu-llvm-19-2, x86_64-gnu-nopt, x86_64-gnu-stable, x86_64-mingw-1, x86_64-msvc-1

Job duration changes

  1. dist-x86_64-apple: 7041.7s -> 9179.2s (30.4%)
  2. x86_64-apple-2: 4491.9s -> 5040.6s (12.2%)
  3. aarch64-gnu: 9382.1s -> 10521.1s (12.1%)
  4. dist-i686-mingw: 8006.2s -> 8687.0s (8.5%)
  5. x86_64-apple-1: 6703.0s -> 7247.0s (8.1%)
  6. dist-aarch64-apple: 4714.4s -> 5011.1s (6.3%)
  7. x86_64-msvc-ext3: 7553.3s -> 7868.1s (4.2%)
  8. i686-gnu-2: 6333.2s -> 6563.6s (3.6%)
  9. x86_64-gnu-stable: 6629.8s -> 6793.8s (2.5%)
  10. dist-i686-linux: 5957.2s -> 6100.4s (2.4%)
How to interpret the job duration changes?

Job durations can vary a lot, based on the actual runner instance
that executed the job, system noise, invalidated caches, etc. The table above is provided
mostly for t-infra members, for simpler debugging of potential CI slow-downs.

@rust-timer
Copy link
Collaborator

Finished benchmarking commit (5cc6072): comparison URL.

Overall result: ❌ regressions - no action needed

@rustbot label: -perf-regression

Instruction count

This is the most reliable metric that we have; it was used to determine the overall result at the top of this comment. However, even this metric can sometimes exhibit noise.

mean range count
Regressions ❌
(primary)
- - 0
Regressions ❌
(secondary)
0.4% [0.4%, 0.4%] 1
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) - - 0

Max RSS (memory usage)

Results (secondary -2.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)
- - 0
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
-2.1% [-2.1%, -2.1%] 1
All ❌✅ (primary) - - 0

Cycles

Results (primary 3.2%, secondary 3.7%)

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)
3.2% [2.7%, 3.5%] 3
Regressions ❌
(secondary)
3.7% [2.9%, 4.5%] 2
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) 3.2% [2.7%, 3.5%] 3

Binary size

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

Bootstrap: 777.788s -> 777.697s (-0.01%)
Artifact size: 365.94 MiB -> 365.93 MiB (-0.00%)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-attributes Area: Attributes (`#[…]`, `#![…]`) A-compiletest Area: The compiletest test runner A-testsuite Area: The testsuite used to check the correctness of rustc merged-by-bors This PR was explicitly merged by bors. O-unix Operating system: Unix-like O-wasi Operating system: Wasi, Webassembly System Interface O-wasm Target: WASM (WebAssembly), http://webassembly.org/ 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-libs Relevant to the library team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

10 participants