Skip to content

Bump Ruma (breaking) #5337

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

Draft
wants to merge 10 commits into
base: main
Choose a base branch
from

Conversation

zecakeh
Copy link
Collaborator

@zecakeh zecakeh commented Jul 2, 2025

This is more or less ready, with all the changes that are required due to breaking changes in Ruma. I still need to fix a few tests. I will probably open other PRs soon to try to make this slightly smaller (but there is not much to do).

I tried to split the commits by source of the change, so I recommend to review this commit by commit. However after the first commit the code doesn't compile unless all the other commits are applied, so I recommend to squash everything when merging.

Note that currently Ruma is not ready for a release with those breaking changes, however it should be ready in a few weeks.

@zecakeh zecakeh requested review from a team as code owners July 2, 2025 13:59
@zecakeh zecakeh requested review from poljar and removed request for a team July 2, 2025 13:59
@zecakeh zecakeh marked this pull request as draft July 2, 2025 14:00
@zecakeh zecakeh changed the title Bump Ruma Bump Ruma (breaking) Jul 3, 2025
@zecakeh zecakeh force-pushed the event-handler-type-prefix branch from 9730498 to d05861b Compare July 8, 2025 09:05
Copy link

codecov bot commented Jul 8, 2025

Codecov Report

Attention: Patch coverage is 75.00000% with 60 lines in your changes missing coverage. Please review.

Project coverage is 88.83%. Comparing base (25ed7ee) to head (93e2549).

✅ All tests successful. No failed tests found.

Files with missing lines Patch % Lines
...trix-sdk-ui/src/timeline/event_item/content/mod.rs 26.31% 28 Missing ⚠️
crates/matrix-sdk-base/src/room/room_info.rs 64.28% 9 Missing and 1 partial ⚠️
crates/matrix-sdk-base/src/room/create.rs 0.00% 5 Missing ⚠️
crates/matrix-sdk-base/src/store/memory_store.rs 50.00% 3 Missing and 1 partial ⚠️
...es/matrix-sdk-common/src/deserialized_responses.rs 25.00% 3 Missing ⚠️
crates/matrix-sdk-sqlite/src/state_store.rs 57.14% 3 Missing ⚠️
...tes/matrix-sdk-base/src/store/migration_helpers.rs 33.33% 2 Missing ⚠️
crates/matrix-sdk-base/src/utils.rs 0.00% 2 Missing ⚠️
crates/matrix-sdk/src/account.rs 0.00% 2 Missing ⚠️
crates/matrix-sdk/src/authentication/matrix/mod.rs 66.66% 0 Missing and 1 partial ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##             main    #5337      +/-   ##
==========================================
+ Coverage   88.81%   88.83%   +0.01%     
==========================================
  Files         334      333       -1     
  Lines       91261    91136     -125     
  Branches    91261    91136     -125     
==========================================
- Hits        81054    80959      -95     
+ Misses       6396     6367      -29     
+ Partials     3811     3810       -1     

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

@zecakeh zecakeh force-pushed the event-handler-type-prefix branch from d05861b to dc253ad Compare July 8, 2025 09:40
@zecakeh zecakeh force-pushed the event-handler-type-prefix branch from dc253ad to 8423330 Compare July 13, 2025 10:36
Comment on lines +565 to +566
// Safety: A decrypted event always includes a room_id in its
// payload.
Copy link
Collaborator

Choose a reason for hiding this comment

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

I wouldn't put Safety: if it's not about unsafe code.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

I copied this comment from other places in the code that do the same thing.

None,
rendezvous_server.to_string(),
None,
&SupportedVersions { versions: Default::default(), features: Default::default() },
Copy link
Collaborator

Choose a reason for hiding this comment

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

Should we have an associated const for empty SupportedVersions upstream?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

In this case, it looks to me like we should call /versions first, otherwise when this becomes stable we won't know which version of the path to call.

zecakeh added 10 commits July 14, 2025 19:12
Signed-off-by: Kévin Commaille <zecakeh@tedomum.fr>
Signed-off-by: Kévin Commaille <zecakeh@tedomum.fr>
Signed-off-by: Kévin Commaille <zecakeh@tedomum.fr>
Signed-off-by: Kévin Commaille <zecakeh@tedomum.fr>
Signed-off-by: Kévin Commaille <zecakeh@tedomum.fr>
Signed-off-by: Kévin Commaille <zecakeh@tedomum.fr>
Signed-off-by: Kévin Commaille <zecakeh@tedomum.fr>
…oints

Signed-off-by: Kévin Commaille <zecakeh@tedomum.fr>
Signed-off-by: Kévin Commaille <zecakeh@tedomum.fr>
Signed-off-by: Kévin Commaille <zecakeh@tedomum.fr>
@zecakeh zecakeh force-pushed the event-handler-type-prefix branch from 8423330 to 93e2549 Compare July 14, 2025 17:26
@jplatte
Copy link
Collaborator

jplatte commented Jul 14, 2025

I think you can rebase with -Xours (or -Xtheirs? whichever one uses your changes) and cargo fmt after to have an automated clean rebase.

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