Skip to content

Revert "Merge #2027 #2057"#2117

Merged
asomers merged 1 commit intonix-rust:r0.26from
asomers:revert-bitflags
Aug 28, 2023
Merged

Revert "Merge #2027 #2057"#2117
asomers merged 1 commit intonix-rust:r0.26from
asomers:revert-bitflags

Conversation

@asomers
Copy link
Copy Markdown
Member

@asomers asomers commented Aug 28, 2023

This reverts commit 0c3afc2.

This rolls back the version of bitflags used to 1.1. Upgrading bitflags to 2.0 inadvertently caused breaking changes in the r0.26 branch, by virtue of the methods that the bitflags! macro adds.

Also, mask the bad_bit_mask lint, triggered by bitflags's generated code. That lint was the motivation for upgrading bitflags in the first place. The bitflags maintainers have decided not to fix those warnings in the 1.x release series.
bitflags/bitflags#373

Fixes #2112

This reverts commit 0c3afc2.

This rolls back the version of bitflags used to 1.1.  Upgrading bitflags
to 2.0 inadvertently caused breaking changes in the r0.26 branch, by
virtue of the methods that the bitflags! macro adds.

Also, mask the bad_bit_mask lint, triggered by bitflags's generated
code.  That lint was the motivation for upgrading bitflags in the first
place.  The bitflags maintainers have decided not to fix those warnings
in the 1.x release series.
bitflags/bitflags#373

Fixes nix-rust#2112
@asomers
Copy link
Copy Markdown
Member Author

asomers commented Aug 28, 2023

cc @ogoffart

@ogoffart
Copy link
Copy Markdown

Thanks for taking care of this.

@asomers asomers merged commit 1d5c730 into nix-rust:r0.26 Aug 28, 2023
@asomers asomers deleted the revert-bitflags branch August 28, 2023 20:07
asomers added a commit that referenced this pull request Aug 28, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants