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

macros: expand #[derive]s after other attribute macros and improve intra-#[derive] ordering #37067

Merged
merged 2 commits into from
Oct 13, 2016

Conversation

jseyfried
Copy link
Contributor

@jseyfried jseyfried changed the title macros: expand #[derive]s after other macro invocations and improve intra-#[derive] ordering macros: expand #[derive]s after other attribute macros and improve intra-#[derive] ordering Oct 10, 2016
@jseyfried jseyfried force-pushed the expand_derives_last branch from db51187 to 8aa6b5c Compare October 10, 2016 14:18
@alexcrichton
Copy link
Member

@bors: r+

Thanks @jseyfried!

@bors
Copy link
Contributor

bors commented Oct 10, 2016

📌 Commit 8aa6b5c has been approved by alexcrichton

if mitem.value_str().is_some() {
cx.span_err(mitem.span, "unexpected value in `derive`");
let mut derive_attrs = Vec::new();
item = item.map_attrs(|attrs| attrs.into_iter().filter_map(|attr| {
Copy link
Contributor

Choose a reason for hiding this comment

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

Could this use Iterator#partition instead?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Good point, amended.

@jseyfried jseyfried force-pushed the expand_derives_last branch from 8aa6b5c to 448d6ad Compare October 10, 2016 22:16
@jseyfried
Copy link
Contributor Author

@bors r=alexcrichton

@bors
Copy link
Contributor

bors commented Oct 10, 2016

📌 Commit 448d6ad has been approved by alexcrichton

@jseyfried
Copy link
Contributor Author

cc @nrc

sophiajt pushed a commit to sophiajt/rust that referenced this pull request Oct 11, 2016
…excrichton

macros: expand `#[derive]`s after other attribute macros and improve intra-`#[derive]` ordering

Fixes serde-rs/serde#577.
cc rust-lang#35900
r? @alexcrichton
bors added a commit that referenced this pull request Oct 12, 2016
Rollup of 10 pull requests

- Successful merges: #36692, #36743, #36762, #36991, #37023, #37050, #37056, #37064, #37066, #37067
- Failed merges:
alexcrichton added a commit to alexcrichton/rust that referenced this pull request Oct 12, 2016
…excrichton

macros: expand `#[derive]`s after other attribute macros and improve intra-`#[derive]` ordering

Fixes serde-rs/serde#577.
cc rust-lang#35900
r? @alexcrichton
bors added a commit that referenced this pull request Oct 12, 2016
@bors bors merged commit 448d6ad into rust-lang:master Oct 13, 2016
@jseyfried jseyfried deleted the expand_derives_last branch October 16, 2016 05:43
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.

4 participants