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

Add whitespace around "=" in assoc items #40689

Merged

Conversation

GuillaumeGomez
Copy link
Member

Part of #40641.

r? @rust-lang/docs

Before:

screen shot 2017-03-20 at 22 42 34

After:

screen shot 2017-03-20 at 22 42 36

@GuillaumeGomez GuillaumeGomez force-pushed the rustdoc-associated-type-formatting branch 2 times, most recently from be7322c to d3276f5 Compare March 20, 2017 22:25
@frewsxcv
Copy link
Member

Looks great, nice work!

If anyone reads this, for the record, this spacing is consistent with how rustfmt does the formatting.

@frewsxcv
Copy link
Member

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Mar 21, 2017

📌 Commit d3276f5 has been approved by frewsxcv

@frewsxcv
Copy link
Member

@bors r-

r=me after tidy issue is addressed

/checkout/src/test/rustdoc/doc-assoc-item.rs:17: trailing whitespace

@GuillaumeGomez GuillaumeGomez force-pushed the rustdoc-associated-type-formatting branch from d3276f5 to 4b6c854 Compare March 21, 2017 10:27
@GuillaumeGomez
Copy link
Member Author

@bors: r=frewsxcv

@bors
Copy link
Contributor

bors commented Mar 21, 2017

📌 Commit 4b6c854 has been approved by frewsxcv

@bors
Copy link
Contributor

bors commented Mar 21, 2017

🔒 Merge conflict

@bstrie bstrie force-pushed the rustdoc-associated-type-formatting branch from 4b6c854 to f531722 Compare March 21, 2017 20:22
@bstrie
Copy link
Contributor

bstrie commented Mar 21, 2017

I've rebased this branch due to a submodule conflict that invalidated many PRs.

@bors r=frewsxcv

@bors
Copy link
Contributor

bors commented Mar 21, 2017

📌 Commit f531722 has been approved by frewsxcv

frewsxcv added a commit to frewsxcv/rust that referenced this pull request Mar 22, 2017
…ype-formatting, r=frewsxcv

Add whitespace around "=" in assoc items

Part of rust-lang#40641.

r? @rust-lang/docs

Before:

<img width="1440" alt="screen shot 2017-03-20 at 22 42 34" src="https://cloud.githubusercontent.com/assets/3050060/24123102/89181d8c-0dbe-11e7-897c-841497cf7001.png">

After:

<img width="1440" alt="screen shot 2017-03-20 at 22 42 36" src="https://cloud.githubusercontent.com/assets/3050060/24123118/8dec176e-0dbe-11e7-9759-cabbd062a4c2.png">
GuillaumeGomez added a commit to GuillaumeGomez/rust that referenced this pull request Mar 22, 2017
…ype-formatting, r=frewsxcv

Add whitespace around "=" in assoc items

Part of rust-lang#40641.

r? @rust-lang/docs

Before:

<img width="1440" alt="screen shot 2017-03-20 at 22 42 34" src="https://cloud.githubusercontent.com/assets/3050060/24123102/89181d8c-0dbe-11e7-897c-841497cf7001.png">

After:

<img width="1440" alt="screen shot 2017-03-20 at 22 42 36" src="https://cloud.githubusercontent.com/assets/3050060/24123118/8dec176e-0dbe-11e7-9759-cabbd062a4c2.png">
frewsxcv added a commit to frewsxcv/rust that referenced this pull request Mar 22, 2017
…ype-formatting, r=frewsxcv

Add whitespace around "=" in assoc items

Part of rust-lang#40641.

r? @rust-lang/docs

Before:

<img width="1440" alt="screen shot 2017-03-20 at 22 42 34" src="https://cloud.githubusercontent.com/assets/3050060/24123102/89181d8c-0dbe-11e7-897c-841497cf7001.png">

After:

<img width="1440" alt="screen shot 2017-03-20 at 22 42 36" src="https://cloud.githubusercontent.com/assets/3050060/24123118/8dec176e-0dbe-11e7-9759-cabbd062a4c2.png">
bors added a commit that referenced this pull request Mar 22, 2017
Rollup of 13 pull requests

- Successful merges: #40509, #40523, #40548, #40578, #40619, #40689, #40690, #40692, #40704, #40722, #40723, #40725, #40732
- Failed merges:
@bors bors merged commit f531722 into rust-lang:master Mar 23, 2017
@GuillaumeGomez GuillaumeGomez deleted the rustdoc-associated-type-formatting branch March 23, 2017 10:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants