Propagate spans and attributes from proc macro definitions#63761
Merged
bors merged 4 commits intorust-lang:masterfrom Aug 27, 2019
Merged
Propagate spans and attributes from proc macro definitions#63761bors merged 4 commits intorust-lang:masterfrom
bors merged 4 commits intorust-lang:masterfrom
Conversation
Contributor
|
r? @eddyb (rust_highfive has picked a reviewer for you, use r? to override) |
rust-highfive
added
the
S-waiting-on-review
Contributor
Author
|
cc @Aaron1011 |
petrochenkov
commented
Aug 20, 2019
src/librustc_metadata/decoder.rs
Outdated
Contributor
Author
There was a problem hiding this comment.
I'm not sure whether this dance is necessary.
Can these two "roots" have different editions?
I don't really understand how "dual proc macros" work.
cc @Zoxc
petrochenkov
commented
Aug 20, 2019
This comment has been minimized.
This comment has been minimized.
petrochenkov
force-pushed
the
procattrs
branch
from
cc81a74 to
5c4e04e
Compare
eddyb
reviewed
Aug 21, 2019
src/libproc_macro/lib.rs
Outdated
Member
There was a problem hiding this comment.
Ohhh right, this works now, without the risk of this quote ending up defined anywhere other than the proc_macro crate!
eddyb
approved these changes
Aug 21, 2019
Member
eddyb
left a comment
eddyb
left a comment
There was a problem hiding this comment.
r=me but maybe @alexcrichton or @dtolnay want to take a look as well
Member
|
I won't pretend to fully understand what's happening here but what I do understand all seems quite reasonable! |
Contributor
Author
|
@bors r=eddyb |
Collaborator
|
📌 Commit 5c4e04e036ee8b4565ac9c8e24d4ca73abade656 has been approved by |
bors
added
S-waiting-on-bors
Collaborator
|
⌛ Testing commit 5c4e04e036ee8b4565ac9c8e24d4ca73abade656 with merge 8848c10c117204140db4f06c59687e44655dea92... |
Collaborator
|
💥 Test timed out |
bors
added
S-waiting-on-review
Collaborator
|
☔ The latest upstream changes (presumably #63823) made this pull request unmergeable. Please resolve the merge conflicts. |
petrochenkov
added
S-waiting-on-author
Previously in was implemented using a special hack in the metadata loader
Fix caching of loaded proc macros
…location Which is no longer dummy and is available from metadata now.
petrochenkov
force-pushed
the
procattrs
branch
from
5c4e04e to
c476b55
Compare
Contributor
Author
|
@bors r=eddyb |
Collaborator
|
📌 Commit c476b55 has been approved by |
bors
added
S-waiting-on-bors
Centril
added a commit
to Centril/rust
that referenced
this pull request
Aug 27, 2019
Propagate spans and attributes from proc macro definitions Thanks to rust-lang#63269 we now have spans and attributes from proc macro definitions available in metadata. However, that PR didn't actually put them into use! This PR finishes that work. Attributes `rustc_macro_transparency`, `allow_internal_unstable`, `allow_internal_unsafe`, `local_inner_macros`, `rustc_builtin_macro`, `stable`, `unstable`, `rustc_deprecated`, `deprecated` now have effect when applied to proc macro definition functions. From those attributes only `deprecated` is both stable and supposed to be used in new code. (`#![staged_api]` still cannot be used in proc macro crates for unrelated reasons though.) `Span::def_site` from the proc macro API now returns the correct location of the proc macro definition. Also, I made a mistake in rust-lang#63269 (comment), loaded proc macros didn't actually use the resolver cache. This PR fixes the caching issue, now proc macros go through the `Resolver::macro_map` cache as well. (Also, the first commit turns `proc_macro::quote` into a regular built-in macro to reduce the number of places where `SyntaxExtension`s need to be manually created.)
Centril
added a commit
to Centril/rust
that referenced
this pull request
Aug 27, 2019
Propagate spans and attributes from proc macro definitions Thanks to rust-lang#63269 we now have spans and attributes from proc macro definitions available in metadata. However, that PR didn't actually put them into use! This PR finishes that work. Attributes `rustc_macro_transparency`, `allow_internal_unstable`, `allow_internal_unsafe`, `local_inner_macros`, `rustc_builtin_macro`, `stable`, `unstable`, `rustc_deprecated`, `deprecated` now have effect when applied to proc macro definition functions. From those attributes only `deprecated` is both stable and supposed to be used in new code. (`#![staged_api]` still cannot be used in proc macro crates for unrelated reasons though.) `Span::def_site` from the proc macro API now returns the correct location of the proc macro definition. Also, I made a mistake in rust-lang#63269 (comment), loaded proc macros didn't actually use the resolver cache. This PR fixes the caching issue, now proc macros go through the `Resolver::macro_map` cache as well. (Also, the first commit turns `proc_macro::quote` into a regular built-in macro to reduce the number of places where `SyntaxExtension`s need to be manually created.)
bors
added a commit
that referenced
this pull request
Aug 27, 2019
Rollup of 4 pull requests Successful merges: - #62600 (libtest: add --show-output flag to print stdout of successful tests) - #63698 (Fixed floating point issue with asinh function) - #63761 (Propagate spans and attributes from proc macro definitions) - #63917 (Error when generator trait is not found) Failed merges: r? @ghost
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
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.
Thanks to #63269 we now have spans and attributes from proc macro definitions available in metadata.
However, that PR didn't actually put them into use! This PR finishes that work.
Attributes
rustc_macro_transparency,allow_internal_unstable,allow_internal_unsafe,local_inner_macros,rustc_builtin_macro,stable,unstable,rustc_deprecated,deprecatednow have effect when applied to proc macro definition functions.From those attributes only
deprecatedis both stable and supposed to be used in new code.(
#![staged_api]still cannot be used in proc macro crates for unrelated reasons though.)Span::def_sitefrom the proc macro API now returns the correct location of the proc macro definition.Also, I made a mistake in #63269 (comment), loaded proc macros didn't actually use the resolver cache.
This PR fixes the caching issue, now proc macros go through the
Resolver::macro_mapcache as well.(Also, the first commit turns
proc_macro::quoteinto a regular built-in macro to reduce the number of places whereSyntaxExtensions need to be manually created.)