Skip to content

Rollup of 4 pull requests - #125254

Merged
bors merged 11 commits into
rust-lang:masterfrom
matthiaskrgr:rollup-ukvsxbc
May 18, 2024
Merged

Rollup of 4 pull requests#125254
bors merged 11 commits into
rust-lang:masterfrom
matthiaskrgr:rollup-ukvsxbc

Conversation

@matthiaskrgr

Copy link
Copy Markdown
Member

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

oriongonzaand others added 11 commits May 14, 2024 23:07
conflicts specifically and a few more improvements.
…iser,fmease
Improve parser
Fixesrust-lang#124935.
- Add a few more help diagnostics to incorrect semicolons
- Overall improved that function
- Addded a few comments
- Renamed diff_marker fns to git_diff_marker
Fix ICE in non-operand `aggregate_raw_ptr` intrinsic codegen
Introduced in rust-lang#123840
Found in rust-lang#121571, cc `@clarfonthey`
…fee1-dead
Temporarily revert to NonZeroUsize in rustc-abi to fix building on stable
rust-analyzer uses an auto-published version of `rustc-abi`, but `NonZero` isn't yet stable. This prevents us from updating the RA subtree, which is quite old already.
I can file a revert PR after the release.
…ape-examples-invalid-expr, r=jieyouxu
Migrate `run-make/rustdoc-scrape-examples-invalid-expr` to `rmake.rs`
Part of rust-lang#121876.
r? `@jieyouxu`
@rustbotrustbot added 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-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. rollup A PR which is a rollup labels May 18, 2024
@matthiaskrgr

Copy link
Copy Markdown
MemberAuthor

@bors r+ rollup=never p=4

@bors

bors commented May 18, 2024

Copy link
Copy Markdown
Collaborator

📌 Commit cd1ca14 has been approved by matthiaskrgr

It is now in the queue for this repository.

@borsbors 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 May 18, 2024
@bors

bors commented May 18, 2024

Copy link
Copy Markdown
Collaborator

⌛ Testing commit cd1ca14 with merge c00957a...

@bors

bors commented May 18, 2024

Copy link
Copy Markdown
Collaborator

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

@borsbors added the merged-by-bors This PR was explicitly merged by bors. label May 18, 2024
@bors
bors merged commit c00957a into rust-lang:masterMay 18, 2024
@rustbotrustbot added this to the 1.80.0 milestone May 18, 2024
@rust-timer

Copy link
Copy Markdown
Collaborator

📌 Perf builds for each rolled up PR:

PR#MessagePerf Build Sha
#125117Improve parserf8f11b4815fcc69178f18022180a284c66e7e177 (link)
#125184Fix ICE in non-operand aggregate_raw_ptr intrinsic codegend27af5d809ccfbcffc83a30ee495c08ac6950142 (link)
#125240Temporarily revert to NonZeroUsize in rustc-abi to fix buil…5a1c991f4f10b0872c35a7c5bf9c84527ecf052a (link)
#125248Migrate run-make/rustdoc-scrape-examples-invalid-expr to …2472842d53ba589679601d94d3c56c27351f4d82 (link)

previous master: cf2baaa835

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
Copy Markdown
Collaborator

Finished benchmarking commit (c00957a): 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)

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

Cycles

Results (primary -0.4%)

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.

meanrangecount
Regressions ❌
(primary)
4.6%[4.6%, 4.6%]1
Regressions ❌
(secondary)
--0
Improvements ✅
(primary)
-5.4%[-5.4%, -5.4%]1
Improvements ✅
(secondary)
--0
All ❌✅ (primary)-0.4%[-5.4%, 4.6%]2

Binary size

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

Bootstrap: 671.867s -> 669.868s (-0.30%)
Artifact size: 316.05 MiB -> 316.05 MiB (-0.00%)

@matthiaskrgr
matthiaskrgr deleted the rollup-ukvsxbc branch September 1, 2024 17:36
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

A-testsuiteArea: The testsuite used to check the correctness of rustcmerged-by-borsThis PR was explicitly merged by bors.rollupA PR which is a rollupS-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-bootstrapRelevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap)T-compilerRelevant to the compiler team, which will review and decide on the PR/issue.T-rustdocRelevant to the rustdoc team, which will review and decide on the PR/issue.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

8 participants

@matthiaskrgr@bors@rust-timer@rustbot@oriongonza@scottmcm@lnicola@GuillaumeGomez