Skip to content

Rollup of 5 pull requests - #105940

Merged
bors merged 10 commits into
rust-lang:masterfrom
matthiaskrgr:rollup-ho4po1t
Dec 20, 2022
Merged

Rollup of 5 pull requests#105940
bors merged 10 commits into
rust-lang:masterfrom
matthiaskrgr:rollup-ho4po1t

Conversation

@matthiaskrgr

Copy link
Copy Markdown
Member

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

oli-obkand others added 10 commits December 19, 2022 14:48
…Simulacrum
Don't panic on stable since miri is not available there
fixesrust-lang#105816
…t, r=GuillaumeGomez
rustdoc: force pre tags to have the default line height
Fixesrust-lang#105906
…es-code-blocks, r=notriddle
rustdoc: Simplify CSS for scraped code examples code blocks
It's another approach than rust-lang#105894 for rust-lang#105823.
I simply removed the extra style added for the scraped code blocks which appears to be unneeded.
r? `@notriddle`
Add readable rustdoc display for tvOS and watchOS
They are currently displayed as `target_os="..."` in rustdoc, but it would be nice to have readable display like in iOS and other OSs.
<img width="487" alt="cfg" src="https://user-images.githubusercontent.com/43724913/208579395-fd5cf276-8171-47ab-bbed-23e40bb7af11.png">
…r=GuillaumeGomez
docs/test: add UI test and long-form error docs for `E0377`
@rustbotrustbot added T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) 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-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 Dec 20, 2022
@matthiaskrgr

Copy link
Copy Markdown
MemberAuthor

@bors r+ rollup=never p=5

@bors

bors commented Dec 20, 2022

Copy link
Copy Markdown
Collaborator

📌 Commit 051c52a 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 Dec 20, 2022
@bors

bors commented Dec 20, 2022

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 051c52a with merge 8a746f4...

@bors

bors commented Dec 20, 2022

Copy link
Copy Markdown
Collaborator

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

@borsbors added the merged-by-bors This PR was explicitly merged by bors. label Dec 20, 2022
@bors
bors merged commit 8a746f4 into rust-lang:masterDec 20, 2022
@rustbotrustbot added this to the 1.68.0 milestone Dec 20, 2022
@rust-timer

Copy link
Copy Markdown
Collaborator

📌 Perf builds for each rolled up PR:

PR#Perf Build Sha
#10593505a0eb5ff172dec81ffcbd82d507aa9cce02cc4e
#1059336fa78008c7a7f8d12d3fd4cebade898479a5ea49
#105914d3c5881c62d298356e090f926b01e30de7e129d9
#10591266fa4e9e7e7b983a52030efea3bc75afc0bec4c2
#105901c7dc22335538d020fba22038fa46d083b5900897

previous master: eb9e5e711d

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

Overall result: ✅ improvements - 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.

meanrangecount
Regressions ❌
(primary)
--0
Regressions ❌
(secondary)
--0
Improvements ✅
(primary)
-1.1%[-1.1%, -1.0%]2
Improvements ✅
(secondary)
-1.7%[-2.6%, -0.4%]9
All ❌✅ (primary)-1.1%[-1.1%, -1.0%]2

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.

meanrangecount
Regressions ❌
(primary)
2.7%[2.7%, 2.7%]1
Regressions ❌
(secondary)
2.7%[2.2%, 3.8%]9
Improvements ✅
(primary)
--0
Improvements ✅
(secondary)
--0
All ❌✅ (primary)2.7%[2.7%, 2.7%]1

Cycles

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.

meanrangecount
Regressions ❌
(primary)
3.0%[1.5%, 4.6%]8
Regressions ❌
(secondary)
--0
Improvements ✅
(primary)
--0
Improvements ✅
(secondary)
--0
All ❌✅ (primary)3.0%[1.5%, 4.6%]8

@lqdlqd mentioned this pull request Dec 20, 2022
@matthiaskrgr
matthiaskrgr deleted the rollup-ho4po1t branch December 22, 2022 10:46
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.

9 participants

@matthiaskrgr@bors@rust-timer@rustbot@oli-obk@notriddle@GuillaumeGomez@taiki-e@Ezrashaw