-
Notifications
You must be signed in to change notification settings - Fork 12.6k
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
Dual proc macro hash #65698
Dual proc macro hash #65698
Conversation
r? @zackmdavis (rust_highfive has picked a reviewer for you, use r? to override) |
r? @Xanewok |
5223720
to
f25624d
Compare
Cc @Zoxc |
@alexcrichton Can you run a try build? |
This comment has been minimized.
This comment has been minimized.
I have already tested this locally. RLS and Rustfmt builds and Miri is failing because of unrelated issues (#65684). Clippy for cross platforms is still waiting on rust-lang/rust-clippy#4714 |
☔ The latest upstream changes (presumably #65771) made this pull request unmergeable. Please resolve the merge conflicts. |
f25624d
to
2f46e0b
Compare
The job Click to expand the log.
I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact |
r? @Zoxc |
Wait, I've just got to reviewing this. |
r=me with commits squashed |
How do I squash commits? |
Use |
(I usually just soft-reset to the first commit and then amend everything else into it, it's pretty convenient to do from |
You could try cherry picking this PR just as a sanity check that things work: #56447 You can also do the CI cross compilation docker builds locally to ensure stuff works before trying to land this, if you haven't done so already. |
@msizanoen1 |
@petrochenkov Testing done - all green tools on toolstate builds (except clippy - rust-lang/rust-clippy#4714) after introducing |
@bors r+ |
📌 Commit 03e7964cd9a2d6ff89ecb0fb9b3ea5b066b5ff39 has been approved by |
☔ The latest upstream changes (presumably #65990) made this pull request unmergeable. Please resolve the merge conflicts. |
This changes the mechanism of `-Z dual-proc-macro` to record the host proc macro hash in the transistive dependency information and use it during dependency resolution instead of resolving only by name.
03e7964
to
8a0d233
Compare
@petrochenkov Rebased for conflict resolution. |
@bors r+ |
📌 Commit 8a0d233 has been approved by |
Dual proc macro hash This PR changes current `-Z dual-proc-macro` mechanism from resolving only by name to including the hash of the host crate inside the transistive dependency information to prevent name conflicts. Fix partially #62558
☀️ Test successful - checks-azure |
This PR changes current
-Z dual-proc-macro
mechanism from resolving only by name to including the hash of the host crate inside the transistive dependency information to prevent name conflicts.Fix partially #62558