Skip to content

Conversation

GuillaumeGomez
Copy link
Member

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label May 29, 2018
@QuietMisdreavus
Copy link
Member

Do you have a screenshot with the new change?

@GuillaumeGomez
Copy link
Member Author

I'll this evening. But It's mostly style fixes.

@GuillaumeGomez
Copy link
Member Author

Here it is:

screen shot 2018-05-30 at 23 06 24

@QuietMisdreavus
Copy link
Member

Thanks!

@bors r+

@bors
Copy link
Collaborator

bors commented May 30, 2018

📌 Commit c7312fb has been approved by QuietMisdreavus

@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 May 30, 2018
@bors
Copy link
Collaborator

bors commented May 31, 2018

🔒 Merge conflict

@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 May 31, 2018
@QuietMisdreavus
Copy link
Member

It looks like bors had a hiccup and marked a bunch of PRs with "merge conflict" even though no such conflict existed? I'm going to poke this again.

@bors r+

@bors
Copy link
Collaborator

bors commented May 31, 2018

💡 This pull request was already approved, no need to approve it again.

@bors
Copy link
Collaborator

bors commented May 31, 2018

📌 Commit c7312fb has been approved by QuietMisdreavus

@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 May 31, 2018
@QuietMisdreavus
Copy link
Member

@bors retry

(reasoning up-thread)

GuillaumeGomez added a commit to GuillaumeGomez/rust that referenced this pull request May 31, 2018
…r=QuietMisdreavus

Fixes some style issues in rustdoc "implementations on Foreign types"

Fixes rust-lang#51113.

r? @QuietMisdreavus
bors added a commit that referenced this pull request May 31, 2018
Rollup of 7 pull requests

Successful merges:

 - #49546 (Stabilize short error format)
 - #51123 (Update build instructions)
 - #51146 (typeck: Do not pass the field check on field error)
 - #51193 (Fixes some style issues in rustdoc "implementations on Foreign types")
 - #51213 (fs: copy: Use File::set_permissions instead of fs::set_permissions)
 - #51227 (mod.rs isn't beautiful)
 - #51240 (Two minor parsing tweaks)

Failed merges:
@bors bors merged commit c7312fb into rust-lang:master May 31, 2018
@GuillaumeGomez GuillaumeGomez deleted the fixes-style-issues branch May 31, 2018 23:25
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.

4 participants