Using Option on FFI (#4635)

Cargo.toml

@@ -204,10 +204,10 @@ icu_benchmark_macros = { path = "tools/benchmark/macros" }
 
 # The version here can either be a `version = ".."` spec or `git = "https://github.com/rust-diplomat/diplomat", rev = ".."`
 # Diplomat must be published preceding a new ICU4X release but may use git versions in between
-diplomat = { git = "https://github.com/rust-diplomat/diplomat.git", rev = "a47173bb7af0b284ed18fdca0a1ce4a9fae08e6f" }
-diplomat-runtime = { git = "https://github.com/rust-diplomat/diplomat.git", rev = "a47173bb7af0b284ed18fdca0a1ce4a9fae08e6f" }
-diplomat_core = { git = "https://github.com/rust-diplomat/diplomat.git", rev = "a47173bb7af0b284ed18fdca0a1ce4a9fae08e6f" }
-diplomat-tool = { git = "https://github.com/rust-diplomat/diplomat.git", rev = "a47173bb7af0b284ed18fdca0a1ce4a9fae08e6f" }
+diplomat = { git = "https://github.com/rust-diplomat/diplomat.git", rev = "66c3e35d779f1f0743ce06a9f043017d6badf596" }
+diplomat-runtime = { git = "https://github.com/rust-diplomat/diplomat.git", rev = "66c3e35d779f1f0743ce06a9f043017d6badf596" }
+diplomat_core = { git = "https://github.com/rust-diplomat/diplomat.git", rev = "66c3e35d779f1f0743ce06a9f043017d6badf596" }
+diplomat-tool = { git = "https://github.com/rust-diplomat/diplomat.git", rev = "66c3e35d779f1f0743ce06a9f043017d6badf596" }
 
 # Size optimized builds
 [profile.release-opt-size]

ffi/capi/src/calendar.rs

@@ -59,18 +59,16 @@ pub mod ffi {
  impl ICU4XAnyCalendarKind {
  /// Read the calendar type off of the -u-ca- extension on a locale.
  ///
- /// Errors if there is no calendar on the locale or if the locale's calendar
+ /// Returns nothing if there is no calendar on the locale or if the locale's calendar
  /// is not known or supported.
  #[diplomat::rust_link(icu::calendar::AnyCalendarKind::get_for_locale, FnInEnum)]
- pub fn get_for_locale(locale: &ICU4XLocale) -> Result<ICU4XAnyCalendarKind, ()> {
- AnyCalendarKind::get_for_locale(&locale.0)
- .map(Into::into)
- .ok_or(())
+ pub fn get_for_locale(locale: &ICU4XLocale) -> Option<ICU4XAnyCalendarKind> {
+ AnyCalendarKind::get_for_locale(&locale.0).map(Into::into)
  }
 
  /// Obtain the calendar type given a BCP-47 -u-ca- extension string.
  ///
- /// Errors if the calendar is not known or supported.
+ /// Returns nothing if the calendar is not known or supported.
  #[diplomat::rust_link(icu::calendar::AnyCalendarKind::get_for_bcp47_value, FnInEnum)]
  #[diplomat::rust_link(
  icu::calendar::AnyCalendarKind::get_for_bcp47_string,
@@ -82,10 +80,8 @@ pub mod ffi {
  FnInEnum,
  hidden
  )]
- pub fn get_for_bcp47(s: &DiplomatStr) -> Result<ICU4XAnyCalendarKind, ()> {
- AnyCalendarKind::get_for_bcp47_bytes(s)
- .map(Into::into)
- .ok_or(())
+ pub fn get_for_bcp47(s: &DiplomatStr) -> Option<ICU4XAnyCalendarKind> {
+ AnyCalendarKind::get_for_bcp47_bytes(s).map(Into::into)
  }
 
  /// Obtain the string suitable for use in the -u-ca- extension in a BCP47 locale.

ffi/capi/src/pluralrules.rs

@@ -29,10 +29,8 @@ pub mod ffi {
  /// [specified in TR35](https://unicode.org/reports/tr35/tr35-numbers.html#Language_Plural_Rules)
  #[diplomat::rust_link(icu::plurals::PluralCategory::get_for_cldr_string, FnInEnum)]
  #[diplomat::rust_link(icu::plurals::PluralCategory::get_for_cldr_bytes, FnInEnum)]
- pub fn get_for_cldr_string(s: &DiplomatStr) -> Result<ICU4XPluralCategory, ()> {
- PluralCategory::get_for_cldr_bytes(s)
- .ok_or(())
- .map(Into::into)
+ pub fn get_for_cldr_string(s: &DiplomatStr) -> Option<ICU4XPluralCategory> {
+ PluralCategory::get_for_cldr_bytes(s).map(Into::into)
  }
  }
 

ffi/capi/src/script.rs

@@ -147,10 +147,10 @@ pub mod ffi {
  self.0.array_len()
  }
 
- /// Get script at index, returning an error if out of bounds
+ /// Get script at index
  #[diplomat::rust_link(icu::properties::script::ScriptExtensionsSet::iter, FnInStruct)]
- pub fn script_at(&self, index: usize) -> Result<u16, ()> {
- self.0.array_get(index).map(|x| x.0).ok_or(())
+ pub fn script_at(&self, index: usize) -> Option<u16> {
+ self.0.array_get(index).map(|x| x.0)
  }
  }
 }