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

syntax: Remove traits AttrMetaMethods, AttributeMethods, and AttrNestedMetaItemMethods #35917

Merged
merged 5 commits into from
Aug 30, 2016

Conversation

jseyfried
Copy link
Contributor

syntax-[breaking-change] cc #31645
r? @nrc

@jseyfried
Copy link
Contributor Author

cc @cgswords @eddyb
@Manishearth This is based on top of #35850 for easier inclusion in the breaking batch.

@bors
Copy link
Contributor

bors commented Aug 23, 2016

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

@nrc
Copy link
Member

nrc commented Aug 24, 2016

r+

@jseyfried jseyfried force-pushed the remove_attr_ext_traits branch from af064ec to 3e5494c Compare August 24, 2016 21:45
@bors
Copy link
Contributor

bors commented Aug 25, 2016

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

@jseyfried jseyfried force-pushed the remove_attr_ext_traits branch 2 times, most recently from 2534cfc to fa9aedb Compare August 25, 2016 06:50
@jseyfried
Copy link
Contributor Author

Rebased.

@bors
Copy link
Contributor

bors commented Aug 25, 2016

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

@jseyfried jseyfried force-pushed the remove_attr_ext_traits branch from fa9aedb to 469753f Compare August 25, 2016 20:42
@jseyfried jseyfried changed the title syntax: Remove traits AttrMetaMethods, AttributeMethods, and AttrMetaListItemMethods syntax: Remove traits AttrMetaMethods, AttributeMethods, and AttrNestedMetaItemMethods Aug 25, 2016
@jseyfried
Copy link
Contributor Author

Rebased.

@nrc
Copy link
Member

nrc commented Aug 26, 2016

@Manishearth r=@nrc

jseyfried added a commit to jseyfried/rust that referenced this pull request Aug 28, 2016
…=nrc

syntax: Remove traits `AttrMetaMethods`, `AttributeMethods`, and `AttrNestedMetaItemMethods`
bors added a commit that referenced this pull request Aug 30, 2016
Batch up libsyntax breaking changes

Batch of the following syntax-[breaking-change] changes:
 - #35591: Add a field `span: Span` to `ast::Generics`.
 - #35618: Remove variant `Mod` of `ast::PathListItemKind` and refactor the remaining variant `ast::PathListKind::Ident` to a struct `ast::PathListKind_`.
 - #35480: Change uses of `Constness` in the AST to `Spanned<Constness>`.
  - c.f. `MethodSig`, `ItemKind`
 - #35728: Refactor `cx.pat_enum()` into `cx.pat_tuple_struct()` and `cx.pat_path()`.
 - #35850: Generalize the elements of lists in attributes from `MetaItem` to a new type `NestedMetaItem` that can represent a `MetaItem` or a literal.
 - #35917: Remove traits `AttrMetaMethods`, `AttributeMethods`, and `AttrNestedMetaItemMethods`.
  - Besides removing imports of these traits, this won't cause fallout.
 - Add a variant `Union` to `ItemKind` to future proof for `union` (c.f. #36016).
 - Remove inherent methods `attrs` and `fold_attrs` of `Annotatable`.
  - Use methods `attrs` and `map_attrs` of `HasAttrs` instead.

r? @Manishearth
@bors bors merged commit 469753f into rust-lang:master Aug 30, 2016
@jseyfried jseyfried deleted the remove_attr_ext_traits branch October 16, 2016 09:31
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