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

Rollup of 3 pull requests #64569

Closed
wants to merge 7 commits into from
Closed

Conversation

tmandry
Copy link
Member

@tmandry tmandry commented Sep 18, 2019

Successful merges:

Failed merges:

r? @ghost

matthewjasper and others added 7 commits September 15, 2019 10:22
This ensures that we match the order used by proc macro metadata
serialization.

Fixes rust-lang#64251
…petrochenkov

Print out more information for `-Zunpretty=expanded,hygiene`

I've found this helpful when trying to understand how hygiene works.

Closes rust-lang#16420
…excrichton

Load proc macro metadata in the correct order.

Serialized proc macro metadata is assumed to have a one-to-one
correspondence with the entries in static array generated by proc_macro_harness.
However, we were previously serializing proc macro metadata in a
different order than proc macros were laied out in the static array.
This lead to us associating the wrong data with a proc macro when
generating documentation, causing Rustdoc to generate incorrect docs for
proc macros.

This commit keeps track of the order in which we insert proc macros into
the generated static array. We use this same order when serializing proc
macro metadata, ensuring that we can later associate the metadata for a
proc macro with its entry in the static array.

Fixes rust-lang#64251
@tmandry
Copy link
Member Author

tmandry commented Sep 18, 2019

Closing in favor of #64570

@tmandry tmandry closed this Sep 18, 2019
@tmandry tmandry deleted the rollup-wm6zfq4 branch September 18, 2019 04:29
@Centril Centril added the rollup A PR which is a rollup label Oct 24, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
rollup A PR which is a rollup
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants