Skip to content

Don't apply impl block collapse rules to trait impls - #58150

Merged
bors merged 1 commit into
rust-lang:masterfrom
GuillaumeGomez:dont-apply-impl-collapse-rules-to-trait-impls
Feb 7, 2019
Merged

Don't apply impl block collapse rules to trait impls#58150
bors merged 1 commit into
rust-lang:masterfrom
GuillaumeGomez:dont-apply-impl-collapse-rules-to-trait-impls

Conversation

@GuillaumeGomez

Copy link
Copy Markdown
Member

@rust-highfiverust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Feb 4, 2019

@ManishearthManishearth left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

r=me

Comment threadsrc/librustdoc/html/static/main.js Outdated

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

remove the question mark

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done.

@GuillaumeGomez
GuillaumeGomezforce-pushed the dont-apply-impl-collapse-rules-to-trait-impls branch from 08705a0 to 729e37dCompareFebruary 7, 2019 10:48
@GuillaumeGomez

Copy link
Copy Markdown
MemberAuthor

@bors: r=Manishearth

@bors

bors commented Feb 7, 2019

Copy link
Copy Markdown
Collaborator

📌 Commit 729e37d has been approved by Manishearth

@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 Feb 7, 2019
GuillaumeGomez added a commit to GuillaumeGomez/rust that referenced this pull request Feb 7, 2019
…apse-rules-to-trait-impls, r=Manishearth
Don't apply impl block collapse rules to trait impls
Fixesrust-lang#58147.
r? @QuietMisdreavus
bors added a commit that referenced this pull request Feb 7, 2019
Rollup of 11 pull requests
Successful merges:
- #57504 (Re-enable history api on file:// protocol)
- #57848 (Generate a documentation page for core::mem::transmute.)
- #57884 (Update minifier version)
- #57954 (rustdoc: remove blank unstable spans)
- #58028 (Fix image link in the settings menu)
- #58033 (rustdoc: wrap stability tags in colored spans)
- #58086 ([rustdoc] Improve file list display)
- #58143 (Sort elements in the sidebar)
- #58146 (Prevent automatic collapse of methods impl blocks)
- #58150 (Don't apply impl block collapse rules to trait impls)
- #58185 (Remove images' url to make it work even without internet connection)
Failed merges:
r? @ghost
@bors
bors merged commit 729e37d into rust-lang:masterFeb 7, 2019
@GuillaumeGomez
GuillaumeGomez deleted the dont-apply-impl-collapse-rules-to-trait-impls branch February 8, 2019 00:35
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants

@GuillaumeGomez@bors@Manishearth@hch12907@QuietMisdreavus@rust-highfive