Add FFI for ICU4XLocaleFallbackSupplement

sffc · Sep 21, 2023 · 83946f8 · 83946f8
1 parent 88e35c2
commit 83946f8
Show file tree

Hide file tree

Showing 18 changed files with 190 additions and 3 deletions.
diff --git a/ffi/diplomat/c/include/ICU4XLocaleFallbackConfig.h b/ffi/diplomat/c/include/ICU4XLocaleFallbackConfig.h
diff --git a/ffi/diplomat/c/include/ICU4XLocaleFallbackSupplement.h b/ffi/diplomat/c/include/ICU4XLocaleFallbackSupplement.h
diff --git a/ffi/diplomat/cpp/docs/source/fallbacker_ffi.rst b/ffi/diplomat/cpp/docs/source/fallbacker_ffi.rst
diff --git a/ffi/diplomat/cpp/include/ICU4XLocaleFallbackConfig.h b/ffi/diplomat/cpp/include/ICU4XLocaleFallbackConfig.h
diff --git a/ffi/diplomat/cpp/include/ICU4XLocaleFallbackConfig.hpp b/ffi/diplomat/cpp/include/ICU4XLocaleFallbackConfig.hpp
diff --git a/ffi/diplomat/cpp/include/ICU4XLocaleFallbackSupplement.h b/ffi/diplomat/cpp/include/ICU4XLocaleFallbackSupplement.h
diff --git a/ffi/diplomat/cpp/include/ICU4XLocaleFallbackSupplement.hpp b/ffi/diplomat/cpp/include/ICU4XLocaleFallbackSupplement.hpp
diff --git a/ffi/diplomat/cpp/include/ICU4XLocaleFallbacker.hpp b/ffi/diplomat/cpp/include/ICU4XLocaleFallbacker.hpp
diff --git a/ffi/diplomat/js/docs/source/fallbacker_ffi.rst b/ffi/diplomat/js/docs/source/fallbacker_ffi.rst
diff --git a/ffi/diplomat/js/include/ICU4XLocaleFallbackConfig.d.ts b/ffi/diplomat/js/include/ICU4XLocaleFallbackConfig.d.ts
diff --git a/ffi/diplomat/js/include/ICU4XLocaleFallbackConfig.js b/ffi/diplomat/js/include/ICU4XLocaleFallbackConfig.js
diff --git a/ffi/diplomat/js/include/ICU4XLocaleFallbackSupplement.d.ts b/ffi/diplomat/js/include/ICU4XLocaleFallbackSupplement.d.ts
diff --git a/ffi/diplomat/js/include/ICU4XLocaleFallbackSupplement.js b/ffi/diplomat/js/include/ICU4XLocaleFallbackSupplement.js
diff --git a/ffi/diplomat/js/include/ICU4XLocaleFallbacker.js b/ffi/diplomat/js/include/ICU4XLocaleFallbacker.js
diff --git a/ffi/diplomat/js/include/index.d.ts b/ffi/diplomat/js/include/index.d.ts
diff --git a/ffi/diplomat/js/include/index.js b/ffi/diplomat/js/include/index.js
diff --git a/ffi/diplomat/src/fallbacker.rs b/ffi/diplomat/src/fallbacker.rs
@@ -39,6 +39,18 @@ pub mod ffi {
         Collation = 2,
     }
 
+    /// What additional data is required to load when performing fallback.
+    #[diplomat::rust_link(icu::locid_transform::fallback::LocaleFallbackSupplement, Enum)]
+    #[diplomat::rust_link(
+        icu::locid_transform::fallback::LocaleFallbackSupplement::const_default,
+        FnInEnum,
+        hidden
+    )]
+    pub enum ICU4XLocaleFallbackSupplement {
+        None = 0,
+        Collation = 1,
+    }
+
     /// Collection of configurations for the ICU4X fallback algorithm.
     #[diplomat::rust_link(icu::locid_transform::fallback::LocaleFallbackConfig, Struct)]
     #[diplomat::rust_link(
@@ -51,6 +63,8 @@ pub mod ffi {
         pub priority: ICU4XLocaleFallbackPriority,
         /// An empty string is considered `None`.
         pub extension_key: &'a str,
+        /// Fallback supplement data key to customize fallback rules.
+        pub fallback_supplement: ICU4XLocaleFallbackSupplement,
     }
 
     /// An object that runs the ICU4X locale fallback algorithm with specific configurations.
@@ -170,6 +184,12 @@ impl TryFrom<ffi::ICU4XLocaleFallbackConfig<'_>>
             "" => None,
             s => Some(s.parse()?),
         };
+        result.fallback_supplement = match other.fallback_supplement {
+            ffi::ICU4XLocaleFallbackSupplement::None => None,
+            ffi::ICU4XLocaleFallbackSupplement::Collation => {
+                Some(icu_locid_transform::fallback::LocaleFallbackSupplement::Collation)
+            }
+        };
         Ok(result)
     }
 }
diff --git a/ffi/diplomat/tests/missing_apis.txt b/ffi/diplomat/tests/missing_apis.txt
@@ -14,7 +14,6 @@
 # Please check in with @Manishearth, @robertbastian, or @sffc if you have questions
 
 
-icu::locid_transform::fallback::LocaleFallbackSupplement#Enum
 icu::properties::bidi_data::BidiAuxiliaryProperties#Struct
 icu::properties::bidi_data::BidiAuxiliaryProperties::from_data#FnInStruct
 icu::properties::bidi_data::BidiAuxiliaryPropertiesBorrowed#Struct