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

rustdoc: insert newlines between attributes #73852

Merged
merged 1 commit into from
Jul 14, 2020

Conversation

euclio
Copy link
Contributor

@euclio euclio commented Jun 28, 2020

Fixes #73205.

@rust-highfive
Copy link
Collaborator

r? @steveklabnik

(rust_highfive has picked a reviewer for you, use r? to override)

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jun 28, 2020
@steveklabnik
Copy link
Member

@bors r? @GuillaumeGomez

@euclio euclio force-pushed the rustdoc-attr-newlines branch 2 times, most recently from e7b5bf0 to f3f4087 Compare June 29, 2020 13:39
@bors
Copy link
Contributor

bors commented Jul 11, 2020

☔ The latest upstream changes (presumably #74235) made this pull request unmergeable. Please resolve the merge conflicts.

Copy link
Member

@GuillaumeGomez GuillaumeGomez left a comment

Choose a reason for hiding this comment

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

Looks good to me! Once rebased, and CI passed, r=me.

@euclio
Copy link
Contributor Author

euclio commented Jul 12, 2020

Rebased and green.

@GuillaumeGomez
Copy link
Member

@bors: r+

@bors
Copy link
Contributor

bors commented Jul 12, 2020

📌 Commit 0979545 has been approved by GuillaumeGomez

@bors
Copy link
Contributor

bors commented Jul 12, 2020

🌲 The tree is currently closed for pull requests below priority 30, this pull request will be tested once the tree is reopened

@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 Jul 12, 2020
Manishearth added a commit to Manishearth/rust that referenced this pull request Jul 13, 2020
…llaumeGomez

rustdoc: insert newlines between attributes

Fixes rust-lang#73205.
Manishearth added a commit to Manishearth/rust that referenced this pull request Jul 13, 2020
…llaumeGomez

rustdoc: insert newlines between attributes

Fixes rust-lang#73205.
Manishearth added a commit to Manishearth/rust that referenced this pull request Jul 13, 2020
…llaumeGomez

rustdoc: insert newlines between attributes

Fixes rust-lang#73205.
Manishearth added a commit to Manishearth/rust that referenced this pull request Jul 13, 2020
…llaumeGomez

rustdoc: insert newlines between attributes

Fixes rust-lang#73205.
Manishearth added a commit to Manishearth/rust that referenced this pull request Jul 14, 2020
…llaumeGomez

rustdoc: insert newlines between attributes

Fixes rust-lang#73205.
Manishearth added a commit to Manishearth/rust that referenced this pull request Jul 14, 2020
…llaumeGomez

rustdoc: insert newlines between attributes

Fixes rust-lang#73205.
bors added a commit to rust-lang-ci/rust that referenced this pull request Jul 14, 2020
…arth

Rollup of 8 pull requests

Successful merges:

 - rust-lang#73354 (Update RELEASES.md for 1.45.0)
 - rust-lang#73852 (rustdoc: insert newlines between attributes)
 - rust-lang#73867 (Document the union keyword)
 - rust-lang#74046 (Fix caching issue when building tools.)
 - rust-lang#74123 (clean up E0718 explanation)
 - rust-lang#74147 (rustdoc: Allow linking from private items to private types)
 - rust-lang#74285 (rust-lang#71669: add ui, codegen tests for volatile + nearby int intrinsics)
 - rust-lang#74286 (Added detailed error code explanation for issue E0688 in Rust compiler.)

Failed merges:

r? @ghost
@bors bors merged commit eb7fdb2 into rust-lang:master Jul 14, 2020
@euclio euclio deleted the rustdoc-attr-newlines branch July 14, 2020 12:09
@cuviper cuviper added this to the 1.46 milestone May 2, 2024
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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Multiple attributes are shown on the same line in type declarations in rustdoc
6 participants