Fix inconsistent strum dependencies and imports #40907
Merged
Conversation
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
Member
|
Wouldn't it make more sense to simply add derive feature to strum in workspace toml, as I think nearly all uses of strum uses the macros? |
Member
|
Would it also be possible to move the derive feature to the root |
Contributor
Author
|
I usually prefer to be explicit about things like this (explicit deps, etc), but currently anything which fixes |
Contributor
Author
|
Let me try it the other way around. |
Contributor
Author
|
Well, compositing_traits only need strum_macros: |
The `scripts_traits` crate was the only crate depending on `strum` with the `derive` feature. This accidentally allowed other crates to import strum macros via `strum::` without declaring their own dependency on `strum_macros`, causing compilation issues when running `./mach test-unit -p net`. This patch makes the imporys consistent across the codebase by: - replacing all `strum_macro::` imports with `strum::` imports - removing strum_macro dependencies - adding derive feature to the strum workspace Signed-off-by: Jan Varga <jvarga@igalia.com>
Contributor
Author
|
Ok, I reworked it as suggested. |
mrobinson
approved these changes
Nov 26, 2025
Member
mrobinson
left a comment
There was a problem hiding this comment.
Thanks. This is a nice cleanup.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 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.
The
scripts_traitscrate was the only crate depending onstrumwith thederivefeature. This accidentally allowed other crates to import strummacros via
strum::without declaring their own dependency onstrum_macros,causing compilation issues when running
./mach test-unit -p net.This PR makes the imports consistent across the code base by:
strum_macro::imports withstrum::importsTesting: Unit tests continue to pass