Skip to content

Rollup of 5 pull requests - #124111

Merged
bors merged 13 commits into
rust-lang:masterfrom
matthiaskrgr:rollup-cmmkryf
Apr 18, 2024
Merged

Rollup of 5 pull requests#124111
bors merged 13 commits into
rust-lang:masterfrom
matthiaskrgr:rollup-cmmkryf

Conversation

@matthiaskrgr

Copy link
Copy Markdown
Member

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

Zalatharand others added 13 commits April 17, 2024 19:59
This comment was historically inside a block guarded by
`if let Some(otherwise_block) = otherwise`.
When rust-lang#120978 made the otherwise block non-optional, it also flattened that
region of code. Doing so left this comment awkwardly stranded above an
unrelated line of code, without its original context.
We can restore that context by moving it above the declaration of `otherwise`.
In llvm/llvm-project@9067070 they ended
up largely reverting
llvm/llvm-project@e817966. This means
the change we did in
rust-lang/rust@b378059 is now only
corrct for LLVM 18...so we have to adjust again.
@rustbot label: +llvm-main
…n, r=notriddle
Fix copy path button
Currently, on all nightly docs, clicking on the "copy path" button triggers a JS error. It's because changes in rust-lang#123706 forgot to update the JS (it contained an image before but not anymore).
I had to make some small changes in the CSS to fix the display when the button was clicked as well.
r? ``@notriddle``
…leanups, r=Nadrieril
Match ergonomics 2024: miscellaneous code cleanups
- Store `ByRef` instead of `BindingAnnotation` in `PatInfo`
- Rename `BindingAnnotation` to `BindingMode`
r? ``@Nadrieril``
cc rust-lang#123076
``@rustbot`` label A-patterns
Move confusing comment about otherwise blocks in `lower_match_tree`
This comment was historically inside a block guarded by `if let Some(otherwise_block) = otherwise`.
When rust-lang#120978 made the “otherwise block” non-optional, it also flattened that region of code. Doing so left this comment awkwardly stranded above an unrelated line of code, without its original context.
We can restore that context by moving it above the declaration of `otherwise`.
r? ``@Nadrieril``
…uviper
llvm: update riscv target feature to match LLVM 19
In llvm/llvm-project@9067070 they ended up largely reverting
llvm/llvm-project@e817966. This means the change we did in
rust-lang/rust@b378059 is now only corrct for LLVM 18...so we have to adjust again.
``@rustbot`` label: +llvm-main
fix: make `str::from_raw_parts_mut` `mut`
`str::from_raw_parts_mut` wasn't actually `mut`
rust-lang#119206
@rustbotrustbot added 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. 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. rollup A PR which is a rollup labels Apr 18, 2024
@matthiaskrgr

Copy link
Copy Markdown
MemberAuthor

@bors r+ rollup=never p=5

@bors

bors commented Apr 18, 2024

Copy link
Copy Markdown
Collaborator

📌 Commit 5543da9 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 Apr 18, 2024
@bors

bors commented Apr 18, 2024

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 5543da9 with merge ecd4547...

@bors

bors commented Apr 18, 2024

Copy link
Copy Markdown
Collaborator

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

@borsbors added the merged-by-bors This PR was explicitly merged by bors. label Apr 18, 2024
@bors
bors merged commit ecd4547 into rust-lang:masterApr 18, 2024
@rustbotrustbot added this to the 1.79.0 milestone Apr 18, 2024
@rust-timer

Copy link
Copy Markdown
Collaborator

📌 Perf builds for each rolled up PR:

PR#MessagePerf Build Sha
#124041Fix copy path button26599eb4e6234656a6c037ffda22b1f7b2f90bd7 (link)
#124047Match ergonomics 2024: miscellaneous code cleanupsd96b7a7f959082519c303e01e74e68451b85d17b (link)
#124064Move confusing comment about otherwise blocks in `lower_mat…456d451bcca25bc86dc33415f585a2e7682e9921 (link)
#124090llvm: update riscv target feature to match LLVM 19316fd387255d6fa87ec1046224627ab3aa72276c (link)
#124100fix: make str::from_raw_parts_mutmut25e437e86afb8a23e440a870912494398326c727 (link)

previous master: b1248bc60d

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 (ecd4547): 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

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: 677.64s -> 678.014s (0.06%)
Artifact size: 315.35 MiB -> 315.34 MiB (-0.00%)

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

Labels

merged-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-compilerRelevant to the compiler team, which will review and decide on the PR/issue.T-libsRelevant to the library 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.

9 participants

@matthiaskrgr@bors@rust-timer@rustbot@Zalathar@Jules-Bertholet@GuillaumeGomez@durin42@oriongonza