Skip to content
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

Bump bitflags to v2 #629

Merged
merged 2 commits into from
Jul 13, 2023
Merged

Bump bitflags to v2 #629

merged 2 commits into from
Jul 13, 2023

Conversation

daxpedda
Copy link
Contributor

@daxpedda daxpedda commented Jun 5, 2023

Changelog: https://github.com/bitflags/bitflags/blob/2.0.0/CHANGELOG.md#200.

This is a breaking change. The API that is implemented by the macro is now different.

We didn't really have to derive anything apart from Debug to make it work, but considering this is public I derived all other traits as well except PartialOrd, Ord and Default.

Fixes #622.

@codecov
Copy link

codecov bot commented Jun 5, 2023

Codecov Report

Patch coverage has no change and project coverage change: +0.12 🎉

Comparison is base (c032dd8) 73.38% compared to head (81c040d) 73.50%.

❗ Current head 81c040d differs from pull request most recent head 9f67f62. Consider uploading reports for the commit 9f67f62 to get more accurate results

Additional details and impacted files
@@            Coverage Diff             @@
##           master     #629      +/-   ##
==========================================
+ Coverage   73.38%   73.50%   +0.12%     
==========================================
  Files          47       47              
  Lines        7672     7651      -21     
==========================================
- Hits         5630     5624       -6     
+ Misses       2042     2027      -15     
Flag Coverage Δ
main 58.92% <ø> (+0.10%) ⬆️
test-- 78.34% <ø> (-0.03%) ⬇️
test--server_system 61.64% <ø> (+0.15%) ⬆️
test-client_system- 69.34% <ø> (+0.02%) ⬆️
test-client_system-server_system 51.62% <ø> (+0.14%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files Coverage Δ
wayland-scanner/src/common.rs 95.72% <ø> (ø)

... and 8 files with indirect coverage changes

☔ View full report in Codecov by Sentry.
📢 Do you have feedback about the report comment? Let us know in this issue.

@daxpedda
Copy link
Contributor Author

daxpedda commented Jun 5, 2023

CI failure is actually an issue in calloop with minimal dependencies: Smithay/calloop#133.

@daxpedda
Copy link
Contributor Author

daxpedda commented Jun 5, 2023

What should I do here? Are older versions of calloop going to be yanked or should I just raise the minimum version of calloop?

@kchibisov
Copy link
Member

I think we can move calloop integration into a separate crate entirely, so breaking change to calloop won't raise the wayland-client version? What do you think @elinorbgr ? That would simplify handling of the crate in my opinion.

We'd have breaking bumps of wayland-client, due to syn/bitflags update, so it looks like a good opportunity for a split.

@elinorbgr
Copy link
Member

For this PR, just bump the calloop dependency to 0.10.6 (I released both 0.11 and 0.10.6, and both have the fix).

regarding calloop and wayland-client in general, I need to check back why we included them in the first place, and this is out of scope for this PR.

@daxpedda
Copy link
Contributor Author

daxpedda commented Jun 5, 2023

Done.

@kchibisov
Copy link
Member

regarding calloop and wayland-client in general, I need to check back why we included them in the first place, and this is out of scope for this PR.

It was included because it was 1) common code which could be used by other libs outside of the client-toolkit, so the code from client toolkit moved up. 2) Yes, it's for other PR, but in general, I think it should be separate 1 file crate with just a source.

@elinorbgr elinorbgr merged commit 0377929 into Smithay:master Jul 13, 2023
13 checks passed
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.

Update bitflags to 2.0
3 participants