Skip to content
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

Gardening #23877

Merged
merged 2 commits into from
Apr 2, 2015
Merged

Gardening #23877

merged 2 commits into from
Apr 2, 2015

Conversation

richo
Copy link
Contributor

@richo richo commented Mar 30, 2015

I also wanted to unignore https://github.com/rust-lang/rust/blob/master/src/libsyntax/ext/expand.rs#L1768-L1777 since the issue it references is closed, but the test fails, and it's internals aren't super clear to me.

@rust-highfive
Copy link
Collaborator

r? @sfackler

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

@bors
Copy link
Contributor

bors commented Apr 1, 2015

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

richo added 2 commits April 1, 2015 11:04
This issue is long closed. It seems that unwrapping will always panic
though.
@richo
Copy link
Contributor Author

richo commented Apr 1, 2015

Rebased.

@Manishearth
Copy link
Member

@bors: r+ rollup

@bors
Copy link
Contributor

bors commented Apr 2, 2015

📌 Commit 85c74c6 has been approved by Manishearth

@bors
Copy link
Contributor

bors commented Apr 2, 2015

⌛ Testing commit 85c74c6 with merge edac3ce...

bors added a commit that referenced this pull request Apr 2, 2015
I also wanted to unignore https://github.com/rust-lang/rust/blob/master/src/libsyntax/ext/expand.rs#L1768-L1777 since the issue it references is closed, but the test fails, and it's internals aren't super clear to me.
@bors bors merged commit 85c74c6 into rust-lang:master Apr 2, 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.

5 participants