Skip to content

Add attributes for trait and methods as well #50953

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 1 commit into from
Jun 3, 2018
Merged

Add attributes for trait and methods as well #50953

merged 1 commit into from
Jun 3, 2018

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 21, 2018
@QuietMisdreavus
Copy link
Contributor

Do you have screenshots for this? The change looks good but i'd like to double-check what it looks like first.

@GuillaumeGomez
Copy link
Member Author

I'll provide it in the next days (rustfest meanwhile!).

@TimNN TimNN 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-review Status: Awaiting review from the assignee but also interested parties. labels May 29, 2018
@GuillaumeGomez
Copy link
Member Author

Here are the screenshots:

screen shot 2018-06-01 at 15 49 30

screen shot 2018-06-01 at 15 49 33

@QuietMisdreavus
Copy link
Contributor

Looks good to me, thanks!

@bors r+

@bors
Copy link
Collaborator

bors commented Jun 1, 2018

📌 Commit 96c018c 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 Jun 1, 2018
@bors
Copy link
Collaborator

bors commented Jun 1, 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 Jun 1, 2018
@GuillaumeGomez
Copy link
Member Author

I suppose there is no merge conflicts so let's just retry...

@bors: r=QuietMisdreavus

@bors
Copy link
Collaborator

bors commented Jun 2, 2018

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

  • This pull request previously failed. You should add more commits to fix the bug, or use retry to trigger a build again.
  • There's another pull request that is currently being tested, blocking this pull request: [beta] Process backports #51037

@bors
Copy link
Collaborator

bors commented Jun 2, 2018

📌 Commit 96c018c 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 Jun 2, 2018
@bors
Copy link
Collaborator

bors commented Jun 2, 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 Jun 2, 2018
@GuillaumeGomez GuillaumeGomez force-pushed the attributes-in-other-places branch from 96c018c to 26ad95c Compare June 2, 2018 21:27
@GuillaumeGomez
Copy link
Member Author

Rebased, no conflict. This is making me sad...

@bors: r=QuietMisdreavus

@bors
Copy link
Collaborator

bors commented Jun 2, 2018

📌 Commit 26ad95c 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 Jun 2, 2018
@bors
Copy link
Collaborator

bors commented Jun 3, 2018

⌛ Testing commit 26ad95c with merge 251ec62...

bors added a commit that referenced this pull request Jun 3, 2018
@bors
Auto merge of #50953 - GuillaumeGomez:attributes-in-other-places, r=Q…
251ec62 
…uietMisdreavus

Add attributes for trait and methods as well

Fixes #48485.

r? @QuietMisdreavus
@bors
Copy link
Collaborator

bors commented Jun 3, 2018

☀️ Test successful - status-appveyor, status-travis
Approved by: QuietMisdreavus
Pushing 251ec62 to master...

@bors bors merged commit 26ad95c into rust-lang:master Jun 3, 2018
@GuillaumeGomez GuillaumeGomez deleted the attributes-in-other-places branch June 3, 2018 10:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@QuietMisdreavus QuietMisdreavus

Labels
S-waiting-on-bors Status: 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.
5 participants
@GuillaumeGomez @QuietMisdreavus @bors @TimNN @rust-highfive