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

Treat MultiDecorators as a special case of MultiModifiers #34446

Merged
merged 2 commits into from
Jun 30, 2016

Conversation

jseyfried
Copy link
Contributor

@jseyfried jseyfried commented Jun 24, 2016

This deals with #32950 by using @durka's option 1.
r? @nrc

@nrc
Copy link
Member

nrc commented Jun 27, 2016

@bors: r+

@bors
Copy link
Contributor

bors commented Jun 27, 2016

📌 Commit 972a578 has been approved by nrc

@bors
Copy link
Contributor

bors commented Jun 27, 2016

⌛ Testing commit 972a578 with merge c4bccb0...

@bors
Copy link
Contributor

bors commented Jun 27, 2016

⛄ The build was interrupted to prioritize another pull request.

@bors
Copy link
Contributor

bors commented Jun 28, 2016

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

@jseyfried
Copy link
Contributor Author

@bors r=nrc

@bors
Copy link
Contributor

bors commented Jun 29, 2016

📌 Commit a595ffa has been approved by nrc

Manishearth added a commit to Manishearth/rust that referenced this pull request Jun 29, 2016
Treat `MultiDecorator`s as a special case of `MultiModifier`s

This deals with rust-lang#32950 by using @durka's [option 1](rust-lang#33769 (comment)).
r? @nrc
bors added a commit that referenced this pull request Jun 30, 2016
Rollup of 11 pull requests

- Successful merges: #34355, #34446, #34459, #34460, #34467, #34495, #34497, #34499, #34513, #34536, #34542
- Failed merges:
@bors bors merged commit a595ffa into rust-lang:master Jun 30, 2016
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.

3 participants