Skip to content

Allow #[derive(...)] methods to generate multiple items, and other cleanup#23985

Merged
bors merged 4 commits into
rust-lang:masterfrom
erickt:derive-cleanup
Apr 18, 2015
Merged

Allow #[derive(...)] methods to generate multiple items, and other cleanup#23985
bors merged 4 commits into
rust-lang:masterfrom
erickt:derive-cleanup

Conversation

@erickt

@erickt erickt commented Apr 2, 2015

Copy link
Copy Markdown
Contributor

This extracts some of the minor cleanup patches from #23905.

@rust-highfive

Copy link
Copy Markdown
Contributor

r? @brson

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

@huonw huonw assigned huonw and unassigned brson Apr 2, 2015

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.

The listed changes to this file are essentially all spurious, right? (i.e. just from git not realising that totaleq.rs was renamed to overwrite eq.rs?)

(And similarly for ord.rs?)

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Yes, that's correct.

@huonw

huonw commented Apr 6, 2015

Copy link
Copy Markdown
Contributor

@bors r+

@bors

bors commented Apr 6, 2015

Copy link
Copy Markdown
Collaborator

📌 Commit 02c5ff7 has been approved by huonw

@bors

bors commented Apr 6, 2015

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 02c5ff7 with merge 7907099...

bors added a commit that referenced this pull request Apr 6, 2015
This extracts some of the minor cleanup patches from #23905.
@bors

bors commented Apr 6, 2015

Copy link
Copy Markdown
Collaborator

💔 Test failed - auto-win-64-nopt-t

@alexcrichton

Copy link
Copy Markdown
Member

@bors: retry

On Sun, Apr 5, 2015 at 9:56 PM, bors notifications@github.com wrote:

[image: 💔] Test failed - auto-win-64-nopt-t
http://buildbot.rust-lang.org/builders/auto-win-64-nopt-t/builds/2859


Reply to this email directly or view it on GitHub
#23985 (comment).

@bors

bors commented Apr 7, 2015

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 02c5ff7 with merge b44acd3...

bors added a commit that referenced this pull request Apr 7, 2015
This extracts some of the minor cleanup patches from #23905.
@bors

bors commented Apr 7, 2015

Copy link
Copy Markdown
Collaborator

💔 Test failed - auto-mac-64-opt

@erickt

erickt commented Apr 10, 2015

Copy link
Copy Markdown
Contributor Author

@bors: retry

@bors

bors commented Apr 15, 2015

Copy link
Copy Markdown
Collaborator

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

@erickt

erickt commented Apr 16, 2015

Copy link
Copy Markdown
Contributor Author

@bors: retry

@erickt

erickt commented Apr 17, 2015

Copy link
Copy Markdown
Contributor Author

@bors r+ ed437cd

@bors

bors commented Apr 18, 2015

Copy link
Copy Markdown
Collaborator

⌛ Testing commit ed437cd with merge 1284be4...

bors added a commit that referenced this pull request Apr 18, 2015
This extracts some of the minor cleanup patches from #23905.
@bors

bors commented Apr 18, 2015

Copy link
Copy Markdown
Collaborator

@bors bors merged commit ed437cd into rust-lang:master Apr 18, 2015
Sign up for free to 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.

6 participants