Skip to content

Conversation

topecongiro
Copy link
Contributor

This update includes a bug fix that fixes generating invalid code when formatting an impl block with const generics inside a where clause.

Changes
rust-lang/rustfmt@0462008...1de58ce

@rust-highfive
Copy link
Contributor

r? @nikomatsakis

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

@rust-highfive
Copy link
Contributor

⚠️ Warning ⚠️

  • These commits modify submodules.

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Aug 13, 2019
@nikomatsakis
Copy link
Contributor

@bors r+ rollup

@bors
Copy link
Collaborator

bors commented Aug 14, 2019

📌 Commit 57a731fbbe141e3fabfbdca92a38dc39f2db177b has been approved by nikomatsakis

@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 Aug 14, 2019
@Centril
Copy link
Contributor

Centril commented Aug 14, 2019

@bors rollup-

@topecongiro
Copy link
Contributor Author

topecongiro commented Aug 15, 2019

Included rust-lang/rustfmt@541d9a8 to fix the broken test.

@bors
Copy link
Collaborator

bors commented Aug 19, 2019

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

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Aug 19, 2019
@topecongiro
Copy link
Contributor Author

Resolved conflicts.

@topecongiro
Copy link
Contributor Author

r? @Centril

@Centril
Copy link
Contributor

Centril commented Aug 22, 2019

@bors r+ delegate+

@bors
Copy link
Collaborator

bors commented Aug 22, 2019

📌 Commit 0be01fa has been approved by Centril

@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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Aug 22, 2019
@bors
Copy link
Collaborator

bors commented Aug 22, 2019

✌️ @topecongiro can now approve this pull request

@bors
Copy link
Collaborator

bors commented Aug 22, 2019

⌛ Testing commit 0be01fa with merge ee7161d...

bors added a commit that referenced this pull request Aug 22, 2019
Update rustfmt to 1.4.5

This update includes a bug fix that fixes generating invalid code when formatting an impl block with const generics inside a where clause.

**Changes**
rust-lang/rustfmt@0462008...1de58ce
@bors
Copy link
Collaborator

bors commented Aug 23, 2019

☀️ Test successful - checks-azure
Approved by: Centril
Pushing ee7161d to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Aug 23, 2019
@bors bors merged commit 0be01fa into rust-lang:master Aug 23, 2019
@topecongiro topecongiro deleted the rustfmt-1.4.5 branch August 23, 2019 01:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merged-by-bors This PR was explicitly merged by bors. 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.

5 participants