Skip to content

Rollup of 3 pull requests#142826

Merged
bors merged 7 commits intorust-lang:masterfrom
jdonszelmann:rollup-1wxomvb
Jun 21, 2025
Merged

Rollup of 3 pull requests#142826
bors merged 7 commits intorust-lang:masterfrom
jdonszelmann:rollup-1wxomvb

Conversation

@jdonszelmann
Copy link
Contributor

@jdonszelmann jdonszelmann commented Jun 21, 2025 •
edited by rustbot
Loading

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

petrochenkov and others added 7 commits June 18, 2025 20:34
@petrochenkov
expand: Remove some unnecessary generic parameters
95cd989
@tgross35
Add a test for concat_bytes! with C strings
342f07a 
Also ensure the suggestions are checked, since this will be updated.
@tgross35
Improve diagnostics for concat_bytes! with C string literals
044c99d 
Use the same error as other invalid types for `concat_bytes!`, rather
than using `ConcatCStrLit` from `concat!`. Also add more information
with a note about why this doesn't work, and a suggestion to use a
null-terminated byte string instead.
@GrigorenkoPV
Port #[may_dangle] to the new attribute system
045faa8
@jdonszelmann
Rollup merge of rust-lang#142539 - GrigorenkoPV:attributes/may_dangle…
cd857f4 
…, r=jdonszelmann

Port `#[may_dangle]` to the new attribute system

Very similar to rust-lang#142498.

This is a part of rust-lang#131229, so
r? `@jdonszelmann`
@jdonszelmann
Rollup merge of rust-lang#142690 - petrochenkov:expnoparam, r=compile…
6ed5d48 
…r-errors

expand: Remove some unnecessary generic parameters
@jdonszelmann
Rollup merge of rust-lang#142698 - tgross35:concat-byte-cstr-diag, r=…
c693bc2 
…petrochenkov

Improve diagnostics for `concat_bytes!` with C string  literals

Use the same error as other invalid types for `concat_bytes!`, rather
than using `ConcatCStrLit` from `concat!`. Also add more information
with a note about why this doesn't work, and a suggestion to use a
null-terminated byte string instead.
@rustbot rustbot added A-attributes Area: Attributes (`#[…]`, `#![…]`) S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. rollup A PR which is a rollup labels Jun 21, 2025
@jdonszelmann
Copy link
Contributor Author

jdonszelmann commented Jun 21, 2025

@bors r+ rollup=never p=5

@bors
Copy link
Collaborator

bors commented Jun 21, 2025

📌 Commit c693bc2 has been approved by jdonszelmann

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

bors commented Jun 21, 2025

⌛ Testing commit c693bc2 with merge ea34650...

@bors
Copy link
Collaborator

bors commented Jun 21, 2025

☀️ Test successful - checks-actions
Approved by: jdonszelmann
Pushing ea34650 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jun 21, 2025
@bors bors merged commit ea34650 into rust-lang:master Jun 21, 2025
11 checks passed
@rustbot rustbot added this to the 1.89.0 milestone Jun 21, 2025
@rust-timer
Copy link
Collaborator

rust-timer commented Jun 21, 2025

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#142539 Port #[may_dangle] to the new attribute system 1980db454473b42bc817fd7887ccaab394ae9f5a (link)
#142690 expand: Remove some unnecessary generic parameters be471a2a94776927fb5e700bcf7dbe3aab4fcd21 (link)
#142698 Improve diagnostics for concat_bytes! with C string lite… d851827b079b1c75a9ac0d4d562ad3755cd4a547 (link)

previous master: 6d0c9e2a1c

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

@github-actions
Copy link
Contributor

github-actions bot commented Jun 21, 2025

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 6d0c9e2 (parent) -> ea34650 (this PR)

Test differences

Show 8 test diffs

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

Test dashboard

Run

cargo run --manifest-path src/ci/citool/Cargo.toml -- \
    test-dashboard ea34650916887b5075812d0f11c1d3209e7f94ab --output-dir test-dashboard

And then open test-dashboard/index.html in your browser to see an overview of all executed tests.

Job duration changes

  1. dist-aarch64-apple: 4833.4s -> 6102.2s (26.3%)
  2. x86_64-apple-1: 7646.2s -> 6291.8s (-17.7%)
  3. dist-x86_64-apple: 7746.3s -> 8947.3s (15.5%)
  4. x86_64-apple-2: 5071.3s -> 4519.4s (-10.9%)
  5. dist-riscv64-linux: 4556.2s -> 5024.0s (10.3%)
  6. dist-ohos-armv7: 3975.0s -> 4358.4s (9.6%)
  7. dist-powerpc-linux: 4821.5s -> 5264.7s (9.2%)
  8. x86_64-gnu-aux: 6910.9s -> 6362.0s (-7.9%)
  9. dist-s390x-linux: 4813.1s -> 5191.4s (7.9%)
  10. dist-powerpc64le-linux-musl: 4991.7s -> 5362.7s (7.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.

This was referenced Jun 21, 2025
Merged
Merged
Merged
Merged
Merged
Merged
@rust-timer
Copy link
Collaborator

rust-timer commented Jun 21, 2025

Finished benchmarking commit (ea34650): comparison URL.

Overall result: ❌✅ regressions and improvements - please read the text below

Our benchmarks found a performance regression caused by this PR.
This might be an actual regression, but it can also be just noise.

Next Steps:

  • If the regression was expected or you think it can be justified,
    please write a comment with sufficient written justification, and add
    @rustbot label: +perf-regression-triaged to it, to mark the regression as triaged.
  • If you think that you know of a way to resolve the regression, try to create
    a new PR with a fix for the regression.
  • If you do not understand the regression or you think that it is just noise,
    you can ask the @rust-lang/wg-compiler-performance working group for help (members of this group
    were already notified of this PR).

@rustbot label: +perf-regression
cc @rust-lang/wg-compiler-performance

Instruction count

Our most reliable metric. Used to determine the overall result above. However, even this metric can be noisy.

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

Max RSS (memory usage)

Results (secondary 2.0%)

A less reliable metric. May be of interest, but not used to determine the overall result above.

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

Cycles

Results (secondary 7.2%)

A less reliable metric. May be of interest, but not used to determine the overall result above.

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

Binary size

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

Bootstrap: 690.042s -> 691.091s (0.15%)
Artifact size: 371.86 MiB -> 371.86 MiB (0.00%)

@rustbot rustbot added the perf-regression Performance regression. label Jun 21, 2025
@rylev
Copy link
Member

rylev commented Jun 24, 2025

Change overall is near a wash, and the regressions are small enough that I don't think it's worth investigating the performance change here deeply.

@rustbot label: +perf-regression-triaged

@rustbot rustbot added the perf-regression-triaged The performance regression has been triaged. label Jun 24, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

A-attributes Area: Attributes (`#[…]`, `#![…]`) merged-by-bors This PR was explicitly merged by bors. perf-regression Performance regression. perf-regression-triaged The performance regression has been triaged. 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-compiler Relevant to the compiler team, which will review and decide on the PR/issue.

Projects

None yet

Milestone

1.89.0

Development

Successfully merging this pull request may close these issues.

8 participants

@jdonszelmann @bors @rust-timer @rylev @rustbot @petrochenkov @tgross35 @GrigorenkoPV