-
Notifications
You must be signed in to change notification settings - Fork 14
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
exposing Automerge::Diff through to Swift #183
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Generally this looks great, thank you!
We don't need both difference(from:) and difference(to:) if they're effectively identical APIs with just slightly different parameters. Drop one, and I've made suggestions to change the parameter since to since
since the other side that's passed to the core library's difference
is the current set of heads.
I'm a unclear on why the WASM build didn't appear to pick up the change. Visually it looks correct to me, but we might need to dig a bit further. We did just update the CI runners to an updated version of Rust, which may have had a follow on effect that's hitting us here.
I saw the same thing in the logs re: downloading the XCFramework. It shouldn't be a requirement for builds on Linux or WASI, but I'd agree that this might be the bit that's hurting us. Unfortunately, XCFramework - while downloaded - can't be rebuilt on just Linux, so we don't have the same path to using a "local version". If you've tried this on your own build servers and it works - flows through WASM builds correctly, etc - then I'm happy to merge this with that check breaking, on the idea that we can pop a release with the Rust updates which theoretically should resolve the issue for future builds after there's an updated point release. |
Co-authored-by: Joseph Heck <heckj@mac.com>
Co-authored-by: Joseph Heck <heckj@mac.com>
Co-authored-by: Joseph Heck <heckj@mac.com>
e7dd502
to
868e8cd
Compare
Adding manually missing autogenerate code (headers + automerge.swift), WASM is working 🎉. We should update the Linux bot to generate it automatically without committing it - please, double-check 868e8cd because it contains more changes than I expected. Probably, because of my rust version (nightly-2024-05-23-aarch64-apple-darwin) side-note: I can revert this latest commit with the autogenerated code. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I got the CI stuff updated - good call - with #185, and merged that in. You can rebase if you want to double check that this PR works without the checked in updates, but don't feel obliged.
Thanks for clarifying that directionality IS reflected based on the two sets of heads provided to difference, makes a lot more sense to have the various API
868e8cd
to
0f3aa34
Compare
Awesome! I have reverted the commits with the auto-generated code, to keep the PR clean and have rebased changes into this branch. Result: it works like a charm! Thanks for the parallel work done into #185 - it is now ready to be merged |
Bindings for being able to compare two points of the document history.
Related documentation: https://docs.rs/automerge/latest/automerge/struct.Automerge.html#method.diff