Skip to content

Fix uniffi revision#7217

Merged
mhammond merged 1 commit intomozilla:mainfrom
bendk:push-unwyskvvlnwt
Feb 26, 2026
Merged

Fix uniffi revision#7217
mhammond merged 1 commit intomozilla:mainfrom
bendk:push-unwyskvvlnwt

Conversation

@bendk
Copy link
Contributor

@bendk bendk commented Feb 11, 2026

I messed up the revision on by FFI branch. I picked the first commit, rather than the final commit. The first commit was just some prepatory refactors, so wasn't having any effect.

See https://github.com/mozilla/uniffi-rs/commits/kotlin-pointer-ffi/

Pull Request checklist

  • Breaking changes: This PR follows our breaking change policy
    • This PR follows the breaking change policy:
      • This PR has no breaking API changes, or
      • There are corresponding PRs for our consumer applications that resolve the breaking changes and have been approved
  • Quality: This PR builds and tests run cleanly
    • Note:
      • For changes that need extra cross-platform testing, consider adding [ci full] to the PR title.
      • If this pull request includes a breaking change, consider cutting a new release after merging.
  • Tests: This PR includes thorough tests or an explanation of why it does not
  • Changelog: This PR includes a changelog entry in CHANGELOG.md or an explanation of why it does not need one
    • Any breaking changes to Swift or Kotlin binding APIs are noted explicitly
  • Dependencies: This PR follows our dependency management guidelines
    • Any new dependencies are accompanied by a summary of the due diligence applied in selecting them.

@bendk bendk requested a review from mhammond February 11, 2026 19:56
Copy link
Member

@mhammond mhammond left a comment

Choose a reason for hiding this comment

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

lgtm, but the android failure seems odd?

@bendk bendk force-pushed the push-unwyskvvlnwt branch from 4922409 to 0d3dba0 Compare February 12, 2026 16:08
@bendk
Copy link
Contributor Author

bendk commented Feb 12, 2026

lgtm, but the android failure seems odd?

That was a real issue -- we weren't enabling the pointer-ffi feature. I realized this wasn't so simple, since we're patching the crate. We can't just enable it or else things will fail in moz-central where the patch isn't applied and the feature doesn't exist.

I added this commit to the pointer FFI branch: mozilla/uniffi-rs@c0f8727. It seems to fix things, does it seem okay to you?

@bendk bendk force-pushed the push-unwyskvvlnwt branch 2 times, most recently from ada2cf9 to a08bec4 Compare February 12, 2026 16:33
@mhammond
Copy link
Member

That seems fine to me for this branch only!

@bendk
Copy link
Contributor Author

bendk commented Feb 13, 2026

Yeah, we definitely should not ever merge that branch.

I'm going to wait until I get back from PTO to merge this one (2/23).

@bendk bendk force-pushed the push-unwyskvvlnwt branch 2 times, most recently from 96f958d to 6a9fac3 Compare February 24, 2026 19:35
@bendk
Copy link
Contributor Author

bendk commented Feb 24, 2026

Clippy was failing for nimbus because it's on edition 2024 which has extra clippy checks for using unsafe code in unsafe functions. I tweaked the branch to add more unsafe blocks: https://github.com/mozilla/uniffi-rs/compare/c0f87273413829745a07fc07056617ee79a0d5a9..59b035078322fbc0a605cc3c784cc38214113450

@bendk bendk added this pull request to the merge queue Feb 24, 2026
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to no response for status checks Feb 24, 2026
@bendk bendk added this pull request to the merge queue Feb 24, 2026
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to no response for status checks Feb 24, 2026
@bendk bendk added this pull request to the merge queue Feb 25, 2026
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to no response for status checks Feb 25, 2026
@bendk bendk added this pull request to the merge queue Feb 25, 2026
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to no response for status checks Feb 25, 2026
@bendk bendk force-pushed the push-unwyskvvlnwt branch from 6a9fac3 to 76ed742 Compare February 25, 2026 20:56
@bendk
Copy link
Contributor Author

bendk commented Feb 25, 2026

Looks like the tests were passing, but they were taking too much time for the merge queue. I'm bumping the resource class to xlarge to see if that fixes things.

I messed up the revision on by FFI branch.  I picked the first commit,
rather than the final commit.  The first commit was just some prepatory
refactors, so wasn't having any effect.

See https://github.com/mozilla/uniffi-rs/commits/kotlin-pointer-ffi/
@bendk bendk force-pushed the push-unwyskvvlnwt branch from 76ed742 to 7de5a6f Compare February 25, 2026 20:57
@bendk bendk enabled auto-merge February 25, 2026 20:57
@bendk bendk added this pull request to the merge queue Feb 25, 2026
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to no response for status checks Feb 25, 2026
@mhammond mhammond added this pull request to the merge queue Feb 26, 2026
Merged via the queue into mozilla:main with commit 88b38d7 Feb 26, 2026
14 checks passed
@bendk
Copy link
Contributor Author

bendk commented Feb 26, 2026

Thanks for merging this! It got into today's nightly, which is great.

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