Bindgen refactors

tools/publish-release.sh

@@ -23,7 +23,7 @@ done
 set -ex
 
 # Note: make sure these are ordered so that dependencies come before the crates that depend on them
-cargo publish -p uniffi_checksum_derive
+cargo publish -p uniffi_internal_macros
 cargo publish -p uniffi_meta
 cargo publish -p uniffi_core
 cargo publish -p uniffi_testing

uniffi_bindgen/src/interface/enum_.rs

@@ -209,14 +209,20 @@ impl Enum {
     // in those cases, so by the time this get's run we can be confident these
     // error cases can't exist.
     pub fn variant_discr(&self, variant_index: usize) -> Result<Literal> {
-        if variant_index >= self.variants.len() {
-            anyhow::bail!("Invalid variant index {variant_index}");
+        for (i, lit) in self.variant_discr_iter().enumerate() {
+            let lit = lit?;
+            if i == variant_index {
+                return Ok(lit);
+            }
         }
+        anyhow::bail!("Invalid variant index {variant_index}");
+    }
+
+    // Iterate over variant discriminants
+    pub fn variant_discr_iter(&self) -> impl Iterator<Item = Result<Literal>> + '_ {
         let mut next = 0;
-        let mut this;
-        let mut this_lit = Literal::new_uint(0);
-        for v in self.variants().iter().take(variant_index + 1) {
-            (this, this_lit) = match v.discr {
+        self.variants().iter().map(move |v| {
+            let (this, this_lit) = match v.discr {
                 None => (
                     next,
                     if (next as i64) < 0 {
@@ -231,8 +237,8 @@ impl Enum {
                 _ => anyhow::bail!("Invalid literal type {v:?}"),
             };
             next = this.wrapping_add(1);
-        }
-        Ok(this_lit)
+            Ok(this_lit)
+        })
     }
 
     pub fn variant_discr_type(&self) -> &Option<Type> {

uniffi_checksum_derive/Cargo.toml → uniffi_internal_macros/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
-name = "uniffi_checksum_derive"
+name = "uniffi_internal_macros"
 version = "0.28.3"
-description = "a multi-language bindings generator for rust (checksum custom derive)"
+description = "a multi-language bindings generator for rust (interal macro crate)"
 documentation = "https://mozilla.github.io/uniffi-rs"
 homepage = "https://mozilla.github.io/uniffi-rs"
 repository = "https://github.com/mozilla/uniffi-rs"

uniffi_checksum_derive/src/lib.rs → uniffi_internal_macros/src/lib.rs

@@ -2,8 +2,6 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-//! Custom derive for uniffi_meta::Checksum
-
 use proc_macro::TokenStream;
 use quote::{format_ident, quote};
 use syn::{
@@ -23,6 +21,7 @@ fn has_ignore_attribute(attrs: &[Attribute]) -> bool {
     })
 }
 
+/// Custom derive for uniffi_meta::Checksum
 #[proc_macro_derive(Checksum, attributes(checksum_ignore))]
 pub fn checksum_derive(input: TokenStream) -> TokenStream {
     let input: DeriveInput = parse_macro_input!(input);

uniffi_meta/Cargo.toml

@@ -13,4 +13,4 @@ readme = "../README.md"
 anyhow = "1"
 bytes = "1.3"
 siphasher = "0.3"
-uniffi_checksum_derive = { version = "0.28.3", path = "../uniffi_checksum_derive" }
+uniffi_internal_macros = { version = "0.28.3", path = "../uniffi_internal_macros" }

uniffi_meta/src/lib.rs

@@ -3,7 +3,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 use std::{collections::BTreeMap, hash::Hasher};
-pub use uniffi_checksum_derive::Checksum;
+pub use uniffi_internal_macros::Checksum;
 
 mod ffi_names;
 pub use ffi_names::*;