Skip to content

Deny derive_more error feature and replace it with thiserror#16684

Merged
alice-i-cecile merged 4 commits intobevyengine:mainfrom
bushrat011899:RevertBackToThisError
Dec 6, 2024
Merged

Deny derive_more error feature and replace it with thiserror#16684
alice-i-cecile merged 4 commits intobevyengine:mainfrom
bushrat011899:RevertBackToThisError

Conversation

@bushrat011899
Copy link
Contributor

@bushrat011899 bushrat011899 commented Dec 6, 2024

Objective

  • Remove derive_more's error derivation and replace it with thiserror

Solution

  • Added derive_more's error feature to deny.toml to prevent it sneaking back in.
  • Reverted to thiserror error derivation

Notes

Merge conflicts were too numerous to revert the individual changes, so this reversion was done manually. Please scrutinise carefully during review.

@bushrat011899 bushrat011899 added C-Dependencies A change to the crates that Bevy depends on P-High This is particularly urgent, and deserves immediate attention A-Cross-Cutting Impacts the entire engine X-Uncontroversial This work is generally agreed upon D-Straightforward Simple bug fixes and API improvements, docs, test and examples S-Needs-Review Needs reviewer attention (from anyone!) to move forward labels Dec 6, 2024
@bushrat011899 bushrat011899 marked this pull request as ready for review December 6, 2024 12:13
@alice-i-cecile alice-i-cecile added X-Blessed Has a large architectural impact or tradeoffs, but the design has been endorsed by decision makers and removed X-Uncontroversial This work is generally agreed upon labels Dec 6, 2024
Copy link
Contributor

@BenjaminBrienen BenjaminBrienen left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

My eyes feel dizzy now lol

@alice-i-cecile alice-i-cecile added this pull request to the merge queue Dec 6, 2024
@alice-i-cecile
Copy link
Member

Github's web interface hates this many files being changed, but I checked out the changes and they look fine. Merging ASAP to avoid merge conflicts.

@alice-i-cecile alice-i-cecile added S-Ready-For-Final-Review This PR has been approved by the community. It's ready for a maintainer to consider merging it and removed S-Needs-Review Needs reviewer attention (from anyone!) to move forward labels Dec 6, 2024
Merged via the queue into bevyengine:main with commit a6adced Dec 6, 2024
@andriyDev andriyDev mentioned this pull request Dec 11, 2024
ecoskey pushed a commit to ecoskey/bevy that referenced this pull request Jan 6, 2025
…evyengine#16684)

# Objective

- Remove `derive_more`'s error derivation and replace it with
`thiserror`

## Solution

- Added `derive_more`'s `error` feature to `deny.toml` to prevent it
sneaking back in.
- Reverted to `thiserror` error derivation

## Notes

Merge conflicts were too numerous to revert the individual changes, so
this reversion was done manually. Please scrutinise carefully during
review.
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 C-Dependencies A change to the crates that Bevy depends on D-Straightforward Simple bug fixes and API improvements, docs, test and examples 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 X-Blessed Has a large architectural impact or tradeoffs, but the design has been endorsed by decision makers

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants