Skip to content

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

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.

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

Merged
merged 4 commits into from
Apr 18, 2015

Conversation

erickt
Copy link
Contributor

@erickt erickt commented Apr 2, 2015

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

@rust-highfive
Copy link
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
@@ -8,7 +8,7 @@
// option. This file may not be copied, modified, or distributed
Copy link
Member

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
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
Copy link
Member

huonw commented Apr 6, 2015

@bors r+

@bors
Copy link
Collaborator

bors commented Apr 6, 2015

📌 Commit 02c5ff7 has been approved by huonw

@bors
Copy link
Collaborator

bors commented Apr 6, 2015

⌛ 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
Copy link
Collaborator

bors commented Apr 6, 2015

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

@alexcrichton
Copy link
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
Copy link
Collaborator

bors commented Apr 7, 2015

⌛ 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
Copy link
Collaborator

bors commented Apr 7, 2015

💔 Test failed - auto-mac-64-opt

@erickt
Copy link
Contributor Author

erickt commented Apr 10, 2015

@bors: retry

@bors
Copy link
Collaborator

bors commented Apr 15, 2015

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

@erickt
Copy link
Contributor Author

erickt commented Apr 16, 2015

@bors: retry

@erickt
Copy link
Contributor Author

erickt commented Apr 17, 2015

@bors r+ ed437cd

@bors
Copy link
Collaborator

bors commented Apr 18, 2015

⌛ 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 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