Skip to content

Conversation

@raldone01
Copy link
Contributor

@raldone01 raldone01 commented Feb 11, 2025

This is a follow up fix for #17330 and fixes #17780.
There was a logic error in the ambiguity detection of cargo-manifest-proc-macros.
cargo-manifest-proc-macros now has a test for this case to prevent the issue in the future.

I also opted to hard fail if the cargo-manifest-proc-macros crate fails. That way the error is more obvious and easier to fix and diagnose.

Testing

@raldone01 raldone01 force-pushed the fix/failing_proc_macros_on_dev_and_normal_bevy_dependency branch from d54d456 to 9d03b66 Compare February 11, 2025 12:28
@villor
Copy link
Contributor

villor commented Feb 11, 2025

I can confirm that this fixes the issues encountered in bevyengine/bevy_editor_prototypes#178
Using this PR in place of bevy main, the code compiles with no errors.

@raldone01 raldone01 marked this pull request as ready for review February 11, 2025 17:48
@alice-i-cecile alice-i-cecile added P-High This is particularly urgent, and deserves immediate attention S-Ready-For-Final-Review This PR has been approved by the community. It's ready for a maintainer to consider merging it A-Cross-Cutting Impacts the entire engine D-Macros Code that generates Rust code labels Feb 11, 2025
@alice-i-cecile
Copy link
Member

Fantastic; thank you so much for the prompt investigation and fix! The upstream fix was particularly nice :)

@alice-i-cecile alice-i-cecile added this pull request to the merge queue Feb 11, 2025
@alice-i-cecile alice-i-cecile added this to the 0.16 milestone Feb 11, 2025
Merged via the queue into bevyengine:main with commit fb0e5c4 Feb 11, 2025
37 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

A-Cross-Cutting Impacts the entire engine D-Macros Code that generates Rust code P-High This is particularly urgent, and deserves immediate attention S-Ready-For-Final-Review This PR has been approved by the community. It's ready for a maintainer to consider merging it

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Hardening proc macro path resolution broke cargo overrides

3 participants