Merge "Update uniffi_checksum_derive to 0.28.3" into main
diff --git a/crates/uniffi_checksum_derive/.android-checksum.json b/crates/uniffi_checksum_derive/.android-checksum.json
new file mode 100644
index 0000000..afe1c96
--- /dev/null
+++ b/crates/uniffi_checksum_derive/.android-checksum.json
@@ -0,0 +1 @@
+{"package":null,"files":{"cargo_embargo.json":"aa45a963da01d3f018be316cd5b7646a5b413ce2611c5218f2914d2e8a9efd0e","METADATA":"3cc77205d0eb0c55c3803c9db6b0be6c67cac8c972feb6e312d57c25e73b33e9","README.md":"bd32a92f1fa622e318f77b7ddfff8737bdbbe2e0df26dc9f1fde0705f3a9c18d","LICENSE":"eb272adec43829624ef944827cee5edc5896c80ceaccea3e8e471dadeaeee408","Cargo.toml":"d93ef126d7c68f76635059863633ffa5710ababa4b3c118003205b64f45e1d7b",".cargo-checksum.json":"07326c062a9496cbb64cbf846bf79f0346f34f8c2fb40d1ade0bb56be70e45f6","src/lib.rs":"aada73e8c5d693e82160d6712fb6ce86a3c158ee5527abe84ecb400f649b772e","Android.bp":"0ea0d8b9a9025021c0755e3b7fc1f970255f929c7baf3d57827df3c88129b08e","patches/LICENSE.patch":"cfb7d0c0c947397e0cf46698509020438a9a3305875ecf9b75fafeb30815ac80","MODULE_LICENSE_MPL":"0d6f8afa3940b7f06bebee651376d43bc8b0d5b437337be2696d30377451e93a"}}
\ No newline at end of file
diff --git a/crates/uniffi_checksum_derive/.cargo-checksum.json b/crates/uniffi_checksum_derive/.cargo-checksum.json
index 5e21137..7eab913 100644
--- a/crates/uniffi_checksum_derive/.cargo-checksum.json
+++ b/crates/uniffi_checksum_derive/.cargo-checksum.json
@@ -1 +1 @@
-{"files":{"Cargo.toml":"da89504b9007c2a1ea0e498a2e8ec6baeb0ff7391363cd9007e383247637792c","README.md":"37c1af00ec81a9f1bc206ab3578356e5f9ad4077dc46dd1bb623d81d804948b8","src/lib.rs":"44d2e2c595b14d33d16c71dfe4ef42ad0b9e010a878ee2ec49c2e929d60275ba"},"package":"ae7e5a6c33b1dec3f255f57ec0b6af0f0b2bb3021868be1d5eec7a38e2905ebc"}
\ No newline at end of file
+{"files":{"Cargo.toml":"ac014f3069d42e6b486aae8a602cf023c36661d123364574c8307cb6825b8abb","README.md":"1163018760cf0243c8f6fc8a497852f4357db23c22e48fe243abd27b500bc95d","src/lib.rs":"3301ac9be2750c348f677c1fcf721daa37945901434d6cd6958d7926c987e4ea"},"package":"802d2051a700e3ec894c79f80d2705b69d85844dafbbe5d1a92776f8f48b563a"}
\ No newline at end of file
diff --git a/crates/uniffi_checksum_derive/Android.bp b/crates/uniffi_checksum_derive/Android.bp
index eaf0d9c..2eff054 100644
--- a/crates/uniffi_checksum_derive/Android.bp
+++ b/crates/uniffi_checksum_derive/Android.bp
@@ -17,7 +17,7 @@
name: "libuniffi_checksum_derive",
crate_name: "uniffi_checksum_derive",
cargo_env_compat: true,
- cargo_pkg_version: "0.27.1",
+ cargo_pkg_version: "0.28.3",
crate_root: "src/lib.rs",
edition: "2021",
features: ["default"],
diff --git a/crates/uniffi_checksum_derive/Cargo.toml b/crates/uniffi_checksum_derive/Cargo.toml
index 681c884..a25112f 100644
--- a/crates/uniffi_checksum_derive/Cargo.toml
+++ b/crates/uniffi_checksum_derive/Cargo.toml
@@ -12,7 +12,7 @@
[package]
edition = "2021"
name = "uniffi_checksum_derive"
-version = "0.27.1"
+version = "0.28.3"
authors = ["Firefox Sync Team <[email protected]>"]
description = "a multi-language bindings generator for rust (checksum custom derive)"
homepage = "https://mozilla.github.io/uniffi-rs"
diff --git a/crates/uniffi_checksum_derive/METADATA b/crates/uniffi_checksum_derive/METADATA
index d9804c5..8f57a2f 100644
--- a/crates/uniffi_checksum_derive/METADATA
+++ b/crates/uniffi_checksum_derive/METADATA
@@ -1,17 +1,17 @@
name: "uniffi_checksum_derive"
description: "a multi-language bindings generator for rust (checksum custom derive)"
third_party {
- version: "0.27.1"
+ version: "0.28.3"
license_type: RECIPROCAL
last_upgrade_date {
year: 2024
- month: 5
- day: 6
+ month: 12
+ day: 20
}
homepage: "https://crates.io/crates/uniffi_checksum_derive"
identifier {
type: "Archive"
- value: "https://static.crates.io/crates/uniffi_checksum_derive/uniffi_checksum_derive-0.27.1.crate"
- version: "0.27.1"
+ value: "https://static.crates.io/crates/uniffi_checksum_derive/uniffi_checksum_derive-0.28.3.crate"
+ version: "0.28.3"
}
}
diff --git a/crates/uniffi_checksum_derive/README.md b/crates/uniffi_checksum_derive/README.md
index 64ac348..50348a9 100644
--- a/crates/uniffi_checksum_derive/README.md
+++ b/crates/uniffi_checksum_derive/README.md
@@ -43,8 +43,7 @@
Other tools we know of which try and solve a similarly shaped problem are:
-* [Diplomat](https://github.com/rust-diplomat/diplomat/) - see our [writeup of
- the different approach taken by that tool](docs/diplomat-and-macros.md)
+* [Diplomat](https://github.com/rust-diplomat/diplomat/), which is focused more on C/C++ interop.
* [Interoptopus](https://github.com/ralfbiedert/interoptopus/)
(Please open a PR if you think other tools should be listed!)
diff --git a/crates/uniffi_checksum_derive/src/lib.rs b/crates/uniffi_checksum_derive/src/lib.rs
index e600982..449183d 100644
--- a/crates/uniffi_checksum_derive/src/lib.rs
+++ b/crates/uniffi_checksum_derive/src/lib.rs
@@ -108,14 +108,13 @@
.fields
.iter()
.enumerate()
- .filter_map(|(num, field)| {
- (!has_ignore_attribute(&field.attrs)).then(|| match field.ident.as_ref() {
- Some(ident) => quote! { Checksum::checksum(&self.#ident, state); },
- None => {
- let i = Index::from(num);
- quote! { Checksum::checksum(&self.#i, state); }
- }
- })
+ .filter(|&(_num, field)| (!has_ignore_attribute(&field.attrs)))
+ .map(|(num, field)| match field.ident.as_ref() {
+ Some(ident) => quote! { Checksum::checksum(&self.#ident, state); },
+ None => {
+ let i = Index::from(num);
+ quote! { Checksum::checksum(&self.#i, state); }
+ }
});
quote! {
#(#stmts)*
diff --git a/pseudo_crate/Cargo.lock b/pseudo_crate/Cargo.lock
index 1b30c3f..bd963b6 100644
--- a/pseudo_crate/Cargo.lock
+++ b/pseudo_crate/Cargo.lock
@@ -447,7 +447,7 @@
"unicode-width",
"unicode-xid 0.2.4",
"uniffi",
- "uniffi_checksum_derive",
+ "uniffi_checksum_derive 0.28.3",
"uniffi_core",
"uniffi_macros",
"uniffi_meta",
@@ -5662,6 +5662,16 @@
]
[[package]]
+name = "uniffi_checksum_derive"
+version = "0.28.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "802d2051a700e3ec894c79f80d2705b69d85844dafbbe5d1a92776f8f48b563a"
+dependencies = [
+ "quote 1.0.36",
+ "syn 2.0.90",
+]
+
+[[package]]
name = "uniffi_core"
version = "0.27.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -5704,7 +5714,7 @@
"anyhow",
"bytes",
"siphasher 0.3.11",
- "uniffi_checksum_derive",
+ "uniffi_checksum_derive 0.27.1",
]
[[package]]
diff --git a/pseudo_crate/Cargo.toml b/pseudo_crate/Cargo.toml
index 656b5c7..f5f55cc 100644
--- a/pseudo_crate/Cargo.toml
+++ b/pseudo_crate/Cargo.toml
@@ -362,7 +362,7 @@
unicode-width = "=0.1.11"
unicode-xid = "=0.2.4"
uniffi = "=0.27.1"
-uniffi_checksum_derive = "=0.27.1"
+uniffi_checksum_derive = "=0.28.3"
uniffi_core = "=0.27.1"
uniffi_macros = "=0.27.1"
uniffi_meta = "=0.27.1"
