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

Maintanance fixes #184

Merged
merged 5 commits into from
May 22, 2024
Merged

Maintanance fixes #184

merged 5 commits into from
May 22, 2024

Conversation

luukvanderduim
Copy link
Collaborator

Review with rigor, handle with care, scrutinize like it's 1999!

See individual commits for details.

We moved from naming objects in the servers' object-trees `Accessible`s to
`ObjectRef`s. Variable names should be renamed aswell such to aim for least
confusion.

In this conversion I opt for the short 'obj' as variable name, it is short and
clear.
We did a search and replace for all instances of `Accessible` and replaced
these with `ObjectRef` even though we were careful at doing so, this mishap
occurred.

In the item docs of `accessible_id()` it read "ObjectRef applications" which
should be "Accessible applications". This fixes that.
Nightly clippy points out that we optionally re-export zbus in lib.rs,
however we did not have a feature named "zbus" to make this work.
Thus rendering this option dead-code.

This adds zbus as optional dependency and fixes the problem and warning.
zbus saw fixes since 4.0 and AFAIK there is nothing urgent to keep us strictly
at 4.0.

This also makes crates use the workspace defined dependency where possible.
This helps prevent having multiple versions of the same crate as dependencies.

See: https://github.com/dbus2/zbus/releases
"default-features" and "default_features" both used to work but the nightly
compiler informs us that this will be deprecated by edition 2024.

Let's just use "default-features" then.
Copy link

codecov bot commented May 15, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 86.69%. Comparing base (85d7518) to head (f1696af).
Report is 13 commits behind head on main.

Additional details and impacted files
@@            Coverage Diff             @@
##             main     #184      +/-   ##
==========================================
+ Coverage   83.74%   86.69%   +2.95%     
==========================================
  Files          39       39              
  Lines        3112     3338     +226     
==========================================
+ Hits         2606     2894     +288     
+ Misses        506      444      -62     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@TTWNO
Copy link
Member

TTWNO commented May 16, 2024

Thank you again Luuk for catching these important issues! I really would have never noticed, because I know the history and would have brushed it off.

I'm curious why you chose to upgrade zbus and zvarinat though? Generally, we want to use the oldest compatible version of dependencies. It would be a shame if we caused a version mismatch downstream just by being too aggressive about upstream upgrades.

@luukvanderduim
Copy link
Collaborator Author

Z-crates Changelogs

zbus 4.2.1 has a number of "Critical fixes", especially the one where properties are invalidated after querying(?) seems problematic.
Also "Hack to make connection handshake work inside Flatpak. xdg-dbus-proxy" might be of importance for us.
zbus 4.2.0 dropped two dependencies.

I chose to also upgrade zvariant to keep the z-crates underlying dependencies in sync.

But if you want to investigate this a bit further, I am fine if you drop this commit and just take the others.

@TTWNO TTWNO merged commit 280f3b2 into main May 22, 2024
13 checks passed
@TTWNO TTWNO deleted the maintanance-fixes-2405 branch May 22, 2024 19:58
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