Skip to content

Add whitespace around "=" in assoc items - #40689

Merged
bors merged 1 commit into
rust-lang:masterfrom
GuillaumeGomez:rustdoc-associated-type-formatting
Mar 23, 2017
Merged

Add whitespace around "=" in assoc items#40689
bors merged 1 commit into
rust-lang:masterfrom
GuillaumeGomez:rustdoc-associated-type-formatting

Conversation

@GuillaumeGomez

Copy link
Copy Markdown
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
GuillaumeGomezforce-pushed the rustdoc-associated-type-formatting branch 2 times, most recently from be7322c to d3276f5CompareMarch 20, 2017 22:25
@frewsxcv

Copy link
Copy Markdown
Contributor

Looks great, nice work!

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

@frewsxcv

Copy link
Copy Markdown
Contributor

@bors r+ rollup

@bors

bors commented Mar 21, 2017

Copy link
Copy Markdown
Collaborator

📌 Commit d3276f5 has been approved by frewsxcv

@frewsxcv

Copy link
Copy Markdown
Contributor

@bors r-

r=me after tidy issue is addressed

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

@GuillaumeGomez
GuillaumeGomezforce-pushed the rustdoc-associated-type-formatting branch from d3276f5 to 4b6c854CompareMarch 21, 2017 10:27
@GuillaumeGomez

Copy link
Copy Markdown
MemberAuthor

@bors: r=frewsxcv

@bors

bors commented Mar 21, 2017

Copy link
Copy Markdown
Collaborator

📌 Commit 4b6c854 has been approved by frewsxcv

@bors

bors commented Mar 21, 2017

Copy link
Copy Markdown
Collaborator

🔒 Merge conflict

@bstrie
bstrieforce-pushed the rustdoc-associated-type-formatting branch from 4b6c854 to f531722CompareMarch 21, 2017 20:22
@bstrie

Copy link
Copy Markdown
Contributor

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

@bors r=frewsxcv

@bors

bors commented Mar 21, 2017

Copy link
Copy Markdown
Collaborator

📌 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">
@frewsxcvfrewsxcv mentioned this pull request Mar 22, 2017
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">
@frewsxcvfrewsxcv mentioned this pull request Mar 22, 2017
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:masterMar 23, 2017
@GuillaumeGomez
GuillaumeGomez deleted the rustdoc-associated-type-formatting branch March 23, 2017 10:42
Sign up for freeto 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

@GuillaumeGomez@frewsxcv@bors@bstrie