Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rollup of 4 pull requests #105125

Merged
merged 9 commits into from
Dec 1, 2022
Merged

Rollup of 4 pull requests #105125

merged 9 commits into from
Dec 1, 2022

Conversation

matthiaskrgr
Copy link
Member

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

TaKO8Ki and others added 9 commits November 30, 2022 13:31
DIV tags have block display by default. It is from when this rule
used to target a SPAN tag, but became redundant in
4bd6748.
Extract llvm datalayout parsing out of spec module

fix rust-lang#103693 (comment)
…-div-desc, r=GuillaumeGomez

rustdoc: remove redundant CSS `div.desc { display: block }`

DIV tags have block display by default. It is from when this rule used to target a SPAN tag, but became redundant in 4bd6748.
Fix ICE from rust-lang#105101

Fixes rust-lang#105101

Rather than comparing idents, compare spans, which should be unique to each variant.
@rustbot rustbot 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-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. rollup A PR which is a rollup labels Dec 1, 2022
@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=4

@bors
Copy link
Contributor

bors commented Dec 1, 2022

📌 Commit ee9eaa6 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 Dec 1, 2022
@bors
Copy link
Contributor

bors commented Dec 1, 2022

⌛ Testing commit ee9eaa6 with merge 55a66cdaaf8da778b3cb3ab16bbf574fc063b603...

@bors
Copy link
Contributor

bors commented Dec 1, 2022

💔 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 Dec 1, 2022
@matthiaskrgr
Copy link
Member Author

@bors retry might be one of those spurious rustdoc failures

@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 Dec 1, 2022
@rust-log-analyzer
Copy link
Collaborator

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

Click to see the possible cause of the failure (guessed by this bot)
.......... (80/90)
.......... (90/90)


/checkout/src/test/rustdoc-gui/code-sidebar-toggle.goml code-sidebar-toggle... FAILED
[ERROR] (line 4) Error: Execution context was destroyed, most likely because of a navigation.: for command `wait-for: "#sidebar-toggle"`
Build completed unsuccessfully in 0:02:24

@bors
Copy link
Contributor

bors commented Dec 1, 2022

⌛ Testing commit ee9eaa6 with merge c090c68...

@bors
Copy link
Contributor

bors commented Dec 1, 2022

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

1 similar comment
@bors
Copy link
Contributor

bors commented Dec 1, 2022

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

@bors bors added merged-by-bors This PR was explicitly merged by bors. labels Dec 1, 2022
@rust-timer
Copy link
Collaborator

📌 Perf builds for each rolled up PR:

PR# Perf Build Sha

previous master: c090c6880c

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

@bors bors merged commit c090c68 into rust-lang:master Dec 1, 2022
@rustbot rustbot added this to the 1.67.0 milestone Dec 1, 2022
@rust-timer
Copy link
Collaborator

📌 Perf builds for each rolled up PR:

PR# Perf Build Sha
#105106 2bc65480a4120cd30217c4a71aeaee6452c696ce
#105088 24b351fc05f2e29f5feee1f2dddda3afae8a655f
#105087 ab11513184165bfe14ab979e8efd59a51c810abb
#105078 32e82d8ac4538c4ee7a2ec39b0a942f3b51c449e

previous master: 367ecffe52

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

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)
- - 0
Improvements ✅
(primary)
-3.7% [-3.7%, -3.7%] 1
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) -3.7% [-3.7%, -3.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.

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

@matthiaskrgr matthiaskrgr deleted the rollup-fr0snmj branch December 22, 2022 10:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
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-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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants