Improve resolution of associated types in declarative macros 2.0 #44818
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
petrochenkov
commented
Sep 25, 2017
| -> impl Iterator<Item = NodeItem<ty::AssociatedItem>> + 'a { | ||
| self.flat_map(move |node| { | ||
| node.items(tcx).filter(move |item| { | ||
| let item_ident = tcx.adjust(item.name, trait_def_id, impl_node_id).0; |
There was a problem hiding this comment.
Hm, actually adjust doesn't require the NodeId if we need only the adjusted ident, so it looks like specialization can be fixed as well.
carols10cents
added
the
S-waiting-on-review
petrochenkov
force-pushed
the
astymac2
branch
2 times, most recently
from
70fab20
to
f75497d
Compare
|
Updated with a fix for specialization. There are still plenty of unhygienic comparisons to fix (see loops through |
jseyfried
reviewed
Sep 28, 2017
src/librustc/ty/mod.rs
Outdated
| @@ -2282,6 +2282,13 @@ impl<'a, 'gcx, 'tcx> TyCtxt<'a, 'gcx, 'tcx> { | |||
| } | |||
| } | |||
|
|
|||
| // Hygienically compare a use-site name (`use_name`) for a field or an associated item with its | |||
| // supposed definition name (`def_name`). The method also needs the supposed definition's | |||
| // `DefId` to perform comparison. | |||
There was a problem hiding this comment.
def_def_id "should" be the DefId of supposed definition's parent, i.e. the scope (module, enum, struct, trait, or impl) in which we are resolving use_name (the name of the the item, variant, field, trait item, or impl item, resp.).
However, I believe this distinction only makes a difference when resolving in modules, so we can probably safely use the semantics in this PR for resolution that happens after resolve.
|
cc @nrc |
carols10cents
added
S-waiting-on-author
|
Rebased + used trait DefIds in accordance with #44818 (comment) |
|
📌 Commit 2d9161d has been approved by |
bors
added a commit
that referenced
this pull request
Oct 6, 2017
Improve resolution of associated types in declarative macros 2.0 Make various identifier comparisons for associated types (and sometimes other associated items) hygienic. Now declarative macros 2.0 can use `Self::AssocTy`, `TyParam::AssocTy`, `Trait<AssocTy = u8>` where `AssocTy` is an associated type of a trait `Trait` visible from the macro. Also, `Trait` can now be implemented inside the macro and specialization should work properly (fixes #40847 (comment)). r? @jseyfried or @eddyb
|
💔 Test failed - status-travis |
|
|
bors
added a commit
that referenced
this pull request
Oct 6, 2017
Improve resolution of associated types in declarative macros 2.0 Make various identifier comparisons for associated types (and sometimes other associated items) hygienic. Now declarative macros 2.0 can use `Self::AssocTy`, `TyParam::AssocTy`, `Trait<AssocTy = u8>` where `AssocTy` is an associated type of a trait `Trait` visible from the macro. Also, `Trait` can now be implemented inside the macro and specialization should work properly (fixes #40847 (comment)). r? @jseyfried or @eddyb
|
☀️ Test successful - status-appveyor, status-travis |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Make various identifier comparisons for associated types (and sometimes other associated items) hygienic.
Now declarative macros 2.0 can use
Self::AssocTy,TyParam::AssocTy,Trait<AssocTy = u8>whereAssocTyis an associated type of a traitTraitvisible from the macro. Also,Traitcan now be implemented inside the macro and specialization should work properly (fixes #40847 (comment)).r? @jseyfried or @eddyb