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

Unify impl blocks by wrapping them into a div #94740

Merged
merged 2 commits into from
Mar 10, 2022

Conversation

GuillaumeGomez
Copy link
Member

@GuillaumeGomez GuillaumeGomez commented Mar 8, 2022

The blanket and "auto traits" sections are wrapped into a div with an ID. This PR fixes this incoherence by wrapping each impl section (the "deref impl" and the "inherent impl" sections were missing it). It'll also make some tests simpler to write.

r? @notriddle

@rustbot rustbot added the T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. label Mar 8, 2022
@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Mar 8, 2022
@rust-log-analyzer

This comment has been minimized.

@rust-log-analyzer

This comment has been minimized.

@GuillaumeGomez
Copy link
Member Author

I added the missing derive_id.

@GuillaumeGomez
Copy link
Member Author

@bors: r=notriddle rollup

@bors
Copy link
Contributor

bors commented Mar 9, 2022

📌 Commit fbd9c28 has been approved by notriddle

@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 Mar 9, 2022
@bors
Copy link
Contributor

bors commented Mar 9, 2022

⌛ Testing commit fbd9c28 with merge 6c9c9a8ccf07314ed9e87144975d89ef810c4ce8...

@bors
Copy link
Contributor

bors commented Mar 9, 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 Mar 9, 2022
@GuillaumeGomez
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 Mar 9, 2022
@rust-log-analyzer
Copy link
Collaborator

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

Click to see the possible cause of the failure (guessed by this bot)
      Memory: 14 GB
      System Firmware Version: VMW71.00V.13989454.B64.1906190538
      Apple ROM Info: [MS_VM_CERT/SHA1/27d66596a61c48dd3dc7216fd715126e33f59ae7]Welcome to the Virtual Machine
      SMC Version (system): 2.8f0
      Serial Number (system): VMwBAN2ANl4S
      Provisioning UDID: 4203018E-580F-C1B5-9525-B745CECA79EB

hw.ncpu: 3
hw.byteorder: 1234
---
[  0%] Built target RTLSanCommon.osx
[ 14%] Built target RTSanitizerCommonLibc.osx
Consolidate compiler generated dependencies of target RTSanitizerCommonCoverage.osx
[ 71%] Built target RTSanitizerCommon.osx
make[3]: *** No rule to make target `lib/sanitizer_common/K��)�o��M�Q�'��/���X�X�=%���/^K�', needed by `lib/sanitizer_common/CMakeFiles/RTSanitizerCommonSymbolizer.osx.dir/sanitizer_symbolizer_posix_libcdep.cpp.o'.  Stop.
Consolidate compiler generated dependencies of target RTSanitizerCommonSymbolizer.osx
make[2]: *** [lib/sanitizer_common/CMakeFiles/RTSanitizerCommonSymbolizer.osx.dir/all] Error 2
[ 71%] Built target RTSanitizerCommonCoverage.osx
make[2]: *** Waiting for unfinished jobs....
Consolidate compiler generated dependencies of target RTInterception.osx
make[1]: *** [lib/lsan/CMakeFiles/clang_rt.lsan_osx_dynamic.dir/rule] Error 2
[ 71%] Built target RTInterception.osx
make: *** [clang_rt.lsan_osx_dynamic] Error 2
thread 'main' panicked at '
Build completed unsuccessfully in 0:42:58
command did not execute successfully, got: exit status: 2

matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Mar 9, 2022
…=notriddle

Unify impl blocks by wrapping them into a div

The blanket and "auto traits" sections are wrapped into a `div` with an ID. This PR fixes this incoherence by wrapping each impl section (the "deref impl" and the "inherent impl" sections were missing it). It'll also make some tests simpler to write.

r? ``@notriddle``
Dylan-DPC added a commit to Dylan-DPC/rust that referenced this pull request Mar 9, 2022
…=notriddle

Unify impl blocks by wrapping them into a div

The blanket and "auto traits" sections are wrapped into a `div` with an ID. This PR fixes this incoherence by wrapping each impl section (the "deref impl" and the "inherent impl" sections were missing it). It'll also make some tests simpler to write.

r? ```@notriddle```
m-ou-se added a commit to m-ou-se/rust that referenced this pull request Mar 10, 2022
…=notriddle

Unify impl blocks by wrapping them into a div

The blanket and "auto traits" sections are wrapped into a `div` with an ID. This PR fixes this incoherence by wrapping each impl section (the "deref impl" and the "inherent impl" sections were missing it). It'll also make some tests simpler to write.

r? ````@notriddle````
bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 10, 2022
…askrgr

Rollup of 8 pull requests

Successful merges:

 - rust-lang#94440 (Better error for normalization errors from parent crates that use `#![feature(generic_const_exprs)]`)
 - rust-lang#94587 (Document new recommended use of `FromIterator::from_iter`)
 - rust-lang#94644 (Fix soundness issue in scoped threads.)
 - rust-lang#94740 (Unify impl blocks by wrapping them into a div)
 - rust-lang#94753 (Improve rustdoc book)
 - rust-lang#94796 (Allow `cargo run` instead of `cargo run -p bootstrap`)
 - rust-lang#94805 (Revert accidental stabilization)
 - rust-lang#94809 (RustWrapper: add missing include)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 82215ce into rust-lang:master Mar 10, 2022
@rustbot rustbot added this to the 1.61.0 milestone Mar 10, 2022
@GuillaumeGomez GuillaumeGomez deleted the unify-impl-blocks branch March 11, 2022 09:35
Dylan-DPC added a commit to Dylan-DPC/rust that referenced this pull request Mar 11, 2022
…, r=notriddle

Collapse blanket and auto-trait impls by default

Blocked on rust-lang#94740 (the two first commits come from it).

This behaviour was changed in rust-lang#88490 and apparently wasn't caught since then.

You can test it [here](https://rustdoc.crud.net/imperio/collapsed-by-default/test_docs/struct.Foo.html#blanket-implementations).

r? `@notriddle`
Dylan-DPC added a commit to Dylan-DPC/rust that referenced this pull request Mar 11, 2022
…, r=notriddle

Collapse blanket and auto-trait impls by default

Blocked on rust-lang#94740 (the two first commits come from it).

This behaviour was changed in rust-lang#88490 and apparently wasn't caught since then.

You can test it [here](https://rustdoc.crud.net/imperio/collapsed-by-default/test_docs/struct.Foo.html#blanket-implementations).

r? ``@notriddle``
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. 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.

6 participants