Skip to content

Clean up some code - #43006

Merged
bors merged 2 commits into
rust-lang:masterfrom
GuillaumeGomez:e0611-cleanup
Jul 11, 2017
Merged

Clean up some code#43006
bors merged 2 commits into
rust-lang:masterfrom
GuillaumeGomez:e0611-cleanup

Conversation

@GuillaumeGomez

@GuillaumeGomezGuillaumeGomez commented Jul 1, 2017

Copy link
Copy Markdown
Member

@Mark-SimulacrumMark-Simulacrum added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jul 2, 2017
@GuillaumeGomez

GuillaumeGomez commented Jul 5, 2017

Copy link
Copy Markdown
MemberAuthor

ping @nikomatsakis

Or if anyone else wants to review it?

@aidanhs

aidanhs commented Jul 5, 2017

Copy link
Copy Markdown
Contributor

I pinged @nikomatsakis on IRC for review a bit earlier.

nikomatsakis
nikomatsakis requested changes Jul 7, 2017
View reviewed changes

@nikomatsakisnikomatsakis left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

What do you think of this as an alternate long explanation? In your version, there were some grammatical errors, and I've tried to keep the overall flow of the explanation, while respecting the overall "error code template" laid out in RFC 1567.

@GuillaumeGomez

GuillaumeGomez commented Jul 7, 2017

Copy link
Copy Markdown
MemberAuthor

Well, it seems good to me so I'll take yours. Thanks for the review!

@GuillaumeGomez

GuillaumeGomez commented Jul 7, 2017

Copy link
Copy Markdown
MemberAuthor

Ok updated.

@nikomatsakis

nikomatsakis commented Jul 10, 2017

Copy link
Copy Markdown
Contributor

@bors r+

@bors

bors commented Jul 10, 2017

Copy link
Copy Markdown
Collaborator

📌 Commit 440e637 has been approved by nikomatsakis

@bors

bors commented Jul 10, 2017

Copy link
Copy Markdown
Collaborator

🔒 Merge conflict

@GuillaumeGomez

GuillaumeGomez commented Jul 11, 2017

Copy link
Copy Markdown
MemberAuthor

@bors: r=nikomatsakis

@bors

bors commented Jul 11, 2017

Copy link
Copy Markdown
Collaborator

📌 Commit 24a5cea has been approved by nikomatsakis

@bors

bors commented Jul 11, 2017

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 24a5cea with merge dddf24d...

bors added a commit that referenced this pull request Jul 11, 2017
@bors
Auto merge of#43006- GuillaumeGomez:e0611-cleanup, r=nikomatsakis
dddf24d
Clean up some code
From #42669.
r? @nikomatsakis
@arielb1arielb1 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 11, 2017
@bors

bors commented Jul 11, 2017

Copy link
Copy Markdown
Collaborator

☀️ Test successful - status-appveyor, status-travis
Approved by: nikomatsakis
Pushing dddf24d to master...

@bors
bors merged commit 24a5cea into rust-lang:masterJul 11, 2017
@GuillaumeGomez
GuillaumeGomez deleted the e0611-cleanup branch July 11, 2017 18:23
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@nikomatsakisnikomatsakisnikomatsakis approved these changes

Assignees

@nikomatsakisnikomatsakis

Labels

S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@GuillaumeGomez@aidanhs@nikomatsakis@bors@arielb1@Mark-Simulacrum