Skip to content

Conversation

matthiaskrgr
Copy link
Member

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

joshtriplett and others added 8 commits August 4, 2023 01:23
… operator)

`as` casts currently get formatted like a binary operator, except that
the second line can stack several `as` casts rather than breaking them
each onto their own line. Merge `as` into a subsection of the binary
operators section, and then go into detail on the one difference between
`as` formatting and binary operator formatting.
Allow llvm-* to be set by unauthenticated users, which is currently
llvm-main and llvm-fixed-upstream.
…ebcartwright

style-guide: Document formatting of `as` casts (mostly like a binary operator)

`as` casts currently get formatted like a binary operator, except that
the second line can stack several `as` casts rather than breaking them
each onto their own line. Document this.

As far as I can tell (cc `@calebcartwright` for verification), this is not a 2024 edition change, it just documents current behavior.
…m, r=Nilstrieb

Allow anyone to set llvm-fixed-upstream

Allow llvm-* to be set by unauthenticated users, which is currently llvm-main and llvm-fixed-upstream.
Rename BoxMeUp to PanicPayload.

"BoxMeUp" is not very clear. Let's rename that to a description of what it actually represents: a panic payload.

This PR also renames the structs that implement this trait to have more descriptive names.

Part of rust-lang#116005

r? `@oli-obk`
…r=notriddle

Update browser-ui-test version to 0.16.10

Following GuillaumeGomez/browser-UI-test#539, it contains generated JS improvements and also a fix in a diagnostic.

r? `@notriddle`
@rustbot rustbot added A-meta Area: Issues & PRs about the rust-lang/rust repository itself 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-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-style Relevant to the style team, which will review and decide on the PR/issue. rollup A PR which is a rollup labels Sep 20, 2023
@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=4

@bors
Copy link
Collaborator

bors commented Sep 20, 2023

📌 Commit 156d2e2 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 Sep 20, 2023
@bors
Copy link
Collaborator

bors commented Sep 20, 2023

⌛ Testing commit 156d2e2 with merge c1a6862...

bors added a commit to rust-lang-ci/rust that referenced this pull request Sep 20, 2023
…iaskrgr

Rollup of 4 pull requests

Successful merges:

 - rust-lang#114394 (style-guide: Document formatting of `as` casts (mostly like a binary operator))
 - rust-lang#115990 (Allow anyone to set llvm-fixed-upstream)
 - rust-lang#116008 (Rename BoxMeUp to PanicPayload.)
 - rust-lang#116011 (Update browser-ui-test version to 0.16.10)

r? `@ghost`
`@rustbot` modify labels: rollup
@rust-log-analyzer
Copy link
Collaborator

The job aarch64-gnu failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)
test [rustdoc] tests/rustdoc/check-source-code-urls-to-def-std.rs ... ok
test [rustdoc] tests/rustdoc/check-styled-link.rs ... ok
test [rustdoc] tests/rustdoc/codeblock-title.rs ... ok
test [rustdoc] tests/rustdoc/check.rs ... ok
##[error]The runner has received a shutdown signal. This can happen when the runner service is stopped, or a manually started runner is canceled.
test [rustdoc] tests/rustdoc/const-generics/add-impl.rs ... ok
test [rustdoc] tests/rustdoc/const-display.rs ... ok
test [rustdoc] tests/rustdoc/const-doc.rs ... ok
test [rustdoc] tests/rustdoc/const-generics/const-generic-defaults.rs ... ok
test [rustdoc] tests/rustdoc/const-generics/const-generic-defaults.rs ... ok

##[group]Clock drift check
Session terminated, killing shell... ...killed.
##[error]The operation was canceled.
Cleaning up orphan processes

@bors
Copy link
Collaborator

bors commented Sep 21, 2023

💔 Test failed - checks-actions

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Sep 21, 2023
@matthiaskrgr
Copy link
Member Author

@bors retry

@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 Sep 21, 2023
@bors
Copy link
Collaborator

bors commented Sep 21, 2023

⌛ Testing commit 156d2e2 with merge cbce15c...

@bors
Copy link
Collaborator

bors commented Sep 21, 2023

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

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Sep 21, 2023
@bors bors merged commit cbce15c into rust-lang:master Sep 21, 2023
@rustbot rustbot added this to the 1.74.0 milestone Sep 21, 2023
@rust-timer
Copy link
Collaborator

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#114394 style-guide: Document formatting of as casts (mostly like… 1f779fa3ba330b3f530958a6e817b5137e5ee945 (link)
#115990 Allow anyone to set llvm-fixed-upstream 821c6f3691906bfa9d944bdc81212831a7b0d560 (link)
#116008 Rename BoxMeUp to PanicPayload. 28cb203f5e8281cfef9bd1dedc485e02d25c8b75 (link)
#116011 Update browser-ui-test version to 0.16.10 c1c7d0fe96fa60854e31015409ef6535567da011 (link)

previous master: 3223b0b5e8

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 (cbce15c): comparison URL.

Overall result: ❌ regressions - no action needed

@rustbot label: -perf-regression

Instruction count

This is a highly reliable metric that was used to determine the overall result at the top of this comment.

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

Max RSS (memory usage)

Results

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)
1.1% [1.1%, 1.1%] 2
Improvements ✅
(primary)
-2.5% [-2.5%, -2.5%] 1
Improvements ✅
(secondary)
-2.1% [-2.7%, -1.2%] 3
All ❌✅ (primary) -2.5% [-2.5%, -2.5%] 1

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: 633.664s -> 632.213s (-0.23%)
Artifact size: 318.05 MiB -> 317.78 MiB (-0.09%)

@matthiaskrgr matthiaskrgr deleted the rollup-mv5i4fd branch March 16, 2024 18:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

A-meta Area: Issues & PRs about the rust-lang/rust repository itself 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-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-style Relevant to the style 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