From 6bcdedc99e0986f2f9ff5abfd0ec2aa736da36d1 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Fri, 22 Aug 2025 11:03:51 +0000 Subject: [PATCH 1/3] Initial plan From daea597a53c753efcda636dd0351ba06a4b8d97e Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Fri, 22 Aug 2025 11:32:56 +0000 Subject: [PATCH 2/3] Update automerge library to 1.0.0-beta.3 and Rust nightly to 2024-12-01 Co-authored-by: lightsprint09 <3703083+lightsprint09@users.noreply.github.com> --- rust/Cargo.lock | 213 ++++++++++++++++++++++------------- rust/Cargo.toml | 2 +- rust/src/doc.rs | 20 +++- rust/src/mark.rs | 4 +- rust/src/scalar_value.rs | 47 ++++++++ rust/src/value.rs | 14 +++ scripts/build-xcframework.sh | 2 +- 7 files changed, 212 insertions(+), 90 deletions(-) diff --git a/rust/Cargo.lock b/rust/Cargo.lock index 80e9e936..ecd9032c 100644 --- a/rust/Cargo.lock +++ b/rust/Cargo.lock @@ -1,6 +1,6 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. -version = 3 +version = 4 [[package]] name = "adler" @@ -63,26 +63,27 @@ checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" [[package]] name = "automerge" -version = "0.6.1" +version = "1.0.0-beta.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02fba3b76f952e13270300d8a1aca3476942bba013de5e64ef538ef5607b40df" +checksum = "ba32daac7cbb4fde9baec6356645d48e8332d2fe0d68ff1a6d1810f144b27c22" dependencies = [ "cfg-if", "flate2", "fxhash", + "getrandom", "hex", - "im", + "hexane", "itertools", "js-sys", "leb128", + "rand", "serde", "sha2", "smol_str", - "thiserror", + "thiserror 2.0.16", "tinyvec", "tracing", "unicode-segmentation", - "uuid", "wasm-bindgen", "web-sys", ] @@ -106,21 +107,21 @@ dependencies = [ ] [[package]] -name = "bitmaps" -version = "2.1.0" +name = "block-buffer" +version = "0.11.0-rc.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "031043d04099746d8db04daf1fa424b2bc8bd69d92b25962dcde24da39ab64a2" +checksum = "a229bfd78e4827c91b9b95784f69492c1b77c1ab75a45a8a037b139215086f94" dependencies = [ - "typenum", + "hybrid-array", ] [[package]] -name = "block-buffer" -version = "0.10.4" +name = "borsh" +version = "1.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" +checksum = "ad8646f98db542e39fc66e68a20b2144f6a732636df7c2354e74645faaa433ce" dependencies = [ - "generic-array", + "cfg_aliases", ] [[package]] @@ -170,7 +171,7 @@ dependencies = [ "semver", "serde", "serde_json", - "thiserror", + "thiserror 1.0.61", ] [[package]] @@ -179,6 +180,18 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" +[[package]] +name = "cfg_aliases" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" + +[[package]] +name = "const-oid" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0dabb6555f92fb9ee4140454eb5dcd14c7960e1225c6d1a6cc361f032947713e" + [[package]] name = "cpufeatures" version = "0.2.12" @@ -199,21 +212,21 @@ dependencies = [ [[package]] name = "crypto-common" -version = "0.1.6" +version = "0.2.0-rc.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" +checksum = "8a23fa214dea9efd4dacee5a5614646b30216ae0f05d4bb51bafb50e9da1c5be" dependencies = [ - "generic-array", - "typenum", + "hybrid-array", ] [[package]] name = "digest" -version = "0.10.7" +version = "0.11.0-rc.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" +checksum = "460dd7f37e4950526b54a5a6b1f41b6c8e763c58eb9a8fc8fc05ba5c2f44ca7b" dependencies = [ "block-buffer", + "const-oid", "crypto-common", ] @@ -251,21 +264,11 @@ dependencies = [ "byteorder", ] -[[package]] -name = "generic-array" -version = "0.14.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" -dependencies = [ - "typenum", - "version_check", -] - [[package]] name = "getrandom" -version = "0.2.15" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" +checksum = "335ff9f135e4384c8150d6f27c6daed433577f86b4750418338c01a1a2528592" dependencies = [ "cfg-if", "js-sys", @@ -304,24 +307,30 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" [[package]] -name = "im" -version = "15.1.0" +name = "hexane" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0acd33ff0285af998aaf9b57342af478078f53492322fafc47450e09397e0e9" +checksum = "23a2135edd9d8aab997c63ef9f4f60d2d81d47801551ed79f55d539abfcbb2cd" +dependencies = [ + "leb128", + "thiserror 2.0.16", + "web-sys", +] + +[[package]] +name = "hybrid-array" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "891d15931895091dea5c47afa5b3c9a01ba634b311919fd4d41388fa0e3d76af" dependencies = [ - "bitmaps", - "rand_core", - "rand_xoshiro", - "sized-chunks", "typenum", - "version_check", ] [[package]] name = "itertools" -version = "0.13.0" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186" +checksum = "2b192c782037fadd9cfa75548310488aabdbf3d2da73885b31bd0abd03351285" dependencies = [ "either", ] @@ -430,11 +439,20 @@ version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b4596b6d070b27117e987119b4dac604f3c58cfb0b191112e24771b2faeac1a6" +[[package]] +name = "ppv-lite86" +version = "0.2.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85eae3c4ed2f50dcfe72643da4befc30deadb458a9b590d720cde2f2b1e97da9" +dependencies = [ + "zerocopy", +] + [[package]] name = "proc-macro2" -version = "1.0.83" +version = "1.0.101" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b33eb56c327dec362a9e55b3ad14f9d2f0904fb5a5b03b513ab5465399e9f43" +checksum = "89ae43fd86e4158d6db51ad8e2b80f313af9cc74f5c0e03ccb87de09998732de" dependencies = [ "unicode-ident", ] @@ -449,20 +467,35 @@ dependencies = [ ] [[package]] -name = "rand_core" -version = "0.6.4" +name = "rand" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" +checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" +dependencies = [ + "libc", + "rand_chacha", + "rand_core", +] [[package]] -name = "rand_xoshiro" -version = "0.6.0" +name = "rand_chacha" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f97cdb2a36ed4183de61b2f824cc45c9f1037f28afe0a322e9fff4c108b5aaa" +checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" dependencies = [ + "ppv-lite86", "rand_core", ] +[[package]] +name = "rand_core" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" +dependencies = [ + "getrandom", +] + [[package]] name = "ryu" version = "1.0.18" @@ -531,9 +564,9 @@ dependencies = [ [[package]] name = "sha2" -version = "0.10.8" +version = "0.11.0-rc.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" +checksum = "aa1d2e6b3cc4e43a8258a9a3b17aa5dfd2cc5186c7024bba8a64aa65b2c71a59" dependencies = [ "cfg-if", "cpufeatures", @@ -546,16 +579,6 @@ version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" -[[package]] -name = "sized-chunks" -version = "0.6.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16d69225bde7a69b235da73377861095455d298f2b970996eec25ddbb42b3d1e" -dependencies = [ - "bitmaps", - "typenum", -] - [[package]] name = "smawk" version = "0.3.2" @@ -564,10 +587,11 @@ checksum = "b7c388c1b5e93756d0c740965c41e8822f866621d41acbdf6336a6a168f8840c" [[package]] name = "smol_str" -version = "0.2.2" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd538fb6910ac1099850255cf94a94df6551fbdd602454387d0adb2d1ca6dead" +checksum = "9676b89cd56310a87b93dec47b11af744f34d5fc9f367b829474eec0a891350d" dependencies = [ + "borsh", "serde", ] @@ -579,9 +603,9 @@ checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" [[package]] name = "syn" -version = "2.0.65" +version = "2.0.106" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2863d96a84c6439701d7a38f9de935ec562c8832cc55d1dde0f513b52fad106" +checksum = "ede7c438028d4436d71104916910f5bb611972c5cfd7f89b8300a8186e6fada6" dependencies = [ "proc-macro2", "quote", @@ -603,7 +627,16 @@ version = "1.0.61" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709" dependencies = [ - "thiserror-impl", + "thiserror-impl 1.0.61", +] + +[[package]] +name = "thiserror" +version = "2.0.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3467d614147380f2e4e374161426ff399c91084acd2363eaf549172b3d5e60c0" +dependencies = [ + "thiserror-impl 2.0.16", ] [[package]] @@ -617,6 +650,17 @@ dependencies = [ "syn", ] +[[package]] +name = "thiserror-impl" +version = "2.0.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c5e1be1c48b9172ee610da68fd9cd2770e7a4056cb3fc98710ee6906f0c7960" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "tinyvec" version = "1.6.0" @@ -718,7 +762,7 @@ name = "uniffi_automerge" version = "0.1.0" dependencies = [ "automerge", - "thiserror", + "thiserror 1.0.61", "uniffi", ] @@ -836,17 +880,6 @@ dependencies = [ "weedle2", ] -[[package]] -name = "uuid" -version = "1.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0" -dependencies = [ - "getrandom", - "serde", - "wasm-bindgen", -] - [[package]] name = "version_check" version = "0.9.4" @@ -932,3 +965,23 @@ checksum = "998d2c24ec099a87daf9467808859f9d82b61f1d9c9701251aea037f514eae0e" dependencies = [ "nom", ] + +[[package]] +name = "zerocopy" +version = "0.8.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1039dd0d3c310cf05de012d8a39ff557cb0d23087fd44cad61df08fc31907a2f" +dependencies = [ + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.8.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ecf5b4cc5364572d7f4c329661bcc82724222973f2cab6f050a4e5c22f75181" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] diff --git a/rust/Cargo.toml b/rust/Cargo.toml index 4e321776..71681e37 100644 --- a/rust/Cargo.toml +++ b/rust/Cargo.toml @@ -13,7 +13,7 @@ path = "uniffi-bindgen.rs" required-features = ["uniffi/cli"] [dependencies] -automerge = { version = "0.6.1", default-features = false, features = ["wasm"] } +automerge = { version = "1.0.0-beta.3", default-features = false, features = ["wasm"] } thiserror = "1.0.38" uniffi = "0.28.2" diff --git a/rust/src/doc.rs b/rust/src/doc.rs index 265ee21a..393743fc 100644 --- a/rust/src/doc.rs +++ b/rust/src/doc.rs @@ -276,9 +276,13 @@ impl Doc { assert_map(&*doc, &obj)?; Ok(doc .map_range(&obj, ..) - .map(|am::iter::MapRangeItem { key, value, id, .. }| KeyValue { - key: key.into(), - value: (value, id).into(), + .map(|item| { + let id = item.id(); + let value = item.value; + KeyValue { + key: item.key.into(), + value: (value, id).into(), + } }) .collect::>()) } @@ -294,9 +298,13 @@ impl Doc { assert_map(&*doc, &obj)?; Ok(doc .map_range_at(&obj, .., &heads) - .map(|am::iter::MapRangeItem { key, value, id, .. }| KeyValue { - key: key.into(), - value: (value, id).into(), + .map(|item| { + let id = item.id(); + let value = item.value; + KeyValue { + key: item.key.into(), + value: (value, id).into(), + } }) .collect::>()) } diff --git a/rust/src/mark.rs b/rust/src/mark.rs index a039e6dd..e6ed78d5 100644 --- a/rust/src/mark.rs +++ b/rust/src/mark.rs @@ -27,8 +27,8 @@ pub struct Mark { pub value: ScalarValue, } -impl<'a> From<&'a am::marks::Mark<'a>> for Mark { - fn from(am_mark: &'a am::marks::Mark<'a>) -> Mark { +impl From<&am::marks::Mark> for Mark { + fn from(am_mark: &am::marks::Mark) -> Mark { Mark { start: am_mark.start as u64, end: am_mark.end as u64, diff --git a/rust/src/scalar_value.rs b/rust/src/scalar_value.rs index 7924c7fe..415e17b7 100644 --- a/rust/src/scalar_value.rs +++ b/rust/src/scalar_value.rs @@ -1,4 +1,5 @@ use automerge as am; +use automerge::ScalarValueRef; pub enum ScalarValue { Bytes { value: Vec }, @@ -54,3 +55,49 @@ impl<'a> From<&'a am::ScalarValue> for ScalarValue { } } } + +impl From for ScalarValue { + fn from(value: am::ScalarValue) -> Self { + match value { + am::ScalarValue::Bytes(b) => ScalarValue::Bytes { value: b }, + am::ScalarValue::Str(s) => ScalarValue::String { + value: s.to_string(), + }, + am::ScalarValue::Int(n) => ScalarValue::Int { value: n }, + am::ScalarValue::Uint(n) => ScalarValue::Uint { value: n }, + am::ScalarValue::F64(n) => ScalarValue::F64 { value: n }, + am::ScalarValue::Counter(c) => ScalarValue::Counter { + value: c.into(), + }, + am::ScalarValue::Timestamp(n) => ScalarValue::Timestamp { value: n }, + am::ScalarValue::Boolean(b) => ScalarValue::Boolean { value: b }, + am::ScalarValue::Unknown { type_code, bytes } => ScalarValue::Unknown { + type_code, + data: bytes, + }, + am::ScalarValue::Null => ScalarValue::Null, + } + } +} + +impl<'a> From<&ScalarValueRef<'a>> for ScalarValue { + fn from(value: &ScalarValueRef<'a>) -> Self { + match value { + ScalarValueRef::Bytes(b) => ScalarValue::Bytes { value: b.to_vec() }, + ScalarValueRef::Str(s) => ScalarValue::String { + value: s.to_string(), + }, + ScalarValueRef::Int(n) => ScalarValue::Int { value: *n }, + ScalarValueRef::Uint(n) => ScalarValue::Uint { value: *n }, + ScalarValueRef::F64(n) => ScalarValue::F64 { value: *n }, + ScalarValueRef::Counter(c) => ScalarValue::Counter { value: *c }, + ScalarValueRef::Timestamp(n) => ScalarValue::Timestamp { value: *n }, + ScalarValueRef::Boolean(b) => ScalarValue::Boolean { value: *b }, + ScalarValueRef::Null => ScalarValue::Null, + ScalarValueRef::Unknown { type_code, bytes } => ScalarValue::Unknown { + type_code: *type_code, + data: bytes.to_vec(), + }, + } + } +} diff --git a/rust/src/value.rs b/rust/src/value.rs index ecb997b3..0210e75d 100644 --- a/rust/src/value.rs +++ b/rust/src/value.rs @@ -20,3 +20,17 @@ impl<'a> From<(am::Value<'a>, am::ObjId)> for Value { } } } + +impl<'a> From<(am::ValueRef<'a>, am::ObjId)> for Value { + fn from(value: (am::ValueRef<'a>, am::ObjId)) -> Self { + match value { + (am::ValueRef::Object(ty), id) => Value::Object { + typ: ObjType::from(ty), + id: id.into(), + }, + (am::ValueRef::Scalar(s), _) => Value::Scalar { + value: (&s).into(), + }, + } + } +} diff --git a/scripts/build-xcframework.sh b/scripts/build-xcframework.sh index 61f0fb15..f57681c3 100755 --- a/scripts/build-xcframework.sh +++ b/scripts/build-xcframework.sh @@ -32,7 +32,7 @@ XCFRAMEWORK_FOLDER="$THIS_SCRIPT_DIR/../${FRAMEWORK_NAME}.xcframework" # (as of 10/10/23), but leaving it open to float seems less useful than # moving the pinning forward, since Catalyst support (target macabi) still # requires an active, nightly toolchain. -RUST_NIGHTLY="nightly-2024-05-23" +RUST_NIGHTLY="nightly-2024-12-01" echo "Install nightly and rust-src for Catalyst" rustup toolchain install ${RUST_NIGHTLY} From 40d7bc907e8064dcc84ce2e07d62620868ed169f Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Fri, 22 Aug 2025 11:37:16 +0000 Subject: [PATCH 3/3] Fix clippy warning in change.rs Co-authored-by: lightsprint09 <3703083+lightsprint09@users.noreply.github.com> --- rust/Cargo.lock | 58 +++++++++++++++++----------------------- rust/src/change.rs | 2 +- rust/src/scalar_value.rs | 4 +-- rust/src/value.rs | 4 +-- 4 files changed, 28 insertions(+), 40 deletions(-) diff --git a/rust/Cargo.lock b/rust/Cargo.lock index ecd9032c..6926212e 100644 --- a/rust/Cargo.lock +++ b/rust/Cargo.lock @@ -382,9 +382,9 @@ checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" [[package]] name = "mime_guess" -version = "2.0.4" +version = "2.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4192263c238a5f0d0c6bfd21f336a313a4ce1c450542449ca191bb657b4642ef" +checksum = "f7c44f8e672c00fe5308fa235f821cb4198414e1c77935c1ab6948d3fd78550e" dependencies = [ "mime", "unicase", @@ -553,11 +553,12 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.117" +version = "1.0.143" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "455182ea6142b14f93f4bc5320a2b31c1f266b66a4a5c858b013302a5d8cbfc3" +checksum = "d401abef1d108fbd9cbaebc3e46611f4b1021f714a0597a71f41ee463f5f4a5a" dependencies = [ "itoa", + "memchr", "ryu", "serde", ] @@ -724,12 +725,9 @@ checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" [[package]] name = "unicase" -version = "2.7.0" +version = "2.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7d2d4dafb69621809a81864c9c1b864479e1235c0dd4e199924b9742439ed89" -dependencies = [ - "version_check", -] +checksum = "75b844d17643ee918803943289730bec8aac480150456169e647ed0b576ba539" [[package]] name = "unicode-ident" @@ -745,9 +743,9 @@ checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" [[package]] name = "uniffi" -version = "0.28.2" +version = "0.28.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51ce6280c581045879e11b400bae14686a819df22b97171215d15549efa04ddb" +checksum = "4cb08c58c7ed7033150132febe696bef553f891b1ede57424b40d87a89e3c170" dependencies = [ "anyhow", "cargo_metadata", @@ -768,9 +766,9 @@ dependencies = [ [[package]] name = "uniffi_bindgen" -version = "0.28.2" +version = "0.28.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e9f25730c9db2e878521d606f54e921edb719cdd94d735e7f97705d6796d024" +checksum = "cade167af943e189a55020eda2c314681e223f1e42aca7c4e52614c2b627698f" dependencies = [ "anyhow", "askama", @@ -791,9 +789,9 @@ dependencies = [ [[package]] name = "uniffi_build" -version = "0.28.2" +version = "0.28.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88dba57ac699bd8ec53d6a352c8dd0e479b33f698c5659831bb1e4ce468c07bd" +checksum = "4c7cf32576e08104b7dc2a6a5d815f37616e66c6866c2a639fe16e6d2286b75b" dependencies = [ "anyhow", "camino", @@ -802,9 +800,9 @@ dependencies = [ [[package]] name = "uniffi_checksum_derive" -version = "0.28.2" +version = "0.28.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2c801f0f05b06df456a2da4c41b9c2c4fdccc6b9916643c6c67275c4c9e4d07" +checksum = "802d2051a700e3ec894c79f80d2705b69d85844dafbbe5d1a92776f8f48b563a" dependencies = [ "quote", "syn", @@ -812,9 +810,9 @@ dependencies = [ [[package]] name = "uniffi_core" -version = "0.28.2" +version = "0.28.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61049e4db6212d0ede80982adf0e1d6fa224e6118387324c5cfbe3083dfb2252" +checksum = "bc7687007d2546c454d8ae609b105daceb88175477dac280707ad6d95bcd6f1f" dependencies = [ "anyhow", "bytes", @@ -826,9 +824,9 @@ dependencies = [ [[package]] name = "uniffi_macros" -version = "0.28.2" +version = "0.28.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b40fd2249e0c5dcbd2bfa3c263db1ec981f7273dca7f4132bf06a272359a586c" +checksum = "12c65a5b12ec544ef136693af8759fb9d11aefce740fb76916721e876639033b" dependencies = [ "bincode", "camino", @@ -844,9 +842,9 @@ dependencies = [ [[package]] name = "uniffi_meta" -version = "0.28.2" +version = "0.28.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9ad57039b4fafdbf77428d74fff40e0908e5a1731e023c19cfe538f6d4a8ed6" +checksum = "4a74ed96c26882dac1ca9b93ca23c827e284bacbd7ec23c6f0b0372f747d59e4" dependencies = [ "anyhow", "bytes", @@ -856,9 +854,9 @@ dependencies = [ [[package]] name = "uniffi_testing" -version = "0.28.2" +version = "0.28.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21fa171d4d258dc51bbd01893cc9608c1b62273d2f9ea55fb64f639e77824567" +checksum = "6a6f984f0781f892cc864a62c3a5c60361b1ccbd68e538e6c9fbced5d82268ac" dependencies = [ "anyhow", "camino", @@ -869,9 +867,9 @@ dependencies = [ [[package]] name = "uniffi_udl" -version = "0.28.2" +version = "0.28.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f52299e247419e7e2934bef2f94d7cccb0e6566f3248b1d48b160d8f369a2668" +checksum = "037820a4cfc4422db1eaa82f291a3863c92c7d1789dc513489c36223f9b4cdfc" dependencies = [ "anyhow", "textwrap", @@ -880,12 +878,6 @@ dependencies = [ "weedle2", ] -[[package]] -name = "version_check" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" - [[package]] name = "wasi" version = "0.11.0+wasi-snapshot-preview1" diff --git a/rust/src/change.rs b/rust/src/change.rs index 4998c03b..06b130c0 100644 --- a/rust/src/change.rs +++ b/rust/src/change.rs @@ -16,7 +16,7 @@ impl From for Change { Change { actor_id: value.actor_id().into(), message: value.message().cloned(), - deps: value.deps().into_iter().map(ChangeHash::from).collect(), + deps: value.deps().iter().map(ChangeHash::from).collect(), timestamp: value.timestamp(), bytes: value.bytes().into_owned(), hash: value.hash().into(), diff --git a/rust/src/scalar_value.rs b/rust/src/scalar_value.rs index 415e17b7..40b2d2e6 100644 --- a/rust/src/scalar_value.rs +++ b/rust/src/scalar_value.rs @@ -66,9 +66,7 @@ impl From for ScalarValue { am::ScalarValue::Int(n) => ScalarValue::Int { value: n }, am::ScalarValue::Uint(n) => ScalarValue::Uint { value: n }, am::ScalarValue::F64(n) => ScalarValue::F64 { value: n }, - am::ScalarValue::Counter(c) => ScalarValue::Counter { - value: c.into(), - }, + am::ScalarValue::Counter(c) => ScalarValue::Counter { value: c.into() }, am::ScalarValue::Timestamp(n) => ScalarValue::Timestamp { value: n }, am::ScalarValue::Boolean(b) => ScalarValue::Boolean { value: b }, am::ScalarValue::Unknown { type_code, bytes } => ScalarValue::Unknown { diff --git a/rust/src/value.rs b/rust/src/value.rs index 0210e75d..e0c6ef41 100644 --- a/rust/src/value.rs +++ b/rust/src/value.rs @@ -28,9 +28,7 @@ impl<'a> From<(am::ValueRef<'a>, am::ObjId)> for Value { typ: ObjType::from(ty), id: id.into(), }, - (am::ValueRef::Scalar(s), _) => Value::Scalar { - value: (&s).into(), - }, + (am::ValueRef::Scalar(s), _) => Value::Scalar { value: (&s).into() }, } } }