diff --git a/Cargo.lock b/Cargo.lock index 79830c6776c..d0fc6735d00 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -711,7 +711,7 @@ dependencies = [ [[package]] name = "diplomat" version = "0.12.0" -source = "git+https://github.com/rust-diplomat/diplomat?rev=fb5e716f9032d5a00a985896e4e54d5db2e38ac2#fb5e716f9032d5a00a985896e4e54d5db2e38ac2" +source = "git+https://github.com/Manishearth/diplomat?rev=0fd371d03cb11866a87782762e3fd445e13a3800#0fd371d03cb11866a87782762e3fd445e13a3800" dependencies = [ "diplomat_core", "proc-macro2", @@ -742,7 +742,7 @@ dependencies = [ [[package]] name = "diplomat-runtime" version = "0.12.0" -source = "git+https://github.com/rust-diplomat/diplomat?rev=fb5e716f9032d5a00a985896e4e54d5db2e38ac2#fb5e716f9032d5a00a985896e4e54d5db2e38ac2" +source = "git+https://github.com/Manishearth/diplomat?rev=0fd371d03cb11866a87782762e3fd445e13a3800#0fd371d03cb11866a87782762e3fd445e13a3800" dependencies = [ "log", ] @@ -750,7 +750,7 @@ dependencies = [ [[package]] name = "diplomat-tool" version = "0.12.1" -source = "git+https://github.com/rust-diplomat/diplomat?rev=fb5e716f9032d5a00a985896e4e54d5db2e38ac2#fb5e716f9032d5a00a985896e4e54d5db2e38ac2" +source = "git+https://github.com/Manishearth/diplomat?rev=0fd371d03cb11866a87782762e3fd445e13a3800#0fd371d03cb11866a87782762e3fd445e13a3800" dependencies = [ "askama", "clap", @@ -771,7 +771,7 @@ dependencies = [ [[package]] name = "diplomat_core" version = "0.12.1" -source = "git+https://github.com/rust-diplomat/diplomat?rev=fb5e716f9032d5a00a985896e4e54d5db2e38ac2#fb5e716f9032d5a00a985896e4e54d5db2e38ac2" +source = "git+https://github.com/Manishearth/diplomat?rev=0fd371d03cb11866a87782762e3fd445e13a3800#0fd371d03cb11866a87782762e3fd445e13a3800" dependencies = [ "displaydoc", "either", diff --git a/Cargo.toml b/Cargo.toml index 978279d6dbd..04d3402a753 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -215,10 +215,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", rev = "fb5e716f9032d5a00a985896e4e54d5db2e38ac2", default-features = false } -diplomat-runtime = { git = "https://github.com/rust-diplomat/diplomat", rev = "fb5e716f9032d5a00a985896e4e54d5db2e38ac2", default-features = false } -diplomat_core = { git = "https://github.com/rust-diplomat/diplomat", rev = "fb5e716f9032d5a00a985896e4e54d5db2e38ac2", default-features = false } -diplomat-tool = { git = "https://github.com/rust-diplomat/diplomat", rev = "fb5e716f9032d5a00a985896e4e54d5db2e38ac2", default-features = false } +diplomat = { git = "https://github.com/Manishearth/diplomat", rev = "0fd371d03cb11866a87782762e3fd445e13a3800", default-features = false } +diplomat-runtime = { git = "https://github.com/Manishearth/diplomat", rev = "0fd371d03cb11866a87782762e3fd445e13a3800", default-features = false } +diplomat_core = { git = "https://github.com/Manishearth/diplomat", rev = "0fd371d03cb11866a87782762e3fd445e13a3800", default-features = false } +diplomat-tool = { git = "https://github.com/Manishearth/diplomat", rev = "0fd371d03cb11866a87782762e3fd445e13a3800", default-features = false } # EXTERNAL DEPENDENCIES # diff --git a/examples/cpp/Cargo.lock b/examples/cpp/Cargo.lock index af32aa07502..3aad1ebe9c1 100644 --- a/examples/cpp/Cargo.lock +++ b/examples/cpp/Cargo.lock @@ -10,7 +10,7 @@ checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" [[package]] name = "calendrical_calculations" -version = "0.2.1" +version = "0.2.2" dependencies = [ "core_maths", "displaydoc", @@ -72,7 +72,7 @@ dependencies = [ [[package]] name = "diplomat" version = "0.12.0" -source = "git+https://github.com/rust-diplomat/diplomat?rev=35e06283521e5630689b0900057ebe66afec3dfb#35e06283521e5630689b0900057ebe66afec3dfb" +source = "git+https://github.com/Manishearth/diplomat?branch=cpp-lib-name#472cd4f49468ba895e931d9d6dfe55973ada5065" dependencies = [ "diplomat_core", "proc-macro2", @@ -83,7 +83,7 @@ dependencies = [ [[package]] name = "diplomat-runtime" version = "0.12.0" -source = "git+https://github.com/rust-diplomat/diplomat?rev=35e06283521e5630689b0900057ebe66afec3dfb#35e06283521e5630689b0900057ebe66afec3dfb" +source = "git+https://github.com/Manishearth/diplomat?branch=cpp-lib-name#472cd4f49468ba895e931d9d6dfe55973ada5065" dependencies = [ "log", ] @@ -91,7 +91,7 @@ dependencies = [ [[package]] name = "diplomat_core" version = "0.12.1" -source = "git+https://github.com/rust-diplomat/diplomat?rev=35e06283521e5630689b0900057ebe66afec3dfb#35e06283521e5630689b0900057ebe66afec3dfb" +source = "git+https://github.com/Manishearth/diplomat?branch=cpp-lib-name#472cd4f49468ba895e931d9d6dfe55973ada5065" dependencies = [ "proc-macro2", "quote", @@ -152,7 +152,7 @@ dependencies = [ [[package]] name = "icu_calendar" -version = "2.0.3" +version = "2.0.4" dependencies = [ "calendrical_calculations", "displaydoc", @@ -575,9 +575,6 @@ checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c" [[package]] name = "ixdtf" version = "0.6.3" -dependencies = [ - "displaydoc", -] [[package]] name = "lazy_static" @@ -684,7 +681,7 @@ dependencies = [ [[package]] name = "potential_utf" -version = "0.1.2" +version = "0.1.3" dependencies = [ "serde", "writeable", diff --git a/ffi/capi/bindings/cpp/icu4x/Bidi.d.hpp b/ffi/capi/bindings/cpp/icu4x/Bidi.d.hpp index fed7ec6cb89..cdd3983e39f 100644 --- a/ffi/capi/bindings/cpp/icu4x/Bidi.d.hpp +++ b/ffi/capi/bindings/cpp/icu4x/Bidi.d.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_Bidi_D_HPP -#define icu4x_Bidi_D_HPP +#ifndef ICU4X_Bidi_D_HPP +#define ICU4X_Bidi_D_HPP #include #include @@ -9,8 +9,7 @@ #include #include #include -#include "../diplomat_runtime.hpp" - +#include "diplomat_runtime.hpp" namespace icu4x { namespace capi { struct Bidi; } class Bidi; @@ -21,7 +20,8 @@ class DataProvider; namespace capi { struct ReorderedIndexMap; } class ReorderedIndexMap; class DataError; -} +} // namespace icu4x + namespace icu4x { @@ -40,69 +40,69 @@ class Bidi { public: /** - * Creates a new {@link Bidi} from locale data using compiled data. + * Creates a new {@link Bidi} from locale data using compiled data. */ inline static std::unique_ptr create(); /** - * Creates a new {@link Bidi} from locale data, and a particular data source. + * Creates a new {@link Bidi} from locale data, and a particular data source. */ - inline static diplomat::result, icu4x::DataError> create_with_provider(const icu4x::DataProvider& provider); + inline static icu4x::diplomat::result, icu4x::DataError> create_with_provider(const icu4x::DataProvider& provider); /** - * Use the data loaded in this object to process a string and calculate bidi information - * - * Takes in a Level for the default level, if it is an invalid value or None it will default to Auto. - * - * Returns nothing if `text` is invalid UTF-8. - * - * See the [Rust documentation for `new_with_data_source`](https://docs.rs/unicode_bidi/0.3.11/unicode_bidi/struct.BidiInfo.html#method.new_with_data_source) for more information. + * Use the data loaded in this object to process a string and calculate bidi information + * + * Takes in a Level for the default level, if it is an invalid value or None it will default to Auto. + * + * Returns nothing if `text` is invalid UTF-8. + * + * See the [Rust documentation for `new_with_data_source`](https://docs.rs/unicode_bidi/0.3.11/unicode_bidi/struct.BidiInfo.html#method.new_with_data_source) for more information. */ inline std::unique_ptr for_text(std::string_view text, std::optional default_level) const; /** - * Utility function for producing reorderings given a list of levels - * - * Produces a map saying which visual index maps to which source index. - * - * The levels array must not have values greater than 126 (this is the - * Bidi maximum explicit depth plus one). - * Failure to follow this invariant may lead to incorrect results, - * but is still safe. - * - * See the [Rust documentation for `reorder_visual`](https://docs.rs/unicode_bidi/0.3.11/unicode_bidi/struct.BidiInfo.html#method.reorder_visual) for more information. + * Utility function for producing reorderings given a list of levels + * + * Produces a map saying which visual index maps to which source index. + * + * The levels array must not have values greater than 126 (this is the + * Bidi maximum explicit depth plus one). + * Failure to follow this invariant may lead to incorrect results, + * but is still safe. + * + * See the [Rust documentation for `reorder_visual`](https://docs.rs/unicode_bidi/0.3.11/unicode_bidi/struct.BidiInfo.html#method.reorder_visual) for more information. */ - inline std::unique_ptr reorder_visual(diplomat::span levels) const; + inline std::unique_ptr reorder_visual(icu4x::diplomat::span levels) const; /** - * Check if a Level returned by level_at is an RTL level. - * - * Invalid levels (numbers greater than 125) will be assumed LTR - * - * See the [Rust documentation for `is_rtl`](https://docs.rs/unicode_bidi/0.3.11/unicode_bidi/level/struct.Level.html#method.is_rtl) for more information. + * Check if a Level returned by level_at is an RTL level. + * + * Invalid levels (numbers greater than 125) will be assumed LTR + * + * See the [Rust documentation for `is_rtl`](https://docs.rs/unicode_bidi/0.3.11/unicode_bidi/level/struct.Level.html#method.is_rtl) for more information. */ inline static bool level_is_rtl(uint8_t level); /** - * Check if a Level returned by level_at is an LTR level. - * - * Invalid levels (numbers greater than 125) will be assumed LTR - * - * See the [Rust documentation for `is_ltr`](https://docs.rs/unicode_bidi/0.3.11/unicode_bidi/level/struct.Level.html#method.is_ltr) for more information. + * Check if a Level returned by level_at is an LTR level. + * + * Invalid levels (numbers greater than 125) will be assumed LTR + * + * See the [Rust documentation for `is_ltr`](https://docs.rs/unicode_bidi/0.3.11/unicode_bidi/level/struct.Level.html#method.is_ltr) for more information. */ inline static bool level_is_ltr(uint8_t level); /** - * Get a basic RTL Level value - * - * See the [Rust documentation for `rtl`](https://docs.rs/unicode_bidi/0.3.11/unicode_bidi/level/struct.Level.html#method.rtl) for more information. + * Get a basic RTL Level value + * + * See the [Rust documentation for `rtl`](https://docs.rs/unicode_bidi/0.3.11/unicode_bidi/level/struct.Level.html#method.rtl) for more information. */ inline static uint8_t level_rtl(); /** - * Get a simple LTR Level value - * - * See the [Rust documentation for `ltr`](https://docs.rs/unicode_bidi/0.3.11/unicode_bidi/level/struct.Level.html#method.ltr) for more information. + * Get a simple LTR Level value + * + * See the [Rust documentation for `ltr`](https://docs.rs/unicode_bidi/0.3.11/unicode_bidi/level/struct.Level.html#method.ltr) for more information. */ inline static uint8_t level_ltr(); @@ -121,4 +121,4 @@ class Bidi { }; } // namespace -#endif // icu4x_Bidi_D_HPP +#endif // ICU4X_Bidi_D_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/Bidi.hpp b/ffi/capi/bindings/cpp/icu4x/Bidi.hpp index fa84b36bb9a..cbb6a7efc6b 100644 --- a/ffi/capi/bindings/cpp/icu4x/Bidi.hpp +++ b/ffi/capi/bindings/cpp/icu4x/Bidi.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_Bidi_HPP -#define icu4x_Bidi_HPP +#ifndef ICU4X_Bidi_HPP +#define ICU4X_Bidi_HPP #include "Bidi.d.hpp" @@ -11,11 +11,11 @@ #include #include #include -#include "../diplomat_runtime.hpp" #include "BidiInfo.hpp" #include "DataError.hpp" #include "DataProvider.hpp" #include "ReorderedIndexMap.hpp" +#include "diplomat_runtime.hpp" namespace icu4x { @@ -27,9 +27,9 @@ namespace capi { typedef struct icu4x_Bidi_create_with_provider_mv1_result {union {icu4x::capi::Bidi* ok; icu4x::capi::DataError err;}; bool is_ok;} icu4x_Bidi_create_with_provider_mv1_result; icu4x_Bidi_create_with_provider_mv1_result icu4x_Bidi_create_with_provider_mv1(const icu4x::capi::DataProvider* provider); - icu4x::capi::BidiInfo* icu4x_Bidi_for_text_utf8_mv1(const icu4x::capi::Bidi* self, diplomat::capi::DiplomatStringView text, diplomat::capi::OptionU8 default_level); + icu4x::capi::BidiInfo* icu4x_Bidi_for_text_utf8_mv1(const icu4x::capi::Bidi* self, icu4x::diplomat::capi::DiplomatStringView text, icu4x::diplomat::capi::OptionU8 default_level); - icu4x::capi::ReorderedIndexMap* icu4x_Bidi_reorder_visual_mv1(const icu4x::capi::Bidi* self, diplomat::capi::DiplomatU8View levels); + icu4x::capi::ReorderedIndexMap* icu4x_Bidi_reorder_visual_mv1(const icu4x::capi::Bidi* self, icu4x::diplomat::capi::DiplomatU8View levels); bool icu4x_Bidi_level_is_rtl_mv1(uint8_t level); @@ -50,19 +50,19 @@ inline std::unique_ptr icu4x::Bidi::create() { return std::unique_ptr(icu4x::Bidi::FromFFI(result)); } -inline diplomat::result, icu4x::DataError> icu4x::Bidi::create_with_provider(const icu4x::DataProvider& provider) { +inline icu4x::diplomat::result, icu4x::DataError> icu4x::Bidi::create_with_provider(const icu4x::DataProvider& provider) { auto result = icu4x::capi::icu4x_Bidi_create_with_provider_mv1(provider.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DataError>(diplomat::Ok>(std::unique_ptr(icu4x::Bidi::FromFFI(result.ok)))) : diplomat::result, icu4x::DataError>(diplomat::Err(icu4x::DataError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::Bidi::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Err(icu4x::DataError::FromFFI(result.err))); } inline std::unique_ptr icu4x::Bidi::for_text(std::string_view text, std::optional default_level) const { auto result = icu4x::capi::icu4x_Bidi_for_text_utf8_mv1(this->AsFFI(), {text.data(), text.size()}, - default_level.has_value() ? (diplomat::capi::OptionU8{ { default_level.value() }, true }) : (diplomat::capi::OptionU8{ {}, false })); + default_level.has_value() ? (icu4x::diplomat::capi::OptionU8{ { default_level.value() }, true }) : (icu4x::diplomat::capi::OptionU8{ {}, false })); return std::unique_ptr(icu4x::BidiInfo::FromFFI(result)); } -inline std::unique_ptr icu4x::Bidi::reorder_visual(diplomat::span levels) const { +inline std::unique_ptr icu4x::Bidi::reorder_visual(icu4x::diplomat::span levels) const { auto result = icu4x::capi::icu4x_Bidi_reorder_visual_mv1(this->AsFFI(), {levels.data(), levels.size()}); return std::unique_ptr(icu4x::ReorderedIndexMap::FromFFI(result)); @@ -109,4 +109,4 @@ inline void icu4x::Bidi::operator delete(void* ptr) { } -#endif // icu4x_Bidi_HPP +#endif // ICU4X_Bidi_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/BidiClass.d.hpp b/ffi/capi/bindings/cpp/icu4x/BidiClass.d.hpp index be6721c1266..f55fb6c840d 100644 --- a/ffi/capi/bindings/cpp/icu4x/BidiClass.d.hpp +++ b/ffi/capi/bindings/cpp/icu4x/BidiClass.d.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_BidiClass_D_HPP -#define icu4x_BidiClass_D_HPP +#ifndef ICU4X_BidiClass_D_HPP +#define ICU4X_BidiClass_D_HPP #include #include @@ -9,11 +9,11 @@ #include #include #include -#include "../diplomat_runtime.hpp" - +#include "diplomat_runtime.hpp" namespace icu4x { class BidiClass; -} +} // namespace icu4x + namespace icu4x { @@ -89,35 +89,35 @@ class BidiClass { explicit operator bool() const = delete; /** - * See the [Rust documentation for `for_char`](https://docs.rs/icu/2.0.0/icu/properties/props/trait.EnumeratedProperty.html#tymethod.for_char) for more information. + * See the [Rust documentation for `for_char`](https://docs.rs/icu/2.0.0/icu/properties/props/trait.EnumeratedProperty.html#tymethod.for_char) for more information. */ inline static icu4x::BidiClass for_char(char32_t ch); /** - * Get the "long" name of this property value (returns empty if property value is unknown) - * - * See the [Rust documentation for `get`](https://docs.rs/icu/2.0.0/icu/properties/struct.PropertyNamesLongBorrowed.html#method.get) for more information. + * Get the "long" name of this property value (returns empty if property value is unknown) + * + * See the [Rust documentation for `get`](https://docs.rs/icu/2.0.0/icu/properties/struct.PropertyNamesLongBorrowed.html#method.get) for more information. */ inline std::optional long_name() const; /** - * Get the "short" name of this property value (returns empty if property value is unknown) - * - * See the [Rust documentation for `get`](https://docs.rs/icu/2.0.0/icu/properties/struct.PropertyNamesShortBorrowed.html#method.get) for more information. + * Get the "short" name of this property value (returns empty if property value is unknown) + * + * See the [Rust documentation for `get`](https://docs.rs/icu/2.0.0/icu/properties/struct.PropertyNamesShortBorrowed.html#method.get) for more information. */ inline std::optional short_name() const; /** - * Convert to an integer value usable with ICU4C and CodePointMapData - * - * See the [Rust documentation for `to_icu4c_value`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.BidiClass.html#method.to_icu4c_value) for more information. + * Convert to an integer value usable with ICU4C and CodePointMapData + * + * See the [Rust documentation for `to_icu4c_value`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.BidiClass.html#method.to_icu4c_value) for more information. */ inline uint8_t to_integer_value() const; /** - * Convert from an integer value from ICU4C or CodePointMapData - * - * See the [Rust documentation for `from_icu4c_value`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.BidiClass.html#method.from_icu4c_value) for more information. + * Convert from an integer value from ICU4C or CodePointMapData + * + * See the [Rust documentation for `from_icu4c_value`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.BidiClass.html#method.from_icu4c_value) for more information. */ inline static std::optional from_integer_value(uint8_t other); @@ -128,4 +128,4 @@ class BidiClass { }; } // namespace -#endif // icu4x_BidiClass_D_HPP +#endif // ICU4X_BidiClass_D_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/BidiClass.hpp b/ffi/capi/bindings/cpp/icu4x/BidiClass.hpp index 851ba2c84af..fd97c253de3 100644 --- a/ffi/capi/bindings/cpp/icu4x/BidiClass.hpp +++ b/ffi/capi/bindings/cpp/icu4x/BidiClass.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_BidiClass_HPP -#define icu4x_BidiClass_HPP +#ifndef ICU4X_BidiClass_HPP +#define ICU4X_BidiClass_HPP #include "BidiClass.d.hpp" @@ -11,7 +11,7 @@ #include #include #include -#include "../diplomat_runtime.hpp" +#include "diplomat_runtime.hpp" namespace icu4x { @@ -20,10 +20,10 @@ namespace capi { icu4x::capi::BidiClass icu4x_BidiClass_for_char_mv1(char32_t ch); - typedef struct icu4x_BidiClass_long_name_mv1_result {union {diplomat::capi::DiplomatStringView ok; }; bool is_ok;} icu4x_BidiClass_long_name_mv1_result; + typedef struct icu4x_BidiClass_long_name_mv1_result {union {icu4x::diplomat::capi::DiplomatStringView ok; }; bool is_ok;} icu4x_BidiClass_long_name_mv1_result; icu4x_BidiClass_long_name_mv1_result icu4x_BidiClass_long_name_mv1(icu4x::capi::BidiClass self); - typedef struct icu4x_BidiClass_short_name_mv1_result {union {diplomat::capi::DiplomatStringView ok; }; bool is_ok;} icu4x_BidiClass_short_name_mv1_result; + typedef struct icu4x_BidiClass_short_name_mv1_result {union {icu4x::diplomat::capi::DiplomatStringView ok; }; bool is_ok;} icu4x_BidiClass_short_name_mv1_result; icu4x_BidiClass_short_name_mv1_result icu4x_BidiClass_short_name_mv1(icu4x::capi::BidiClass self); uint8_t icu4x_BidiClass_to_integer_value_mv1(icu4x::capi::BidiClass self); @@ -94,4 +94,4 @@ inline std::optional icu4x::BidiClass::from_integer_value(uint auto result = icu4x::capi::icu4x_BidiClass_from_integer_value_mv1(other); return result.is_ok ? std::optional(icu4x::BidiClass::FromFFI(result.ok)) : std::nullopt; } -#endif // icu4x_BidiClass_HPP +#endif // ICU4X_BidiClass_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/BidiDirection.d.hpp b/ffi/capi/bindings/cpp/icu4x/BidiDirection.d.hpp index 8f7027b0057..9407c09aeac 100644 --- a/ffi/capi/bindings/cpp/icu4x/BidiDirection.d.hpp +++ b/ffi/capi/bindings/cpp/icu4x/BidiDirection.d.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_BidiDirection_D_HPP -#define icu4x_BidiDirection_D_HPP +#ifndef ICU4X_BidiDirection_D_HPP +#define ICU4X_BidiDirection_D_HPP #include #include @@ -9,7 +9,7 @@ #include #include #include -#include "../diplomat_runtime.hpp" +#include "diplomat_runtime.hpp" namespace icu4x { @@ -48,4 +48,4 @@ class BidiDirection { }; } // namespace -#endif // icu4x_BidiDirection_D_HPP +#endif // ICU4X_BidiDirection_D_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/BidiDirection.hpp b/ffi/capi/bindings/cpp/icu4x/BidiDirection.hpp index 1da0bfa591b..4c5fa71cb90 100644 --- a/ffi/capi/bindings/cpp/icu4x/BidiDirection.hpp +++ b/ffi/capi/bindings/cpp/icu4x/BidiDirection.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_BidiDirection_HPP -#define icu4x_BidiDirection_HPP +#ifndef ICU4X_BidiDirection_HPP +#define ICU4X_BidiDirection_HPP #include "BidiDirection.d.hpp" @@ -11,7 +11,7 @@ #include #include #include -#include "../diplomat_runtime.hpp" +#include "diplomat_runtime.hpp" namespace icu4x { @@ -36,4 +36,4 @@ inline icu4x::BidiDirection icu4x::BidiDirection::FromFFI(icu4x::capi::BidiDirec std::abort(); } } -#endif // icu4x_BidiDirection_HPP +#endif // ICU4X_BidiDirection_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/BidiInfo.d.hpp b/ffi/capi/bindings/cpp/icu4x/BidiInfo.d.hpp index 0fe3ebd52cb..17e227dcccd 100644 --- a/ffi/capi/bindings/cpp/icu4x/BidiInfo.d.hpp +++ b/ffi/capi/bindings/cpp/icu4x/BidiInfo.d.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_BidiInfo_D_HPP -#define icu4x_BidiInfo_D_HPP +#ifndef ICU4X_BidiInfo_D_HPP +#define ICU4X_BidiInfo_D_HPP #include #include @@ -9,12 +9,12 @@ #include #include #include -#include "../diplomat_runtime.hpp" - +#include "diplomat_runtime.hpp" namespace icu4x { namespace capi { struct BidiParagraph; } class BidiParagraph; -} +} // namespace icu4x + namespace icu4x { @@ -33,26 +33,26 @@ class BidiInfo { public: /** - * The number of paragraphs contained here + * The number of paragraphs contained here */ inline size_t paragraph_count() const; /** - * Get the nth paragraph, returning `None` if out of bounds + * Get the nth paragraph, returning `None` if out of bounds */ inline std::unique_ptr paragraph_at(size_t n) const; /** - * The number of bytes in this full text + * The number of bytes in this full text */ inline size_t size() const; /** - * Get the BIDI level at a particular byte index in the full text. - * This integer is conceptually a `unicode_bidi::Level`, - * and can be further inspected using the static methods on Bidi. - * - * Returns 0 (equivalent to `Level::ltr()`) on error + * Get the BIDI level at a particular byte index in the full text. + * This integer is conceptually a `unicode_bidi::Level`, + * and can be further inspected using the static methods on Bidi. + * + * Returns 0 (equivalent to `Level::ltr()`) on error */ inline uint8_t level_at(size_t pos) const; @@ -71,4 +71,4 @@ class BidiInfo { }; } // namespace -#endif // icu4x_BidiInfo_D_HPP +#endif // ICU4X_BidiInfo_D_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/BidiInfo.hpp b/ffi/capi/bindings/cpp/icu4x/BidiInfo.hpp index 00cc282ebe8..123ce56e68d 100644 --- a/ffi/capi/bindings/cpp/icu4x/BidiInfo.hpp +++ b/ffi/capi/bindings/cpp/icu4x/BidiInfo.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_BidiInfo_HPP -#define icu4x_BidiInfo_HPP +#ifndef ICU4X_BidiInfo_HPP +#define ICU4X_BidiInfo_HPP #include "BidiInfo.d.hpp" @@ -11,8 +11,8 @@ #include #include #include -#include "../diplomat_runtime.hpp" #include "BidiParagraph.hpp" +#include "diplomat_runtime.hpp" namespace icu4x { @@ -76,4 +76,4 @@ inline void icu4x::BidiInfo::operator delete(void* ptr) { } -#endif // icu4x_BidiInfo_HPP +#endif // ICU4X_BidiInfo_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/BidiMirroringGlyph.d.hpp b/ffi/capi/bindings/cpp/icu4x/BidiMirroringGlyph.d.hpp index 9c53cb84e42..627d65eec42 100644 --- a/ffi/capi/bindings/cpp/icu4x/BidiMirroringGlyph.d.hpp +++ b/ffi/capi/bindings/cpp/icu4x/BidiMirroringGlyph.d.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_BidiMirroringGlyph_D_HPP -#define icu4x_BidiMirroringGlyph_D_HPP +#ifndef ICU4X_BidiMirroringGlyph_D_HPP +#define ICU4X_BidiMirroringGlyph_D_HPP #include #include @@ -9,19 +9,19 @@ #include #include #include -#include "../diplomat_runtime.hpp" #include "BidiPairedBracketType.d.hpp" - +#include "diplomat_runtime.hpp" namespace icu4x { struct BidiMirroringGlyph; class BidiPairedBracketType; -} +} // namespace icu4x + namespace icu4x { namespace capi { struct BidiMirroringGlyph { - diplomat::capi::OptionChar mirroring_glyph; + icu4x::diplomat::capi::OptionChar mirroring_glyph; bool mirrored; icu4x::capi::BidiPairedBracketType paired_bracket_type; }; @@ -41,7 +41,7 @@ struct BidiMirroringGlyph { icu4x::BidiPairedBracketType paired_bracket_type; /** - * See the [Rust documentation for `for_char`](https://docs.rs/icu/2.0.0/icu/properties/props/trait.EnumeratedProperty.html#tymethod.for_char) for more information. + * See the [Rust documentation for `for_char`](https://docs.rs/icu/2.0.0/icu/properties/props/trait.EnumeratedProperty.html#tymethod.for_char) for more information. */ inline static icu4x::BidiMirroringGlyph for_char(char32_t ch); @@ -50,4 +50,4 @@ struct BidiMirroringGlyph { }; } // namespace -#endif // icu4x_BidiMirroringGlyph_D_HPP +#endif // ICU4X_BidiMirroringGlyph_D_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/BidiMirroringGlyph.hpp b/ffi/capi/bindings/cpp/icu4x/BidiMirroringGlyph.hpp index 1ea314c0368..15cd79ea756 100644 --- a/ffi/capi/bindings/cpp/icu4x/BidiMirroringGlyph.hpp +++ b/ffi/capi/bindings/cpp/icu4x/BidiMirroringGlyph.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_BidiMirroringGlyph_HPP -#define icu4x_BidiMirroringGlyph_HPP +#ifndef ICU4X_BidiMirroringGlyph_HPP +#define ICU4X_BidiMirroringGlyph_HPP #include "BidiMirroringGlyph.d.hpp" @@ -11,8 +11,8 @@ #include #include #include -#include "../diplomat_runtime.hpp" #include "BidiPairedBracketType.hpp" +#include "diplomat_runtime.hpp" namespace icu4x { @@ -33,7 +33,7 @@ inline icu4x::BidiMirroringGlyph icu4x::BidiMirroringGlyph::for_char(char32_t ch inline icu4x::capi::BidiMirroringGlyph icu4x::BidiMirroringGlyph::AsFFI() const { return icu4x::capi::BidiMirroringGlyph { - /* .mirroring_glyph = */ mirroring_glyph.has_value() ? (diplomat::capi::OptionChar{ { mirroring_glyph.value() }, true }) : (diplomat::capi::OptionChar{ {}, false }), + /* .mirroring_glyph = */ mirroring_glyph.has_value() ? (icu4x::diplomat::capi::OptionChar{ { mirroring_glyph.value() }, true }) : (icu4x::diplomat::capi::OptionChar{ {}, false }), /* .mirrored = */ mirrored, /* .paired_bracket_type = */ paired_bracket_type.AsFFI(), }; @@ -48,4 +48,4 @@ inline icu4x::BidiMirroringGlyph icu4x::BidiMirroringGlyph::FromFFI(icu4x::capi: } -#endif // icu4x_BidiMirroringGlyph_HPP +#endif // ICU4X_BidiMirroringGlyph_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/BidiPairedBracketType.d.hpp b/ffi/capi/bindings/cpp/icu4x/BidiPairedBracketType.d.hpp index 81b29555a06..cdc73bca016 100644 --- a/ffi/capi/bindings/cpp/icu4x/BidiPairedBracketType.d.hpp +++ b/ffi/capi/bindings/cpp/icu4x/BidiPairedBracketType.d.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_BidiPairedBracketType_D_HPP -#define icu4x_BidiPairedBracketType_D_HPP +#ifndef ICU4X_BidiPairedBracketType_D_HPP +#define ICU4X_BidiPairedBracketType_D_HPP #include #include @@ -9,7 +9,7 @@ #include #include #include -#include "../diplomat_runtime.hpp" +#include "diplomat_runtime.hpp" namespace icu4x { @@ -51,4 +51,4 @@ class BidiPairedBracketType { }; } // namespace -#endif // icu4x_BidiPairedBracketType_D_HPP +#endif // ICU4X_BidiPairedBracketType_D_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/BidiPairedBracketType.hpp b/ffi/capi/bindings/cpp/icu4x/BidiPairedBracketType.hpp index 9f3450f6582..336d0ecdfed 100644 --- a/ffi/capi/bindings/cpp/icu4x/BidiPairedBracketType.hpp +++ b/ffi/capi/bindings/cpp/icu4x/BidiPairedBracketType.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_BidiPairedBracketType_HPP -#define icu4x_BidiPairedBracketType_HPP +#ifndef ICU4X_BidiPairedBracketType_HPP +#define ICU4X_BidiPairedBracketType_HPP #include "BidiPairedBracketType.d.hpp" @@ -11,7 +11,7 @@ #include #include #include -#include "../diplomat_runtime.hpp" +#include "diplomat_runtime.hpp" namespace icu4x { @@ -36,4 +36,4 @@ inline icu4x::BidiPairedBracketType icu4x::BidiPairedBracketType::FromFFI(icu4x: std::abort(); } } -#endif // icu4x_BidiPairedBracketType_HPP +#endif // ICU4X_BidiPairedBracketType_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/BidiParagraph.d.hpp b/ffi/capi/bindings/cpp/icu4x/BidiParagraph.d.hpp index 06fb2bf1005..2dc07eeb022 100644 --- a/ffi/capi/bindings/cpp/icu4x/BidiParagraph.d.hpp +++ b/ffi/capi/bindings/cpp/icu4x/BidiParagraph.d.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_BidiParagraph_D_HPP -#define icu4x_BidiParagraph_D_HPP +#ifndef ICU4X_BidiParagraph_D_HPP +#define ICU4X_BidiParagraph_D_HPP #include #include @@ -9,11 +9,11 @@ #include #include #include -#include "../diplomat_runtime.hpp" - +#include "diplomat_runtime.hpp" namespace icu4x { class BidiDirection; -} +} // namespace icu4x + namespace icu4x { @@ -30,56 +30,56 @@ class BidiParagraph { public: /** - * Given a paragraph index `n` within the surrounding text, this sets this - * object to the paragraph at that index. Returns nothing when out of bounds. - * - * This is equivalent to calling `paragraph_at()` on `BidiInfo` but doesn't - * create a new object + * Given a paragraph index `n` within the surrounding text, this sets this + * object to the paragraph at that index. Returns nothing when out of bounds. + * + * This is equivalent to calling `paragraph_at()` on `BidiInfo` but doesn't + * create a new object */ inline bool set_paragraph_in_text(size_t n); /** - * The primary direction of this paragraph - * - * See the [Rust documentation for `level_at`](https://docs.rs/unicode_bidi/0.3.11/unicode_bidi/struct.Paragraph.html#method.level_at) for more information. + * The primary direction of this paragraph + * + * See the [Rust documentation for `level_at`](https://docs.rs/unicode_bidi/0.3.11/unicode_bidi/struct.Paragraph.html#method.level_at) for more information. */ inline icu4x::BidiDirection direction() const; /** - * The number of bytes in this paragraph - * - * See the [Rust documentation for `len`](https://docs.rs/unicode_bidi/0.3.11/unicode_bidi/struct.ParagraphInfo.html#method.len) for more information. + * The number of bytes in this paragraph + * + * See the [Rust documentation for `len`](https://docs.rs/unicode_bidi/0.3.11/unicode_bidi/struct.ParagraphInfo.html#method.len) for more information. */ inline size_t size() const; /** - * The start index of this paragraph within the source text + * The start index of this paragraph within the source text */ inline size_t range_start() const; /** - * The end index of this paragraph within the source text + * The end index of this paragraph within the source text */ inline size_t range_end() const; /** - * Reorder a line based on display order. The ranges are specified relative to the source text and must be contained - * within this paragraph's range. - * - * See the [Rust documentation for `level_at`](https://docs.rs/unicode_bidi/0.3.11/unicode_bidi/struct.Paragraph.html#method.level_at) for more information. + * Reorder a line based on display order. The ranges are specified relative to the source text and must be contained + * within this paragraph's range. + * + * See the [Rust documentation for `level_at`](https://docs.rs/unicode_bidi/0.3.11/unicode_bidi/struct.Paragraph.html#method.level_at) for more information. */ inline std::optional reorder_line(size_t range_start, size_t range_end) const; template inline std::optional reorder_line_write(size_t range_start, size_t range_end, W& writeable_output) const; /** - * Get the BIDI level at a particular byte index in this paragraph. - * This integer is conceptually a `unicode_bidi::Level`, - * and can be further inspected using the static methods on Bidi. - * - * Returns 0 (equivalent to `Level::ltr()`) on error - * - * See the [Rust documentation for `level_at`](https://docs.rs/unicode_bidi/0.3.11/unicode_bidi/struct.Paragraph.html#method.level_at) for more information. + * Get the BIDI level at a particular byte index in this paragraph. + * This integer is conceptually a `unicode_bidi::Level`, + * and can be further inspected using the static methods on Bidi. + * + * Returns 0 (equivalent to `Level::ltr()`) on error + * + * See the [Rust documentation for `level_at`](https://docs.rs/unicode_bidi/0.3.11/unicode_bidi/struct.Paragraph.html#method.level_at) for more information. */ inline uint8_t level_at(size_t pos) const; @@ -98,4 +98,4 @@ class BidiParagraph { }; } // namespace -#endif // icu4x_BidiParagraph_D_HPP +#endif // ICU4X_BidiParagraph_D_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/BidiParagraph.hpp b/ffi/capi/bindings/cpp/icu4x/BidiParagraph.hpp index 5ea37cac59d..83810f88f78 100644 --- a/ffi/capi/bindings/cpp/icu4x/BidiParagraph.hpp +++ b/ffi/capi/bindings/cpp/icu4x/BidiParagraph.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_BidiParagraph_HPP -#define icu4x_BidiParagraph_HPP +#ifndef ICU4X_BidiParagraph_HPP +#define ICU4X_BidiParagraph_HPP #include "BidiParagraph.d.hpp" @@ -11,8 +11,8 @@ #include #include #include -#include "../diplomat_runtime.hpp" #include "BidiDirection.hpp" +#include "diplomat_runtime.hpp" namespace icu4x { @@ -30,7 +30,7 @@ namespace capi { size_t icu4x_BidiParagraph_range_end_mv1(const icu4x::capi::BidiParagraph* self); typedef struct icu4x_BidiParagraph_reorder_line_mv1_result { bool is_ok;} icu4x_BidiParagraph_reorder_line_mv1_result; - icu4x_BidiParagraph_reorder_line_mv1_result icu4x_BidiParagraph_reorder_line_mv1(const icu4x::capi::BidiParagraph* self, size_t range_start, size_t range_end, diplomat::capi::DiplomatWrite* write); + icu4x_BidiParagraph_reorder_line_mv1_result icu4x_BidiParagraph_reorder_line_mv1(const icu4x::capi::BidiParagraph* self, size_t range_start, size_t range_end, icu4x::diplomat::capi::DiplomatWrite* write); uint8_t icu4x_BidiParagraph_level_at_mv1(const icu4x::capi::BidiParagraph* self, size_t pos); @@ -68,7 +68,7 @@ inline size_t icu4x::BidiParagraph::range_end() const { inline std::optional icu4x::BidiParagraph::reorder_line(size_t range_start, size_t range_end) const { std::string output; - diplomat::capi::DiplomatWrite write = diplomat::WriteFromString(output); + icu4x::diplomat::capi::DiplomatWrite write = icu4x::diplomat::WriteFromString(output); auto result = icu4x::capi::icu4x_BidiParagraph_reorder_line_mv1(this->AsFFI(), range_start, range_end, @@ -77,7 +77,7 @@ inline std::optional icu4x::BidiParagraph::reorder_line(size_t rang } template inline std::optional icu4x::BidiParagraph::reorder_line_write(size_t range_start, size_t range_end, W& writeable) const { - diplomat::capi::DiplomatWrite write = diplomat::WriteTrait::Construct(writeable); + icu4x::diplomat::capi::DiplomatWrite write = icu4x::diplomat::WriteTrait::Construct(writeable); auto result = icu4x::capi::icu4x_BidiParagraph_reorder_line_mv1(this->AsFFI(), range_start, range_end, @@ -112,4 +112,4 @@ inline void icu4x::BidiParagraph::operator delete(void* ptr) { } -#endif // icu4x_BidiParagraph_HPP +#endif // ICU4X_BidiParagraph_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/Calendar.d.hpp b/ffi/capi/bindings/cpp/icu4x/Calendar.d.hpp index 5866d6632bb..761ad0cc1d7 100644 --- a/ffi/capi/bindings/cpp/icu4x/Calendar.d.hpp +++ b/ffi/capi/bindings/cpp/icu4x/Calendar.d.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_Calendar_D_HPP -#define icu4x_Calendar_D_HPP +#ifndef ICU4X_Calendar_D_HPP +#define ICU4X_Calendar_D_HPP #include #include @@ -9,8 +9,7 @@ #include #include #include -#include "../diplomat_runtime.hpp" - +#include "diplomat_runtime.hpp" namespace icu4x { namespace capi { struct Calendar; } class Calendar; @@ -18,7 +17,8 @@ namespace capi { struct DataProvider; } class DataProvider; class CalendarKind; class DataError; -} +} // namespace icu4x + namespace icu4x { @@ -35,23 +35,23 @@ class Calendar { public: /** - * Creates a new {@link Calendar} for the specified kind, using compiled data. - * - * See the [Rust documentation for `new`](https://docs.rs/icu/2.0.0/icu/calendar/enum.AnyCalendar.html#method.new) for more information. + * Creates a new {@link Calendar} for the specified kind, using compiled data. + * + * See the [Rust documentation for `new`](https://docs.rs/icu/2.0.0/icu/calendar/enum.AnyCalendar.html#method.new) for more information. */ inline static std::unique_ptr create(icu4x::CalendarKind kind); /** - * Creates a new {@link Calendar} for the specified kind, using a particular data source. - * - * See the [Rust documentation for `new`](https://docs.rs/icu/2.0.0/icu/calendar/enum.AnyCalendar.html#method.new) for more information. + * Creates a new {@link Calendar} for the specified kind, using a particular data source. + * + * See the [Rust documentation for `new`](https://docs.rs/icu/2.0.0/icu/calendar/enum.AnyCalendar.html#method.new) for more information. */ - inline static diplomat::result, icu4x::DataError> create_with_provider(const icu4x::DataProvider& provider, icu4x::CalendarKind kind); + inline static icu4x::diplomat::result, icu4x::DataError> create_with_provider(const icu4x::DataProvider& provider, icu4x::CalendarKind kind); /** - * Returns the kind of this calendar - * - * See the [Rust documentation for `kind`](https://docs.rs/icu/2.0.0/icu/calendar/enum.AnyCalendar.html#method.kind) for more information. + * Returns the kind of this calendar + * + * See the [Rust documentation for `kind`](https://docs.rs/icu/2.0.0/icu/calendar/enum.AnyCalendar.html#method.kind) for more information. */ inline icu4x::CalendarKind kind() const; @@ -70,4 +70,4 @@ class Calendar { }; } // namespace -#endif // icu4x_Calendar_D_HPP +#endif // ICU4X_Calendar_D_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/Calendar.hpp b/ffi/capi/bindings/cpp/icu4x/Calendar.hpp index b9ed61cb078..25ab7614096 100644 --- a/ffi/capi/bindings/cpp/icu4x/Calendar.hpp +++ b/ffi/capi/bindings/cpp/icu4x/Calendar.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_Calendar_HPP -#define icu4x_Calendar_HPP +#ifndef ICU4X_Calendar_HPP +#define ICU4X_Calendar_HPP #include "Calendar.d.hpp" @@ -11,10 +11,10 @@ #include #include #include -#include "../diplomat_runtime.hpp" #include "CalendarKind.hpp" #include "DataError.hpp" #include "DataProvider.hpp" +#include "diplomat_runtime.hpp" namespace icu4x { @@ -39,10 +39,10 @@ inline std::unique_ptr icu4x::Calendar::create(icu4x::CalendarK return std::unique_ptr(icu4x::Calendar::FromFFI(result)); } -inline diplomat::result, icu4x::DataError> icu4x::Calendar::create_with_provider(const icu4x::DataProvider& provider, icu4x::CalendarKind kind) { +inline icu4x::diplomat::result, icu4x::DataError> icu4x::Calendar::create_with_provider(const icu4x::DataProvider& provider, icu4x::CalendarKind kind) { auto result = icu4x::capi::icu4x_Calendar_create_with_provider_mv1(provider.AsFFI(), kind.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DataError>(diplomat::Ok>(std::unique_ptr(icu4x::Calendar::FromFFI(result.ok)))) : diplomat::result, icu4x::DataError>(diplomat::Err(icu4x::DataError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::Calendar::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Err(icu4x::DataError::FromFFI(result.err))); } inline icu4x::CalendarKind icu4x::Calendar::kind() const { @@ -71,4 +71,4 @@ inline void icu4x::Calendar::operator delete(void* ptr) { } -#endif // icu4x_Calendar_HPP +#endif // ICU4X_Calendar_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/CalendarError.d.hpp b/ffi/capi/bindings/cpp/icu4x/CalendarError.d.hpp index f15b140ea41..85a13db8c1a 100644 --- a/ffi/capi/bindings/cpp/icu4x/CalendarError.d.hpp +++ b/ffi/capi/bindings/cpp/icu4x/CalendarError.d.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_CalendarError_D_HPP -#define icu4x_CalendarError_D_HPP +#ifndef ICU4X_CalendarError_D_HPP +#define ICU4X_CalendarError_D_HPP #include #include @@ -9,7 +9,7 @@ #include #include #include -#include "../diplomat_runtime.hpp" +#include "diplomat_runtime.hpp" namespace icu4x { @@ -53,4 +53,4 @@ class CalendarError { }; } // namespace -#endif // icu4x_CalendarError_D_HPP +#endif // ICU4X_CalendarError_D_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/CalendarError.hpp b/ffi/capi/bindings/cpp/icu4x/CalendarError.hpp index 3dafaf02ca8..275d0c3b649 100644 --- a/ffi/capi/bindings/cpp/icu4x/CalendarError.hpp +++ b/ffi/capi/bindings/cpp/icu4x/CalendarError.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_CalendarError_HPP -#define icu4x_CalendarError_HPP +#ifndef ICU4X_CalendarError_HPP +#define ICU4X_CalendarError_HPP #include "CalendarError.d.hpp" @@ -11,7 +11,7 @@ #include #include #include -#include "../diplomat_runtime.hpp" +#include "diplomat_runtime.hpp" namespace icu4x { @@ -37,4 +37,4 @@ inline icu4x::CalendarError icu4x::CalendarError::FromFFI(icu4x::capi::CalendarE std::abort(); } } -#endif // icu4x_CalendarError_HPP +#endif // ICU4X_CalendarError_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/CalendarKind.d.hpp b/ffi/capi/bindings/cpp/icu4x/CalendarKind.d.hpp index d140c3c4482..2fc269f4980 100644 --- a/ffi/capi/bindings/cpp/icu4x/CalendarKind.d.hpp +++ b/ffi/capi/bindings/cpp/icu4x/CalendarKind.d.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_CalendarKind_D_HPP -#define icu4x_CalendarKind_D_HPP +#ifndef ICU4X_CalendarKind_D_HPP +#define ICU4X_CalendarKind_D_HPP #include #include @@ -9,13 +9,13 @@ #include #include #include -#include "../diplomat_runtime.hpp" - +#include "diplomat_runtime.hpp" namespace icu4x { namespace capi { struct Locale; } class Locale; class CalendarKind; -} +} // namespace icu4x + namespace icu4x { @@ -83,9 +83,9 @@ class CalendarKind { explicit operator bool() const = delete; /** - * Creates a new {@link CalendarKind} for the specified locale, using compiled data. - * - * See the [Rust documentation for `new`](https://docs.rs/icu/2.0.0/icu/calendar/enum.AnyCalendarKind.html#method.new) for more information. + * Creates a new {@link CalendarKind} for the specified locale, using compiled data. + * + * See the [Rust documentation for `new`](https://docs.rs/icu/2.0.0/icu/calendar/enum.AnyCalendarKind.html#method.new) for more information. */ inline static icu4x::CalendarKind create(const icu4x::Locale& locale); @@ -96,4 +96,4 @@ class CalendarKind { }; } // namespace -#endif // icu4x_CalendarKind_D_HPP +#endif // ICU4X_CalendarKind_D_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/CalendarKind.hpp b/ffi/capi/bindings/cpp/icu4x/CalendarKind.hpp index 98546862a19..54e75550663 100644 --- a/ffi/capi/bindings/cpp/icu4x/CalendarKind.hpp +++ b/ffi/capi/bindings/cpp/icu4x/CalendarKind.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_CalendarKind_HPP -#define icu4x_CalendarKind_HPP +#ifndef ICU4X_CalendarKind_HPP +#define ICU4X_CalendarKind_HPP #include "CalendarKind.d.hpp" @@ -11,8 +11,8 @@ #include #include #include -#include "../diplomat_runtime.hpp" #include "Locale.hpp" +#include "diplomat_runtime.hpp" namespace icu4x { @@ -59,4 +59,4 @@ inline icu4x::CalendarKind icu4x::CalendarKind::create(const icu4x::Locale& loca auto result = icu4x::capi::icu4x_CalendarKind_create_mv1(locale.AsFFI()); return icu4x::CalendarKind::FromFFI(result); } -#endif // icu4x_CalendarKind_HPP +#endif // ICU4X_CalendarKind_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/CanonicalCombiningClass.d.hpp b/ffi/capi/bindings/cpp/icu4x/CanonicalCombiningClass.d.hpp index 193966458b3..efed15138cc 100644 --- a/ffi/capi/bindings/cpp/icu4x/CanonicalCombiningClass.d.hpp +++ b/ffi/capi/bindings/cpp/icu4x/CanonicalCombiningClass.d.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_CanonicalCombiningClass_D_HPP -#define icu4x_CanonicalCombiningClass_D_HPP +#ifndef ICU4X_CanonicalCombiningClass_D_HPP +#define ICU4X_CanonicalCombiningClass_D_HPP #include #include @@ -9,11 +9,11 @@ #include #include #include -#include "../diplomat_runtime.hpp" - +#include "diplomat_runtime.hpp" namespace icu4x { class CanonicalCombiningClass; -} +} // namespace icu4x + namespace icu4x { @@ -159,21 +159,21 @@ class CanonicalCombiningClass { explicit operator bool() const = delete; /** - * See the [Rust documentation for `for_char`](https://docs.rs/icu/2.0.0/icu/properties/props/trait.EnumeratedProperty.html#tymethod.for_char) for more information. + * See the [Rust documentation for `for_char`](https://docs.rs/icu/2.0.0/icu/properties/props/trait.EnumeratedProperty.html#tymethod.for_char) for more information. */ inline static icu4x::CanonicalCombiningClass for_char(char32_t ch); /** - * Convert to an integer value usable with ICU4C and CodePointMapData - * - * See the [Rust documentation for `to_icu4c_value`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.CanonicalCombiningClass.html#method.to_icu4c_value) for more information. + * Convert to an integer value usable with ICU4C and CodePointMapData + * + * See the [Rust documentation for `to_icu4c_value`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.CanonicalCombiningClass.html#method.to_icu4c_value) for more information. */ inline uint8_t to_integer_value() const; /** - * Convert from an integer value from ICU4C or CodePointMapData - * - * See the [Rust documentation for `from_icu4c_value`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.CanonicalCombiningClass.html#method.from_icu4c_value) for more information. + * Convert from an integer value from ICU4C or CodePointMapData + * + * See the [Rust documentation for `from_icu4c_value`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.CanonicalCombiningClass.html#method.from_icu4c_value) for more information. */ inline static std::optional from_integer_value(uint8_t other); @@ -184,4 +184,4 @@ class CanonicalCombiningClass { }; } // namespace -#endif // icu4x_CanonicalCombiningClass_D_HPP +#endif // ICU4X_CanonicalCombiningClass_D_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/CanonicalCombiningClass.hpp b/ffi/capi/bindings/cpp/icu4x/CanonicalCombiningClass.hpp index 140d4a1e045..99bfb6ddd38 100644 --- a/ffi/capi/bindings/cpp/icu4x/CanonicalCombiningClass.hpp +++ b/ffi/capi/bindings/cpp/icu4x/CanonicalCombiningClass.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_CanonicalCombiningClass_HPP -#define icu4x_CanonicalCombiningClass_HPP +#ifndef ICU4X_CanonicalCombiningClass_HPP +#define ICU4X_CanonicalCombiningClass_HPP #include "CanonicalCombiningClass.d.hpp" @@ -11,7 +11,7 @@ #include #include #include -#include "../diplomat_runtime.hpp" +#include "diplomat_runtime.hpp" namespace icu4x { @@ -113,4 +113,4 @@ inline std::optional icu4x::CanonicalCombiningCl auto result = icu4x::capi::icu4x_CanonicalCombiningClass_from_integer_value_mv1(other); return result.is_ok ? std::optional(icu4x::CanonicalCombiningClass::FromFFI(result.ok)) : std::nullopt; } -#endif // icu4x_CanonicalCombiningClass_HPP +#endif // ICU4X_CanonicalCombiningClass_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/CanonicalCombiningClassMap.d.hpp b/ffi/capi/bindings/cpp/icu4x/CanonicalCombiningClassMap.d.hpp index f5f0065bda2..9f33c8504b1 100644 --- a/ffi/capi/bindings/cpp/icu4x/CanonicalCombiningClassMap.d.hpp +++ b/ffi/capi/bindings/cpp/icu4x/CanonicalCombiningClassMap.d.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_CanonicalCombiningClassMap_D_HPP -#define icu4x_CanonicalCombiningClassMap_D_HPP +#ifndef ICU4X_CanonicalCombiningClassMap_D_HPP +#define ICU4X_CanonicalCombiningClassMap_D_HPP #include #include @@ -9,15 +9,15 @@ #include #include #include -#include "../diplomat_runtime.hpp" - +#include "diplomat_runtime.hpp" namespace icu4x { namespace capi { struct CanonicalCombiningClassMap; } class CanonicalCombiningClassMap; namespace capi { struct DataProvider; } class DataProvider; class DataError; -} +} // namespace icu4x + namespace icu4x { @@ -36,23 +36,23 @@ class CanonicalCombiningClassMap { public: /** - * Construct a new CanonicalCombiningClassMap instance for NFC using compiled data. - * - * See the [Rust documentation for `new`](https://docs.rs/icu/2.0.0/icu/normalizer/properties/struct.CanonicalCombiningClassMap.html#method.new) for more information. + * Construct a new CanonicalCombiningClassMap instance for NFC using compiled data. + * + * See the [Rust documentation for `new`](https://docs.rs/icu/2.0.0/icu/normalizer/properties/struct.CanonicalCombiningClassMap.html#method.new) for more information. */ inline static std::unique_ptr create(); /** - * Construct a new CanonicalCombiningClassMap instance for NFC using a particular data source. - * - * See the [Rust documentation for `new`](https://docs.rs/icu/2.0.0/icu/normalizer/properties/struct.CanonicalCombiningClassMap.html#method.new) for more information. + * Construct a new CanonicalCombiningClassMap instance for NFC using a particular data source. + * + * See the [Rust documentation for `new`](https://docs.rs/icu/2.0.0/icu/normalizer/properties/struct.CanonicalCombiningClassMap.html#method.new) for more information. */ - inline static diplomat::result, icu4x::DataError> create_with_provider(const icu4x::DataProvider& provider); + inline static icu4x::diplomat::result, icu4x::DataError> create_with_provider(const icu4x::DataProvider& provider); /** - * See the [Rust documentation for `get`](https://docs.rs/icu/2.0.0/icu/normalizer/properties/struct.CanonicalCombiningClassMapBorrowed.html#method.get) for more information. - * - * Additional information: [1](https://docs.rs/icu/2.0.0/icu/properties/props/struct.CanonicalCombiningClass.html) + * See the [Rust documentation for `get`](https://docs.rs/icu/2.0.0/icu/normalizer/properties/struct.CanonicalCombiningClassMapBorrowed.html#method.get) for more information. + * + * Additional information: [1](https://docs.rs/icu/2.0.0/icu/properties/props/struct.CanonicalCombiningClass.html) */ inline uint8_t operator[](char32_t ch) const; @@ -71,4 +71,4 @@ class CanonicalCombiningClassMap { }; } // namespace -#endif // icu4x_CanonicalCombiningClassMap_D_HPP +#endif // ICU4X_CanonicalCombiningClassMap_D_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/CanonicalCombiningClassMap.hpp b/ffi/capi/bindings/cpp/icu4x/CanonicalCombiningClassMap.hpp index dfe51ea3091..da5df53a692 100644 --- a/ffi/capi/bindings/cpp/icu4x/CanonicalCombiningClassMap.hpp +++ b/ffi/capi/bindings/cpp/icu4x/CanonicalCombiningClassMap.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_CanonicalCombiningClassMap_HPP -#define icu4x_CanonicalCombiningClassMap_HPP +#ifndef ICU4X_CanonicalCombiningClassMap_HPP +#define ICU4X_CanonicalCombiningClassMap_HPP #include "CanonicalCombiningClassMap.d.hpp" @@ -11,9 +11,9 @@ #include #include #include -#include "../diplomat_runtime.hpp" #include "DataError.hpp" #include "DataProvider.hpp" +#include "diplomat_runtime.hpp" namespace icu4x { @@ -38,9 +38,9 @@ inline std::unique_ptr icu4x::CanonicalCombin return std::unique_ptr(icu4x::CanonicalCombiningClassMap::FromFFI(result)); } -inline diplomat::result, icu4x::DataError> icu4x::CanonicalCombiningClassMap::create_with_provider(const icu4x::DataProvider& provider) { +inline icu4x::diplomat::result, icu4x::DataError> icu4x::CanonicalCombiningClassMap::create_with_provider(const icu4x::DataProvider& provider) { auto result = icu4x::capi::icu4x_CanonicalCombiningClassMap_create_with_provider_mv1(provider.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DataError>(diplomat::Ok>(std::unique_ptr(icu4x::CanonicalCombiningClassMap::FromFFI(result.ok)))) : diplomat::result, icu4x::DataError>(diplomat::Err(icu4x::DataError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::CanonicalCombiningClassMap::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Err(icu4x::DataError::FromFFI(result.err))); } inline uint8_t icu4x::CanonicalCombiningClassMap::operator[](char32_t ch) const { @@ -70,4 +70,4 @@ inline void icu4x::CanonicalCombiningClassMap::operator delete(void* ptr) { } -#endif // icu4x_CanonicalCombiningClassMap_HPP +#endif // ICU4X_CanonicalCombiningClassMap_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/CanonicalComposition.d.hpp b/ffi/capi/bindings/cpp/icu4x/CanonicalComposition.d.hpp index 277fb4204d2..a063cb27939 100644 --- a/ffi/capi/bindings/cpp/icu4x/CanonicalComposition.d.hpp +++ b/ffi/capi/bindings/cpp/icu4x/CanonicalComposition.d.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_CanonicalComposition_D_HPP -#define icu4x_CanonicalComposition_D_HPP +#ifndef ICU4X_CanonicalComposition_D_HPP +#define ICU4X_CanonicalComposition_D_HPP #include #include @@ -9,15 +9,15 @@ #include #include #include -#include "../diplomat_runtime.hpp" - +#include "diplomat_runtime.hpp" namespace icu4x { namespace capi { struct CanonicalComposition; } class CanonicalComposition; namespace capi { struct DataProvider; } class DataProvider; class DataError; -} +} // namespace icu4x + namespace icu4x { @@ -38,24 +38,24 @@ class CanonicalComposition { public: /** - * Construct a new CanonicalComposition instance for NFC using compiled data. - * - * See the [Rust documentation for `new`](https://docs.rs/icu/2.0.0/icu/normalizer/properties/struct.CanonicalComposition.html#method.new) for more information. + * Construct a new CanonicalComposition instance for NFC using compiled data. + * + * See the [Rust documentation for `new`](https://docs.rs/icu/2.0.0/icu/normalizer/properties/struct.CanonicalComposition.html#method.new) for more information. */ inline static std::unique_ptr create(); /** - * Construct a new CanonicalComposition instance for NFC using a particular data source. - * - * See the [Rust documentation for `new`](https://docs.rs/icu/2.0.0/icu/normalizer/properties/struct.CanonicalComposition.html#method.new) for more information. + * Construct a new CanonicalComposition instance for NFC using a particular data source. + * + * See the [Rust documentation for `new`](https://docs.rs/icu/2.0.0/icu/normalizer/properties/struct.CanonicalComposition.html#method.new) for more information. */ - inline static diplomat::result, icu4x::DataError> create_with_provider(const icu4x::DataProvider& provider); + inline static icu4x::diplomat::result, icu4x::DataError> create_with_provider(const icu4x::DataProvider& provider); /** - * Performs canonical composition (including Hangul) on a pair of characters - * or returns NUL if these characters don’t compose. Composition exclusions are taken into account. - * - * See the [Rust documentation for `compose`](https://docs.rs/icu/2.0.0/icu/normalizer/properties/struct.CanonicalCompositionBorrowed.html#method.compose) for more information. + * Performs canonical composition (including Hangul) on a pair of characters + * or returns NUL if these characters don’t compose. Composition exclusions are taken into account. + * + * See the [Rust documentation for `compose`](https://docs.rs/icu/2.0.0/icu/normalizer/properties/struct.CanonicalCompositionBorrowed.html#method.compose) for more information. */ inline char32_t compose(char32_t starter, char32_t second) const; @@ -74,4 +74,4 @@ class CanonicalComposition { }; } // namespace -#endif // icu4x_CanonicalComposition_D_HPP +#endif // ICU4X_CanonicalComposition_D_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/CanonicalComposition.hpp b/ffi/capi/bindings/cpp/icu4x/CanonicalComposition.hpp index 00d909e77af..435d27cd558 100644 --- a/ffi/capi/bindings/cpp/icu4x/CanonicalComposition.hpp +++ b/ffi/capi/bindings/cpp/icu4x/CanonicalComposition.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_CanonicalComposition_HPP -#define icu4x_CanonicalComposition_HPP +#ifndef ICU4X_CanonicalComposition_HPP +#define ICU4X_CanonicalComposition_HPP #include "CanonicalComposition.d.hpp" @@ -11,9 +11,9 @@ #include #include #include -#include "../diplomat_runtime.hpp" #include "DataError.hpp" #include "DataProvider.hpp" +#include "diplomat_runtime.hpp" namespace icu4x { @@ -38,9 +38,9 @@ inline std::unique_ptr icu4x::CanonicalComposition: return std::unique_ptr(icu4x::CanonicalComposition::FromFFI(result)); } -inline diplomat::result, icu4x::DataError> icu4x::CanonicalComposition::create_with_provider(const icu4x::DataProvider& provider) { +inline icu4x::diplomat::result, icu4x::DataError> icu4x::CanonicalComposition::create_with_provider(const icu4x::DataProvider& provider) { auto result = icu4x::capi::icu4x_CanonicalComposition_create_with_provider_mv1(provider.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DataError>(diplomat::Ok>(std::unique_ptr(icu4x::CanonicalComposition::FromFFI(result.ok)))) : diplomat::result, icu4x::DataError>(diplomat::Err(icu4x::DataError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::CanonicalComposition::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Err(icu4x::DataError::FromFFI(result.err))); } inline char32_t icu4x::CanonicalComposition::compose(char32_t starter, char32_t second) const { @@ -71,4 +71,4 @@ inline void icu4x::CanonicalComposition::operator delete(void* ptr) { } -#endif // icu4x_CanonicalComposition_HPP +#endif // ICU4X_CanonicalComposition_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/CanonicalDecomposition.d.hpp b/ffi/capi/bindings/cpp/icu4x/CanonicalDecomposition.d.hpp index fa779f16581..65bbf625b4d 100644 --- a/ffi/capi/bindings/cpp/icu4x/CanonicalDecomposition.d.hpp +++ b/ffi/capi/bindings/cpp/icu4x/CanonicalDecomposition.d.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_CanonicalDecomposition_D_HPP -#define icu4x_CanonicalDecomposition_D_HPP +#ifndef ICU4X_CanonicalDecomposition_D_HPP +#define ICU4X_CanonicalDecomposition_D_HPP #include #include @@ -9,8 +9,7 @@ #include #include #include -#include "../diplomat_runtime.hpp" - +#include "diplomat_runtime.hpp" namespace icu4x { namespace capi { struct CanonicalDecomposition; } class CanonicalDecomposition; @@ -18,7 +17,8 @@ namespace capi { struct DataProvider; } class DataProvider; struct Decomposed; class DataError; -} +} // namespace icu4x + namespace icu4x { @@ -39,23 +39,23 @@ class CanonicalDecomposition { public: /** - * Construct a new CanonicalDecomposition instance for NFC using compiled data. - * - * See the [Rust documentation for `new`](https://docs.rs/icu/2.0.0/icu/normalizer/properties/struct.CanonicalDecomposition.html#method.new) for more information. + * Construct a new CanonicalDecomposition instance for NFC using compiled data. + * + * See the [Rust documentation for `new`](https://docs.rs/icu/2.0.0/icu/normalizer/properties/struct.CanonicalDecomposition.html#method.new) for more information. */ inline static std::unique_ptr create(); /** - * Construct a new CanonicalDecomposition instance for NFC using a particular data source. - * - * See the [Rust documentation for `new`](https://docs.rs/icu/2.0.0/icu/normalizer/properties/struct.CanonicalDecomposition.html#method.new) for more information. + * Construct a new CanonicalDecomposition instance for NFC using a particular data source. + * + * See the [Rust documentation for `new`](https://docs.rs/icu/2.0.0/icu/normalizer/properties/struct.CanonicalDecomposition.html#method.new) for more information. */ - inline static diplomat::result, icu4x::DataError> create_with_provider(const icu4x::DataProvider& provider); + inline static icu4x::diplomat::result, icu4x::DataError> create_with_provider(const icu4x::DataProvider& provider); /** - * Performs non-recursive canonical decomposition (including for Hangul). - * - * See the [Rust documentation for `decompose`](https://docs.rs/icu/2.0.0/icu/normalizer/properties/struct.CanonicalDecompositionBorrowed.html#method.decompose) for more information. + * Performs non-recursive canonical decomposition (including for Hangul). + * + * See the [Rust documentation for `decompose`](https://docs.rs/icu/2.0.0/icu/normalizer/properties/struct.CanonicalDecompositionBorrowed.html#method.decompose) for more information. */ inline icu4x::Decomposed decompose(char32_t c) const; @@ -74,4 +74,4 @@ class CanonicalDecomposition { }; } // namespace -#endif // icu4x_CanonicalDecomposition_D_HPP +#endif // ICU4X_CanonicalDecomposition_D_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/CanonicalDecomposition.hpp b/ffi/capi/bindings/cpp/icu4x/CanonicalDecomposition.hpp index bae3c7dc47b..c03b978565e 100644 --- a/ffi/capi/bindings/cpp/icu4x/CanonicalDecomposition.hpp +++ b/ffi/capi/bindings/cpp/icu4x/CanonicalDecomposition.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_CanonicalDecomposition_HPP -#define icu4x_CanonicalDecomposition_HPP +#ifndef ICU4X_CanonicalDecomposition_HPP +#define ICU4X_CanonicalDecomposition_HPP #include "CanonicalDecomposition.d.hpp" @@ -11,10 +11,10 @@ #include #include #include -#include "../diplomat_runtime.hpp" #include "DataError.hpp" #include "DataProvider.hpp" #include "Decomposed.hpp" +#include "diplomat_runtime.hpp" namespace icu4x { @@ -39,9 +39,9 @@ inline std::unique_ptr icu4x::CanonicalDecomposit return std::unique_ptr(icu4x::CanonicalDecomposition::FromFFI(result)); } -inline diplomat::result, icu4x::DataError> icu4x::CanonicalDecomposition::create_with_provider(const icu4x::DataProvider& provider) { +inline icu4x::diplomat::result, icu4x::DataError> icu4x::CanonicalDecomposition::create_with_provider(const icu4x::DataProvider& provider) { auto result = icu4x::capi::icu4x_CanonicalDecomposition_create_with_provider_mv1(provider.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DataError>(diplomat::Ok>(std::unique_ptr(icu4x::CanonicalDecomposition::FromFFI(result.ok)))) : diplomat::result, icu4x::DataError>(diplomat::Err(icu4x::DataError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::CanonicalDecomposition::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Err(icu4x::DataError::FromFFI(result.err))); } inline icu4x::Decomposed icu4x::CanonicalDecomposition::decompose(char32_t c) const { @@ -71,4 +71,4 @@ inline void icu4x::CanonicalDecomposition::operator delete(void* ptr) { } -#endif // icu4x_CanonicalDecomposition_HPP +#endif // ICU4X_CanonicalDecomposition_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/CaseMapCloser.d.hpp b/ffi/capi/bindings/cpp/icu4x/CaseMapCloser.d.hpp index 22b07acabae..30a8814e50b 100644 --- a/ffi/capi/bindings/cpp/icu4x/CaseMapCloser.d.hpp +++ b/ffi/capi/bindings/cpp/icu4x/CaseMapCloser.d.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_CaseMapCloser_D_HPP -#define icu4x_CaseMapCloser_D_HPP +#ifndef ICU4X_CaseMapCloser_D_HPP +#define ICU4X_CaseMapCloser_D_HPP #include #include @@ -9,8 +9,7 @@ #include #include #include -#include "../diplomat_runtime.hpp" - +#include "diplomat_runtime.hpp" namespace icu4x { namespace capi { struct CaseMapCloser; } class CaseMapCloser; @@ -19,7 +18,8 @@ class CodePointSetBuilder; namespace capi { struct DataProvider; } class DataProvider; class DataError; -} +} // namespace icu4x + namespace icu4x { @@ -36,34 +36,34 @@ class CaseMapCloser { public: /** - * Construct a new CaseMapCloser instance using compiled data. - * - * See the [Rust documentation for `new`](https://docs.rs/icu/2.0.0/icu/casemap/struct.CaseMapCloser.html#method.new) for more information. + * Construct a new CaseMapCloser instance using compiled data. + * + * See the [Rust documentation for `new`](https://docs.rs/icu/2.0.0/icu/casemap/struct.CaseMapCloser.html#method.new) for more information. */ - inline static diplomat::result, icu4x::DataError> create(); + inline static icu4x::diplomat::result, icu4x::DataError> create(); /** - * Construct a new CaseMapCloser instance using a particular data source. - * - * See the [Rust documentation for `new`](https://docs.rs/icu/2.0.0/icu/casemap/struct.CaseMapCloser.html#method.new) for more information. + * Construct a new CaseMapCloser instance using a particular data source. + * + * See the [Rust documentation for `new`](https://docs.rs/icu/2.0.0/icu/casemap/struct.CaseMapCloser.html#method.new) for more information. */ - inline static diplomat::result, icu4x::DataError> create_with_provider(const icu4x::DataProvider& provider); + inline static icu4x::diplomat::result, icu4x::DataError> create_with_provider(const icu4x::DataProvider& provider); /** - * Adds all simple case mappings and the full case folding for `c` to `builder`. - * Also adds special case closure mappings. - * - * See the [Rust documentation for `add_case_closure_to`](https://docs.rs/icu/2.0.0/icu/casemap/struct.CaseMapCloserBorrowed.html#method.add_case_closure_to) for more information. + * Adds all simple case mappings and the full case folding for `c` to `builder`. + * Also adds special case closure mappings. + * + * See the [Rust documentation for `add_case_closure_to`](https://docs.rs/icu/2.0.0/icu/casemap/struct.CaseMapCloserBorrowed.html#method.add_case_closure_to) for more information. */ inline void add_case_closure_to(char32_t c, icu4x::CodePointSetBuilder& builder) const; /** - * Finds all characters and strings which may casemap to `s` as their full case folding string - * and adds them to the set. - * - * Returns true if the string was found - * - * See the [Rust documentation for `add_string_case_closure_to`](https://docs.rs/icu/2.0.0/icu/casemap/struct.CaseMapCloserBorrowed.html#method.add_string_case_closure_to) for more information. + * Finds all characters and strings which may casemap to `s` as their full case folding string + * and adds them to the set. + * + * Returns true if the string was found + * + * See the [Rust documentation for `add_string_case_closure_to`](https://docs.rs/icu/2.0.0/icu/casemap/struct.CaseMapCloserBorrowed.html#method.add_string_case_closure_to) for more information. */ inline bool add_string_case_closure_to(std::string_view s, icu4x::CodePointSetBuilder& builder) const; @@ -82,4 +82,4 @@ class CaseMapCloser { }; } // namespace -#endif // icu4x_CaseMapCloser_D_HPP +#endif // ICU4X_CaseMapCloser_D_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/CaseMapCloser.hpp b/ffi/capi/bindings/cpp/icu4x/CaseMapCloser.hpp index c50f012d269..fc8c2ec6345 100644 --- a/ffi/capi/bindings/cpp/icu4x/CaseMapCloser.hpp +++ b/ffi/capi/bindings/cpp/icu4x/CaseMapCloser.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_CaseMapCloser_HPP -#define icu4x_CaseMapCloser_HPP +#ifndef ICU4X_CaseMapCloser_HPP +#define ICU4X_CaseMapCloser_HPP #include "CaseMapCloser.d.hpp" @@ -11,10 +11,10 @@ #include #include #include -#include "../diplomat_runtime.hpp" #include "CodePointSetBuilder.hpp" #include "DataError.hpp" #include "DataProvider.hpp" +#include "diplomat_runtime.hpp" namespace icu4x { @@ -29,7 +29,7 @@ namespace capi { void icu4x_CaseMapCloser_add_case_closure_to_mv1(const icu4x::capi::CaseMapCloser* self, char32_t c, icu4x::capi::CodePointSetBuilder* builder); - bool icu4x_CaseMapCloser_add_string_case_closure_to_mv1(const icu4x::capi::CaseMapCloser* self, diplomat::capi::DiplomatStringView s, icu4x::capi::CodePointSetBuilder* builder); + bool icu4x_CaseMapCloser_add_string_case_closure_to_mv1(const icu4x::capi::CaseMapCloser* self, icu4x::diplomat::capi::DiplomatStringView s, icu4x::capi::CodePointSetBuilder* builder); void icu4x_CaseMapCloser_destroy_mv1(CaseMapCloser* self); @@ -37,14 +37,14 @@ namespace capi { } // namespace capi } // namespace -inline diplomat::result, icu4x::DataError> icu4x::CaseMapCloser::create() { +inline icu4x::diplomat::result, icu4x::DataError> icu4x::CaseMapCloser::create() { auto result = icu4x::capi::icu4x_CaseMapCloser_create_mv1(); - return result.is_ok ? diplomat::result, icu4x::DataError>(diplomat::Ok>(std::unique_ptr(icu4x::CaseMapCloser::FromFFI(result.ok)))) : diplomat::result, icu4x::DataError>(diplomat::Err(icu4x::DataError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::CaseMapCloser::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Err(icu4x::DataError::FromFFI(result.err))); } -inline diplomat::result, icu4x::DataError> icu4x::CaseMapCloser::create_with_provider(const icu4x::DataProvider& provider) { +inline icu4x::diplomat::result, icu4x::DataError> icu4x::CaseMapCloser::create_with_provider(const icu4x::DataProvider& provider) { auto result = icu4x::capi::icu4x_CaseMapCloser_create_with_provider_mv1(provider.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DataError>(diplomat::Ok>(std::unique_ptr(icu4x::CaseMapCloser::FromFFI(result.ok)))) : diplomat::result, icu4x::DataError>(diplomat::Err(icu4x::DataError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::CaseMapCloser::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Err(icu4x::DataError::FromFFI(result.err))); } inline void icu4x::CaseMapCloser::add_case_closure_to(char32_t c, icu4x::CodePointSetBuilder& builder) const { @@ -81,4 +81,4 @@ inline void icu4x::CaseMapCloser::operator delete(void* ptr) { } -#endif // icu4x_CaseMapCloser_HPP +#endif // ICU4X_CaseMapCloser_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/CaseMapper.d.hpp b/ffi/capi/bindings/cpp/icu4x/CaseMapper.d.hpp index f2804cbb65c..b1db2bc0645 100644 --- a/ffi/capi/bindings/cpp/icu4x/CaseMapper.d.hpp +++ b/ffi/capi/bindings/cpp/icu4x/CaseMapper.d.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_CaseMapper_D_HPP -#define icu4x_CaseMapper_D_HPP +#ifndef ICU4X_CaseMapper_D_HPP +#define ICU4X_CaseMapper_D_HPP #include #include @@ -9,8 +9,7 @@ #include #include #include -#include "../diplomat_runtime.hpp" - +#include "diplomat_runtime.hpp" namespace icu4x { namespace capi { struct CaseMapper; } class CaseMapper; @@ -22,7 +21,8 @@ namespace capi { struct Locale; } class Locale; struct TitlecaseOptionsV1; class DataError; -} +} // namespace icu4x + namespace icu4x { @@ -39,189 +39,189 @@ class CaseMapper { public: /** - * Construct a new CaseMapper instance using compiled data. - * - * See the [Rust documentation for `new`](https://docs.rs/icu/2.0.0/icu/casemap/struct.CaseMapper.html#method.new) for more information. + * Construct a new CaseMapper instance using compiled data. + * + * See the [Rust documentation for `new`](https://docs.rs/icu/2.0.0/icu/casemap/struct.CaseMapper.html#method.new) for more information. */ inline static std::unique_ptr create(); /** - * Construct a new CaseMapper instance using a particular data source. - * - * See the [Rust documentation for `new`](https://docs.rs/icu/2.0.0/icu/casemap/struct.CaseMapper.html#method.new) for more information. + * Construct a new CaseMapper instance using a particular data source. + * + * See the [Rust documentation for `new`](https://docs.rs/icu/2.0.0/icu/casemap/struct.CaseMapper.html#method.new) for more information. */ - inline static diplomat::result, icu4x::DataError> create_with_provider(const icu4x::DataProvider& provider); + inline static icu4x::diplomat::result, icu4x::DataError> create_with_provider(const icu4x::DataProvider& provider); /** - * Returns the full lowercase mapping of the given string - * - * See the [Rust documentation for `lowercase`](https://docs.rs/icu/2.0.0/icu/casemap/struct.CaseMapperBorrowed.html#method.lowercase) for more information. + * Returns the full lowercase mapping of the given string + * + * See the [Rust documentation for `lowercase`](https://docs.rs/icu/2.0.0/icu/casemap/struct.CaseMapperBorrowed.html#method.lowercase) for more information. */ - inline diplomat::result lowercase(std::string_view s, const icu4x::Locale& locale) const; + inline icu4x::diplomat::result lowercase(std::string_view s, const icu4x::Locale& locale) const; template - inline diplomat::result lowercase_write(std::string_view s, const icu4x::Locale& locale, W& writeable_output) const; + inline icu4x::diplomat::result lowercase_write(std::string_view s, const icu4x::Locale& locale, W& writeable_output) const; /** - * Returns the full uppercase mapping of the given string - * - * See the [Rust documentation for `uppercase`](https://docs.rs/icu/2.0.0/icu/casemap/struct.CaseMapperBorrowed.html#method.uppercase) for more information. + * Returns the full uppercase mapping of the given string + * + * See the [Rust documentation for `uppercase`](https://docs.rs/icu/2.0.0/icu/casemap/struct.CaseMapperBorrowed.html#method.uppercase) for more information. */ - inline diplomat::result uppercase(std::string_view s, const icu4x::Locale& locale) const; + inline icu4x::diplomat::result uppercase(std::string_view s, const icu4x::Locale& locale) const; template - inline diplomat::result uppercase_write(std::string_view s, const icu4x::Locale& locale, W& writeable_output) const; + inline icu4x::diplomat::result uppercase_write(std::string_view s, const icu4x::Locale& locale, W& writeable_output) const; /** - * Returns the full lowercase mapping of the given string, using compiled data (avoids having to allocate a CaseMapper object) - * - * See the [Rust documentation for `lowercase`](https://docs.rs/icu/2.0.0/icu/casemap/struct.CaseMapperBorrowed.html#method.lowercase) for more information. + * Returns the full lowercase mapping of the given string, using compiled data (avoids having to allocate a CaseMapper object) + * + * See the [Rust documentation for `lowercase`](https://docs.rs/icu/2.0.0/icu/casemap/struct.CaseMapperBorrowed.html#method.lowercase) for more information. */ - inline static diplomat::result lowercase_with_compiled_data(std::string_view s, const icu4x::Locale& locale); + inline static icu4x::diplomat::result lowercase_with_compiled_data(std::string_view s, const icu4x::Locale& locale); template - inline static diplomat::result lowercase_with_compiled_data_write(std::string_view s, const icu4x::Locale& locale, W& writeable_output); + inline static icu4x::diplomat::result lowercase_with_compiled_data_write(std::string_view s, const icu4x::Locale& locale, W& writeable_output); /** - * Returns the full uppercase mapping of the given string, using compiled data (avoids having to allocate a CaseMapper object) - * - * See the [Rust documentation for `uppercase`](https://docs.rs/icu/2.0.0/icu/casemap/struct.CaseMapperBorrowed.html#method.uppercase) for more information. + * Returns the full uppercase mapping of the given string, using compiled data (avoids having to allocate a CaseMapper object) + * + * See the [Rust documentation for `uppercase`](https://docs.rs/icu/2.0.0/icu/casemap/struct.CaseMapperBorrowed.html#method.uppercase) for more information. */ - inline static diplomat::result uppercase_with_compiled_data(std::string_view s, const icu4x::Locale& locale); + inline static icu4x::diplomat::result uppercase_with_compiled_data(std::string_view s, const icu4x::Locale& locale); template - inline static diplomat::result uppercase_with_compiled_data_write(std::string_view s, const icu4x::Locale& locale, W& writeable_output); + inline static icu4x::diplomat::result uppercase_with_compiled_data_write(std::string_view s, const icu4x::Locale& locale, W& writeable_output); /** - * Returns the full titlecase mapping of the given string, performing head adjustment without - * loading additional data. - * (if head adjustment is enabled in the options) - * - * The `v1` refers to the version of the options struct, which may change as we add more options - * - * See the [Rust documentation for `titlecase_segment_with_only_case_data`](https://docs.rs/icu/2.0.0/icu/casemap/struct.CaseMapperBorrowed.html#method.titlecase_segment_with_only_case_data) for more information. + * Returns the full titlecase mapping of the given string, performing head adjustment without + * loading additional data. + * (if head adjustment is enabled in the options) + * + * The `v1` refers to the version of the options struct, which may change as we add more options + * + * See the [Rust documentation for `titlecase_segment_with_only_case_data`](https://docs.rs/icu/2.0.0/icu/casemap/struct.CaseMapperBorrowed.html#method.titlecase_segment_with_only_case_data) for more information. */ - inline diplomat::result titlecase_segment_with_only_case_data_v1(std::string_view s, const icu4x::Locale& locale, icu4x::TitlecaseOptionsV1 options) const; + inline icu4x::diplomat::result titlecase_segment_with_only_case_data_v1(std::string_view s, const icu4x::Locale& locale, icu4x::TitlecaseOptionsV1 options) const; template - inline diplomat::result titlecase_segment_with_only_case_data_v1_write(std::string_view s, const icu4x::Locale& locale, icu4x::TitlecaseOptionsV1 options, W& writeable_output) const; + inline icu4x::diplomat::result titlecase_segment_with_only_case_data_v1_write(std::string_view s, const icu4x::Locale& locale, icu4x::TitlecaseOptionsV1 options, W& writeable_output) const; /** - * Case-folds the characters in the given string - * - * See the [Rust documentation for `fold`](https://docs.rs/icu/2.0.0/icu/casemap/struct.CaseMapperBorrowed.html#method.fold) for more information. + * Case-folds the characters in the given string + * + * See the [Rust documentation for `fold`](https://docs.rs/icu/2.0.0/icu/casemap/struct.CaseMapperBorrowed.html#method.fold) for more information. */ - inline diplomat::result fold(std::string_view s) const; + inline icu4x::diplomat::result fold(std::string_view s) const; template - inline diplomat::result fold_write(std::string_view s, W& writeable_output) const; + inline icu4x::diplomat::result fold_write(std::string_view s, W& writeable_output) const; /** - * Case-folds the characters in the given string - * using Turkic (T) mappings for dotted/dotless I. - * - * See the [Rust documentation for `fold_turkic`](https://docs.rs/icu/2.0.0/icu/casemap/struct.CaseMapperBorrowed.html#method.fold_turkic) for more information. + * Case-folds the characters in the given string + * using Turkic (T) mappings for dotted/dotless I. + * + * See the [Rust documentation for `fold_turkic`](https://docs.rs/icu/2.0.0/icu/casemap/struct.CaseMapperBorrowed.html#method.fold_turkic) for more information. */ - inline diplomat::result fold_turkic(std::string_view s) const; + inline icu4x::diplomat::result fold_turkic(std::string_view s) const; template - inline diplomat::result fold_turkic_write(std::string_view s, W& writeable_output) const; - - /** - * Adds all simple case mappings and the full case folding for `c` to `builder`. - * Also adds special case closure mappings. - * - * In other words, this adds all characters that this casemaps to, as - * well as all characters that may casemap to this one. - * - * Note that since CodePointSetBuilder does not contain strings, this will - * ignore string mappings. - * - * Identical to the similarly named method on `CaseMapCloser`, use that if you - * plan on using string case closure mappings too. - * - * See the [Rust documentation for `add_case_closure_to`](https://docs.rs/icu/2.0.0/icu/casemap/struct.CaseMapperBorrowed.html#method.add_case_closure_to) for more information. + inline icu4x::diplomat::result fold_turkic_write(std::string_view s, W& writeable_output) const; + + /** + * Adds all simple case mappings and the full case folding for `c` to `builder`. + * Also adds special case closure mappings. + * + * In other words, this adds all characters that this casemaps to, as + * well as all characters that may casemap to this one. + * + * Note that since CodePointSetBuilder does not contain strings, this will + * ignore string mappings. + * + * Identical to the similarly named method on `CaseMapCloser`, use that if you + * plan on using string case closure mappings too. + * + * See the [Rust documentation for `add_case_closure_to`](https://docs.rs/icu/2.0.0/icu/casemap/struct.CaseMapperBorrowed.html#method.add_case_closure_to) for more information. */ inline void add_case_closure_to(char32_t c, icu4x::CodePointSetBuilder& builder) const; /** - * Returns the simple lowercase mapping of the given character. - * - * This function only implements simple and common mappings. - * Full mappings, which can map one char to a string, are not included. - * For full mappings, use `CaseMapperBorrowed::lowercase`. - * - * See the [Rust documentation for `simple_lowercase`](https://docs.rs/icu/2.0.0/icu/casemap/struct.CaseMapperBorrowed.html#method.simple_lowercase) for more information. + * Returns the simple lowercase mapping of the given character. + * + * This function only implements simple and common mappings. + * Full mappings, which can map one char to a string, are not included. + * For full mappings, use `CaseMapperBorrowed::lowercase`. + * + * See the [Rust documentation for `simple_lowercase`](https://docs.rs/icu/2.0.0/icu/casemap/struct.CaseMapperBorrowed.html#method.simple_lowercase) for more information. */ inline char32_t simple_lowercase(char32_t ch) const; /** - * Returns the simple lowercase mapping of the given character, using compiled data (avoids having to allocate a CaseMapper object) - * - * See the [Rust documentation for `simple_lowercase`](https://docs.rs/icu/2.0.0/icu/casemap/struct.CaseMapperBorrowed.html#method.simple_lowercase) for more information. + * Returns the simple lowercase mapping of the given character, using compiled data (avoids having to allocate a CaseMapper object) + * + * See the [Rust documentation for `simple_lowercase`](https://docs.rs/icu/2.0.0/icu/casemap/struct.CaseMapperBorrowed.html#method.simple_lowercase) for more information. */ inline static char32_t simple_lowercase_with_compiled_data(char32_t ch); /** - * Returns the simple uppercase mapping of the given character. - * - * This function only implements simple and common mappings. - * Full mappings, which can map one char to a string, are not included. - * For full mappings, use `CaseMapperBorrowed::uppercase`. - * - * See the [Rust documentation for `simple_uppercase`](https://docs.rs/icu/2.0.0/icu/casemap/struct.CaseMapperBorrowed.html#method.simple_uppercase) for more information. + * Returns the simple uppercase mapping of the given character. + * + * This function only implements simple and common mappings. + * Full mappings, which can map one char to a string, are not included. + * For full mappings, use `CaseMapperBorrowed::uppercase`. + * + * See the [Rust documentation for `simple_uppercase`](https://docs.rs/icu/2.0.0/icu/casemap/struct.CaseMapperBorrowed.html#method.simple_uppercase) for more information. */ inline char32_t simple_uppercase(char32_t ch) const; /** - * Returns the simple uppercase mapping of the given character, using compiled data (avoids having to allocate a CaseMapper object) - * - * See the [Rust documentation for `simple_uppercase`](https://docs.rs/icu/2.0.0/icu/casemap/struct.CaseMapperBorrowed.html#method.simple_uppercase) for more information. + * Returns the simple uppercase mapping of the given character, using compiled data (avoids having to allocate a CaseMapper object) + * + * See the [Rust documentation for `simple_uppercase`](https://docs.rs/icu/2.0.0/icu/casemap/struct.CaseMapperBorrowed.html#method.simple_uppercase) for more information. */ inline static char32_t simple_uppercase_with_compiled_data(char32_t ch); /** - * Returns the simple titlecase mapping of the given character. - * - * This function only implements simple and common mappings. - * Full mappings, which can map one char to a string, are not included. - * For full mappings, use `CaseMapperBorrowed::titlecase_segment`. - * - * See the [Rust documentation for `simple_titlecase`](https://docs.rs/icu/2.0.0/icu/casemap/struct.CaseMapperBorrowed.html#method.simple_titlecase) for more information. + * Returns the simple titlecase mapping of the given character. + * + * This function only implements simple and common mappings. + * Full mappings, which can map one char to a string, are not included. + * For full mappings, use `CaseMapperBorrowed::titlecase_segment`. + * + * See the [Rust documentation for `simple_titlecase`](https://docs.rs/icu/2.0.0/icu/casemap/struct.CaseMapperBorrowed.html#method.simple_titlecase) for more information. */ inline char32_t simple_titlecase(char32_t ch) const; /** - * Returns the simple titlecase mapping of the given character, using compiled data (avoids having to allocate a CaseMapper object) - * - * See the [Rust documentation for `simple_titlecase`](https://docs.rs/icu/2.0.0/icu/casemap/struct.CaseMapperBorrowed.html#method.simple_titlecase) for more information. + * Returns the simple titlecase mapping of the given character, using compiled data (avoids having to allocate a CaseMapper object) + * + * See the [Rust documentation for `simple_titlecase`](https://docs.rs/icu/2.0.0/icu/casemap/struct.CaseMapperBorrowed.html#method.simple_titlecase) for more information. */ inline static char32_t simple_titlecase_with_compiled_data(char32_t ch); /** - * Returns the simple casefolding of the given character. - * - * This function only implements simple folding. - * For full folding, use `CaseMapperBorrowed::fold`. - * - * See the [Rust documentation for `simple_fold`](https://docs.rs/icu/2.0.0/icu/casemap/struct.CaseMapperBorrowed.html#method.simple_fold) for more information. + * Returns the simple casefolding of the given character. + * + * This function only implements simple folding. + * For full folding, use `CaseMapperBorrowed::fold`. + * + * See the [Rust documentation for `simple_fold`](https://docs.rs/icu/2.0.0/icu/casemap/struct.CaseMapperBorrowed.html#method.simple_fold) for more information. */ inline char32_t simple_fold(char32_t ch) const; /** - * Returns the simple casefolding of the given character, using compiled data (avoids having to allocate a CaseMapper object) - * - * See the [Rust documentation for `simple_fold`](https://docs.rs/icu/2.0.0/icu/casemap/struct.CaseMapperBorrowed.html#method.simple_fold) for more information. + * Returns the simple casefolding of the given character, using compiled data (avoids having to allocate a CaseMapper object) + * + * See the [Rust documentation for `simple_fold`](https://docs.rs/icu/2.0.0/icu/casemap/struct.CaseMapperBorrowed.html#method.simple_fold) for more information. */ inline static char32_t simple_fold_with_compiled_data(char32_t ch); /** - * Returns the simple casefolding of the given character in the Turkic locale. - * - * This function only implements simple folding. - * For full folding, use `CaseMapperBorrowed::fold_turkic`. - * - * See the [Rust documentation for `simple_fold_turkic`](https://docs.rs/icu/2.0.0/icu/casemap/struct.CaseMapperBorrowed.html#method.simple_fold_turkic) for more information. + * Returns the simple casefolding of the given character in the Turkic locale. + * + * This function only implements simple folding. + * For full folding, use `CaseMapperBorrowed::fold_turkic`. + * + * See the [Rust documentation for `simple_fold_turkic`](https://docs.rs/icu/2.0.0/icu/casemap/struct.CaseMapperBorrowed.html#method.simple_fold_turkic) for more information. */ inline char32_t simple_fold_turkic(char32_t ch) const; /** - * Returns the simple Turkic casefolding of the given character, using compiled data (avoids having to allocate a CaseMapper object) - * - * See the [Rust documentation for `simple_fold_turkic`](https://docs.rs/icu/2.0.0/icu/casemap/struct.CaseMapperBorrowed.html#method.simple_fold_turkic) for more information. + * Returns the simple Turkic casefolding of the given character, using compiled data (avoids having to allocate a CaseMapper object) + * + * See the [Rust documentation for `simple_fold_turkic`](https://docs.rs/icu/2.0.0/icu/casemap/struct.CaseMapperBorrowed.html#method.simple_fold_turkic) for more information. */ inline static char32_t simple_fold_turkic_with_compiled_data(char32_t ch); @@ -240,4 +240,4 @@ class CaseMapper { }; } // namespace -#endif // icu4x_CaseMapper_D_HPP +#endif // ICU4X_CaseMapper_D_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/CaseMapper.hpp b/ffi/capi/bindings/cpp/icu4x/CaseMapper.hpp index 0f6c26a6288..b3273cea6f7 100644 --- a/ffi/capi/bindings/cpp/icu4x/CaseMapper.hpp +++ b/ffi/capi/bindings/cpp/icu4x/CaseMapper.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_CaseMapper_HPP -#define icu4x_CaseMapper_HPP +#ifndef ICU4X_CaseMapper_HPP +#define ICU4X_CaseMapper_HPP #include "CaseMapper.d.hpp" @@ -11,12 +11,12 @@ #include #include #include -#include "../diplomat_runtime.hpp" #include "CodePointSetBuilder.hpp" #include "DataError.hpp" #include "DataProvider.hpp" #include "Locale.hpp" #include "TitlecaseOptionsV1.hpp" +#include "diplomat_runtime.hpp" namespace icu4x { @@ -28,19 +28,19 @@ namespace capi { typedef struct icu4x_CaseMapper_create_with_provider_mv1_result {union {icu4x::capi::CaseMapper* ok; icu4x::capi::DataError err;}; bool is_ok;} icu4x_CaseMapper_create_with_provider_mv1_result; icu4x_CaseMapper_create_with_provider_mv1_result icu4x_CaseMapper_create_with_provider_mv1(const icu4x::capi::DataProvider* provider); - void icu4x_CaseMapper_lowercase_mv1(const icu4x::capi::CaseMapper* self, diplomat::capi::DiplomatStringView s, const icu4x::capi::Locale* locale, diplomat::capi::DiplomatWrite* write); + void icu4x_CaseMapper_lowercase_mv1(const icu4x::capi::CaseMapper* self, icu4x::diplomat::capi::DiplomatStringView s, const icu4x::capi::Locale* locale, icu4x::diplomat::capi::DiplomatWrite* write); - void icu4x_CaseMapper_uppercase_mv1(const icu4x::capi::CaseMapper* self, diplomat::capi::DiplomatStringView s, const icu4x::capi::Locale* locale, diplomat::capi::DiplomatWrite* write); + void icu4x_CaseMapper_uppercase_mv1(const icu4x::capi::CaseMapper* self, icu4x::diplomat::capi::DiplomatStringView s, const icu4x::capi::Locale* locale, icu4x::diplomat::capi::DiplomatWrite* write); - void icu4x_CaseMapper_lowercase_with_compiled_data_mv1(diplomat::capi::DiplomatStringView s, const icu4x::capi::Locale* locale, diplomat::capi::DiplomatWrite* write); + void icu4x_CaseMapper_lowercase_with_compiled_data_mv1(icu4x::diplomat::capi::DiplomatStringView s, const icu4x::capi::Locale* locale, icu4x::diplomat::capi::DiplomatWrite* write); - void icu4x_CaseMapper_uppercase_with_compiled_data_mv1(diplomat::capi::DiplomatStringView s, const icu4x::capi::Locale* locale, diplomat::capi::DiplomatWrite* write); + void icu4x_CaseMapper_uppercase_with_compiled_data_mv1(icu4x::diplomat::capi::DiplomatStringView s, const icu4x::capi::Locale* locale, icu4x::diplomat::capi::DiplomatWrite* write); - void icu4x_CaseMapper_titlecase_segment_with_only_case_data_v1_mv1(const icu4x::capi::CaseMapper* self, diplomat::capi::DiplomatStringView s, const icu4x::capi::Locale* locale, icu4x::capi::TitlecaseOptionsV1 options, diplomat::capi::DiplomatWrite* write); + void icu4x_CaseMapper_titlecase_segment_with_only_case_data_v1_mv1(const icu4x::capi::CaseMapper* self, icu4x::diplomat::capi::DiplomatStringView s, const icu4x::capi::Locale* locale, icu4x::capi::TitlecaseOptionsV1 options, icu4x::diplomat::capi::DiplomatWrite* write); - void icu4x_CaseMapper_fold_mv1(const icu4x::capi::CaseMapper* self, diplomat::capi::DiplomatStringView s, diplomat::capi::DiplomatWrite* write); + void icu4x_CaseMapper_fold_mv1(const icu4x::capi::CaseMapper* self, icu4x::diplomat::capi::DiplomatStringView s, icu4x::diplomat::capi::DiplomatWrite* write); - void icu4x_CaseMapper_fold_turkic_mv1(const icu4x::capi::CaseMapper* self, diplomat::capi::DiplomatStringView s, diplomat::capi::DiplomatWrite* write); + void icu4x_CaseMapper_fold_turkic_mv1(const icu4x::capi::CaseMapper* self, icu4x::diplomat::capi::DiplomatStringView s, icu4x::diplomat::capi::DiplomatWrite* write); void icu4x_CaseMapper_add_case_closure_to_mv1(const icu4x::capi::CaseMapper* self, char32_t c, icu4x::capi::CodePointSetBuilder* builder); @@ -75,178 +75,178 @@ inline std::unique_ptr icu4x::CaseMapper::create() { return std::unique_ptr(icu4x::CaseMapper::FromFFI(result)); } -inline diplomat::result, icu4x::DataError> icu4x::CaseMapper::create_with_provider(const icu4x::DataProvider& provider) { +inline icu4x::diplomat::result, icu4x::DataError> icu4x::CaseMapper::create_with_provider(const icu4x::DataProvider& provider) { auto result = icu4x::capi::icu4x_CaseMapper_create_with_provider_mv1(provider.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DataError>(diplomat::Ok>(std::unique_ptr(icu4x::CaseMapper::FromFFI(result.ok)))) : diplomat::result, icu4x::DataError>(diplomat::Err(icu4x::DataError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::CaseMapper::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Err(icu4x::DataError::FromFFI(result.err))); } -inline diplomat::result icu4x::CaseMapper::lowercase(std::string_view s, const icu4x::Locale& locale) const { - if (!diplomat::capi::diplomat_is_str(s.data(), s.size())) { - return diplomat::Err(); +inline icu4x::diplomat::result icu4x::CaseMapper::lowercase(std::string_view s, const icu4x::Locale& locale) const { + if (!icu4x::diplomat::capi::diplomat_is_str(s.data(), s.size())) { + return icu4x::diplomat::Err(); } std::string output; - diplomat::capi::DiplomatWrite write = diplomat::WriteFromString(output); + icu4x::diplomat::capi::DiplomatWrite write = icu4x::diplomat::WriteFromString(output); icu4x::capi::icu4x_CaseMapper_lowercase_mv1(this->AsFFI(), {s.data(), s.size()}, locale.AsFFI(), &write); - return diplomat::Ok(std::move(output)); + return icu4x::diplomat::Ok(std::move(output)); } template -inline diplomat::result icu4x::CaseMapper::lowercase_write(std::string_view s, const icu4x::Locale& locale, W& writeable) const { - if (!diplomat::capi::diplomat_is_str(s.data(), s.size())) { - return diplomat::Err(); +inline icu4x::diplomat::result icu4x::CaseMapper::lowercase_write(std::string_view s, const icu4x::Locale& locale, W& writeable) const { + if (!icu4x::diplomat::capi::diplomat_is_str(s.data(), s.size())) { + return icu4x::diplomat::Err(); } - diplomat::capi::DiplomatWrite write = diplomat::WriteTrait::Construct(writeable); + icu4x::diplomat::capi::DiplomatWrite write = icu4x::diplomat::WriteTrait::Construct(writeable); icu4x::capi::icu4x_CaseMapper_lowercase_mv1(this->AsFFI(), {s.data(), s.size()}, locale.AsFFI(), &write); - return diplomat::Ok(); + return icu4x::diplomat::Ok(); } -inline diplomat::result icu4x::CaseMapper::uppercase(std::string_view s, const icu4x::Locale& locale) const { - if (!diplomat::capi::diplomat_is_str(s.data(), s.size())) { - return diplomat::Err(); +inline icu4x::diplomat::result icu4x::CaseMapper::uppercase(std::string_view s, const icu4x::Locale& locale) const { + if (!icu4x::diplomat::capi::diplomat_is_str(s.data(), s.size())) { + return icu4x::diplomat::Err(); } std::string output; - diplomat::capi::DiplomatWrite write = diplomat::WriteFromString(output); + icu4x::diplomat::capi::DiplomatWrite write = icu4x::diplomat::WriteFromString(output); icu4x::capi::icu4x_CaseMapper_uppercase_mv1(this->AsFFI(), {s.data(), s.size()}, locale.AsFFI(), &write); - return diplomat::Ok(std::move(output)); + return icu4x::diplomat::Ok(std::move(output)); } template -inline diplomat::result icu4x::CaseMapper::uppercase_write(std::string_view s, const icu4x::Locale& locale, W& writeable) const { - if (!diplomat::capi::diplomat_is_str(s.data(), s.size())) { - return diplomat::Err(); +inline icu4x::diplomat::result icu4x::CaseMapper::uppercase_write(std::string_view s, const icu4x::Locale& locale, W& writeable) const { + if (!icu4x::diplomat::capi::diplomat_is_str(s.data(), s.size())) { + return icu4x::diplomat::Err(); } - diplomat::capi::DiplomatWrite write = diplomat::WriteTrait::Construct(writeable); + icu4x::diplomat::capi::DiplomatWrite write = icu4x::diplomat::WriteTrait::Construct(writeable); icu4x::capi::icu4x_CaseMapper_uppercase_mv1(this->AsFFI(), {s.data(), s.size()}, locale.AsFFI(), &write); - return diplomat::Ok(); + return icu4x::diplomat::Ok(); } -inline diplomat::result icu4x::CaseMapper::lowercase_with_compiled_data(std::string_view s, const icu4x::Locale& locale) { - if (!diplomat::capi::diplomat_is_str(s.data(), s.size())) { - return diplomat::Err(); +inline icu4x::diplomat::result icu4x::CaseMapper::lowercase_with_compiled_data(std::string_view s, const icu4x::Locale& locale) { + if (!icu4x::diplomat::capi::diplomat_is_str(s.data(), s.size())) { + return icu4x::diplomat::Err(); } std::string output; - diplomat::capi::DiplomatWrite write = diplomat::WriteFromString(output); + icu4x::diplomat::capi::DiplomatWrite write = icu4x::diplomat::WriteFromString(output); icu4x::capi::icu4x_CaseMapper_lowercase_with_compiled_data_mv1({s.data(), s.size()}, locale.AsFFI(), &write); - return diplomat::Ok(std::move(output)); + return icu4x::diplomat::Ok(std::move(output)); } template -inline diplomat::result icu4x::CaseMapper::lowercase_with_compiled_data_write(std::string_view s, const icu4x::Locale& locale, W& writeable) { - if (!diplomat::capi::diplomat_is_str(s.data(), s.size())) { - return diplomat::Err(); +inline icu4x::diplomat::result icu4x::CaseMapper::lowercase_with_compiled_data_write(std::string_view s, const icu4x::Locale& locale, W& writeable) { + if (!icu4x::diplomat::capi::diplomat_is_str(s.data(), s.size())) { + return icu4x::diplomat::Err(); } - diplomat::capi::DiplomatWrite write = diplomat::WriteTrait::Construct(writeable); + icu4x::diplomat::capi::DiplomatWrite write = icu4x::diplomat::WriteTrait::Construct(writeable); icu4x::capi::icu4x_CaseMapper_lowercase_with_compiled_data_mv1({s.data(), s.size()}, locale.AsFFI(), &write); - return diplomat::Ok(); + return icu4x::diplomat::Ok(); } -inline diplomat::result icu4x::CaseMapper::uppercase_with_compiled_data(std::string_view s, const icu4x::Locale& locale) { - if (!diplomat::capi::diplomat_is_str(s.data(), s.size())) { - return diplomat::Err(); +inline icu4x::diplomat::result icu4x::CaseMapper::uppercase_with_compiled_data(std::string_view s, const icu4x::Locale& locale) { + if (!icu4x::diplomat::capi::diplomat_is_str(s.data(), s.size())) { + return icu4x::diplomat::Err(); } std::string output; - diplomat::capi::DiplomatWrite write = diplomat::WriteFromString(output); + icu4x::diplomat::capi::DiplomatWrite write = icu4x::diplomat::WriteFromString(output); icu4x::capi::icu4x_CaseMapper_uppercase_with_compiled_data_mv1({s.data(), s.size()}, locale.AsFFI(), &write); - return diplomat::Ok(std::move(output)); + return icu4x::diplomat::Ok(std::move(output)); } template -inline diplomat::result icu4x::CaseMapper::uppercase_with_compiled_data_write(std::string_view s, const icu4x::Locale& locale, W& writeable) { - if (!diplomat::capi::diplomat_is_str(s.data(), s.size())) { - return diplomat::Err(); +inline icu4x::diplomat::result icu4x::CaseMapper::uppercase_with_compiled_data_write(std::string_view s, const icu4x::Locale& locale, W& writeable) { + if (!icu4x::diplomat::capi::diplomat_is_str(s.data(), s.size())) { + return icu4x::diplomat::Err(); } - diplomat::capi::DiplomatWrite write = diplomat::WriteTrait::Construct(writeable); + icu4x::diplomat::capi::DiplomatWrite write = icu4x::diplomat::WriteTrait::Construct(writeable); icu4x::capi::icu4x_CaseMapper_uppercase_with_compiled_data_mv1({s.data(), s.size()}, locale.AsFFI(), &write); - return diplomat::Ok(); + return icu4x::diplomat::Ok(); } -inline diplomat::result icu4x::CaseMapper::titlecase_segment_with_only_case_data_v1(std::string_view s, const icu4x::Locale& locale, icu4x::TitlecaseOptionsV1 options) const { - if (!diplomat::capi::diplomat_is_str(s.data(), s.size())) { - return diplomat::Err(); +inline icu4x::diplomat::result icu4x::CaseMapper::titlecase_segment_with_only_case_data_v1(std::string_view s, const icu4x::Locale& locale, icu4x::TitlecaseOptionsV1 options) const { + if (!icu4x::diplomat::capi::diplomat_is_str(s.data(), s.size())) { + return icu4x::diplomat::Err(); } std::string output; - diplomat::capi::DiplomatWrite write = diplomat::WriteFromString(output); + icu4x::diplomat::capi::DiplomatWrite write = icu4x::diplomat::WriteFromString(output); icu4x::capi::icu4x_CaseMapper_titlecase_segment_with_only_case_data_v1_mv1(this->AsFFI(), {s.data(), s.size()}, locale.AsFFI(), options.AsFFI(), &write); - return diplomat::Ok(std::move(output)); + return icu4x::diplomat::Ok(std::move(output)); } template -inline diplomat::result icu4x::CaseMapper::titlecase_segment_with_only_case_data_v1_write(std::string_view s, const icu4x::Locale& locale, icu4x::TitlecaseOptionsV1 options, W& writeable) const { - if (!diplomat::capi::diplomat_is_str(s.data(), s.size())) { - return diplomat::Err(); +inline icu4x::diplomat::result icu4x::CaseMapper::titlecase_segment_with_only_case_data_v1_write(std::string_view s, const icu4x::Locale& locale, icu4x::TitlecaseOptionsV1 options, W& writeable) const { + if (!icu4x::diplomat::capi::diplomat_is_str(s.data(), s.size())) { + return icu4x::diplomat::Err(); } - diplomat::capi::DiplomatWrite write = diplomat::WriteTrait::Construct(writeable); + icu4x::diplomat::capi::DiplomatWrite write = icu4x::diplomat::WriteTrait::Construct(writeable); icu4x::capi::icu4x_CaseMapper_titlecase_segment_with_only_case_data_v1_mv1(this->AsFFI(), {s.data(), s.size()}, locale.AsFFI(), options.AsFFI(), &write); - return diplomat::Ok(); + return icu4x::diplomat::Ok(); } -inline diplomat::result icu4x::CaseMapper::fold(std::string_view s) const { - if (!diplomat::capi::diplomat_is_str(s.data(), s.size())) { - return diplomat::Err(); +inline icu4x::diplomat::result icu4x::CaseMapper::fold(std::string_view s) const { + if (!icu4x::diplomat::capi::diplomat_is_str(s.data(), s.size())) { + return icu4x::diplomat::Err(); } std::string output; - diplomat::capi::DiplomatWrite write = diplomat::WriteFromString(output); + icu4x::diplomat::capi::DiplomatWrite write = icu4x::diplomat::WriteFromString(output); icu4x::capi::icu4x_CaseMapper_fold_mv1(this->AsFFI(), {s.data(), s.size()}, &write); - return diplomat::Ok(std::move(output)); + return icu4x::diplomat::Ok(std::move(output)); } template -inline diplomat::result icu4x::CaseMapper::fold_write(std::string_view s, W& writeable) const { - if (!diplomat::capi::diplomat_is_str(s.data(), s.size())) { - return diplomat::Err(); +inline icu4x::diplomat::result icu4x::CaseMapper::fold_write(std::string_view s, W& writeable) const { + if (!icu4x::diplomat::capi::diplomat_is_str(s.data(), s.size())) { + return icu4x::diplomat::Err(); } - diplomat::capi::DiplomatWrite write = diplomat::WriteTrait::Construct(writeable); + icu4x::diplomat::capi::DiplomatWrite write = icu4x::diplomat::WriteTrait::Construct(writeable); icu4x::capi::icu4x_CaseMapper_fold_mv1(this->AsFFI(), {s.data(), s.size()}, &write); - return diplomat::Ok(); + return icu4x::diplomat::Ok(); } -inline diplomat::result icu4x::CaseMapper::fold_turkic(std::string_view s) const { - if (!diplomat::capi::diplomat_is_str(s.data(), s.size())) { - return diplomat::Err(); +inline icu4x::diplomat::result icu4x::CaseMapper::fold_turkic(std::string_view s) const { + if (!icu4x::diplomat::capi::diplomat_is_str(s.data(), s.size())) { + return icu4x::diplomat::Err(); } std::string output; - diplomat::capi::DiplomatWrite write = diplomat::WriteFromString(output); + icu4x::diplomat::capi::DiplomatWrite write = icu4x::diplomat::WriteFromString(output); icu4x::capi::icu4x_CaseMapper_fold_turkic_mv1(this->AsFFI(), {s.data(), s.size()}, &write); - return diplomat::Ok(std::move(output)); + return icu4x::diplomat::Ok(std::move(output)); } template -inline diplomat::result icu4x::CaseMapper::fold_turkic_write(std::string_view s, W& writeable) const { - if (!diplomat::capi::diplomat_is_str(s.data(), s.size())) { - return diplomat::Err(); +inline icu4x::diplomat::result icu4x::CaseMapper::fold_turkic_write(std::string_view s, W& writeable) const { + if (!icu4x::diplomat::capi::diplomat_is_str(s.data(), s.size())) { + return icu4x::diplomat::Err(); } - diplomat::capi::DiplomatWrite write = diplomat::WriteTrait::Construct(writeable); + icu4x::diplomat::capi::DiplomatWrite write = icu4x::diplomat::WriteTrait::Construct(writeable); icu4x::capi::icu4x_CaseMapper_fold_turkic_mv1(this->AsFFI(), {s.data(), s.size()}, &write); - return diplomat::Ok(); + return icu4x::diplomat::Ok(); } inline void icu4x::CaseMapper::add_case_closure_to(char32_t c, icu4x::CodePointSetBuilder& builder) const { @@ -331,4 +331,4 @@ inline void icu4x::CaseMapper::operator delete(void* ptr) { } -#endif // icu4x_CaseMapper_HPP +#endif // ICU4X_CaseMapper_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/CodePointMapData16.d.hpp b/ffi/capi/bindings/cpp/icu4x/CodePointMapData16.d.hpp index 50770ab9bc2..614fd329ee0 100644 --- a/ffi/capi/bindings/cpp/icu4x/CodePointMapData16.d.hpp +++ b/ffi/capi/bindings/cpp/icu4x/CodePointMapData16.d.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_CodePointMapData16_D_HPP -#define icu4x_CodePointMapData16_D_HPP +#ifndef ICU4X_CodePointMapData16_D_HPP +#define ICU4X_CodePointMapData16_D_HPP #include #include @@ -9,8 +9,7 @@ #include #include #include -#include "../diplomat_runtime.hpp" - +#include "diplomat_runtime.hpp" namespace icu4x { namespace capi { struct CodePointMapData16; } class CodePointMapData16; @@ -21,7 +20,8 @@ class CodePointSetData; namespace capi { struct DataProvider; } class DataProvider; class DataError; -} +} // namespace icu4x + namespace icu4x { @@ -46,46 +46,46 @@ class CodePointMapData16 { public: /** - * Gets the value for a code point. - * - * See the [Rust documentation for `get`](https://docs.rs/icu/2.0.0/icu/properties/struct.CodePointMapDataBorrowed.html#method.get) for more information. + * Gets the value for a code point. + * + * See the [Rust documentation for `get`](https://docs.rs/icu/2.0.0/icu/properties/struct.CodePointMapDataBorrowed.html#method.get) for more information. */ inline uint16_t operator[](char32_t cp) const; /** - * Produces an iterator over ranges of code points that map to `value` - * - * See the [Rust documentation for `iter_ranges_for_value`](https://docs.rs/icu/2.0.0/icu/properties/struct.CodePointMapDataBorrowed.html#method.iter_ranges_for_value) for more information. + * Produces an iterator over ranges of code points that map to `value` + * + * See the [Rust documentation for `iter_ranges_for_value`](https://docs.rs/icu/2.0.0/icu/properties/struct.CodePointMapDataBorrowed.html#method.iter_ranges_for_value) for more information. */ inline std::unique_ptr iter_ranges_for_value(uint16_t value) const; /** - * Produces an iterator over ranges of code points that do not map to `value` - * - * See the [Rust documentation for `iter_ranges_for_value_complemented`](https://docs.rs/icu/2.0.0/icu/properties/struct.CodePointMapDataBorrowed.html#method.iter_ranges_for_value_complemented) for more information. + * Produces an iterator over ranges of code points that do not map to `value` + * + * See the [Rust documentation for `iter_ranges_for_value_complemented`](https://docs.rs/icu/2.0.0/icu/properties/struct.CodePointMapDataBorrowed.html#method.iter_ranges_for_value_complemented) for more information. */ inline std::unique_ptr iter_ranges_for_value_complemented(uint16_t value) const; /** - * Gets a {@link CodePointSetData} representing all entries in this map that map to the given value - * - * See the [Rust documentation for `get_set_for_value`](https://docs.rs/icu/2.0.0/icu/properties/struct.CodePointMapDataBorrowed.html#method.get_set_for_value) for more information. + * Gets a {@link CodePointSetData} representing all entries in this map that map to the given value + * + * See the [Rust documentation for `get_set_for_value`](https://docs.rs/icu/2.0.0/icu/properties/struct.CodePointMapDataBorrowed.html#method.get_set_for_value) for more information. */ inline std::unique_ptr get_set_for_value(uint16_t value) const; /** - * Create a map for the `Script` property, using compiled data. - * - * See the [Rust documentation for `Script`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.Script.html) for more information. + * Create a map for the `Script` property, using compiled data. + * + * See the [Rust documentation for `Script`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.Script.html) for more information. */ inline static std::unique_ptr create_script(); /** - * Create a map for the `Script` property, using a particular data source. - * - * See the [Rust documentation for `Script`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.Script.html) for more information. + * Create a map for the `Script` property, using a particular data source. + * + * See the [Rust documentation for `Script`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.Script.html) for more information. */ - inline static diplomat::result, icu4x::DataError> create_script_with_provider(const icu4x::DataProvider& provider); + inline static icu4x::diplomat::result, icu4x::DataError> create_script_with_provider(const icu4x::DataProvider& provider); inline const icu4x::capi::CodePointMapData16* AsFFI() const; inline icu4x::capi::CodePointMapData16* AsFFI(); @@ -102,4 +102,4 @@ class CodePointMapData16 { }; } // namespace -#endif // icu4x_CodePointMapData16_D_HPP +#endif // ICU4X_CodePointMapData16_D_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/CodePointMapData16.hpp b/ffi/capi/bindings/cpp/icu4x/CodePointMapData16.hpp index 47c42c70ec3..b54707eab6b 100644 --- a/ffi/capi/bindings/cpp/icu4x/CodePointMapData16.hpp +++ b/ffi/capi/bindings/cpp/icu4x/CodePointMapData16.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_CodePointMapData16_HPP -#define icu4x_CodePointMapData16_HPP +#ifndef ICU4X_CodePointMapData16_HPP +#define ICU4X_CodePointMapData16_HPP #include "CodePointMapData16.d.hpp" @@ -11,11 +11,11 @@ #include #include #include -#include "../diplomat_runtime.hpp" #include "CodePointRangeIterator.hpp" #include "CodePointSetData.hpp" #include "DataError.hpp" #include "DataProvider.hpp" +#include "diplomat_runtime.hpp" namespace icu4x { @@ -70,9 +70,9 @@ inline std::unique_ptr icu4x::CodePointMapData16::cre return std::unique_ptr(icu4x::CodePointMapData16::FromFFI(result)); } -inline diplomat::result, icu4x::DataError> icu4x::CodePointMapData16::create_script_with_provider(const icu4x::DataProvider& provider) { +inline icu4x::diplomat::result, icu4x::DataError> icu4x::CodePointMapData16::create_script_with_provider(const icu4x::DataProvider& provider) { auto result = icu4x::capi::icu4x_CodePointMapData16_create_script_with_provider_mv1(provider.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DataError>(diplomat::Ok>(std::unique_ptr(icu4x::CodePointMapData16::FromFFI(result.ok)))) : diplomat::result, icu4x::DataError>(diplomat::Err(icu4x::DataError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::CodePointMapData16::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Err(icu4x::DataError::FromFFI(result.err))); } inline const icu4x::capi::CodePointMapData16* icu4x::CodePointMapData16::AsFFI() const { @@ -96,4 +96,4 @@ inline void icu4x::CodePointMapData16::operator delete(void* ptr) { } -#endif // icu4x_CodePointMapData16_HPP +#endif // ICU4X_CodePointMapData16_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/CodePointMapData8.d.hpp b/ffi/capi/bindings/cpp/icu4x/CodePointMapData8.d.hpp index 133d6668b51..7f3e1a6cb59 100644 --- a/ffi/capi/bindings/cpp/icu4x/CodePointMapData8.d.hpp +++ b/ffi/capi/bindings/cpp/icu4x/CodePointMapData8.d.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_CodePointMapData8_D_HPP -#define icu4x_CodePointMapData8_D_HPP +#ifndef ICU4X_CodePointMapData8_D_HPP +#define ICU4X_CodePointMapData8_D_HPP #include #include @@ -9,8 +9,7 @@ #include #include #include -#include "../diplomat_runtime.hpp" - +#include "diplomat_runtime.hpp" namespace icu4x { namespace capi { struct CodePointMapData8; } class CodePointMapData8; @@ -22,7 +21,8 @@ namespace capi { struct DataProvider; } class DataProvider; struct GeneralCategoryGroup; class DataError; -} +} // namespace icu4x + namespace icu4x { @@ -47,214 +47,214 @@ class CodePointMapData8 { public: /** - * Gets the value for a code point. - * - * See the [Rust documentation for `get`](https://docs.rs/icu/2.0.0/icu/properties/struct.CodePointMapDataBorrowed.html#method.get) for more information. + * Gets the value for a code point. + * + * See the [Rust documentation for `get`](https://docs.rs/icu/2.0.0/icu/properties/struct.CodePointMapDataBorrowed.html#method.get) for more information. */ inline uint8_t operator[](char32_t cp) const; /** - * Produces an iterator over ranges of code points that map to `value` - * - * See the [Rust documentation for `iter_ranges_for_value`](https://docs.rs/icu/2.0.0/icu/properties/struct.CodePointMapDataBorrowed.html#method.iter_ranges_for_value) for more information. + * Produces an iterator over ranges of code points that map to `value` + * + * See the [Rust documentation for `iter_ranges_for_value`](https://docs.rs/icu/2.0.0/icu/properties/struct.CodePointMapDataBorrowed.html#method.iter_ranges_for_value) for more information. */ inline std::unique_ptr iter_ranges_for_value(uint8_t value) const; /** - * Produces an iterator over ranges of code points that do not map to `value` - * - * See the [Rust documentation for `iter_ranges_for_value_complemented`](https://docs.rs/icu/2.0.0/icu/properties/struct.CodePointMapDataBorrowed.html#method.iter_ranges_for_value_complemented) for more information. + * Produces an iterator over ranges of code points that do not map to `value` + * + * See the [Rust documentation for `iter_ranges_for_value_complemented`](https://docs.rs/icu/2.0.0/icu/properties/struct.CodePointMapDataBorrowed.html#method.iter_ranges_for_value_complemented) for more information. */ inline std::unique_ptr iter_ranges_for_value_complemented(uint8_t value) const; /** - * Given a mask value (the nth bit marks property value = n), produce an iterator over ranges of code points - * whose property values are contained in the mask. - * - * The main mask property supported is that for General_Category, which can be obtained via `general_category_to_mask()` or - * by using `GeneralCategoryNameToMaskMapper` - * - * Should only be used on maps for properties with values less than 32 (like Generak_Category), - * other maps will have unpredictable results - * - * See the [Rust documentation for `iter_ranges_for_group`](https://docs.rs/icu/2.0.0/icu/properties/struct.CodePointMapDataBorrowed.html#method.iter_ranges_for_group) for more information. + * Given a mask value (the nth bit marks property value = n), produce an iterator over ranges of code points + * whose property values are contained in the mask. + * + * The main mask property supported is that for General_Category, which can be obtained via `general_category_to_mask()` or + * by using `GeneralCategoryNameToMaskMapper` + * + * Should only be used on maps for properties with values less than 32 (like Generak_Category), + * other maps will have unpredictable results + * + * See the [Rust documentation for `iter_ranges_for_group`](https://docs.rs/icu/2.0.0/icu/properties/struct.CodePointMapDataBorrowed.html#method.iter_ranges_for_group) for more information. */ inline std::unique_ptr iter_ranges_for_group(icu4x::GeneralCategoryGroup group) const; /** - * Gets a {@link CodePointSetData} representing all entries in this map that map to the given value - * - * See the [Rust documentation for `get_set_for_value`](https://docs.rs/icu/2.0.0/icu/properties/struct.CodePointMapDataBorrowed.html#method.get_set_for_value) for more information. + * Gets a {@link CodePointSetData} representing all entries in this map that map to the given value + * + * See the [Rust documentation for `get_set_for_value`](https://docs.rs/icu/2.0.0/icu/properties/struct.CodePointMapDataBorrowed.html#method.get_set_for_value) for more information. */ inline std::unique_ptr get_set_for_value(uint8_t value) const; /** - * Create a map for the `General_Category` property, using compiled data. - * - * See the [Rust documentation for `GeneralCategory`](https://docs.rs/icu/2.0.0/icu/properties/props/enum.GeneralCategory.html) for more information. + * Create a map for the `General_Category` property, using compiled data. + * + * See the [Rust documentation for `GeneralCategory`](https://docs.rs/icu/2.0.0/icu/properties/props/enum.GeneralCategory.html) for more information. */ inline static std::unique_ptr create_general_category(); /** - * Create a map for the `General_Category` property, using a particular data source - * - * See the [Rust documentation for `GeneralCategory`](https://docs.rs/icu/2.0.0/icu/properties/props/enum.GeneralCategory.html) for more information. + * Create a map for the `General_Category` property, using a particular data source + * + * See the [Rust documentation for `GeneralCategory`](https://docs.rs/icu/2.0.0/icu/properties/props/enum.GeneralCategory.html) for more information. */ - inline static diplomat::result, icu4x::DataError> create_general_category_with_provider(const icu4x::DataProvider& provider); + inline static icu4x::diplomat::result, icu4x::DataError> create_general_category_with_provider(const icu4x::DataProvider& provider); /** - * Create a map for the `Bidi_Class` property, using compiled data. - * - * See the [Rust documentation for `BidiClass`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.BidiClass.html) for more information. + * Create a map for the `Bidi_Class` property, using compiled data. + * + * See the [Rust documentation for `BidiClass`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.BidiClass.html) for more information. */ inline static std::unique_ptr create_bidi_class(); /** - * Create a map for the `Bidi_Class` property, using a particular data source. - * - * See the [Rust documentation for `BidiClass`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.BidiClass.html) for more information. + * Create a map for the `Bidi_Class` property, using a particular data source. + * + * See the [Rust documentation for `BidiClass`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.BidiClass.html) for more information. */ - inline static diplomat::result, icu4x::DataError> create_bidi_class_with_provider(const icu4x::DataProvider& provider); + inline static icu4x::diplomat::result, icu4x::DataError> create_bidi_class_with_provider(const icu4x::DataProvider& provider); /** - * Create a map for the `East_Asian_Width` property, using compiled data. - * - * See the [Rust documentation for `EastAsianWidth`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.EastAsianWidth.html) for more information. + * Create a map for the `East_Asian_Width` property, using compiled data. + * + * See the [Rust documentation for `EastAsianWidth`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.EastAsianWidth.html) for more information. */ inline static std::unique_ptr create_east_asian_width(); /** - * Create a map for the `East_Asian_Width` property, using a particular data source. - * - * See the [Rust documentation for `EastAsianWidth`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.EastAsianWidth.html) for more information. + * Create a map for the `East_Asian_Width` property, using a particular data source. + * + * See the [Rust documentation for `EastAsianWidth`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.EastAsianWidth.html) for more information. */ - inline static diplomat::result, icu4x::DataError> create_east_asian_width_with_provider(const icu4x::DataProvider& provider); + inline static icu4x::diplomat::result, icu4x::DataError> create_east_asian_width_with_provider(const icu4x::DataProvider& provider); /** - * Create a map for the `Hangul_Syllable_Type` property, using compiled data. - * - * See the [Rust documentation for `HangulSyllableType`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.HangulSyllableType.html) for more information. + * Create a map for the `Hangul_Syllable_Type` property, using compiled data. + * + * See the [Rust documentation for `HangulSyllableType`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.HangulSyllableType.html) for more information. */ inline static std::unique_ptr create_hangul_syllable_type(); /** - * Create a map for the `Hangul_Syllable_Type` property, using a particular data source. - * - * See the [Rust documentation for `HangulSyllableType`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.HangulSyllableType.html) for more information. + * Create a map for the `Hangul_Syllable_Type` property, using a particular data source. + * + * See the [Rust documentation for `HangulSyllableType`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.HangulSyllableType.html) for more information. */ - inline static diplomat::result, icu4x::DataError> create_hangul_syllable_type_with_provider(const icu4x::DataProvider& provider); + inline static icu4x::diplomat::result, icu4x::DataError> create_hangul_syllable_type_with_provider(const icu4x::DataProvider& provider); /** - * Create a map for the `Indic_Syllabic_Property` property, using compiled data. - * - * See the [Rust documentation for `IndicSyllabicCategory`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.IndicSyllabicCategory.html) for more information. + * Create a map for the `Indic_Syllabic_Property` property, using compiled data. + * + * See the [Rust documentation for `IndicSyllabicCategory`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.IndicSyllabicCategory.html) for more information. */ inline static std::unique_ptr create_indic_syllabic_category(); /** - * Create a map for the `Indic_Syllabic_Property` property, using a particular data source. - * - * See the [Rust documentation for `IndicSyllabicCategory`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.IndicSyllabicCategory.html) for more information. + * Create a map for the `Indic_Syllabic_Property` property, using a particular data source. + * + * See the [Rust documentation for `IndicSyllabicCategory`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.IndicSyllabicCategory.html) for more information. */ - inline static diplomat::result, icu4x::DataError> create_indic_syllabic_category_with_provider(const icu4x::DataProvider& provider); + inline static icu4x::diplomat::result, icu4x::DataError> create_indic_syllabic_category_with_provider(const icu4x::DataProvider& provider); /** - * Create a map for the `Line_Break` property, using compiled data. - * - * See the [Rust documentation for `LineBreak`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.LineBreak.html) for more information. + * Create a map for the `Line_Break` property, using compiled data. + * + * See the [Rust documentation for `LineBreak`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.LineBreak.html) for more information. */ inline static std::unique_ptr create_line_break(); /** - * Create a map for the `Line_Break` property, using a particular data source. - * - * See the [Rust documentation for `LineBreak`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.LineBreak.html) for more information. + * Create a map for the `Line_Break` property, using a particular data source. + * + * See the [Rust documentation for `LineBreak`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.LineBreak.html) for more information. */ - inline static diplomat::result, icu4x::DataError> create_line_break_with_provider(const icu4x::DataProvider& provider); + inline static icu4x::diplomat::result, icu4x::DataError> create_line_break_with_provider(const icu4x::DataProvider& provider); /** - * Create a map for the `Grapheme_Cluster_Break` property, using compiled data. - * - * See the [Rust documentation for `GraphemeClusterBreak`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.GraphemeClusterBreak.html) for more information. + * Create a map for the `Grapheme_Cluster_Break` property, using compiled data. + * + * See the [Rust documentation for `GraphemeClusterBreak`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.GraphemeClusterBreak.html) for more information. */ inline static std::unique_ptr create_grapheme_cluster_break(); /** - * Create a map for the `Grapheme_Cluster_Break` property, using a particular data source. - * - * See the [Rust documentation for `GraphemeClusterBreak`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.GraphemeClusterBreak.html) for more information. + * Create a map for the `Grapheme_Cluster_Break` property, using a particular data source. + * + * See the [Rust documentation for `GraphemeClusterBreak`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.GraphemeClusterBreak.html) for more information. */ - inline static diplomat::result, icu4x::DataError> create_grapheme_cluster_break_with_provider(const icu4x::DataProvider& provider); + inline static icu4x::diplomat::result, icu4x::DataError> create_grapheme_cluster_break_with_provider(const icu4x::DataProvider& provider); /** - * Create a map for the `Word_Break` property, using compiled data. - * - * See the [Rust documentation for `WordBreak`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.WordBreak.html) for more information. + * Create a map for the `Word_Break` property, using compiled data. + * + * See the [Rust documentation for `WordBreak`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.WordBreak.html) for more information. */ inline static std::unique_ptr create_word_break(); /** - * Create a map for the `Word_Break` property, using a particular data source. - * - * See the [Rust documentation for `WordBreak`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.WordBreak.html) for more information. + * Create a map for the `Word_Break` property, using a particular data source. + * + * See the [Rust documentation for `WordBreak`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.WordBreak.html) for more information. */ - inline static diplomat::result, icu4x::DataError> create_word_break_with_provider(const icu4x::DataProvider& provider); + inline static icu4x::diplomat::result, icu4x::DataError> create_word_break_with_provider(const icu4x::DataProvider& provider); /** - * Create a map for the `Sentence_Break` property, using compiled data. - * - * See the [Rust documentation for `SentenceBreak`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.SentenceBreak.html) for more information. + * Create a map for the `Sentence_Break` property, using compiled data. + * + * See the [Rust documentation for `SentenceBreak`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.SentenceBreak.html) for more information. */ inline static std::unique_ptr create_sentence_break(); /** - * Create a map for the `Sentence_Break` property, using a particular data source. - * - * See the [Rust documentation for `SentenceBreak`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.SentenceBreak.html) for more information. + * Create a map for the `Sentence_Break` property, using a particular data source. + * + * See the [Rust documentation for `SentenceBreak`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.SentenceBreak.html) for more information. */ - inline static diplomat::result, icu4x::DataError> create_sentence_break_with_provider(const icu4x::DataProvider& provider); + inline static icu4x::diplomat::result, icu4x::DataError> create_sentence_break_with_provider(const icu4x::DataProvider& provider); /** - * Create a map for the `Joining_Type` property, using compiled data. - * - * See the [Rust documentation for `JoiningType`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.JoiningType.html) for more information. + * Create a map for the `Joining_Type` property, using compiled data. + * + * See the [Rust documentation for `JoiningType`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.JoiningType.html) for more information. */ inline static std::unique_ptr create_joining_type(); /** - * Create a map for the `Joining_Type` property, using a particular data source. - * - * See the [Rust documentation for `JoiningType`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.JoiningType.html) for more information. + * Create a map for the `Joining_Type` property, using a particular data source. + * + * See the [Rust documentation for `JoiningType`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.JoiningType.html) for more information. */ - inline static diplomat::result, icu4x::DataError> create_joining_type_with_provider(const icu4x::DataProvider& provider); + inline static icu4x::diplomat::result, icu4x::DataError> create_joining_type_with_provider(const icu4x::DataProvider& provider); /** - * Create a map for the `Canonical_Combining_Class` property, using compiled data. - * - * See the [Rust documentation for `CanonicalCombiningClass`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.CanonicalCombiningClass.html) for more information. + * Create a map for the `Canonical_Combining_Class` property, using compiled data. + * + * See the [Rust documentation for `CanonicalCombiningClass`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.CanonicalCombiningClass.html) for more information. */ inline static std::unique_ptr create_canonical_combining_class(); /** - * Create a map for the `Canonical_Combining_Class` property, using a particular data source. - * - * See the [Rust documentation for `CanonicalCombiningClass`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.CanonicalCombiningClass.html) for more information. + * Create a map for the `Canonical_Combining_Class` property, using a particular data source. + * + * See the [Rust documentation for `CanonicalCombiningClass`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.CanonicalCombiningClass.html) for more information. */ - inline static diplomat::result, icu4x::DataError> create_canonical_combining_class_with_provider(const icu4x::DataProvider& provider); + inline static icu4x::diplomat::result, icu4x::DataError> create_canonical_combining_class_with_provider(const icu4x::DataProvider& provider); /** - * Create a map for the `Vertical_Orientation` property, using compiled data. - * - * See the [Rust documentation for `VerticalOrientation`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.VerticalOrientation.html) for more information. + * Create a map for the `Vertical_Orientation` property, using compiled data. + * + * See the [Rust documentation for `VerticalOrientation`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.VerticalOrientation.html) for more information. */ inline static std::unique_ptr create_vertical_orientation(); /** - * Create a map for the `Vertical_Orientation` property, using a particular data source. - * - * See the [Rust documentation for `VerticalOrientation`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.VerticalOrientation.html) for more information. + * Create a map for the `Vertical_Orientation` property, using a particular data source. + * + * See the [Rust documentation for `VerticalOrientation`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.VerticalOrientation.html) for more information. */ - inline static diplomat::result, icu4x::DataError> create_vertical_orientation_with_provider(const icu4x::DataProvider& provider); + inline static icu4x::diplomat::result, icu4x::DataError> create_vertical_orientation_with_provider(const icu4x::DataProvider& provider); inline const icu4x::capi::CodePointMapData8* AsFFI() const; inline icu4x::capi::CodePointMapData8* AsFFI(); @@ -271,4 +271,4 @@ class CodePointMapData8 { }; } // namespace -#endif // icu4x_CodePointMapData8_D_HPP +#endif // ICU4X_CodePointMapData8_D_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/CodePointMapData8.hpp b/ffi/capi/bindings/cpp/icu4x/CodePointMapData8.hpp index 2ffe47d9ba0..b336a448bc6 100644 --- a/ffi/capi/bindings/cpp/icu4x/CodePointMapData8.hpp +++ b/ffi/capi/bindings/cpp/icu4x/CodePointMapData8.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_CodePointMapData8_HPP -#define icu4x_CodePointMapData8_HPP +#ifndef ICU4X_CodePointMapData8_HPP +#define ICU4X_CodePointMapData8_HPP #include "CodePointMapData8.d.hpp" @@ -11,12 +11,12 @@ #include #include #include -#include "../diplomat_runtime.hpp" #include "CodePointRangeIterator.hpp" #include "CodePointSetData.hpp" #include "DataError.hpp" #include "DataProvider.hpp" #include "GeneralCategoryGroup.hpp" +#include "diplomat_runtime.hpp" namespace icu4x { @@ -134,9 +134,9 @@ inline std::unique_ptr icu4x::CodePointMapData8::creat return std::unique_ptr(icu4x::CodePointMapData8::FromFFI(result)); } -inline diplomat::result, icu4x::DataError> icu4x::CodePointMapData8::create_general_category_with_provider(const icu4x::DataProvider& provider) { +inline icu4x::diplomat::result, icu4x::DataError> icu4x::CodePointMapData8::create_general_category_with_provider(const icu4x::DataProvider& provider) { auto result = icu4x::capi::icu4x_CodePointMapData8_create_general_category_with_provider_mv1(provider.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DataError>(diplomat::Ok>(std::unique_ptr(icu4x::CodePointMapData8::FromFFI(result.ok)))) : diplomat::result, icu4x::DataError>(diplomat::Err(icu4x::DataError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::CodePointMapData8::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Err(icu4x::DataError::FromFFI(result.err))); } inline std::unique_ptr icu4x::CodePointMapData8::create_bidi_class() { @@ -144,9 +144,9 @@ inline std::unique_ptr icu4x::CodePointMapData8::creat return std::unique_ptr(icu4x::CodePointMapData8::FromFFI(result)); } -inline diplomat::result, icu4x::DataError> icu4x::CodePointMapData8::create_bidi_class_with_provider(const icu4x::DataProvider& provider) { +inline icu4x::diplomat::result, icu4x::DataError> icu4x::CodePointMapData8::create_bidi_class_with_provider(const icu4x::DataProvider& provider) { auto result = icu4x::capi::icu4x_CodePointMapData8_create_bidi_class_with_provider_mv1(provider.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DataError>(diplomat::Ok>(std::unique_ptr(icu4x::CodePointMapData8::FromFFI(result.ok)))) : diplomat::result, icu4x::DataError>(diplomat::Err(icu4x::DataError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::CodePointMapData8::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Err(icu4x::DataError::FromFFI(result.err))); } inline std::unique_ptr icu4x::CodePointMapData8::create_east_asian_width() { @@ -154,9 +154,9 @@ inline std::unique_ptr icu4x::CodePointMapData8::creat return std::unique_ptr(icu4x::CodePointMapData8::FromFFI(result)); } -inline diplomat::result, icu4x::DataError> icu4x::CodePointMapData8::create_east_asian_width_with_provider(const icu4x::DataProvider& provider) { +inline icu4x::diplomat::result, icu4x::DataError> icu4x::CodePointMapData8::create_east_asian_width_with_provider(const icu4x::DataProvider& provider) { auto result = icu4x::capi::icu4x_CodePointMapData8_create_east_asian_width_with_provider_mv1(provider.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DataError>(diplomat::Ok>(std::unique_ptr(icu4x::CodePointMapData8::FromFFI(result.ok)))) : diplomat::result, icu4x::DataError>(diplomat::Err(icu4x::DataError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::CodePointMapData8::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Err(icu4x::DataError::FromFFI(result.err))); } inline std::unique_ptr icu4x::CodePointMapData8::create_hangul_syllable_type() { @@ -164,9 +164,9 @@ inline std::unique_ptr icu4x::CodePointMapData8::creat return std::unique_ptr(icu4x::CodePointMapData8::FromFFI(result)); } -inline diplomat::result, icu4x::DataError> icu4x::CodePointMapData8::create_hangul_syllable_type_with_provider(const icu4x::DataProvider& provider) { +inline icu4x::diplomat::result, icu4x::DataError> icu4x::CodePointMapData8::create_hangul_syllable_type_with_provider(const icu4x::DataProvider& provider) { auto result = icu4x::capi::icu4x_CodePointMapData8_create_hangul_syllable_type_with_provider_mv1(provider.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DataError>(diplomat::Ok>(std::unique_ptr(icu4x::CodePointMapData8::FromFFI(result.ok)))) : diplomat::result, icu4x::DataError>(diplomat::Err(icu4x::DataError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::CodePointMapData8::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Err(icu4x::DataError::FromFFI(result.err))); } inline std::unique_ptr icu4x::CodePointMapData8::create_indic_syllabic_category() { @@ -174,9 +174,9 @@ inline std::unique_ptr icu4x::CodePointMapData8::creat return std::unique_ptr(icu4x::CodePointMapData8::FromFFI(result)); } -inline diplomat::result, icu4x::DataError> icu4x::CodePointMapData8::create_indic_syllabic_category_with_provider(const icu4x::DataProvider& provider) { +inline icu4x::diplomat::result, icu4x::DataError> icu4x::CodePointMapData8::create_indic_syllabic_category_with_provider(const icu4x::DataProvider& provider) { auto result = icu4x::capi::icu4x_CodePointMapData8_create_indic_syllabic_category_with_provider_mv1(provider.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DataError>(diplomat::Ok>(std::unique_ptr(icu4x::CodePointMapData8::FromFFI(result.ok)))) : diplomat::result, icu4x::DataError>(diplomat::Err(icu4x::DataError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::CodePointMapData8::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Err(icu4x::DataError::FromFFI(result.err))); } inline std::unique_ptr icu4x::CodePointMapData8::create_line_break() { @@ -184,9 +184,9 @@ inline std::unique_ptr icu4x::CodePointMapData8::creat return std::unique_ptr(icu4x::CodePointMapData8::FromFFI(result)); } -inline diplomat::result, icu4x::DataError> icu4x::CodePointMapData8::create_line_break_with_provider(const icu4x::DataProvider& provider) { +inline icu4x::diplomat::result, icu4x::DataError> icu4x::CodePointMapData8::create_line_break_with_provider(const icu4x::DataProvider& provider) { auto result = icu4x::capi::icu4x_CodePointMapData8_create_line_break_with_provider_mv1(provider.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DataError>(diplomat::Ok>(std::unique_ptr(icu4x::CodePointMapData8::FromFFI(result.ok)))) : diplomat::result, icu4x::DataError>(diplomat::Err(icu4x::DataError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::CodePointMapData8::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Err(icu4x::DataError::FromFFI(result.err))); } inline std::unique_ptr icu4x::CodePointMapData8::create_grapheme_cluster_break() { @@ -194,9 +194,9 @@ inline std::unique_ptr icu4x::CodePointMapData8::creat return std::unique_ptr(icu4x::CodePointMapData8::FromFFI(result)); } -inline diplomat::result, icu4x::DataError> icu4x::CodePointMapData8::create_grapheme_cluster_break_with_provider(const icu4x::DataProvider& provider) { +inline icu4x::diplomat::result, icu4x::DataError> icu4x::CodePointMapData8::create_grapheme_cluster_break_with_provider(const icu4x::DataProvider& provider) { auto result = icu4x::capi::icu4x_CodePointMapData8_create_grapheme_cluster_break_with_provider_mv1(provider.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DataError>(diplomat::Ok>(std::unique_ptr(icu4x::CodePointMapData8::FromFFI(result.ok)))) : diplomat::result, icu4x::DataError>(diplomat::Err(icu4x::DataError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::CodePointMapData8::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Err(icu4x::DataError::FromFFI(result.err))); } inline std::unique_ptr icu4x::CodePointMapData8::create_word_break() { @@ -204,9 +204,9 @@ inline std::unique_ptr icu4x::CodePointMapData8::creat return std::unique_ptr(icu4x::CodePointMapData8::FromFFI(result)); } -inline diplomat::result, icu4x::DataError> icu4x::CodePointMapData8::create_word_break_with_provider(const icu4x::DataProvider& provider) { +inline icu4x::diplomat::result, icu4x::DataError> icu4x::CodePointMapData8::create_word_break_with_provider(const icu4x::DataProvider& provider) { auto result = icu4x::capi::icu4x_CodePointMapData8_create_word_break_with_provider_mv1(provider.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DataError>(diplomat::Ok>(std::unique_ptr(icu4x::CodePointMapData8::FromFFI(result.ok)))) : diplomat::result, icu4x::DataError>(diplomat::Err(icu4x::DataError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::CodePointMapData8::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Err(icu4x::DataError::FromFFI(result.err))); } inline std::unique_ptr icu4x::CodePointMapData8::create_sentence_break() { @@ -214,9 +214,9 @@ inline std::unique_ptr icu4x::CodePointMapData8::creat return std::unique_ptr(icu4x::CodePointMapData8::FromFFI(result)); } -inline diplomat::result, icu4x::DataError> icu4x::CodePointMapData8::create_sentence_break_with_provider(const icu4x::DataProvider& provider) { +inline icu4x::diplomat::result, icu4x::DataError> icu4x::CodePointMapData8::create_sentence_break_with_provider(const icu4x::DataProvider& provider) { auto result = icu4x::capi::icu4x_CodePointMapData8_create_sentence_break_with_provider_mv1(provider.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DataError>(diplomat::Ok>(std::unique_ptr(icu4x::CodePointMapData8::FromFFI(result.ok)))) : diplomat::result, icu4x::DataError>(diplomat::Err(icu4x::DataError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::CodePointMapData8::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Err(icu4x::DataError::FromFFI(result.err))); } inline std::unique_ptr icu4x::CodePointMapData8::create_joining_type() { @@ -224,9 +224,9 @@ inline std::unique_ptr icu4x::CodePointMapData8::creat return std::unique_ptr(icu4x::CodePointMapData8::FromFFI(result)); } -inline diplomat::result, icu4x::DataError> icu4x::CodePointMapData8::create_joining_type_with_provider(const icu4x::DataProvider& provider) { +inline icu4x::diplomat::result, icu4x::DataError> icu4x::CodePointMapData8::create_joining_type_with_provider(const icu4x::DataProvider& provider) { auto result = icu4x::capi::icu4x_CodePointMapData8_create_joining_type_with_provider_mv1(provider.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DataError>(diplomat::Ok>(std::unique_ptr(icu4x::CodePointMapData8::FromFFI(result.ok)))) : diplomat::result, icu4x::DataError>(diplomat::Err(icu4x::DataError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::CodePointMapData8::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Err(icu4x::DataError::FromFFI(result.err))); } inline std::unique_ptr icu4x::CodePointMapData8::create_canonical_combining_class() { @@ -234,9 +234,9 @@ inline std::unique_ptr icu4x::CodePointMapData8::creat return std::unique_ptr(icu4x::CodePointMapData8::FromFFI(result)); } -inline diplomat::result, icu4x::DataError> icu4x::CodePointMapData8::create_canonical_combining_class_with_provider(const icu4x::DataProvider& provider) { +inline icu4x::diplomat::result, icu4x::DataError> icu4x::CodePointMapData8::create_canonical_combining_class_with_provider(const icu4x::DataProvider& provider) { auto result = icu4x::capi::icu4x_CodePointMapData8_create_canonical_combining_class_with_provider_mv1(provider.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DataError>(diplomat::Ok>(std::unique_ptr(icu4x::CodePointMapData8::FromFFI(result.ok)))) : diplomat::result, icu4x::DataError>(diplomat::Err(icu4x::DataError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::CodePointMapData8::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Err(icu4x::DataError::FromFFI(result.err))); } inline std::unique_ptr icu4x::CodePointMapData8::create_vertical_orientation() { @@ -244,9 +244,9 @@ inline std::unique_ptr icu4x::CodePointMapData8::creat return std::unique_ptr(icu4x::CodePointMapData8::FromFFI(result)); } -inline diplomat::result, icu4x::DataError> icu4x::CodePointMapData8::create_vertical_orientation_with_provider(const icu4x::DataProvider& provider) { +inline icu4x::diplomat::result, icu4x::DataError> icu4x::CodePointMapData8::create_vertical_orientation_with_provider(const icu4x::DataProvider& provider) { auto result = icu4x::capi::icu4x_CodePointMapData8_create_vertical_orientation_with_provider_mv1(provider.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DataError>(diplomat::Ok>(std::unique_ptr(icu4x::CodePointMapData8::FromFFI(result.ok)))) : diplomat::result, icu4x::DataError>(diplomat::Err(icu4x::DataError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::CodePointMapData8::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Err(icu4x::DataError::FromFFI(result.err))); } inline const icu4x::capi::CodePointMapData8* icu4x::CodePointMapData8::AsFFI() const { @@ -270,4 +270,4 @@ inline void icu4x::CodePointMapData8::operator delete(void* ptr) { } -#endif // icu4x_CodePointMapData8_HPP +#endif // ICU4X_CodePointMapData8_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/CodePointRangeIterator.d.hpp b/ffi/capi/bindings/cpp/icu4x/CodePointRangeIterator.d.hpp index 2c8f578b33c..7858838e368 100644 --- a/ffi/capi/bindings/cpp/icu4x/CodePointRangeIterator.d.hpp +++ b/ffi/capi/bindings/cpp/icu4x/CodePointRangeIterator.d.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_CodePointRangeIterator_D_HPP -#define icu4x_CodePointRangeIterator_D_HPP +#ifndef ICU4X_CodePointRangeIterator_D_HPP +#define ICU4X_CodePointRangeIterator_D_HPP #include #include @@ -9,11 +9,11 @@ #include #include #include -#include "../diplomat_runtime.hpp" - +#include "diplomat_runtime.hpp" namespace icu4x { struct CodePointRangeIteratorResult; -} +} // namespace icu4x + namespace icu4x { @@ -31,9 +31,9 @@ class CodePointRangeIterator { public: /** - * Advance the iterator by one and return the next range. - * - * If the iterator is out of items, `done` will be true + * Advance the iterator by one and return the next range. + * + * If the iterator is out of items, `done` will be true */ inline icu4x::CodePointRangeIteratorResult next(); @@ -52,4 +52,4 @@ class CodePointRangeIterator { }; } // namespace -#endif // icu4x_CodePointRangeIterator_D_HPP +#endif // ICU4X_CodePointRangeIterator_D_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/CodePointRangeIterator.hpp b/ffi/capi/bindings/cpp/icu4x/CodePointRangeIterator.hpp index 73a7627652d..1c9b815f550 100644 --- a/ffi/capi/bindings/cpp/icu4x/CodePointRangeIterator.hpp +++ b/ffi/capi/bindings/cpp/icu4x/CodePointRangeIterator.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_CodePointRangeIterator_HPP -#define icu4x_CodePointRangeIterator_HPP +#ifndef ICU4X_CodePointRangeIterator_HPP +#define ICU4X_CodePointRangeIterator_HPP #include "CodePointRangeIterator.d.hpp" @@ -11,8 +11,8 @@ #include #include #include -#include "../diplomat_runtime.hpp" #include "CodePointRangeIteratorResult.hpp" +#include "diplomat_runtime.hpp" namespace icu4x { @@ -53,4 +53,4 @@ inline void icu4x::CodePointRangeIterator::operator delete(void* ptr) { } -#endif // icu4x_CodePointRangeIterator_HPP +#endif // ICU4X_CodePointRangeIterator_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/CodePointRangeIteratorResult.d.hpp b/ffi/capi/bindings/cpp/icu4x/CodePointRangeIteratorResult.d.hpp index 341fb683674..e9160a81065 100644 --- a/ffi/capi/bindings/cpp/icu4x/CodePointRangeIteratorResult.d.hpp +++ b/ffi/capi/bindings/cpp/icu4x/CodePointRangeIteratorResult.d.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_CodePointRangeIteratorResult_D_HPP -#define icu4x_CodePointRangeIteratorResult_D_HPP +#ifndef ICU4X_CodePointRangeIteratorResult_D_HPP +#define ICU4X_CodePointRangeIteratorResult_D_HPP #include #include @@ -9,7 +9,7 @@ #include #include #include -#include "../diplomat_runtime.hpp" +#include "diplomat_runtime.hpp" namespace icu4x { @@ -45,4 +45,4 @@ struct CodePointRangeIteratorResult { }; } // namespace -#endif // icu4x_CodePointRangeIteratorResult_D_HPP +#endif // ICU4X_CodePointRangeIteratorResult_D_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/CodePointRangeIteratorResult.hpp b/ffi/capi/bindings/cpp/icu4x/CodePointRangeIteratorResult.hpp index f44c88d9dd8..e2dad40eec5 100644 --- a/ffi/capi/bindings/cpp/icu4x/CodePointRangeIteratorResult.hpp +++ b/ffi/capi/bindings/cpp/icu4x/CodePointRangeIteratorResult.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_CodePointRangeIteratorResult_HPP -#define icu4x_CodePointRangeIteratorResult_HPP +#ifndef ICU4X_CodePointRangeIteratorResult_HPP +#define ICU4X_CodePointRangeIteratorResult_HPP #include "CodePointRangeIteratorResult.d.hpp" @@ -11,7 +11,7 @@ #include #include #include -#include "../diplomat_runtime.hpp" +#include "diplomat_runtime.hpp" namespace icu4x { @@ -40,4 +40,4 @@ inline icu4x::CodePointRangeIteratorResult icu4x::CodePointRangeIteratorResult:: } -#endif // icu4x_CodePointRangeIteratorResult_HPP +#endif // ICU4X_CodePointRangeIteratorResult_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/CodePointSetBuilder.d.hpp b/ffi/capi/bindings/cpp/icu4x/CodePointSetBuilder.d.hpp index 68df2ea0386..2c026f8753b 100644 --- a/ffi/capi/bindings/cpp/icu4x/CodePointSetBuilder.d.hpp +++ b/ffi/capi/bindings/cpp/icu4x/CodePointSetBuilder.d.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_CodePointSetBuilder_D_HPP -#define icu4x_CodePointSetBuilder_D_HPP +#ifndef ICU4X_CodePointSetBuilder_D_HPP +#define ICU4X_CodePointSetBuilder_D_HPP #include #include @@ -9,14 +9,14 @@ #include #include #include -#include "../diplomat_runtime.hpp" - +#include "diplomat_runtime.hpp" namespace icu4x { namespace capi { struct CodePointSetBuilder; } class CodePointSetBuilder; namespace capi { struct CodePointSetData; } class CodePointSetData; -} +} // namespace icu4x + namespace icu4x { @@ -33,124 +33,124 @@ class CodePointSetBuilder { public: /** - * Make a new set builder containing nothing - * - * See the [Rust documentation for `new`](https://docs.rs/icu/2.0.0/icu/collections/codepointinvlist/struct.CodePointInversionListBuilder.html#method.new) for more information. + * Make a new set builder containing nothing + * + * See the [Rust documentation for `new`](https://docs.rs/icu/2.0.0/icu/collections/codepointinvlist/struct.CodePointInversionListBuilder.html#method.new) for more information. */ inline static std::unique_ptr create(); /** - * Build this into a set - * - * This object is repopulated with an empty builder - * - * See the [Rust documentation for `build`](https://docs.rs/icu/2.0.0/icu/collections/codepointinvlist/struct.CodePointInversionListBuilder.html#method.build) for more information. + * Build this into a set + * + * This object is repopulated with an empty builder + * + * See the [Rust documentation for `build`](https://docs.rs/icu/2.0.0/icu/collections/codepointinvlist/struct.CodePointInversionListBuilder.html#method.build) for more information. */ inline std::unique_ptr build(); /** - * Complements this set - * - * (Elements in this set are removed and vice versa) - * - * See the [Rust documentation for `complement`](https://docs.rs/icu/2.0.0/icu/collections/codepointinvlist/struct.CodePointInversionListBuilder.html#method.complement) for more information. + * Complements this set + * + * (Elements in this set are removed and vice versa) + * + * See the [Rust documentation for `complement`](https://docs.rs/icu/2.0.0/icu/collections/codepointinvlist/struct.CodePointInversionListBuilder.html#method.complement) for more information. */ inline void complement(); /** - * Returns whether this set is empty - * - * See the [Rust documentation for `is_empty`](https://docs.rs/icu/2.0.0/icu/collections/codepointinvlist/struct.CodePointInversionListBuilder.html#method.is_empty) for more information. + * Returns whether this set is empty + * + * See the [Rust documentation for `is_empty`](https://docs.rs/icu/2.0.0/icu/collections/codepointinvlist/struct.CodePointInversionListBuilder.html#method.is_empty) for more information. */ inline bool is_empty() const; /** - * Add a single character to the set - * - * See the [Rust documentation for `add_char`](https://docs.rs/icu/2.0.0/icu/collections/codepointinvlist/struct.CodePointInversionListBuilder.html#method.add_char) for more information. + * Add a single character to the set + * + * See the [Rust documentation for `add_char`](https://docs.rs/icu/2.0.0/icu/collections/codepointinvlist/struct.CodePointInversionListBuilder.html#method.add_char) for more information. */ inline void add_char(char32_t ch); /** - * Add an inclusive range of characters to the set - * - * See the [Rust documentation for `add_range`](https://docs.rs/icu/2.0.0/icu/collections/codepointinvlist/struct.CodePointInversionListBuilder.html#method.add_range) for more information. + * Add an inclusive range of characters to the set + * + * See the [Rust documentation for `add_range`](https://docs.rs/icu/2.0.0/icu/collections/codepointinvlist/struct.CodePointInversionListBuilder.html#method.add_range) for more information. */ inline void add_inclusive_range(char32_t start, char32_t end); /** - * Add all elements that belong to the provided set to the set - * - * See the [Rust documentation for `add_set`](https://docs.rs/icu/2.0.0/icu/collections/codepointinvlist/struct.CodePointInversionListBuilder.html#method.add_set) for more information. + * Add all elements that belong to the provided set to the set + * + * See the [Rust documentation for `add_set`](https://docs.rs/icu/2.0.0/icu/collections/codepointinvlist/struct.CodePointInversionListBuilder.html#method.add_set) for more information. */ inline void add_set(const icu4x::CodePointSetData& data); /** - * Remove a single character to the set - * - * See the [Rust documentation for `remove_char`](https://docs.rs/icu/2.0.0/icu/collections/codepointinvlist/struct.CodePointInversionListBuilder.html#method.remove_char) for more information. + * Remove a single character to the set + * + * See the [Rust documentation for `remove_char`](https://docs.rs/icu/2.0.0/icu/collections/codepointinvlist/struct.CodePointInversionListBuilder.html#method.remove_char) for more information. */ inline void remove_char(char32_t ch); /** - * Remove an inclusive range of characters from the set - * - * See the [Rust documentation for `remove_range`](https://docs.rs/icu/2.0.0/icu/collections/codepointinvlist/struct.CodePointInversionListBuilder.html#method.remove_range) for more information. + * Remove an inclusive range of characters from the set + * + * See the [Rust documentation for `remove_range`](https://docs.rs/icu/2.0.0/icu/collections/codepointinvlist/struct.CodePointInversionListBuilder.html#method.remove_range) for more information. */ inline void remove_inclusive_range(char32_t start, char32_t end); /** - * Remove all elements that belong to the provided set from the set - * - * See the [Rust documentation for `remove_set`](https://docs.rs/icu/2.0.0/icu/collections/codepointinvlist/struct.CodePointInversionListBuilder.html#method.remove_set) for more information. + * Remove all elements that belong to the provided set from the set + * + * See the [Rust documentation for `remove_set`](https://docs.rs/icu/2.0.0/icu/collections/codepointinvlist/struct.CodePointInversionListBuilder.html#method.remove_set) for more information. */ inline void remove_set(const icu4x::CodePointSetData& data); /** - * Removes all elements from the set except a single character - * - * See the [Rust documentation for `retain_char`](https://docs.rs/icu/2.0.0/icu/collections/codepointinvlist/struct.CodePointInversionListBuilder.html#method.retain_char) for more information. + * Removes all elements from the set except a single character + * + * See the [Rust documentation for `retain_char`](https://docs.rs/icu/2.0.0/icu/collections/codepointinvlist/struct.CodePointInversionListBuilder.html#method.retain_char) for more information. */ inline void retain_char(char32_t ch); /** - * Removes all elements from the set except an inclusive range of characters f - * - * See the [Rust documentation for `retain_range`](https://docs.rs/icu/2.0.0/icu/collections/codepointinvlist/struct.CodePointInversionListBuilder.html#method.retain_range) for more information. + * Removes all elements from the set except an inclusive range of characters f + * + * See the [Rust documentation for `retain_range`](https://docs.rs/icu/2.0.0/icu/collections/codepointinvlist/struct.CodePointInversionListBuilder.html#method.retain_range) for more information. */ inline void retain_inclusive_range(char32_t start, char32_t end); /** - * Removes all elements from the set except all elements in the provided set - * - * See the [Rust documentation for `retain_set`](https://docs.rs/icu/2.0.0/icu/collections/codepointinvlist/struct.CodePointInversionListBuilder.html#method.retain_set) for more information. + * Removes all elements from the set except all elements in the provided set + * + * See the [Rust documentation for `retain_set`](https://docs.rs/icu/2.0.0/icu/collections/codepointinvlist/struct.CodePointInversionListBuilder.html#method.retain_set) for more information. */ inline void retain_set(const icu4x::CodePointSetData& data); /** - * Complement a single character to the set - * - * (Characters which are in this set are removed and vice versa) - * - * See the [Rust documentation for `complement_char`](https://docs.rs/icu/2.0.0/icu/collections/codepointinvlist/struct.CodePointInversionListBuilder.html#method.complement_char) for more information. + * Complement a single character to the set + * + * (Characters which are in this set are removed and vice versa) + * + * See the [Rust documentation for `complement_char`](https://docs.rs/icu/2.0.0/icu/collections/codepointinvlist/struct.CodePointInversionListBuilder.html#method.complement_char) for more information. */ inline void complement_char(char32_t ch); /** - * Complement an inclusive range of characters from the set - * - * (Characters which are in this set are removed and vice versa) - * - * See the [Rust documentation for `complement_range`](https://docs.rs/icu/2.0.0/icu/collections/codepointinvlist/struct.CodePointInversionListBuilder.html#method.complement_range) for more information. + * Complement an inclusive range of characters from the set + * + * (Characters which are in this set are removed and vice versa) + * + * See the [Rust documentation for `complement_range`](https://docs.rs/icu/2.0.0/icu/collections/codepointinvlist/struct.CodePointInversionListBuilder.html#method.complement_range) for more information. */ inline void complement_inclusive_range(char32_t start, char32_t end); /** - * Complement all elements that belong to the provided set from the set - * - * (Characters which are in this set are removed and vice versa) - * - * See the [Rust documentation for `complement_set`](https://docs.rs/icu/2.0.0/icu/collections/codepointinvlist/struct.CodePointInversionListBuilder.html#method.complement_set) for more information. + * Complement all elements that belong to the provided set from the set + * + * (Characters which are in this set are removed and vice versa) + * + * See the [Rust documentation for `complement_set`](https://docs.rs/icu/2.0.0/icu/collections/codepointinvlist/struct.CodePointInversionListBuilder.html#method.complement_set) for more information. */ inline void complement_set(const icu4x::CodePointSetData& data); @@ -169,4 +169,4 @@ class CodePointSetBuilder { }; } // namespace -#endif // icu4x_CodePointSetBuilder_D_HPP +#endif // ICU4X_CodePointSetBuilder_D_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/CodePointSetBuilder.hpp b/ffi/capi/bindings/cpp/icu4x/CodePointSetBuilder.hpp index 71523e86f9d..f75b0864a6b 100644 --- a/ffi/capi/bindings/cpp/icu4x/CodePointSetBuilder.hpp +++ b/ffi/capi/bindings/cpp/icu4x/CodePointSetBuilder.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_CodePointSetBuilder_HPP -#define icu4x_CodePointSetBuilder_HPP +#ifndef ICU4X_CodePointSetBuilder_HPP +#define ICU4X_CodePointSetBuilder_HPP #include "CodePointSetBuilder.d.hpp" @@ -11,8 +11,8 @@ #include #include #include -#include "../diplomat_runtime.hpp" #include "CodePointSetData.hpp" +#include "diplomat_runtime.hpp" namespace icu4x { @@ -161,4 +161,4 @@ inline void icu4x::CodePointSetBuilder::operator delete(void* ptr) { } -#endif // icu4x_CodePointSetBuilder_HPP +#endif // ICU4X_CodePointSetBuilder_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/CodePointSetData.d.hpp b/ffi/capi/bindings/cpp/icu4x/CodePointSetData.d.hpp index 7ee4d179a57..e6dc4fbfdab 100644 --- a/ffi/capi/bindings/cpp/icu4x/CodePointSetData.d.hpp +++ b/ffi/capi/bindings/cpp/icu4x/CodePointSetData.d.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_CodePointSetData_D_HPP -#define icu4x_CodePointSetData_D_HPP +#ifndef ICU4X_CodePointSetData_D_HPP +#define ICU4X_CodePointSetData_D_HPP #include #include @@ -9,8 +9,7 @@ #include #include #include -#include "../diplomat_runtime.hpp" - +#include "diplomat_runtime.hpp" namespace icu4x { namespace capi { struct CodePointRangeIterator; } class CodePointRangeIterator; @@ -20,7 +19,8 @@ namespace capi { struct DataProvider; } class DataProvider; struct GeneralCategoryGroup; class DataError; -} +} // namespace icu4x + namespace icu4x { @@ -43,1424 +43,1424 @@ class CodePointSetData { public: /** - * Checks whether the code point is in the set. - * - * See the [Rust documentation for `contains`](https://docs.rs/icu/2.0.0/icu/properties/struct.CodePointSetDataBorrowed.html#method.contains) for more information. + * Checks whether the code point is in the set. + * + * See the [Rust documentation for `contains`](https://docs.rs/icu/2.0.0/icu/properties/struct.CodePointSetDataBorrowed.html#method.contains) for more information. */ inline bool contains(char32_t cp) const; /** - * Produces an iterator over ranges of code points contained in this set - * - * See the [Rust documentation for `iter_ranges`](https://docs.rs/icu/2.0.0/icu/properties/struct.CodePointSetDataBorrowed.html#method.iter_ranges) for more information. + * Produces an iterator over ranges of code points contained in this set + * + * See the [Rust documentation for `iter_ranges`](https://docs.rs/icu/2.0.0/icu/properties/struct.CodePointSetDataBorrowed.html#method.iter_ranges) for more information. */ inline std::unique_ptr iter_ranges() const; /** - * Produces an iterator over ranges of code points not contained in this set - * - * See the [Rust documentation for `iter_ranges_complemented`](https://docs.rs/icu/2.0.0/icu/properties/struct.CodePointSetDataBorrowed.html#method.iter_ranges_complemented) for more information. + * Produces an iterator over ranges of code points not contained in this set + * + * See the [Rust documentation for `iter_ranges_complemented`](https://docs.rs/icu/2.0.0/icu/properties/struct.CodePointSetDataBorrowed.html#method.iter_ranges_complemented) for more information. */ inline std::unique_ptr iter_ranges_complemented() const; /** - * Produces a set for obtaining General Category Group values - * which is a mask with the same format as the `U_GC_XX_MASK` mask in ICU4C, using compiled data. - * - * See the [Rust documentation for `GeneralCategoryGroup`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.GeneralCategoryGroup.html) for more information. - * - * See the [Rust documentation for `get_set_for_value_group`](https://docs.rs/icu/2.0.0/icu/properties/struct.CodePointMapDataBorrowed.html#method.get_set_for_value_group) for more information. + * Produces a set for obtaining General Category Group values + * which is a mask with the same format as the `U_GC_XX_MASK` mask in ICU4C, using compiled data. + * + * See the [Rust documentation for `GeneralCategoryGroup`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.GeneralCategoryGroup.html) for more information. + * + * See the [Rust documentation for `get_set_for_value_group`](https://docs.rs/icu/2.0.0/icu/properties/struct.CodePointMapDataBorrowed.html#method.get_set_for_value_group) for more information. */ inline static std::unique_ptr create_general_category_group(icu4x::GeneralCategoryGroup group); /** - * Produces a set for obtaining General Category Group values - * which is a mask with the same format as the `U_GC_XX_MASK` mask in ICU4C, using a provided data source. - * - * See the [Rust documentation for `GeneralCategoryGroup`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.GeneralCategoryGroup.html) for more information. - * - * See the [Rust documentation for `get_set_for_value_group`](https://docs.rs/icu/2.0.0/icu/properties/struct.CodePointMapDataBorrowed.html#method.get_set_for_value_group) for more information. + * Produces a set for obtaining General Category Group values + * which is a mask with the same format as the `U_GC_XX_MASK` mask in ICU4C, using a provided data source. + * + * See the [Rust documentation for `GeneralCategoryGroup`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.GeneralCategoryGroup.html) for more information. + * + * See the [Rust documentation for `get_set_for_value_group`](https://docs.rs/icu/2.0.0/icu/properties/struct.CodePointMapDataBorrowed.html#method.get_set_for_value_group) for more information. */ - inline static diplomat::result, icu4x::DataError> create_general_category_group_with_provider(const icu4x::DataProvider& provider, uint32_t group); + inline static icu4x::diplomat::result, icu4x::DataError> create_general_category_group_with_provider(const icu4x::DataProvider& provider, uint32_t group); /** - * Get the `Ascii_Hex_Digit` value for a given character, using compiled data - * - * See the [Rust documentation for `for_char`](https://docs.rs/icu/2.0.0/icu/properties/props/trait.BinaryProperty.html#tymethod.for_char) for more information. + * Get the `Ascii_Hex_Digit` value for a given character, using compiled data + * + * See the [Rust documentation for `for_char`](https://docs.rs/icu/2.0.0/icu/properties/props/trait.BinaryProperty.html#tymethod.for_char) for more information. */ inline static bool ascii_hex_digit_for_char(char32_t ch); /** - * Create a set for the `Ascii_Hex_Digit` property, using compiled data. - * - * See the [Rust documentation for `AsciiHexDigit`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.AsciiHexDigit.html) for more information. + * Create a set for the `Ascii_Hex_Digit` property, using compiled data. + * + * See the [Rust documentation for `AsciiHexDigit`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.AsciiHexDigit.html) for more information. */ inline static std::unique_ptr create_ascii_hex_digit(); /** - * Create a set for the `Ascii_Hex_Digit` property, using a particular data source. - * - * See the [Rust documentation for `AsciiHexDigit`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.AsciiHexDigit.html) for more information. + * Create a set for the `Ascii_Hex_Digit` property, using a particular data source. + * + * See the [Rust documentation for `AsciiHexDigit`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.AsciiHexDigit.html) for more information. */ - inline static diplomat::result, icu4x::DataError> create_ascii_hex_digit_with_provider(const icu4x::DataProvider& provider); + inline static icu4x::diplomat::result, icu4x::DataError> create_ascii_hex_digit_with_provider(const icu4x::DataProvider& provider); /** - * Get the `Alnum` value for a given character, using compiled data - * - * See the [Rust documentation for `for_char`](https://docs.rs/icu/2.0.0/icu/properties/props/trait.BinaryProperty.html#tymethod.for_char) for more information. + * Get the `Alnum` value for a given character, using compiled data + * + * See the [Rust documentation for `for_char`](https://docs.rs/icu/2.0.0/icu/properties/props/trait.BinaryProperty.html#tymethod.for_char) for more information. */ inline static bool alnum_for_char(char32_t ch); /** - * Create a set for the `Alnum` property, using compiled data. - * - * See the [Rust documentation for `Alnum`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.Alnum.html) for more information. + * Create a set for the `Alnum` property, using compiled data. + * + * See the [Rust documentation for `Alnum`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.Alnum.html) for more information. */ inline static std::unique_ptr create_alnum(); /** - * Create a set for the `Alnum` property, using a particular data source. - * - * See the [Rust documentation for `Alnum`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.Alnum.html) for more information. + * Create a set for the `Alnum` property, using a particular data source. + * + * See the [Rust documentation for `Alnum`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.Alnum.html) for more information. */ - inline static diplomat::result, icu4x::DataError> create_alnum_with_provider(const icu4x::DataProvider& provider); + inline static icu4x::diplomat::result, icu4x::DataError> create_alnum_with_provider(const icu4x::DataProvider& provider); /** - * Get the `Alphabetic` value for a given character, using compiled data - * - * See the [Rust documentation for `for_char`](https://docs.rs/icu/2.0.0/icu/properties/props/trait.BinaryProperty.html#tymethod.for_char) for more information. + * Get the `Alphabetic` value for a given character, using compiled data + * + * See the [Rust documentation for `for_char`](https://docs.rs/icu/2.0.0/icu/properties/props/trait.BinaryProperty.html#tymethod.for_char) for more information. */ inline static bool alphabetic_for_char(char32_t ch); /** - * Create a set for the `Alphabetic` property, using compiled data. - * - * See the [Rust documentation for `Alphabetic`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.Alphabetic.html) for more information. + * Create a set for the `Alphabetic` property, using compiled data. + * + * See the [Rust documentation for `Alphabetic`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.Alphabetic.html) for more information. */ inline static std::unique_ptr create_alphabetic(); /** - * Create a set for the `Alphabetic` property, using a particular data source. - * - * See the [Rust documentation for `Alphabetic`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.Alphabetic.html) for more information. + * Create a set for the `Alphabetic` property, using a particular data source. + * + * See the [Rust documentation for `Alphabetic`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.Alphabetic.html) for more information. */ - inline static diplomat::result, icu4x::DataError> create_alphabetic_with_provider(const icu4x::DataProvider& provider); + inline static icu4x::diplomat::result, icu4x::DataError> create_alphabetic_with_provider(const icu4x::DataProvider& provider); /** - * Get the `Bidi_Control` value for a given character, using compiled data - * - * See the [Rust documentation for `for_char`](https://docs.rs/icu/2.0.0/icu/properties/props/trait.BinaryProperty.html#tymethod.for_char) for more information. + * Get the `Bidi_Control` value for a given character, using compiled data + * + * See the [Rust documentation for `for_char`](https://docs.rs/icu/2.0.0/icu/properties/props/trait.BinaryProperty.html#tymethod.for_char) for more information. */ inline static bool bidi_control_for_char(char32_t ch); /** - * Create a set for the `Bidi_Control` property, using compiled data. - * - * See the [Rust documentation for `BidiControl`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.BidiControl.html) for more information. + * Create a set for the `Bidi_Control` property, using compiled data. + * + * See the [Rust documentation for `BidiControl`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.BidiControl.html) for more information. */ inline static std::unique_ptr create_bidi_control(); /** - * Create a set for the `Bidi_Control` property, using a particular data source. - * - * See the [Rust documentation for `BidiControl`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.BidiControl.html) for more information. + * Create a set for the `Bidi_Control` property, using a particular data source. + * + * See the [Rust documentation for `BidiControl`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.BidiControl.html) for more information. */ - inline static diplomat::result, icu4x::DataError> create_bidi_control_with_provider(const icu4x::DataProvider& provider); + inline static icu4x::diplomat::result, icu4x::DataError> create_bidi_control_with_provider(const icu4x::DataProvider& provider); /** - * Get the `Bidi_Mirrored` value for a given character, using compiled data - * - * See the [Rust documentation for `for_char`](https://docs.rs/icu/2.0.0/icu/properties/props/trait.BinaryProperty.html#tymethod.for_char) for more information. + * Get the `Bidi_Mirrored` value for a given character, using compiled data + * + * See the [Rust documentation for `for_char`](https://docs.rs/icu/2.0.0/icu/properties/props/trait.BinaryProperty.html#tymethod.for_char) for more information. */ inline static bool bidi_mirrored_for_char(char32_t ch); /** - * Create a set for the `Bidi_Mirrored` property, using compiled data. - * - * See the [Rust documentation for `BidiMirrored`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.BidiMirrored.html) for more information. + * Create a set for the `Bidi_Mirrored` property, using compiled data. + * + * See the [Rust documentation for `BidiMirrored`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.BidiMirrored.html) for more information. */ inline static std::unique_ptr create_bidi_mirrored(); /** - * Create a set for the `Bidi_Mirrored` property, using a particular data source. - * - * See the [Rust documentation for `BidiMirrored`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.BidiMirrored.html) for more information. + * Create a set for the `Bidi_Mirrored` property, using a particular data source. + * + * See the [Rust documentation for `BidiMirrored`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.BidiMirrored.html) for more information. */ - inline static diplomat::result, icu4x::DataError> create_bidi_mirrored_with_provider(const icu4x::DataProvider& provider); + inline static icu4x::diplomat::result, icu4x::DataError> create_bidi_mirrored_with_provider(const icu4x::DataProvider& provider); /** - * Get the `Blank` value for a given character, using compiled data - * - * See the [Rust documentation for `for_char`](https://docs.rs/icu/2.0.0/icu/properties/props/trait.BinaryProperty.html#tymethod.for_char) for more information. + * Get the `Blank` value for a given character, using compiled data + * + * See the [Rust documentation for `for_char`](https://docs.rs/icu/2.0.0/icu/properties/props/trait.BinaryProperty.html#tymethod.for_char) for more information. */ inline static bool blank_for_char(char32_t ch); /** - * Create a set for the `Blank` property, using compiled data. - * - * See the [Rust documentation for `Blank`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.Blank.html) for more information. + * Create a set for the `Blank` property, using compiled data. + * + * See the [Rust documentation for `Blank`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.Blank.html) for more information. */ inline static std::unique_ptr create_blank(); /** - * Create a set for the `Blank` property, using a particular data source. - * - * See the [Rust documentation for `Blank`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.Blank.html) for more information. + * Create a set for the `Blank` property, using a particular data source. + * + * See the [Rust documentation for `Blank`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.Blank.html) for more information. */ - inline static diplomat::result, icu4x::DataError> create_blank_with_provider(const icu4x::DataProvider& provider); + inline static icu4x::diplomat::result, icu4x::DataError> create_blank_with_provider(const icu4x::DataProvider& provider); /** - * Get the `Cased` value for a given character, using compiled data - * - * See the [Rust documentation for `for_char`](https://docs.rs/icu/2.0.0/icu/properties/props/trait.BinaryProperty.html#tymethod.for_char) for more information. + * Get the `Cased` value for a given character, using compiled data + * + * See the [Rust documentation for `for_char`](https://docs.rs/icu/2.0.0/icu/properties/props/trait.BinaryProperty.html#tymethod.for_char) for more information. */ inline static bool cased_for_char(char32_t ch); /** - * Create a set for the `Cased` property, using compiled data. - * - * See the [Rust documentation for `Cased`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.Cased.html) for more information. + * Create a set for the `Cased` property, using compiled data. + * + * See the [Rust documentation for `Cased`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.Cased.html) for more information. */ inline static std::unique_ptr create_cased(); /** - * Create a set for the `Cased` property, using a particular data source. - * - * See the [Rust documentation for `Cased`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.Cased.html) for more information. + * Create a set for the `Cased` property, using a particular data source. + * + * See the [Rust documentation for `Cased`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.Cased.html) for more information. */ - inline static diplomat::result, icu4x::DataError> create_cased_with_provider(const icu4x::DataProvider& provider); + inline static icu4x::diplomat::result, icu4x::DataError> create_cased_with_provider(const icu4x::DataProvider& provider); /** - * Get the `Case_Ignorable` value for a given character, using compiled data - * - * See the [Rust documentation for `for_char`](https://docs.rs/icu/2.0.0/icu/properties/props/trait.BinaryProperty.html#tymethod.for_char) for more information. + * Get the `Case_Ignorable` value for a given character, using compiled data + * + * See the [Rust documentation for `for_char`](https://docs.rs/icu/2.0.0/icu/properties/props/trait.BinaryProperty.html#tymethod.for_char) for more information. */ inline static bool case_ignorable_for_char(char32_t ch); /** - * Create a set for the `Case_Ignorable` property, using compiled data. - * - * See the [Rust documentation for `CaseIgnorable`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.CaseIgnorable.html) for more information. + * Create a set for the `Case_Ignorable` property, using compiled data. + * + * See the [Rust documentation for `CaseIgnorable`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.CaseIgnorable.html) for more information. */ inline static std::unique_ptr create_case_ignorable(); /** - * Create a set for the `Case_Ignorable` property, using a particular data source. - * - * See the [Rust documentation for `CaseIgnorable`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.CaseIgnorable.html) for more information. + * Create a set for the `Case_Ignorable` property, using a particular data source. + * + * See the [Rust documentation for `CaseIgnorable`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.CaseIgnorable.html) for more information. */ - inline static diplomat::result, icu4x::DataError> create_case_ignorable_with_provider(const icu4x::DataProvider& provider); + inline static icu4x::diplomat::result, icu4x::DataError> create_case_ignorable_with_provider(const icu4x::DataProvider& provider); /** - * Get the `Full_Composition_Exclusion` value for a given character, using compiled data - * - * See the [Rust documentation for `for_char`](https://docs.rs/icu/2.0.0/icu/properties/props/trait.BinaryProperty.html#tymethod.for_char) for more information. + * Get the `Full_Composition_Exclusion` value for a given character, using compiled data + * + * See the [Rust documentation for `for_char`](https://docs.rs/icu/2.0.0/icu/properties/props/trait.BinaryProperty.html#tymethod.for_char) for more information. */ inline static bool full_composition_exclusion_for_char(char32_t ch); /** - * Create a set for the `Full_Composition_Exclusion` property, using compiled data. - * - * See the [Rust documentation for `FullCompositionExclusion`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.FullCompositionExclusion.html) for more information. + * Create a set for the `Full_Composition_Exclusion` property, using compiled data. + * + * See the [Rust documentation for `FullCompositionExclusion`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.FullCompositionExclusion.html) for more information. */ inline static std::unique_ptr create_full_composition_exclusion(); /** - * Create a set for the `Full_Composition_Exclusion` property, using a particular data source. - * - * See the [Rust documentation for `FullCompositionExclusion`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.FullCompositionExclusion.html) for more information. + * Create a set for the `Full_Composition_Exclusion` property, using a particular data source. + * + * See the [Rust documentation for `FullCompositionExclusion`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.FullCompositionExclusion.html) for more information. */ - inline static diplomat::result, icu4x::DataError> create_full_composition_exclusion_with_provider(const icu4x::DataProvider& provider); + inline static icu4x::diplomat::result, icu4x::DataError> create_full_composition_exclusion_with_provider(const icu4x::DataProvider& provider); /** - * Get the `Changes_When_Casefolded` value for a given character, using compiled data - * - * See the [Rust documentation for `for_char`](https://docs.rs/icu/2.0.0/icu/properties/props/trait.BinaryProperty.html#tymethod.for_char) for more information. + * Get the `Changes_When_Casefolded` value for a given character, using compiled data + * + * See the [Rust documentation for `for_char`](https://docs.rs/icu/2.0.0/icu/properties/props/trait.BinaryProperty.html#tymethod.for_char) for more information. */ inline static bool changes_when_casefolded_for_char(char32_t ch); /** - * Create a set for the `Changes_When_Casefolded` property, using compiled data. - * - * See the [Rust documentation for `ChangesWhenCasefolded`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.ChangesWhenCasefolded.html) for more information. + * Create a set for the `Changes_When_Casefolded` property, using compiled data. + * + * See the [Rust documentation for `ChangesWhenCasefolded`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.ChangesWhenCasefolded.html) for more information. */ inline static std::unique_ptr create_changes_when_casefolded(); /** - * Create a set for the `Changes_When_Casefolded` property, using a particular data source. - * - * See the [Rust documentation for `ChangesWhenCasefolded`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.ChangesWhenCasefolded.html) for more information. + * Create a set for the `Changes_When_Casefolded` property, using a particular data source. + * + * See the [Rust documentation for `ChangesWhenCasefolded`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.ChangesWhenCasefolded.html) for more information. */ - inline static diplomat::result, icu4x::DataError> create_changes_when_casefolded_with_provider(const icu4x::DataProvider& provider); + inline static icu4x::diplomat::result, icu4x::DataError> create_changes_when_casefolded_with_provider(const icu4x::DataProvider& provider); /** - * Get the `Changes_When_Casemapped` value for a given character, using compiled data - * - * See the [Rust documentation for `for_char`](https://docs.rs/icu/2.0.0/icu/properties/props/trait.BinaryProperty.html#tymethod.for_char) for more information. + * Get the `Changes_When_Casemapped` value for a given character, using compiled data + * + * See the [Rust documentation for `for_char`](https://docs.rs/icu/2.0.0/icu/properties/props/trait.BinaryProperty.html#tymethod.for_char) for more information. */ inline static bool changes_when_casemapped_for_char(char32_t ch); /** - * Create a set for the `Changes_When_Casemapped` property, using compiled data. - * - * See the [Rust documentation for `ChangesWhenCasemapped`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.ChangesWhenCasemapped.html) for more information. + * Create a set for the `Changes_When_Casemapped` property, using compiled data. + * + * See the [Rust documentation for `ChangesWhenCasemapped`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.ChangesWhenCasemapped.html) for more information. */ inline static std::unique_ptr create_changes_when_casemapped(); /** - * Create a set for the `Changes_When_Casemapped` property, using a particular data source. - * - * See the [Rust documentation for `ChangesWhenCasemapped`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.ChangesWhenCasemapped.html) for more information. + * Create a set for the `Changes_When_Casemapped` property, using a particular data source. + * + * See the [Rust documentation for `ChangesWhenCasemapped`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.ChangesWhenCasemapped.html) for more information. */ - inline static diplomat::result, icu4x::DataError> create_changes_when_casemapped_with_provider(const icu4x::DataProvider& provider); + inline static icu4x::diplomat::result, icu4x::DataError> create_changes_when_casemapped_with_provider(const icu4x::DataProvider& provider); /** - * Get the `Changes_When_Nfkc_Casefolded` value for a given character, using compiled data - * - * See the [Rust documentation for `for_char`](https://docs.rs/icu/2.0.0/icu/properties/props/trait.BinaryProperty.html#tymethod.for_char) for more information. + * Get the `Changes_When_Nfkc_Casefolded` value for a given character, using compiled data + * + * See the [Rust documentation for `for_char`](https://docs.rs/icu/2.0.0/icu/properties/props/trait.BinaryProperty.html#tymethod.for_char) for more information. */ inline static bool changes_when_nfkc_casefolded_for_char(char32_t ch); /** - * Create a set for the `Changes_When_Nfkc_Casefolded` property, using compiled data. - * - * See the [Rust documentation for `ChangesWhenNfkcCasefolded`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.ChangesWhenNfkcCasefolded.html) for more information. + * Create a set for the `Changes_When_Nfkc_Casefolded` property, using compiled data. + * + * See the [Rust documentation for `ChangesWhenNfkcCasefolded`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.ChangesWhenNfkcCasefolded.html) for more information. */ inline static std::unique_ptr create_changes_when_nfkc_casefolded(); /** - * Create a set for the `Changes_When_Nfkc_Casefolded` property, using a particular data source. - * - * See the [Rust documentation for `ChangesWhenNfkcCasefolded`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.ChangesWhenNfkcCasefolded.html) for more information. + * Create a set for the `Changes_When_Nfkc_Casefolded` property, using a particular data source. + * + * See the [Rust documentation for `ChangesWhenNfkcCasefolded`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.ChangesWhenNfkcCasefolded.html) for more information. */ - inline static diplomat::result, icu4x::DataError> create_changes_when_nfkc_casefolded_with_provider(const icu4x::DataProvider& provider); + inline static icu4x::diplomat::result, icu4x::DataError> create_changes_when_nfkc_casefolded_with_provider(const icu4x::DataProvider& provider); /** - * Get the `Changes_When_Lowercased` value for a given character, using compiled data - * - * See the [Rust documentation for `for_char`](https://docs.rs/icu/2.0.0/icu/properties/props/trait.BinaryProperty.html#tymethod.for_char) for more information. + * Get the `Changes_When_Lowercased` value for a given character, using compiled data + * + * See the [Rust documentation for `for_char`](https://docs.rs/icu/2.0.0/icu/properties/props/trait.BinaryProperty.html#tymethod.for_char) for more information. */ inline static bool changes_when_lowercased_for_char(char32_t ch); /** - * Create a set for the `Changes_When_Lowercased` property, using compiled data. - * - * See the [Rust documentation for `ChangesWhenLowercased`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.ChangesWhenLowercased.html) for more information. + * Create a set for the `Changes_When_Lowercased` property, using compiled data. + * + * See the [Rust documentation for `ChangesWhenLowercased`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.ChangesWhenLowercased.html) for more information. */ inline static std::unique_ptr create_changes_when_lowercased(); /** - * Create a set for the `Changes_When_Lowercased` property, using a particular data source. - * - * See the [Rust documentation for `ChangesWhenLowercased`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.ChangesWhenLowercased.html) for more information. + * Create a set for the `Changes_When_Lowercased` property, using a particular data source. + * + * See the [Rust documentation for `ChangesWhenLowercased`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.ChangesWhenLowercased.html) for more information. */ - inline static diplomat::result, icu4x::DataError> create_changes_when_lowercased_with_provider(const icu4x::DataProvider& provider); + inline static icu4x::diplomat::result, icu4x::DataError> create_changes_when_lowercased_with_provider(const icu4x::DataProvider& provider); /** - * Get the `Changes_When_Titlecased` value for a given character, using compiled data - * - * See the [Rust documentation for `for_char`](https://docs.rs/icu/2.0.0/icu/properties/props/trait.BinaryProperty.html#tymethod.for_char) for more information. + * Get the `Changes_When_Titlecased` value for a given character, using compiled data + * + * See the [Rust documentation for `for_char`](https://docs.rs/icu/2.0.0/icu/properties/props/trait.BinaryProperty.html#tymethod.for_char) for more information. */ inline static bool changes_when_titlecased_for_char(char32_t ch); /** - * Create a set for the `Changes_When_Titlecased` property, using compiled data. - * - * See the [Rust documentation for `ChangesWhenTitlecased`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.ChangesWhenTitlecased.html) for more information. + * Create a set for the `Changes_When_Titlecased` property, using compiled data. + * + * See the [Rust documentation for `ChangesWhenTitlecased`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.ChangesWhenTitlecased.html) for more information. */ inline static std::unique_ptr create_changes_when_titlecased(); /** - * Create a set for the `Changes_When_Titlecased` property, using a particular data source. - * - * See the [Rust documentation for `ChangesWhenTitlecased`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.ChangesWhenTitlecased.html) for more information. + * Create a set for the `Changes_When_Titlecased` property, using a particular data source. + * + * See the [Rust documentation for `ChangesWhenTitlecased`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.ChangesWhenTitlecased.html) for more information. */ - inline static diplomat::result, icu4x::DataError> create_changes_when_titlecased_with_provider(const icu4x::DataProvider& provider); + inline static icu4x::diplomat::result, icu4x::DataError> create_changes_when_titlecased_with_provider(const icu4x::DataProvider& provider); /** - * Get the `Changes_When_Uppercased` value for a given character, using compiled data - * - * See the [Rust documentation for `for_char`](https://docs.rs/icu/2.0.0/icu/properties/props/trait.BinaryProperty.html#tymethod.for_char) for more information. + * Get the `Changes_When_Uppercased` value for a given character, using compiled data + * + * See the [Rust documentation for `for_char`](https://docs.rs/icu/2.0.0/icu/properties/props/trait.BinaryProperty.html#tymethod.for_char) for more information. */ inline static bool changes_when_uppercased_for_char(char32_t ch); /** - * Create a set for the `Changes_When_Uppercased` property, using compiled data. - * - * See the [Rust documentation for `ChangesWhenUppercased`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.ChangesWhenUppercased.html) for more information. + * Create a set for the `Changes_When_Uppercased` property, using compiled data. + * + * See the [Rust documentation for `ChangesWhenUppercased`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.ChangesWhenUppercased.html) for more information. */ inline static std::unique_ptr create_changes_when_uppercased(); /** - * Create a set for the `Changes_When_Uppercased` property, using a particular data source. - * - * See the [Rust documentation for `ChangesWhenUppercased`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.ChangesWhenUppercased.html) for more information. + * Create a set for the `Changes_When_Uppercased` property, using a particular data source. + * + * See the [Rust documentation for `ChangesWhenUppercased`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.ChangesWhenUppercased.html) for more information. */ - inline static diplomat::result, icu4x::DataError> create_changes_when_uppercased_with_provider(const icu4x::DataProvider& provider); + inline static icu4x::diplomat::result, icu4x::DataError> create_changes_when_uppercased_with_provider(const icu4x::DataProvider& provider); /** - * Get the `Dash` value for a given character, using compiled data - * - * See the [Rust documentation for `for_char`](https://docs.rs/icu/2.0.0/icu/properties/props/trait.BinaryProperty.html#tymethod.for_char) for more information. + * Get the `Dash` value for a given character, using compiled data + * + * See the [Rust documentation for `for_char`](https://docs.rs/icu/2.0.0/icu/properties/props/trait.BinaryProperty.html#tymethod.for_char) for more information. */ inline static bool dash_for_char(char32_t ch); /** - * Create a set for the `Dash` property, using compiled data. - * - * See the [Rust documentation for `Dash`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.Dash.html) for more information. + * Create a set for the `Dash` property, using compiled data. + * + * See the [Rust documentation for `Dash`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.Dash.html) for more information. */ inline static std::unique_ptr create_dash(); /** - * Create a set for the `Dash` property, using a particular data source. - * - * See the [Rust documentation for `Dash`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.Dash.html) for more information. + * Create a set for the `Dash` property, using a particular data source. + * + * See the [Rust documentation for `Dash`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.Dash.html) for more information. */ - inline static diplomat::result, icu4x::DataError> create_dash_with_provider(const icu4x::DataProvider& provider); + inline static icu4x::diplomat::result, icu4x::DataError> create_dash_with_provider(const icu4x::DataProvider& provider); /** - * Get the `Deprecated` value for a given character, using compiled data - * - * See the [Rust documentation for `for_char`](https://docs.rs/icu/2.0.0/icu/properties/props/trait.BinaryProperty.html#tymethod.for_char) for more information. + * Get the `Deprecated` value for a given character, using compiled data + * + * See the [Rust documentation for `for_char`](https://docs.rs/icu/2.0.0/icu/properties/props/trait.BinaryProperty.html#tymethod.for_char) for more information. */ inline static bool deprecated_for_char(char32_t ch); /** - * Create a set for the `Deprecated` property, using compiled data. - * - * See the [Rust documentation for `Deprecated`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.Deprecated.html) for more information. + * Create a set for the `Deprecated` property, using compiled data. + * + * See the [Rust documentation for `Deprecated`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.Deprecated.html) for more information. */ inline static std::unique_ptr create_deprecated(); /** - * Create a set for the `Deprecated` property, using a particular data source. - * - * See the [Rust documentation for `Deprecated`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.Deprecated.html) for more information. + * Create a set for the `Deprecated` property, using a particular data source. + * + * See the [Rust documentation for `Deprecated`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.Deprecated.html) for more information. */ - inline static diplomat::result, icu4x::DataError> create_deprecated_with_provider(const icu4x::DataProvider& provider); + inline static icu4x::diplomat::result, icu4x::DataError> create_deprecated_with_provider(const icu4x::DataProvider& provider); /** - * Get the `Default_Ignorable_Code_Point` value for a given character, using compiled data - * - * See the [Rust documentation for `for_char`](https://docs.rs/icu/2.0.0/icu/properties/props/trait.BinaryProperty.html#tymethod.for_char) for more information. + * Get the `Default_Ignorable_Code_Point` value for a given character, using compiled data + * + * See the [Rust documentation for `for_char`](https://docs.rs/icu/2.0.0/icu/properties/props/trait.BinaryProperty.html#tymethod.for_char) for more information. */ inline static bool default_ignorable_code_point_for_char(char32_t ch); /** - * Create a set for the `Default_Ignorable_Code_Point` property, using compiled data. - * - * See the [Rust documentation for `DefaultIgnorableCodePoint`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.DefaultIgnorableCodePoint.html) for more information. + * Create a set for the `Default_Ignorable_Code_Point` property, using compiled data. + * + * See the [Rust documentation for `DefaultIgnorableCodePoint`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.DefaultIgnorableCodePoint.html) for more information. */ inline static std::unique_ptr create_default_ignorable_code_point(); /** - * Create a set for the `Default_Ignorable_Code_Point` property, using a particular data source. - * - * See the [Rust documentation for `DefaultIgnorableCodePoint`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.DefaultIgnorableCodePoint.html) for more information. + * Create a set for the `Default_Ignorable_Code_Point` property, using a particular data source. + * + * See the [Rust documentation for `DefaultIgnorableCodePoint`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.DefaultIgnorableCodePoint.html) for more information. */ - inline static diplomat::result, icu4x::DataError> create_default_ignorable_code_point_with_provider(const icu4x::DataProvider& provider); + inline static icu4x::diplomat::result, icu4x::DataError> create_default_ignorable_code_point_with_provider(const icu4x::DataProvider& provider); /** - * Get the `Diacritic` value for a given character, using compiled data - * - * See the [Rust documentation for `for_char`](https://docs.rs/icu/2.0.0/icu/properties/props/trait.BinaryProperty.html#tymethod.for_char) for more information. + * Get the `Diacritic` value for a given character, using compiled data + * + * See the [Rust documentation for `for_char`](https://docs.rs/icu/2.0.0/icu/properties/props/trait.BinaryProperty.html#tymethod.for_char) for more information. */ inline static bool diacritic_for_char(char32_t ch); /** - * Create a set for the `Diacritic` property, using compiled data. - * - * See the [Rust documentation for `Diacritic`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.Diacritic.html) for more information. + * Create a set for the `Diacritic` property, using compiled data. + * + * See the [Rust documentation for `Diacritic`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.Diacritic.html) for more information. */ inline static std::unique_ptr create_diacritic(); /** - * Create a set for the `Diacritic` property, using a particular data source. - * - * See the [Rust documentation for `Diacritic`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.Diacritic.html) for more information. + * Create a set for the `Diacritic` property, using a particular data source. + * + * See the [Rust documentation for `Diacritic`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.Diacritic.html) for more information. */ - inline static diplomat::result, icu4x::DataError> create_diacritic_with_provider(const icu4x::DataProvider& provider); + inline static icu4x::diplomat::result, icu4x::DataError> create_diacritic_with_provider(const icu4x::DataProvider& provider); /** - * Get the `Emoji_Modifier_Base` value for a given character, using compiled data - * - * See the [Rust documentation for `for_char`](https://docs.rs/icu/2.0.0/icu/properties/props/trait.BinaryProperty.html#tymethod.for_char) for more information. + * Get the `Emoji_Modifier_Base` value for a given character, using compiled data + * + * See the [Rust documentation for `for_char`](https://docs.rs/icu/2.0.0/icu/properties/props/trait.BinaryProperty.html#tymethod.for_char) for more information. */ inline static bool emoji_modifier_base_for_char(char32_t ch); /** - * Create a set for the `Emoji_Modifier_Base` property, using compiled data. - * - * See the [Rust documentation for `EmojiModifierBase`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.EmojiModifierBase.html) for more information. + * Create a set for the `Emoji_Modifier_Base` property, using compiled data. + * + * See the [Rust documentation for `EmojiModifierBase`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.EmojiModifierBase.html) for more information. */ inline static std::unique_ptr create_emoji_modifier_base(); /** - * Create a set for the `Emoji_Modifier_Base` property, using a particular data source. - * - * See the [Rust documentation for `EmojiModifierBase`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.EmojiModifierBase.html) for more information. + * Create a set for the `Emoji_Modifier_Base` property, using a particular data source. + * + * See the [Rust documentation for `EmojiModifierBase`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.EmojiModifierBase.html) for more information. */ - inline static diplomat::result, icu4x::DataError> create_emoji_modifier_base_with_provider(const icu4x::DataProvider& provider); + inline static icu4x::diplomat::result, icu4x::DataError> create_emoji_modifier_base_with_provider(const icu4x::DataProvider& provider); /** - * Get the `Emoji_Component` value for a given character, using compiled data - * - * See the [Rust documentation for `for_char`](https://docs.rs/icu/2.0.0/icu/properties/props/trait.BinaryProperty.html#tymethod.for_char) for more information. + * Get the `Emoji_Component` value for a given character, using compiled data + * + * See the [Rust documentation for `for_char`](https://docs.rs/icu/2.0.0/icu/properties/props/trait.BinaryProperty.html#tymethod.for_char) for more information. */ inline static bool emoji_component_for_char(char32_t ch); /** - * Create a set for the `Emoji_Component` property, using compiled data. - * - * See the [Rust documentation for `EmojiComponent`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.EmojiComponent.html) for more information. + * Create a set for the `Emoji_Component` property, using compiled data. + * + * See the [Rust documentation for `EmojiComponent`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.EmojiComponent.html) for more information. */ inline static std::unique_ptr create_emoji_component(); /** - * Create a set for the `Emoji_Component` property, using a particular data source. - * - * See the [Rust documentation for `EmojiComponent`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.EmojiComponent.html) for more information. + * Create a set for the `Emoji_Component` property, using a particular data source. + * + * See the [Rust documentation for `EmojiComponent`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.EmojiComponent.html) for more information. */ - inline static diplomat::result, icu4x::DataError> create_emoji_component_with_provider(const icu4x::DataProvider& provider); + inline static icu4x::diplomat::result, icu4x::DataError> create_emoji_component_with_provider(const icu4x::DataProvider& provider); /** - * Get the `Emoji_Modifier` value for a given character, using compiled data - * - * See the [Rust documentation for `for_char`](https://docs.rs/icu/2.0.0/icu/properties/props/trait.BinaryProperty.html#tymethod.for_char) for more information. + * Get the `Emoji_Modifier` value for a given character, using compiled data + * + * See the [Rust documentation for `for_char`](https://docs.rs/icu/2.0.0/icu/properties/props/trait.BinaryProperty.html#tymethod.for_char) for more information. */ inline static bool emoji_modifier_for_char(char32_t ch); /** - * Create a set for the `Emoji_Modifier` property, using compiled data. - * - * See the [Rust documentation for `EmojiModifier`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.EmojiModifier.html) for more information. + * Create a set for the `Emoji_Modifier` property, using compiled data. + * + * See the [Rust documentation for `EmojiModifier`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.EmojiModifier.html) for more information. */ inline static std::unique_ptr create_emoji_modifier(); /** - * Create a set for the `Emoji_Modifier` property, using a particular data source. - * - * See the [Rust documentation for `EmojiModifier`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.EmojiModifier.html) for more information. + * Create a set for the `Emoji_Modifier` property, using a particular data source. + * + * See the [Rust documentation for `EmojiModifier`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.EmojiModifier.html) for more information. */ - inline static diplomat::result, icu4x::DataError> create_emoji_modifier_with_provider(const icu4x::DataProvider& provider); + inline static icu4x::diplomat::result, icu4x::DataError> create_emoji_modifier_with_provider(const icu4x::DataProvider& provider); /** - * Get the `Emoji` value for a given character, using compiled data - * - * See the [Rust documentation for `for_char`](https://docs.rs/icu/2.0.0/icu/properties/props/trait.BinaryProperty.html#tymethod.for_char) for more information. + * Get the `Emoji` value for a given character, using compiled data + * + * See the [Rust documentation for `for_char`](https://docs.rs/icu/2.0.0/icu/properties/props/trait.BinaryProperty.html#tymethod.for_char) for more information. */ inline static bool emoji_for_char(char32_t ch); /** - * Create a set for the `Emoji` property, using compiled data. - * - * See the [Rust documentation for `Emoji`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.Emoji.html) for more information. + * Create a set for the `Emoji` property, using compiled data. + * + * See the [Rust documentation for `Emoji`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.Emoji.html) for more information. */ inline static std::unique_ptr create_emoji(); /** - * Create a set for the `Emoji` property, using a particular data source. - * - * See the [Rust documentation for `Emoji`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.Emoji.html) for more information. + * Create a set for the `Emoji` property, using a particular data source. + * + * See the [Rust documentation for `Emoji`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.Emoji.html) for more information. */ - inline static diplomat::result, icu4x::DataError> create_emoji_with_provider(const icu4x::DataProvider& provider); + inline static icu4x::diplomat::result, icu4x::DataError> create_emoji_with_provider(const icu4x::DataProvider& provider); /** - * Get the `Emoji_Presentation` value for a given character, using compiled data - * - * See the [Rust documentation for `for_char`](https://docs.rs/icu/2.0.0/icu/properties/props/trait.BinaryProperty.html#tymethod.for_char) for more information. + * Get the `Emoji_Presentation` value for a given character, using compiled data + * + * See the [Rust documentation for `for_char`](https://docs.rs/icu/2.0.0/icu/properties/props/trait.BinaryProperty.html#tymethod.for_char) for more information. */ inline static bool emoji_presentation_for_char(char32_t ch); /** - * Create a set for the `Emoji_Presentation` property, using compiled data. - * - * See the [Rust documentation for `EmojiPresentation`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.EmojiPresentation.html) for more information. + * Create a set for the `Emoji_Presentation` property, using compiled data. + * + * See the [Rust documentation for `EmojiPresentation`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.EmojiPresentation.html) for more information. */ inline static std::unique_ptr create_emoji_presentation(); /** - * Create a set for the `Emoji_Presentation` property, using a particular data source. - * - * See the [Rust documentation for `EmojiPresentation`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.EmojiPresentation.html) for more information. + * Create a set for the `Emoji_Presentation` property, using a particular data source. + * + * See the [Rust documentation for `EmojiPresentation`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.EmojiPresentation.html) for more information. */ - inline static diplomat::result, icu4x::DataError> create_emoji_presentation_with_provider(const icu4x::DataProvider& provider); + inline static icu4x::diplomat::result, icu4x::DataError> create_emoji_presentation_with_provider(const icu4x::DataProvider& provider); /** - * Get the `Extender` value for a given character, using compiled data - * - * See the [Rust documentation for `for_char`](https://docs.rs/icu/2.0.0/icu/properties/props/trait.BinaryProperty.html#tymethod.for_char) for more information. + * Get the `Extender` value for a given character, using compiled data + * + * See the [Rust documentation for `for_char`](https://docs.rs/icu/2.0.0/icu/properties/props/trait.BinaryProperty.html#tymethod.for_char) for more information. */ inline static bool extender_for_char(char32_t ch); /** - * Create a set for the `Extender` property, using compiled data. - * - * See the [Rust documentation for `Extender`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.Extender.html) for more information. + * Create a set for the `Extender` property, using compiled data. + * + * See the [Rust documentation for `Extender`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.Extender.html) for more information. */ inline static std::unique_ptr create_extender(); /** - * Create a set for the `Extender` property, using a particular data source. - * - * See the [Rust documentation for `Extender`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.Extender.html) for more information. + * Create a set for the `Extender` property, using a particular data source. + * + * See the [Rust documentation for `Extender`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.Extender.html) for more information. */ - inline static diplomat::result, icu4x::DataError> create_extender_with_provider(const icu4x::DataProvider& provider); + inline static icu4x::diplomat::result, icu4x::DataError> create_extender_with_provider(const icu4x::DataProvider& provider); /** - * Get the `Extended_Pictographic` value for a given character, using compiled data - * - * See the [Rust documentation for `for_char`](https://docs.rs/icu/2.0.0/icu/properties/props/trait.BinaryProperty.html#tymethod.for_char) for more information. + * Get the `Extended_Pictographic` value for a given character, using compiled data + * + * See the [Rust documentation for `for_char`](https://docs.rs/icu/2.0.0/icu/properties/props/trait.BinaryProperty.html#tymethod.for_char) for more information. */ inline static bool extended_pictographic_for_char(char32_t ch); /** - * Create a set for the `Extended_Pictographic` property, using compiled data. - * - * See the [Rust documentation for `ExtendedPictographic`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.ExtendedPictographic.html) for more information. + * Create a set for the `Extended_Pictographic` property, using compiled data. + * + * See the [Rust documentation for `ExtendedPictographic`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.ExtendedPictographic.html) for more information. */ inline static std::unique_ptr create_extended_pictographic(); /** - * Create a set for the `Extended_Pictographic` property, using a particular data source. - * - * See the [Rust documentation for `ExtendedPictographic`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.ExtendedPictographic.html) for more information. + * Create a set for the `Extended_Pictographic` property, using a particular data source. + * + * See the [Rust documentation for `ExtendedPictographic`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.ExtendedPictographic.html) for more information. */ - inline static diplomat::result, icu4x::DataError> create_extended_pictographic_with_provider(const icu4x::DataProvider& provider); + inline static icu4x::diplomat::result, icu4x::DataError> create_extended_pictographic_with_provider(const icu4x::DataProvider& provider); /** - * Get the `Graph` value for a given character, using compiled data - * - * See the [Rust documentation for `for_char`](https://docs.rs/icu/2.0.0/icu/properties/props/trait.BinaryProperty.html#tymethod.for_char) for more information. + * Get the `Graph` value for a given character, using compiled data + * + * See the [Rust documentation for `for_char`](https://docs.rs/icu/2.0.0/icu/properties/props/trait.BinaryProperty.html#tymethod.for_char) for more information. */ inline static bool graph_for_char(char32_t ch); /** - * Create a set for the `Graph` property, using compiled data. - * - * See the [Rust documentation for `Graph`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.Graph.html) for more information. + * Create a set for the `Graph` property, using compiled data. + * + * See the [Rust documentation for `Graph`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.Graph.html) for more information. */ inline static std::unique_ptr create_graph(); /** - * Create a set for the `Graph` property, using a particular data source. - * - * See the [Rust documentation for `Graph`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.Graph.html) for more information. + * Create a set for the `Graph` property, using a particular data source. + * + * See the [Rust documentation for `Graph`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.Graph.html) for more information. */ - inline static diplomat::result, icu4x::DataError> create_graph_with_provider(const icu4x::DataProvider& provider); + inline static icu4x::diplomat::result, icu4x::DataError> create_graph_with_provider(const icu4x::DataProvider& provider); /** - * Get the `Grapheme_Base` value for a given character, using compiled data - * - * See the [Rust documentation for `for_char`](https://docs.rs/icu/2.0.0/icu/properties/props/trait.BinaryProperty.html#tymethod.for_char) for more information. + * Get the `Grapheme_Base` value for a given character, using compiled data + * + * See the [Rust documentation for `for_char`](https://docs.rs/icu/2.0.0/icu/properties/props/trait.BinaryProperty.html#tymethod.for_char) for more information. */ inline static bool grapheme_base_for_char(char32_t ch); /** - * Create a set for the `Grapheme_Base` property, using compiled data. - * - * See the [Rust documentation for `GraphemeBase`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.GraphemeBase.html) for more information. + * Create a set for the `Grapheme_Base` property, using compiled data. + * + * See the [Rust documentation for `GraphemeBase`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.GraphemeBase.html) for more information. */ inline static std::unique_ptr create_grapheme_base(); /** - * Create a set for the `Grapheme_Base` property, using a particular data source. - * - * See the [Rust documentation for `GraphemeBase`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.GraphemeBase.html) for more information. + * Create a set for the `Grapheme_Base` property, using a particular data source. + * + * See the [Rust documentation for `GraphemeBase`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.GraphemeBase.html) for more information. */ - inline static diplomat::result, icu4x::DataError> create_grapheme_base_with_provider(const icu4x::DataProvider& provider); + inline static icu4x::diplomat::result, icu4x::DataError> create_grapheme_base_with_provider(const icu4x::DataProvider& provider); /** - * Get the `Grapheme_Extend` value for a given character, using compiled data - * - * See the [Rust documentation for `for_char`](https://docs.rs/icu/2.0.0/icu/properties/props/trait.BinaryProperty.html#tymethod.for_char) for more information. + * Get the `Grapheme_Extend` value for a given character, using compiled data + * + * See the [Rust documentation for `for_char`](https://docs.rs/icu/2.0.0/icu/properties/props/trait.BinaryProperty.html#tymethod.for_char) for more information. */ inline static bool grapheme_extend_for_char(char32_t ch); /** - * Create a set for the `Grapheme_Extend` property, using compiled data. - * - * See the [Rust documentation for `GraphemeExtend`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.GraphemeExtend.html) for more information. + * Create a set for the `Grapheme_Extend` property, using compiled data. + * + * See the [Rust documentation for `GraphemeExtend`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.GraphemeExtend.html) for more information. */ inline static std::unique_ptr create_grapheme_extend(); /** - * Create a set for the `Grapheme_Extend` property, using a particular data source. - * - * See the [Rust documentation for `GraphemeExtend`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.GraphemeExtend.html) for more information. + * Create a set for the `Grapheme_Extend` property, using a particular data source. + * + * See the [Rust documentation for `GraphemeExtend`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.GraphemeExtend.html) for more information. */ - inline static diplomat::result, icu4x::DataError> create_grapheme_extend_with_provider(const icu4x::DataProvider& provider); + inline static icu4x::diplomat::result, icu4x::DataError> create_grapheme_extend_with_provider(const icu4x::DataProvider& provider); /** - * Get the `Grapheme_Link` value for a given character, using compiled data - * - * See the [Rust documentation for `for_char`](https://docs.rs/icu/2.0.0/icu/properties/props/trait.BinaryProperty.html#tymethod.for_char) for more information. + * Get the `Grapheme_Link` value for a given character, using compiled data + * + * See the [Rust documentation for `for_char`](https://docs.rs/icu/2.0.0/icu/properties/props/trait.BinaryProperty.html#tymethod.for_char) for more information. */ inline static bool grapheme_link_for_char(char32_t ch); /** - * Create a set for the `Grapheme_Link` property, using compiled data. - * - * See the [Rust documentation for `GraphemeLink`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.GraphemeLink.html) for more information. + * Create a set for the `Grapheme_Link` property, using compiled data. + * + * See the [Rust documentation for `GraphemeLink`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.GraphemeLink.html) for more information. */ inline static std::unique_ptr create_grapheme_link(); /** - * Create a set for the `Grapheme_Link` property, using a particular data source. - * - * See the [Rust documentation for `GraphemeLink`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.GraphemeLink.html) for more information. + * Create a set for the `Grapheme_Link` property, using a particular data source. + * + * See the [Rust documentation for `GraphemeLink`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.GraphemeLink.html) for more information. */ - inline static diplomat::result, icu4x::DataError> create_grapheme_link_with_provider(const icu4x::DataProvider& provider); + inline static icu4x::diplomat::result, icu4x::DataError> create_grapheme_link_with_provider(const icu4x::DataProvider& provider); /** - * Get the `Hex_Digit` value for a given character, using compiled data - * - * See the [Rust documentation for `for_char`](https://docs.rs/icu/2.0.0/icu/properties/props/trait.BinaryProperty.html#tymethod.for_char) for more information. + * Get the `Hex_Digit` value for a given character, using compiled data + * + * See the [Rust documentation for `for_char`](https://docs.rs/icu/2.0.0/icu/properties/props/trait.BinaryProperty.html#tymethod.for_char) for more information. */ inline static bool hex_digit_for_char(char32_t ch); /** - * Create a set for the `Hex_Digit` property, using compiled data. - * - * See the [Rust documentation for `HexDigit`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.HexDigit.html) for more information. + * Create a set for the `Hex_Digit` property, using compiled data. + * + * See the [Rust documentation for `HexDigit`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.HexDigit.html) for more information. */ inline static std::unique_ptr create_hex_digit(); /** - * Create a set for the `Hex_Digit` property, using a particular data source. - * - * See the [Rust documentation for `HexDigit`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.HexDigit.html) for more information. + * Create a set for the `Hex_Digit` property, using a particular data source. + * + * See the [Rust documentation for `HexDigit`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.HexDigit.html) for more information. */ - inline static diplomat::result, icu4x::DataError> create_hex_digit_with_provider(const icu4x::DataProvider& provider); + inline static icu4x::diplomat::result, icu4x::DataError> create_hex_digit_with_provider(const icu4x::DataProvider& provider); /** - * Get the `Hyphen` value for a given character, using compiled data - * - * See the [Rust documentation for `for_char`](https://docs.rs/icu/2.0.0/icu/properties/props/trait.BinaryProperty.html#tymethod.for_char) for more information. + * Get the `Hyphen` value for a given character, using compiled data + * + * See the [Rust documentation for `for_char`](https://docs.rs/icu/2.0.0/icu/properties/props/trait.BinaryProperty.html#tymethod.for_char) for more information. */ inline static bool hyphen_for_char(char32_t ch); /** - * Create a set for the `Hyphen` property, using compiled data. - * - * See the [Rust documentation for `Hyphen`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.Hyphen.html) for more information. + * Create a set for the `Hyphen` property, using compiled data. + * + * See the [Rust documentation for `Hyphen`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.Hyphen.html) for more information. */ inline static std::unique_ptr create_hyphen(); /** - * Create a set for the `Hyphen` property, using a particular data source. - * - * See the [Rust documentation for `Hyphen`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.Hyphen.html) for more information. + * Create a set for the `Hyphen` property, using a particular data source. + * + * See the [Rust documentation for `Hyphen`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.Hyphen.html) for more information. */ - inline static diplomat::result, icu4x::DataError> create_hyphen_with_provider(const icu4x::DataProvider& provider); + inline static icu4x::diplomat::result, icu4x::DataError> create_hyphen_with_provider(const icu4x::DataProvider& provider); /** - * Get the `Id_Continue` value for a given character, using compiled data - * - * See the [Rust documentation for `for_char`](https://docs.rs/icu/2.0.0/icu/properties/props/trait.BinaryProperty.html#tymethod.for_char) for more information. + * Get the `Id_Continue` value for a given character, using compiled data + * + * See the [Rust documentation for `for_char`](https://docs.rs/icu/2.0.0/icu/properties/props/trait.BinaryProperty.html#tymethod.for_char) for more information. */ inline static bool id_continue_for_char(char32_t ch); /** - * Create a set for the `Id_Continue` property, using compiled data. - * - * See the [Rust documentation for `IdContinue`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.IdContinue.html) for more information. + * Create a set for the `Id_Continue` property, using compiled data. + * + * See the [Rust documentation for `IdContinue`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.IdContinue.html) for more information. */ inline static std::unique_ptr create_id_continue(); /** - * Create a set for the `Id_Continue` property, using a particular data source. - * - * See the [Rust documentation for `IdContinue`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.IdContinue.html) for more information. + * Create a set for the `Id_Continue` property, using a particular data source. + * + * See the [Rust documentation for `IdContinue`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.IdContinue.html) for more information. */ - inline static diplomat::result, icu4x::DataError> create_id_continue_with_provider(const icu4x::DataProvider& provider); + inline static icu4x::diplomat::result, icu4x::DataError> create_id_continue_with_provider(const icu4x::DataProvider& provider); /** - * Get the `Ideographic` value for a given character, using compiled data - * - * See the [Rust documentation for `for_char`](https://docs.rs/icu/2.0.0/icu/properties/props/trait.BinaryProperty.html#tymethod.for_char) for more information. + * Get the `Ideographic` value for a given character, using compiled data + * + * See the [Rust documentation for `for_char`](https://docs.rs/icu/2.0.0/icu/properties/props/trait.BinaryProperty.html#tymethod.for_char) for more information. */ inline static bool ideographic_for_char(char32_t ch); /** - * Create a set for the `Ideographic` property, using compiled data. - * - * See the [Rust documentation for `Ideographic`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.Ideographic.html) for more information. + * Create a set for the `Ideographic` property, using compiled data. + * + * See the [Rust documentation for `Ideographic`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.Ideographic.html) for more information. */ inline static std::unique_ptr create_ideographic(); /** - * Create a set for the `Ideographic` property, using a particular data source. - * - * See the [Rust documentation for `Ideographic`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.Ideographic.html) for more information. + * Create a set for the `Ideographic` property, using a particular data source. + * + * See the [Rust documentation for `Ideographic`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.Ideographic.html) for more information. */ - inline static diplomat::result, icu4x::DataError> create_ideographic_with_provider(const icu4x::DataProvider& provider); + inline static icu4x::diplomat::result, icu4x::DataError> create_ideographic_with_provider(const icu4x::DataProvider& provider); /** - * Get the `Id_Start` value for a given character, using compiled data - * - * See the [Rust documentation for `for_char`](https://docs.rs/icu/2.0.0/icu/properties/props/trait.BinaryProperty.html#tymethod.for_char) for more information. + * Get the `Id_Start` value for a given character, using compiled data + * + * See the [Rust documentation for `for_char`](https://docs.rs/icu/2.0.0/icu/properties/props/trait.BinaryProperty.html#tymethod.for_char) for more information. */ inline static bool id_start_for_char(char32_t ch); /** - * Create a set for the `Id_Start` property, using compiled data. - * - * See the [Rust documentation for `IdStart`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.IdStart.html) for more information. + * Create a set for the `Id_Start` property, using compiled data. + * + * See the [Rust documentation for `IdStart`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.IdStart.html) for more information. */ inline static std::unique_ptr create_id_start(); /** - * Create a set for the `Id_Start` property, using a particular data source. - * - * See the [Rust documentation for `IdStart`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.IdStart.html) for more information. + * Create a set for the `Id_Start` property, using a particular data source. + * + * See the [Rust documentation for `IdStart`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.IdStart.html) for more information. */ - inline static diplomat::result, icu4x::DataError> create_id_start_with_provider(const icu4x::DataProvider& provider); + inline static icu4x::diplomat::result, icu4x::DataError> create_id_start_with_provider(const icu4x::DataProvider& provider); /** - * Get the `Ids_Binary_Operator` value for a given character, using compiled data - * - * See the [Rust documentation for `for_char`](https://docs.rs/icu/2.0.0/icu/properties/props/trait.BinaryProperty.html#tymethod.for_char) for more information. + * Get the `Ids_Binary_Operator` value for a given character, using compiled data + * + * See the [Rust documentation for `for_char`](https://docs.rs/icu/2.0.0/icu/properties/props/trait.BinaryProperty.html#tymethod.for_char) for more information. */ inline static bool ids_binary_operator_for_char(char32_t ch); /** - * Create a set for the `Ids_Binary_Operator` property, using compiled data. - * - * See the [Rust documentation for `IdsBinaryOperator`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.IdsBinaryOperator.html) for more information. + * Create a set for the `Ids_Binary_Operator` property, using compiled data. + * + * See the [Rust documentation for `IdsBinaryOperator`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.IdsBinaryOperator.html) for more information. */ inline static std::unique_ptr create_ids_binary_operator(); /** - * Create a set for the `Ids_Binary_Operator` property, using a particular data source. - * - * See the [Rust documentation for `IdsBinaryOperator`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.IdsBinaryOperator.html) for more information. + * Create a set for the `Ids_Binary_Operator` property, using a particular data source. + * + * See the [Rust documentation for `IdsBinaryOperator`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.IdsBinaryOperator.html) for more information. */ - inline static diplomat::result, icu4x::DataError> create_ids_binary_operator_with_provider(const icu4x::DataProvider& provider); + inline static icu4x::diplomat::result, icu4x::DataError> create_ids_binary_operator_with_provider(const icu4x::DataProvider& provider); /** - * Get the `Ids_Trinary_Operator` value for a given character, using compiled data - * - * See the [Rust documentation for `for_char`](https://docs.rs/icu/2.0.0/icu/properties/props/trait.BinaryProperty.html#tymethod.for_char) for more information. + * Get the `Ids_Trinary_Operator` value for a given character, using compiled data + * + * See the [Rust documentation for `for_char`](https://docs.rs/icu/2.0.0/icu/properties/props/trait.BinaryProperty.html#tymethod.for_char) for more information. */ inline static bool ids_trinary_operator_for_char(char32_t ch); /** - * Create a set for the `Ids_Trinary_Operator` property, using compiled data. - * - * See the [Rust documentation for `IdsTrinaryOperator`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.IdsTrinaryOperator.html) for more information. + * Create a set for the `Ids_Trinary_Operator` property, using compiled data. + * + * See the [Rust documentation for `IdsTrinaryOperator`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.IdsTrinaryOperator.html) for more information. */ inline static std::unique_ptr create_ids_trinary_operator(); /** - * Create a set for the `Ids_Trinary_Operator` property, using a particular data source. - * - * See the [Rust documentation for `IdsTrinaryOperator`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.IdsTrinaryOperator.html) for more information. + * Create a set for the `Ids_Trinary_Operator` property, using a particular data source. + * + * See the [Rust documentation for `IdsTrinaryOperator`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.IdsTrinaryOperator.html) for more information. */ - inline static diplomat::result, icu4x::DataError> create_ids_trinary_operator_with_provider(const icu4x::DataProvider& provider); + inline static icu4x::diplomat::result, icu4x::DataError> create_ids_trinary_operator_with_provider(const icu4x::DataProvider& provider); /** - * Get the `Join_Control` value for a given character, using compiled data - * - * See the [Rust documentation for `for_char`](https://docs.rs/icu/2.0.0/icu/properties/props/trait.BinaryProperty.html#tymethod.for_char) for more information. + * Get the `Join_Control` value for a given character, using compiled data + * + * See the [Rust documentation for `for_char`](https://docs.rs/icu/2.0.0/icu/properties/props/trait.BinaryProperty.html#tymethod.for_char) for more information. */ inline static bool join_control_for_char(char32_t ch); /** - * Create a set for the `Join_Control` property, using compiled data. - * - * See the [Rust documentation for `JoinControl`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.JoinControl.html) for more information. + * Create a set for the `Join_Control` property, using compiled data. + * + * See the [Rust documentation for `JoinControl`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.JoinControl.html) for more information. */ inline static std::unique_ptr create_join_control(); /** - * Create a set for the `Join_Control` property, using a particular data source. - * - * See the [Rust documentation for `JoinControl`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.JoinControl.html) for more information. + * Create a set for the `Join_Control` property, using a particular data source. + * + * See the [Rust documentation for `JoinControl`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.JoinControl.html) for more information. */ - inline static diplomat::result, icu4x::DataError> create_join_control_with_provider(const icu4x::DataProvider& provider); + inline static icu4x::diplomat::result, icu4x::DataError> create_join_control_with_provider(const icu4x::DataProvider& provider); /** - * Get the `Logical_Order_Exception` value for a given character, using compiled data - * - * See the [Rust documentation for `for_char`](https://docs.rs/icu/2.0.0/icu/properties/props/trait.BinaryProperty.html#tymethod.for_char) for more information. + * Get the `Logical_Order_Exception` value for a given character, using compiled data + * + * See the [Rust documentation for `for_char`](https://docs.rs/icu/2.0.0/icu/properties/props/trait.BinaryProperty.html#tymethod.for_char) for more information. */ inline static bool logical_order_exception_for_char(char32_t ch); /** - * Create a set for the `Logical_Order_Exception` property, using compiled data. - * - * See the [Rust documentation for `LogicalOrderException`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.LogicalOrderException.html) for more information. + * Create a set for the `Logical_Order_Exception` property, using compiled data. + * + * See the [Rust documentation for `LogicalOrderException`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.LogicalOrderException.html) for more information. */ inline static std::unique_ptr create_logical_order_exception(); /** - * Create a set for the `Logical_Order_Exception` property, using a particular data source. - * - * See the [Rust documentation for `LogicalOrderException`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.LogicalOrderException.html) for more information. + * Create a set for the `Logical_Order_Exception` property, using a particular data source. + * + * See the [Rust documentation for `LogicalOrderException`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.LogicalOrderException.html) for more information. */ - inline static diplomat::result, icu4x::DataError> create_logical_order_exception_with_provider(const icu4x::DataProvider& provider); + inline static icu4x::diplomat::result, icu4x::DataError> create_logical_order_exception_with_provider(const icu4x::DataProvider& provider); /** - * Get the `Lowercase` value for a given character, using compiled data - * - * See the [Rust documentation for `for_char`](https://docs.rs/icu/2.0.0/icu/properties/props/trait.BinaryProperty.html#tymethod.for_char) for more information. + * Get the `Lowercase` value for a given character, using compiled data + * + * See the [Rust documentation for `for_char`](https://docs.rs/icu/2.0.0/icu/properties/props/trait.BinaryProperty.html#tymethod.for_char) for more information. */ inline static bool lowercase_for_char(char32_t ch); /** - * Create a set for the `Lowercase` property, using compiled data. - * - * See the [Rust documentation for `Lowercase`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.Lowercase.html) for more information. + * Create a set for the `Lowercase` property, using compiled data. + * + * See the [Rust documentation for `Lowercase`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.Lowercase.html) for more information. */ inline static std::unique_ptr create_lowercase(); /** - * Create a set for the `Lowercase` property, using a particular data source. - * - * See the [Rust documentation for `Lowercase`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.Lowercase.html) for more information. + * Create a set for the `Lowercase` property, using a particular data source. + * + * See the [Rust documentation for `Lowercase`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.Lowercase.html) for more information. */ - inline static diplomat::result, icu4x::DataError> create_lowercase_with_provider(const icu4x::DataProvider& provider); + inline static icu4x::diplomat::result, icu4x::DataError> create_lowercase_with_provider(const icu4x::DataProvider& provider); /** - * Get the `Math` value for a given character, using compiled data - * - * See the [Rust documentation for `for_char`](https://docs.rs/icu/2.0.0/icu/properties/props/trait.BinaryProperty.html#tymethod.for_char) for more information. + * Get the `Math` value for a given character, using compiled data + * + * See the [Rust documentation for `for_char`](https://docs.rs/icu/2.0.0/icu/properties/props/trait.BinaryProperty.html#tymethod.for_char) for more information. */ inline static bool math_for_char(char32_t ch); /** - * Create a set for the `Math` property, using compiled data. - * - * See the [Rust documentation for `Math`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.Math.html) for more information. + * Create a set for the `Math` property, using compiled data. + * + * See the [Rust documentation for `Math`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.Math.html) for more information. */ inline static std::unique_ptr create_math(); /** - * Create a set for the `Math` property, using a particular data source. - * - * See the [Rust documentation for `Math`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.Math.html) for more information. + * Create a set for the `Math` property, using a particular data source. + * + * See the [Rust documentation for `Math`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.Math.html) for more information. */ - inline static diplomat::result, icu4x::DataError> create_math_with_provider(const icu4x::DataProvider& provider); + inline static icu4x::diplomat::result, icu4x::DataError> create_math_with_provider(const icu4x::DataProvider& provider); /** - * Get the `Noncharacter_Code_Point` value for a given character, using compiled data - * - * See the [Rust documentation for `for_char`](https://docs.rs/icu/2.0.0/icu/properties/props/trait.BinaryProperty.html#tymethod.for_char) for more information. + * Get the `Noncharacter_Code_Point` value for a given character, using compiled data + * + * See the [Rust documentation for `for_char`](https://docs.rs/icu/2.0.0/icu/properties/props/trait.BinaryProperty.html#tymethod.for_char) for more information. */ inline static bool noncharacter_code_point_for_char(char32_t ch); /** - * Create a set for the `Noncharacter_Code_Point` property, using compiled data. - * - * See the [Rust documentation for `NoncharacterCodePoint`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.NoncharacterCodePoint.html) for more information. + * Create a set for the `Noncharacter_Code_Point` property, using compiled data. + * + * See the [Rust documentation for `NoncharacterCodePoint`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.NoncharacterCodePoint.html) for more information. */ inline static std::unique_ptr create_noncharacter_code_point(); /** - * Create a set for the `Noncharacter_Code_Point` property, using a particular data source. - * - * See the [Rust documentation for `NoncharacterCodePoint`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.NoncharacterCodePoint.html) for more information. + * Create a set for the `Noncharacter_Code_Point` property, using a particular data source. + * + * See the [Rust documentation for `NoncharacterCodePoint`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.NoncharacterCodePoint.html) for more information. */ - inline static diplomat::result, icu4x::DataError> create_noncharacter_code_point_with_provider(const icu4x::DataProvider& provider); + inline static icu4x::diplomat::result, icu4x::DataError> create_noncharacter_code_point_with_provider(const icu4x::DataProvider& provider); /** - * Get the `Nfc_Inert` value for a given character, using compiled data - * - * See the [Rust documentation for `for_char`](https://docs.rs/icu/2.0.0/icu/properties/props/trait.BinaryProperty.html#tymethod.for_char) for more information. + * Get the `Nfc_Inert` value for a given character, using compiled data + * + * See the [Rust documentation for `for_char`](https://docs.rs/icu/2.0.0/icu/properties/props/trait.BinaryProperty.html#tymethod.for_char) for more information. */ inline static bool nfc_inert_for_char(char32_t ch); /** - * Create a set for the `Nfc_Inert` property, using compiled data. - * - * See the [Rust documentation for `NfcInert`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.NfcInert.html) for more information. + * Create a set for the `Nfc_Inert` property, using compiled data. + * + * See the [Rust documentation for `NfcInert`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.NfcInert.html) for more information. */ inline static std::unique_ptr create_nfc_inert(); /** - * Create a set for the `Nfc_Inert` property, using a particular data source. - * - * See the [Rust documentation for `NfcInert`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.NfcInert.html) for more information. + * Create a set for the `Nfc_Inert` property, using a particular data source. + * + * See the [Rust documentation for `NfcInert`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.NfcInert.html) for more information. */ - inline static diplomat::result, icu4x::DataError> create_nfc_inert_with_provider(const icu4x::DataProvider& provider); + inline static icu4x::diplomat::result, icu4x::DataError> create_nfc_inert_with_provider(const icu4x::DataProvider& provider); /** - * Get the `Nfd_Inert` value for a given character, using compiled data - * - * See the [Rust documentation for `for_char`](https://docs.rs/icu/2.0.0/icu/properties/props/trait.BinaryProperty.html#tymethod.for_char) for more information. + * Get the `Nfd_Inert` value for a given character, using compiled data + * + * See the [Rust documentation for `for_char`](https://docs.rs/icu/2.0.0/icu/properties/props/trait.BinaryProperty.html#tymethod.for_char) for more information. */ inline static bool nfd_inert_for_char(char32_t ch); /** - * Create a set for the `Nfd_Inert` property, using compiled data. - * - * See the [Rust documentation for `NfdInert`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.NfdInert.html) for more information. + * Create a set for the `Nfd_Inert` property, using compiled data. + * + * See the [Rust documentation for `NfdInert`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.NfdInert.html) for more information. */ inline static std::unique_ptr create_nfd_inert(); /** - * Create a set for the `Nfd_Inert` property, using a particular data source. - * - * See the [Rust documentation for `NfdInert`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.NfdInert.html) for more information. + * Create a set for the `Nfd_Inert` property, using a particular data source. + * + * See the [Rust documentation for `NfdInert`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.NfdInert.html) for more information. */ - inline static diplomat::result, icu4x::DataError> create_nfd_inert_with_provider(const icu4x::DataProvider& provider); + inline static icu4x::diplomat::result, icu4x::DataError> create_nfd_inert_with_provider(const icu4x::DataProvider& provider); /** - * Get the `Nfkc_Inert` value for a given character, using compiled data - * - * See the [Rust documentation for `for_char`](https://docs.rs/icu/2.0.0/icu/properties/props/trait.BinaryProperty.html#tymethod.for_char) for more information. + * Get the `Nfkc_Inert` value for a given character, using compiled data + * + * See the [Rust documentation for `for_char`](https://docs.rs/icu/2.0.0/icu/properties/props/trait.BinaryProperty.html#tymethod.for_char) for more information. */ inline static bool nfkc_inert_for_char(char32_t ch); /** - * Create a set for the `Nfkc_Inert` property, using compiled data. - * - * See the [Rust documentation for `NfkcInert`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.NfkcInert.html) for more information. + * Create a set for the `Nfkc_Inert` property, using compiled data. + * + * See the [Rust documentation for `NfkcInert`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.NfkcInert.html) for more information. */ inline static std::unique_ptr create_nfkc_inert(); /** - * Create a set for the `Nfkc_Inert` property, using a particular data source. - * - * See the [Rust documentation for `NfkcInert`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.NfkcInert.html) for more information. + * Create a set for the `Nfkc_Inert` property, using a particular data source. + * + * See the [Rust documentation for `NfkcInert`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.NfkcInert.html) for more information. */ - inline static diplomat::result, icu4x::DataError> create_nfkc_inert_with_provider(const icu4x::DataProvider& provider); + inline static icu4x::diplomat::result, icu4x::DataError> create_nfkc_inert_with_provider(const icu4x::DataProvider& provider); /** - * Get the `Nfkd_Inert` value for a given character, using compiled data - * - * See the [Rust documentation for `for_char`](https://docs.rs/icu/2.0.0/icu/properties/props/trait.BinaryProperty.html#tymethod.for_char) for more information. + * Get the `Nfkd_Inert` value for a given character, using compiled data + * + * See the [Rust documentation for `for_char`](https://docs.rs/icu/2.0.0/icu/properties/props/trait.BinaryProperty.html#tymethod.for_char) for more information. */ inline static bool nfkd_inert_for_char(char32_t ch); /** - * Create a set for the `Nfkd_Inert` property, using compiled data. - * - * See the [Rust documentation for `NfkdInert`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.NfkdInert.html) for more information. + * Create a set for the `Nfkd_Inert` property, using compiled data. + * + * See the [Rust documentation for `NfkdInert`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.NfkdInert.html) for more information. */ inline static std::unique_ptr create_nfkd_inert(); /** - * Create a set for the `Nfkd_Inert` property, using a particular data source. - * - * See the [Rust documentation for `NfkdInert`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.NfkdInert.html) for more information. + * Create a set for the `Nfkd_Inert` property, using a particular data source. + * + * See the [Rust documentation for `NfkdInert`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.NfkdInert.html) for more information. */ - inline static diplomat::result, icu4x::DataError> create_nfkd_inert_with_provider(const icu4x::DataProvider& provider); + inline static icu4x::diplomat::result, icu4x::DataError> create_nfkd_inert_with_provider(const icu4x::DataProvider& provider); /** - * Get the `Pattern_Syntax` value for a given character, using compiled data - * - * See the [Rust documentation for `for_char`](https://docs.rs/icu/2.0.0/icu/properties/props/trait.BinaryProperty.html#tymethod.for_char) for more information. + * Get the `Pattern_Syntax` value for a given character, using compiled data + * + * See the [Rust documentation for `for_char`](https://docs.rs/icu/2.0.0/icu/properties/props/trait.BinaryProperty.html#tymethod.for_char) for more information. */ inline static bool pattern_syntax_for_char(char32_t ch); /** - * Create a set for the `Pattern_Syntax` property, using compiled data. - * - * See the [Rust documentation for `PatternSyntax`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.PatternSyntax.html) for more information. + * Create a set for the `Pattern_Syntax` property, using compiled data. + * + * See the [Rust documentation for `PatternSyntax`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.PatternSyntax.html) for more information. */ inline static std::unique_ptr create_pattern_syntax(); /** - * Create a set for the `Pattern_Syntax` property, using a particular data source. - * - * See the [Rust documentation for `PatternSyntax`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.PatternSyntax.html) for more information. + * Create a set for the `Pattern_Syntax` property, using a particular data source. + * + * See the [Rust documentation for `PatternSyntax`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.PatternSyntax.html) for more information. */ - inline static diplomat::result, icu4x::DataError> create_pattern_syntax_with_provider(const icu4x::DataProvider& provider); + inline static icu4x::diplomat::result, icu4x::DataError> create_pattern_syntax_with_provider(const icu4x::DataProvider& provider); /** - * Get the `Pattern_White_Space` value for a given character, using compiled data - * - * See the [Rust documentation for `for_char`](https://docs.rs/icu/2.0.0/icu/properties/props/trait.BinaryProperty.html#tymethod.for_char) for more information. + * Get the `Pattern_White_Space` value for a given character, using compiled data + * + * See the [Rust documentation for `for_char`](https://docs.rs/icu/2.0.0/icu/properties/props/trait.BinaryProperty.html#tymethod.for_char) for more information. */ inline static bool pattern_white_space_for_char(char32_t ch); /** - * Create a set for the `Pattern_White_Space` property, using compiled data. - * - * See the [Rust documentation for `PatternWhiteSpace`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.PatternWhiteSpace.html) for more information. + * Create a set for the `Pattern_White_Space` property, using compiled data. + * + * See the [Rust documentation for `PatternWhiteSpace`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.PatternWhiteSpace.html) for more information. */ inline static std::unique_ptr create_pattern_white_space(); /** - * Create a set for the `Pattern_White_Space` property, using a particular data source. - * - * See the [Rust documentation for `PatternWhiteSpace`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.PatternWhiteSpace.html) for more information. + * Create a set for the `Pattern_White_Space` property, using a particular data source. + * + * See the [Rust documentation for `PatternWhiteSpace`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.PatternWhiteSpace.html) for more information. */ - inline static diplomat::result, icu4x::DataError> create_pattern_white_space_with_provider(const icu4x::DataProvider& provider); + inline static icu4x::diplomat::result, icu4x::DataError> create_pattern_white_space_with_provider(const icu4x::DataProvider& provider); /** - * Get the `Prepended_Concatenation_Mark` value for a given character, using compiled data - * - * See the [Rust documentation for `for_char`](https://docs.rs/icu/2.0.0/icu/properties/props/trait.BinaryProperty.html#tymethod.for_char) for more information. + * Get the `Prepended_Concatenation_Mark` value for a given character, using compiled data + * + * See the [Rust documentation for `for_char`](https://docs.rs/icu/2.0.0/icu/properties/props/trait.BinaryProperty.html#tymethod.for_char) for more information. */ inline static bool prepended_concatenation_mark_for_char(char32_t ch); /** - * Create a set for the `Prepended_Concatenation_Mark` property, using compiled data. - * - * See the [Rust documentation for `PrependedConcatenationMark`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.PrependedConcatenationMark.html) for more information. + * Create a set for the `Prepended_Concatenation_Mark` property, using compiled data. + * + * See the [Rust documentation for `PrependedConcatenationMark`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.PrependedConcatenationMark.html) for more information. */ inline static std::unique_ptr create_prepended_concatenation_mark(); /** - * Create a set for the `Prepended_Concatenation_Mark` property, using a particular data source. - * - * See the [Rust documentation for `PrependedConcatenationMark`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.PrependedConcatenationMark.html) for more information. + * Create a set for the `Prepended_Concatenation_Mark` property, using a particular data source. + * + * See the [Rust documentation for `PrependedConcatenationMark`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.PrependedConcatenationMark.html) for more information. */ - inline static diplomat::result, icu4x::DataError> create_prepended_concatenation_mark_with_provider(const icu4x::DataProvider& provider); + inline static icu4x::diplomat::result, icu4x::DataError> create_prepended_concatenation_mark_with_provider(const icu4x::DataProvider& provider); /** - * Get the `Print` value for a given character, using compiled data - * - * See the [Rust documentation for `for_char`](https://docs.rs/icu/2.0.0/icu/properties/props/trait.BinaryProperty.html#tymethod.for_char) for more information. + * Get the `Print` value for a given character, using compiled data + * + * See the [Rust documentation for `for_char`](https://docs.rs/icu/2.0.0/icu/properties/props/trait.BinaryProperty.html#tymethod.for_char) for more information. */ inline static bool print_for_char(char32_t ch); /** - * Create a set for the `Print` property, using compiled data. - * - * See the [Rust documentation for `Print`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.Print.html) for more information. + * Create a set for the `Print` property, using compiled data. + * + * See the [Rust documentation for `Print`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.Print.html) for more information. */ inline static std::unique_ptr create_print(); /** - * Create a set for the `Print` property, using a particular data source. - * - * See the [Rust documentation for `Print`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.Print.html) for more information. + * Create a set for the `Print` property, using a particular data source. + * + * See the [Rust documentation for `Print`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.Print.html) for more information. */ - inline static diplomat::result, icu4x::DataError> create_print_with_provider(const icu4x::DataProvider& provider); + inline static icu4x::diplomat::result, icu4x::DataError> create_print_with_provider(const icu4x::DataProvider& provider); /** - * Get the `Quotation_Mark` value for a given character, using compiled data - * - * See the [Rust documentation for `for_char`](https://docs.rs/icu/2.0.0/icu/properties/props/trait.BinaryProperty.html#tymethod.for_char) for more information. + * Get the `Quotation_Mark` value for a given character, using compiled data + * + * See the [Rust documentation for `for_char`](https://docs.rs/icu/2.0.0/icu/properties/props/trait.BinaryProperty.html#tymethod.for_char) for more information. */ inline static bool quotation_mark_for_char(char32_t ch); /** - * Create a set for the `Quotation_Mark` property, using compiled data. - * - * See the [Rust documentation for `QuotationMark`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.QuotationMark.html) for more information. + * Create a set for the `Quotation_Mark` property, using compiled data. + * + * See the [Rust documentation for `QuotationMark`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.QuotationMark.html) for more information. */ inline static std::unique_ptr create_quotation_mark(); /** - * Create a set for the `Quotation_Mark` property, using a particular data source. - * - * See the [Rust documentation for `QuotationMark`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.QuotationMark.html) for more information. + * Create a set for the `Quotation_Mark` property, using a particular data source. + * + * See the [Rust documentation for `QuotationMark`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.QuotationMark.html) for more information. */ - inline static diplomat::result, icu4x::DataError> create_quotation_mark_with_provider(const icu4x::DataProvider& provider); + inline static icu4x::diplomat::result, icu4x::DataError> create_quotation_mark_with_provider(const icu4x::DataProvider& provider); /** - * Get the `Radical` value for a given character, using compiled data - * - * See the [Rust documentation for `for_char`](https://docs.rs/icu/2.0.0/icu/properties/props/trait.BinaryProperty.html#tymethod.for_char) for more information. + * Get the `Radical` value for a given character, using compiled data + * + * See the [Rust documentation for `for_char`](https://docs.rs/icu/2.0.0/icu/properties/props/trait.BinaryProperty.html#tymethod.for_char) for more information. */ inline static bool radical_for_char(char32_t ch); /** - * Create a set for the `Radical` property, using compiled data. - * - * See the [Rust documentation for `Radical`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.Radical.html) for more information. + * Create a set for the `Radical` property, using compiled data. + * + * See the [Rust documentation for `Radical`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.Radical.html) for more information. */ inline static std::unique_ptr create_radical(); /** - * Create a set for the `Radical` property, using a particular data source. - * - * See the [Rust documentation for `Radical`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.Radical.html) for more information. + * Create a set for the `Radical` property, using a particular data source. + * + * See the [Rust documentation for `Radical`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.Radical.html) for more information. */ - inline static diplomat::result, icu4x::DataError> create_radical_with_provider(const icu4x::DataProvider& provider); + inline static icu4x::diplomat::result, icu4x::DataError> create_radical_with_provider(const icu4x::DataProvider& provider); /** - * Get the `Regional_Indicator` value for a given character, using compiled data - * - * See the [Rust documentation for `for_char`](https://docs.rs/icu/2.0.0/icu/properties/props/trait.BinaryProperty.html#tymethod.for_char) for more information. + * Get the `Regional_Indicator` value for a given character, using compiled data + * + * See the [Rust documentation for `for_char`](https://docs.rs/icu/2.0.0/icu/properties/props/trait.BinaryProperty.html#tymethod.for_char) for more information. */ inline static bool regional_indicator_for_char(char32_t ch); /** - * Create a set for the `Regional_Indicator` property, using compiled data. - * - * See the [Rust documentation for `RegionalIndicator`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.RegionalIndicator.html) for more information. + * Create a set for the `Regional_Indicator` property, using compiled data. + * + * See the [Rust documentation for `RegionalIndicator`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.RegionalIndicator.html) for more information. */ inline static std::unique_ptr create_regional_indicator(); /** - * Create a set for the `Regional_Indicator` property, using a particular data source. - * - * See the [Rust documentation for `RegionalIndicator`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.RegionalIndicator.html) for more information. + * Create a set for the `Regional_Indicator` property, using a particular data source. + * + * See the [Rust documentation for `RegionalIndicator`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.RegionalIndicator.html) for more information. */ - inline static diplomat::result, icu4x::DataError> create_regional_indicator_with_provider(const icu4x::DataProvider& provider); + inline static icu4x::diplomat::result, icu4x::DataError> create_regional_indicator_with_provider(const icu4x::DataProvider& provider); /** - * Get the `Soft_Dotted` value for a given character, using compiled data - * - * See the [Rust documentation for `for_char`](https://docs.rs/icu/2.0.0/icu/properties/props/trait.BinaryProperty.html#tymethod.for_char) for more information. + * Get the `Soft_Dotted` value for a given character, using compiled data + * + * See the [Rust documentation for `for_char`](https://docs.rs/icu/2.0.0/icu/properties/props/trait.BinaryProperty.html#tymethod.for_char) for more information. */ inline static bool soft_dotted_for_char(char32_t ch); /** - * Create a set for the `Soft_Dotted` property, using compiled data. - * - * See the [Rust documentation for `SoftDotted`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.SoftDotted.html) for more information. + * Create a set for the `Soft_Dotted` property, using compiled data. + * + * See the [Rust documentation for `SoftDotted`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.SoftDotted.html) for more information. */ inline static std::unique_ptr create_soft_dotted(); /** - * Create a set for the `Soft_Dotted` property, using a particular data source. - * - * See the [Rust documentation for `SoftDotted`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.SoftDotted.html) for more information. + * Create a set for the `Soft_Dotted` property, using a particular data source. + * + * See the [Rust documentation for `SoftDotted`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.SoftDotted.html) for more information. */ - inline static diplomat::result, icu4x::DataError> create_soft_dotted_with_provider(const icu4x::DataProvider& provider); + inline static icu4x::diplomat::result, icu4x::DataError> create_soft_dotted_with_provider(const icu4x::DataProvider& provider); /** - * Get the `Segment_Starter` value for a given character, using compiled data - * - * See the [Rust documentation for `for_char`](https://docs.rs/icu/2.0.0/icu/properties/props/trait.BinaryProperty.html#tymethod.for_char) for more information. + * Get the `Segment_Starter` value for a given character, using compiled data + * + * See the [Rust documentation for `for_char`](https://docs.rs/icu/2.0.0/icu/properties/props/trait.BinaryProperty.html#tymethod.for_char) for more information. */ inline static bool segment_starter_for_char(char32_t ch); /** - * Create a set for the `Segment_Starter` property, using compiled data. - * - * See the [Rust documentation for `SegmentStarter`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.SegmentStarter.html) for more information. + * Create a set for the `Segment_Starter` property, using compiled data. + * + * See the [Rust documentation for `SegmentStarter`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.SegmentStarter.html) for more information. */ inline static std::unique_ptr create_segment_starter(); /** - * Create a set for the `Segment_Starter` property, using a particular data source. - * - * See the [Rust documentation for `SegmentStarter`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.SegmentStarter.html) for more information. + * Create a set for the `Segment_Starter` property, using a particular data source. + * + * See the [Rust documentation for `SegmentStarter`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.SegmentStarter.html) for more information. */ - inline static diplomat::result, icu4x::DataError> create_segment_starter_with_provider(const icu4x::DataProvider& provider); + inline static icu4x::diplomat::result, icu4x::DataError> create_segment_starter_with_provider(const icu4x::DataProvider& provider); /** - * Get the `Case_Sensitive` value for a given character, using compiled data - * - * See the [Rust documentation for `for_char`](https://docs.rs/icu/2.0.0/icu/properties/props/trait.BinaryProperty.html#tymethod.for_char) for more information. + * Get the `Case_Sensitive` value for a given character, using compiled data + * + * See the [Rust documentation for `for_char`](https://docs.rs/icu/2.0.0/icu/properties/props/trait.BinaryProperty.html#tymethod.for_char) for more information. */ inline static bool case_sensitive_for_char(char32_t ch); /** - * Create a set for the `Case_Sensitive` property, using compiled data. - * - * See the [Rust documentation for `CaseSensitive`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.CaseSensitive.html) for more information. + * Create a set for the `Case_Sensitive` property, using compiled data. + * + * See the [Rust documentation for `CaseSensitive`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.CaseSensitive.html) for more information. */ inline static std::unique_ptr create_case_sensitive(); /** - * Create a set for the `Case_Sensitive` property, using a particular data source. - * - * See the [Rust documentation for `CaseSensitive`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.CaseSensitive.html) for more information. + * Create a set for the `Case_Sensitive` property, using a particular data source. + * + * See the [Rust documentation for `CaseSensitive`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.CaseSensitive.html) for more information. */ - inline static diplomat::result, icu4x::DataError> create_case_sensitive_with_provider(const icu4x::DataProvider& provider); + inline static icu4x::diplomat::result, icu4x::DataError> create_case_sensitive_with_provider(const icu4x::DataProvider& provider); /** - * Get the `Sentence_Terminal` value for a given character, using compiled data - * - * See the [Rust documentation for `for_char`](https://docs.rs/icu/2.0.0/icu/properties/props/trait.BinaryProperty.html#tymethod.for_char) for more information. + * Get the `Sentence_Terminal` value for a given character, using compiled data + * + * See the [Rust documentation for `for_char`](https://docs.rs/icu/2.0.0/icu/properties/props/trait.BinaryProperty.html#tymethod.for_char) for more information. */ inline static bool sentence_terminal_for_char(char32_t ch); /** - * Create a set for the `Sentence_Terminal` property, using compiled data. - * - * See the [Rust documentation for `SentenceTerminal`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.SentenceTerminal.html) for more information. + * Create a set for the `Sentence_Terminal` property, using compiled data. + * + * See the [Rust documentation for `SentenceTerminal`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.SentenceTerminal.html) for more information. */ inline static std::unique_ptr create_sentence_terminal(); /** - * Create a set for the `Sentence_Terminal` property, using a particular data source. - * - * See the [Rust documentation for `SentenceTerminal`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.SentenceTerminal.html) for more information. + * Create a set for the `Sentence_Terminal` property, using a particular data source. + * + * See the [Rust documentation for `SentenceTerminal`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.SentenceTerminal.html) for more information. */ - inline static diplomat::result, icu4x::DataError> create_sentence_terminal_with_provider(const icu4x::DataProvider& provider); + inline static icu4x::diplomat::result, icu4x::DataError> create_sentence_terminal_with_provider(const icu4x::DataProvider& provider); /** - * Get the `Terminal_Punctuation` value for a given character, using compiled data - * - * See the [Rust documentation for `for_char`](https://docs.rs/icu/2.0.0/icu/properties/props/trait.BinaryProperty.html#tymethod.for_char) for more information. + * Get the `Terminal_Punctuation` value for a given character, using compiled data + * + * See the [Rust documentation for `for_char`](https://docs.rs/icu/2.0.0/icu/properties/props/trait.BinaryProperty.html#tymethod.for_char) for more information. */ inline static bool terminal_punctuation_for_char(char32_t ch); /** - * Create a set for the `Terminal_Punctuation` property, using compiled data. - * - * See the [Rust documentation for `TerminalPunctuation`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.TerminalPunctuation.html) for more information. + * Create a set for the `Terminal_Punctuation` property, using compiled data. + * + * See the [Rust documentation for `TerminalPunctuation`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.TerminalPunctuation.html) for more information. */ inline static std::unique_ptr create_terminal_punctuation(); /** - * Create a set for the `Terminal_Punctuation` property, using a particular data source. - * - * See the [Rust documentation for `TerminalPunctuation`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.TerminalPunctuation.html) for more information. + * Create a set for the `Terminal_Punctuation` property, using a particular data source. + * + * See the [Rust documentation for `TerminalPunctuation`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.TerminalPunctuation.html) for more information. */ - inline static diplomat::result, icu4x::DataError> create_terminal_punctuation_with_provider(const icu4x::DataProvider& provider); + inline static icu4x::diplomat::result, icu4x::DataError> create_terminal_punctuation_with_provider(const icu4x::DataProvider& provider); /** - * Get the `Unified_Ideograph` value for a given character, using compiled data - * - * See the [Rust documentation for `for_char`](https://docs.rs/icu/2.0.0/icu/properties/props/trait.BinaryProperty.html#tymethod.for_char) for more information. + * Get the `Unified_Ideograph` value for a given character, using compiled data + * + * See the [Rust documentation for `for_char`](https://docs.rs/icu/2.0.0/icu/properties/props/trait.BinaryProperty.html#tymethod.for_char) for more information. */ inline static bool unified_ideograph_for_char(char32_t ch); /** - * Create a set for the `Unified_Ideograph` property, using compiled data. - * - * See the [Rust documentation for `UnifiedIdeograph`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.UnifiedIdeograph.html) for more information. + * Create a set for the `Unified_Ideograph` property, using compiled data. + * + * See the [Rust documentation for `UnifiedIdeograph`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.UnifiedIdeograph.html) for more information. */ inline static std::unique_ptr create_unified_ideograph(); /** - * Create a set for the `Unified_Ideograph` property, using a particular data source. - * - * See the [Rust documentation for `UnifiedIdeograph`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.UnifiedIdeograph.html) for more information. + * Create a set for the `Unified_Ideograph` property, using a particular data source. + * + * See the [Rust documentation for `UnifiedIdeograph`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.UnifiedIdeograph.html) for more information. */ - inline static diplomat::result, icu4x::DataError> create_unified_ideograph_with_provider(const icu4x::DataProvider& provider); + inline static icu4x::diplomat::result, icu4x::DataError> create_unified_ideograph_with_provider(const icu4x::DataProvider& provider); /** - * Get the `Uppercase` value for a given character, using compiled data - * - * See the [Rust documentation for `for_char`](https://docs.rs/icu/2.0.0/icu/properties/props/trait.BinaryProperty.html#tymethod.for_char) for more information. + * Get the `Uppercase` value for a given character, using compiled data + * + * See the [Rust documentation for `for_char`](https://docs.rs/icu/2.0.0/icu/properties/props/trait.BinaryProperty.html#tymethod.for_char) for more information. */ inline static bool uppercase_for_char(char32_t ch); /** - * Create a set for the `Uppercase` property, using compiled data. - * - * See the [Rust documentation for `Uppercase`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.Uppercase.html) for more information. + * Create a set for the `Uppercase` property, using compiled data. + * + * See the [Rust documentation for `Uppercase`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.Uppercase.html) for more information. */ inline static std::unique_ptr create_uppercase(); /** - * Create a set for the `Uppercase` property, using a particular data source. - * - * See the [Rust documentation for `Uppercase`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.Uppercase.html) for more information. + * Create a set for the `Uppercase` property, using a particular data source. + * + * See the [Rust documentation for `Uppercase`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.Uppercase.html) for more information. */ - inline static diplomat::result, icu4x::DataError> create_uppercase_with_provider(const icu4x::DataProvider& provider); + inline static icu4x::diplomat::result, icu4x::DataError> create_uppercase_with_provider(const icu4x::DataProvider& provider); /** - * Get the `Variation_Selector` value for a given character, using compiled data - * - * See the [Rust documentation for `for_char`](https://docs.rs/icu/2.0.0/icu/properties/props/trait.BinaryProperty.html#tymethod.for_char) for more information. + * Get the `Variation_Selector` value for a given character, using compiled data + * + * See the [Rust documentation for `for_char`](https://docs.rs/icu/2.0.0/icu/properties/props/trait.BinaryProperty.html#tymethod.for_char) for more information. */ inline static bool variation_selector_for_char(char32_t ch); /** - * Create a set for the `Variation_Selector` property, using compiled data. - * - * See the [Rust documentation for `VariationSelector`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.VariationSelector.html) for more information. + * Create a set for the `Variation_Selector` property, using compiled data. + * + * See the [Rust documentation for `VariationSelector`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.VariationSelector.html) for more information. */ inline static std::unique_ptr create_variation_selector(); /** - * Create a set for the `Variation_Selector` property, using a particular data source. - * - * See the [Rust documentation for `VariationSelector`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.VariationSelector.html) for more information. + * Create a set for the `Variation_Selector` property, using a particular data source. + * + * See the [Rust documentation for `VariationSelector`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.VariationSelector.html) for more information. */ - inline static diplomat::result, icu4x::DataError> create_variation_selector_with_provider(const icu4x::DataProvider& provider); + inline static icu4x::diplomat::result, icu4x::DataError> create_variation_selector_with_provider(const icu4x::DataProvider& provider); /** - * Get the `White_Space` value for a given character, using compiled data - * - * See the [Rust documentation for `for_char`](https://docs.rs/icu/2.0.0/icu/properties/props/trait.BinaryProperty.html#tymethod.for_char) for more information. + * Get the `White_Space` value for a given character, using compiled data + * + * See the [Rust documentation for `for_char`](https://docs.rs/icu/2.0.0/icu/properties/props/trait.BinaryProperty.html#tymethod.for_char) for more information. */ inline static bool white_space_for_char(char32_t ch); /** - * Create a set for the `White_Space` property, using compiled data. - * - * See the [Rust documentation for `WhiteSpace`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.WhiteSpace.html) for more information. + * Create a set for the `White_Space` property, using compiled data. + * + * See the [Rust documentation for `WhiteSpace`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.WhiteSpace.html) for more information. */ inline static std::unique_ptr create_white_space(); /** - * Create a set for the `White_Space` property, using a particular data source. - * - * See the [Rust documentation for `WhiteSpace`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.WhiteSpace.html) for more information. + * Create a set for the `White_Space` property, using a particular data source. + * + * See the [Rust documentation for `WhiteSpace`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.WhiteSpace.html) for more information. */ - inline static diplomat::result, icu4x::DataError> create_white_space_with_provider(const icu4x::DataProvider& provider); + inline static icu4x::diplomat::result, icu4x::DataError> create_white_space_with_provider(const icu4x::DataProvider& provider); /** - * Get the `Xdigit` value for a given character, using compiled data - * - * See the [Rust documentation for `for_char`](https://docs.rs/icu/2.0.0/icu/properties/props/trait.BinaryProperty.html#tymethod.for_char) for more information. + * Get the `Xdigit` value for a given character, using compiled data + * + * See the [Rust documentation for `for_char`](https://docs.rs/icu/2.0.0/icu/properties/props/trait.BinaryProperty.html#tymethod.for_char) for more information. */ inline static bool xdigit_for_char(char32_t ch); /** - * Create a set for the `Xdigit` property, using compiled data. - * - * See the [Rust documentation for `Xdigit`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.Xdigit.html) for more information. + * Create a set for the `Xdigit` property, using compiled data. + * + * See the [Rust documentation for `Xdigit`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.Xdigit.html) for more information. */ inline static std::unique_ptr create_xdigit(); /** - * Create a set for the `Xdigit` property, using a particular data source. - * - * See the [Rust documentation for `Xdigit`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.Xdigit.html) for more information. + * Create a set for the `Xdigit` property, using a particular data source. + * + * See the [Rust documentation for `Xdigit`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.Xdigit.html) for more information. */ - inline static diplomat::result, icu4x::DataError> create_xdigit_with_provider(const icu4x::DataProvider& provider); + inline static icu4x::diplomat::result, icu4x::DataError> create_xdigit_with_provider(const icu4x::DataProvider& provider); /** - * Get the `Xid_Continue` value for a given character, using compiled data - * - * See the [Rust documentation for `for_char`](https://docs.rs/icu/2.0.0/icu/properties/props/trait.BinaryProperty.html#tymethod.for_char) for more information. + * Get the `Xid_Continue` value for a given character, using compiled data + * + * See the [Rust documentation for `for_char`](https://docs.rs/icu/2.0.0/icu/properties/props/trait.BinaryProperty.html#tymethod.for_char) for more information. */ inline static bool xid_continue_for_char(char32_t ch); /** - * Create a set for the `Xid_Continue` property, using compiled data. - * - * See the [Rust documentation for `XidContinue`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.XidContinue.html) for more information. + * Create a set for the `Xid_Continue` property, using compiled data. + * + * See the [Rust documentation for `XidContinue`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.XidContinue.html) for more information. */ inline static std::unique_ptr create_xid_continue(); /** - * Create a set for the `Xid_Continue` property, using a particular data source. - * - * See the [Rust documentation for `XidContinue`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.XidContinue.html) for more information. + * Create a set for the `Xid_Continue` property, using a particular data source. + * + * See the [Rust documentation for `XidContinue`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.XidContinue.html) for more information. */ - inline static diplomat::result, icu4x::DataError> create_xid_continue_with_provider(const icu4x::DataProvider& provider); + inline static icu4x::diplomat::result, icu4x::DataError> create_xid_continue_with_provider(const icu4x::DataProvider& provider); /** - * Get the `Xid_Start` value for a given character, using compiled data - * - * See the [Rust documentation for `for_char`](https://docs.rs/icu/2.0.0/icu/properties/props/trait.BinaryProperty.html#tymethod.for_char) for more information. + * Get the `Xid_Start` value for a given character, using compiled data + * + * See the [Rust documentation for `for_char`](https://docs.rs/icu/2.0.0/icu/properties/props/trait.BinaryProperty.html#tymethod.for_char) for more information. */ inline static bool xid_start_for_char(char32_t ch); /** - * Create a set for the `Xid_Start` property, using compiled data. - * - * See the [Rust documentation for `XidStart`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.XidStart.html) for more information. + * Create a set for the `Xid_Start` property, using compiled data. + * + * See the [Rust documentation for `XidStart`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.XidStart.html) for more information. */ inline static std::unique_ptr create_xid_start(); /** - * Create a set for the `Xid_Start` property, using a particular data source. - * - * See the [Rust documentation for `XidStart`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.XidStart.html) for more information. + * Create a set for the `Xid_Start` property, using a particular data source. + * + * See the [Rust documentation for `XidStart`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.XidStart.html) for more information. */ - inline static diplomat::result, icu4x::DataError> create_xid_start_with_provider(const icu4x::DataProvider& provider); + inline static icu4x::diplomat::result, icu4x::DataError> create_xid_start_with_provider(const icu4x::DataProvider& provider); /** - * [ecma]: https://tc39.es/ecma262/#table-binary-unicode-properties - * - * See the [Rust documentation for `new_for_ecma262`](https://docs.rs/icu/2.0.0/icu/properties/struct.CodePointSetData.html#method.new_for_ecma262) for more information. + * [ecma]: https://tc39.es/ecma262/#table-binary-unicode-properties + * + * See the [Rust documentation for `new_for_ecma262`](https://docs.rs/icu/2.0.0/icu/properties/struct.CodePointSetData.html#method.new_for_ecma262) for more information. */ - inline static diplomat::result, icu4x::DataError> create_for_ecma262(std::string_view property_name); + inline static icu4x::diplomat::result, icu4x::DataError> create_for_ecma262(std::string_view property_name); /** - * [ecma]: https://tc39.es/ecma262/#table-binary-unicode-properties - * - * See the [Rust documentation for `new_for_ecma262`](https://docs.rs/icu/2.0.0/icu/properties/struct.CodePointSetData.html#method.new_for_ecma262) for more information. + * [ecma]: https://tc39.es/ecma262/#table-binary-unicode-properties + * + * See the [Rust documentation for `new_for_ecma262`](https://docs.rs/icu/2.0.0/icu/properties/struct.CodePointSetData.html#method.new_for_ecma262) for more information. */ - inline static diplomat::result, icu4x::DataError> create_for_ecma262_with_provider(const icu4x::DataProvider& provider, std::string_view property_name); + inline static icu4x::diplomat::result, icu4x::DataError> create_for_ecma262_with_provider(const icu4x::DataProvider& provider, std::string_view property_name); inline const icu4x::capi::CodePointSetData* AsFFI() const; inline icu4x::capi::CodePointSetData* AsFFI(); @@ -1477,4 +1477,4 @@ class CodePointSetData { }; } // namespace -#endif // icu4x_CodePointSetData_D_HPP +#endif // ICU4X_CodePointSetData_D_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/CodePointSetData.hpp b/ffi/capi/bindings/cpp/icu4x/CodePointSetData.hpp index 849dc5b2ad8..a51dd34107c 100644 --- a/ffi/capi/bindings/cpp/icu4x/CodePointSetData.hpp +++ b/ffi/capi/bindings/cpp/icu4x/CodePointSetData.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_CodePointSetData_HPP -#define icu4x_CodePointSetData_HPP +#ifndef ICU4X_CodePointSetData_HPP +#define ICU4X_CodePointSetData_HPP #include "CodePointSetData.d.hpp" @@ -11,11 +11,11 @@ #include #include #include -#include "../diplomat_runtime.hpp" #include "CodePointRangeIterator.hpp" #include "DataError.hpp" #include "DataProvider.hpp" #include "GeneralCategoryGroup.hpp" +#include "diplomat_runtime.hpp" namespace icu4x { @@ -489,10 +489,10 @@ namespace capi { icu4x_CodePointSetData_create_xid_start_with_provider_mv1_result icu4x_CodePointSetData_create_xid_start_with_provider_mv1(const icu4x::capi::DataProvider* provider); typedef struct icu4x_CodePointSetData_create_for_ecma262_mv1_result {union {icu4x::capi::CodePointSetData* ok; icu4x::capi::DataError err;}; bool is_ok;} icu4x_CodePointSetData_create_for_ecma262_mv1_result; - icu4x_CodePointSetData_create_for_ecma262_mv1_result icu4x_CodePointSetData_create_for_ecma262_mv1(diplomat::capi::DiplomatStringView property_name); + icu4x_CodePointSetData_create_for_ecma262_mv1_result icu4x_CodePointSetData_create_for_ecma262_mv1(icu4x::diplomat::capi::DiplomatStringView property_name); typedef struct icu4x_CodePointSetData_create_for_ecma262_with_provider_mv1_result {union {icu4x::capi::CodePointSetData* ok; icu4x::capi::DataError err;}; bool is_ok;} icu4x_CodePointSetData_create_for_ecma262_with_provider_mv1_result; - icu4x_CodePointSetData_create_for_ecma262_with_provider_mv1_result icu4x_CodePointSetData_create_for_ecma262_with_provider_mv1(const icu4x::capi::DataProvider* provider, diplomat::capi::DiplomatStringView property_name); + icu4x_CodePointSetData_create_for_ecma262_with_provider_mv1_result icu4x_CodePointSetData_create_for_ecma262_with_provider_mv1(const icu4x::capi::DataProvider* provider, icu4x::diplomat::capi::DiplomatStringView property_name); void icu4x_CodePointSetData_destroy_mv1(CodePointSetData* self); @@ -521,10 +521,10 @@ inline std::unique_ptr icu4x::CodePointSetData::create_ return std::unique_ptr(icu4x::CodePointSetData::FromFFI(result)); } -inline diplomat::result, icu4x::DataError> icu4x::CodePointSetData::create_general_category_group_with_provider(const icu4x::DataProvider& provider, uint32_t group) { +inline icu4x::diplomat::result, icu4x::DataError> icu4x::CodePointSetData::create_general_category_group_with_provider(const icu4x::DataProvider& provider, uint32_t group) { auto result = icu4x::capi::icu4x_CodePointSetData_create_general_category_group_with_provider_mv1(provider.AsFFI(), group); - return result.is_ok ? diplomat::result, icu4x::DataError>(diplomat::Ok>(std::unique_ptr(icu4x::CodePointSetData::FromFFI(result.ok)))) : diplomat::result, icu4x::DataError>(diplomat::Err(icu4x::DataError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::CodePointSetData::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Err(icu4x::DataError::FromFFI(result.err))); } inline bool icu4x::CodePointSetData::ascii_hex_digit_for_char(char32_t ch) { @@ -537,9 +537,9 @@ inline std::unique_ptr icu4x::CodePointSetData::create_ return std::unique_ptr(icu4x::CodePointSetData::FromFFI(result)); } -inline diplomat::result, icu4x::DataError> icu4x::CodePointSetData::create_ascii_hex_digit_with_provider(const icu4x::DataProvider& provider) { +inline icu4x::diplomat::result, icu4x::DataError> icu4x::CodePointSetData::create_ascii_hex_digit_with_provider(const icu4x::DataProvider& provider) { auto result = icu4x::capi::icu4x_CodePointSetData_create_ascii_hex_digit_with_provider_mv1(provider.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DataError>(diplomat::Ok>(std::unique_ptr(icu4x::CodePointSetData::FromFFI(result.ok)))) : diplomat::result, icu4x::DataError>(diplomat::Err(icu4x::DataError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::CodePointSetData::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Err(icu4x::DataError::FromFFI(result.err))); } inline bool icu4x::CodePointSetData::alnum_for_char(char32_t ch) { @@ -552,9 +552,9 @@ inline std::unique_ptr icu4x::CodePointSetData::create_ return std::unique_ptr(icu4x::CodePointSetData::FromFFI(result)); } -inline diplomat::result, icu4x::DataError> icu4x::CodePointSetData::create_alnum_with_provider(const icu4x::DataProvider& provider) { +inline icu4x::diplomat::result, icu4x::DataError> icu4x::CodePointSetData::create_alnum_with_provider(const icu4x::DataProvider& provider) { auto result = icu4x::capi::icu4x_CodePointSetData_create_alnum_with_provider_mv1(provider.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DataError>(diplomat::Ok>(std::unique_ptr(icu4x::CodePointSetData::FromFFI(result.ok)))) : diplomat::result, icu4x::DataError>(diplomat::Err(icu4x::DataError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::CodePointSetData::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Err(icu4x::DataError::FromFFI(result.err))); } inline bool icu4x::CodePointSetData::alphabetic_for_char(char32_t ch) { @@ -567,9 +567,9 @@ inline std::unique_ptr icu4x::CodePointSetData::create_ return std::unique_ptr(icu4x::CodePointSetData::FromFFI(result)); } -inline diplomat::result, icu4x::DataError> icu4x::CodePointSetData::create_alphabetic_with_provider(const icu4x::DataProvider& provider) { +inline icu4x::diplomat::result, icu4x::DataError> icu4x::CodePointSetData::create_alphabetic_with_provider(const icu4x::DataProvider& provider) { auto result = icu4x::capi::icu4x_CodePointSetData_create_alphabetic_with_provider_mv1(provider.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DataError>(diplomat::Ok>(std::unique_ptr(icu4x::CodePointSetData::FromFFI(result.ok)))) : diplomat::result, icu4x::DataError>(diplomat::Err(icu4x::DataError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::CodePointSetData::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Err(icu4x::DataError::FromFFI(result.err))); } inline bool icu4x::CodePointSetData::bidi_control_for_char(char32_t ch) { @@ -582,9 +582,9 @@ inline std::unique_ptr icu4x::CodePointSetData::create_ return std::unique_ptr(icu4x::CodePointSetData::FromFFI(result)); } -inline diplomat::result, icu4x::DataError> icu4x::CodePointSetData::create_bidi_control_with_provider(const icu4x::DataProvider& provider) { +inline icu4x::diplomat::result, icu4x::DataError> icu4x::CodePointSetData::create_bidi_control_with_provider(const icu4x::DataProvider& provider) { auto result = icu4x::capi::icu4x_CodePointSetData_create_bidi_control_with_provider_mv1(provider.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DataError>(diplomat::Ok>(std::unique_ptr(icu4x::CodePointSetData::FromFFI(result.ok)))) : diplomat::result, icu4x::DataError>(diplomat::Err(icu4x::DataError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::CodePointSetData::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Err(icu4x::DataError::FromFFI(result.err))); } inline bool icu4x::CodePointSetData::bidi_mirrored_for_char(char32_t ch) { @@ -597,9 +597,9 @@ inline std::unique_ptr icu4x::CodePointSetData::create_ return std::unique_ptr(icu4x::CodePointSetData::FromFFI(result)); } -inline diplomat::result, icu4x::DataError> icu4x::CodePointSetData::create_bidi_mirrored_with_provider(const icu4x::DataProvider& provider) { +inline icu4x::diplomat::result, icu4x::DataError> icu4x::CodePointSetData::create_bidi_mirrored_with_provider(const icu4x::DataProvider& provider) { auto result = icu4x::capi::icu4x_CodePointSetData_create_bidi_mirrored_with_provider_mv1(provider.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DataError>(diplomat::Ok>(std::unique_ptr(icu4x::CodePointSetData::FromFFI(result.ok)))) : diplomat::result, icu4x::DataError>(diplomat::Err(icu4x::DataError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::CodePointSetData::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Err(icu4x::DataError::FromFFI(result.err))); } inline bool icu4x::CodePointSetData::blank_for_char(char32_t ch) { @@ -612,9 +612,9 @@ inline std::unique_ptr icu4x::CodePointSetData::create_ return std::unique_ptr(icu4x::CodePointSetData::FromFFI(result)); } -inline diplomat::result, icu4x::DataError> icu4x::CodePointSetData::create_blank_with_provider(const icu4x::DataProvider& provider) { +inline icu4x::diplomat::result, icu4x::DataError> icu4x::CodePointSetData::create_blank_with_provider(const icu4x::DataProvider& provider) { auto result = icu4x::capi::icu4x_CodePointSetData_create_blank_with_provider_mv1(provider.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DataError>(diplomat::Ok>(std::unique_ptr(icu4x::CodePointSetData::FromFFI(result.ok)))) : diplomat::result, icu4x::DataError>(diplomat::Err(icu4x::DataError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::CodePointSetData::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Err(icu4x::DataError::FromFFI(result.err))); } inline bool icu4x::CodePointSetData::cased_for_char(char32_t ch) { @@ -627,9 +627,9 @@ inline std::unique_ptr icu4x::CodePointSetData::create_ return std::unique_ptr(icu4x::CodePointSetData::FromFFI(result)); } -inline diplomat::result, icu4x::DataError> icu4x::CodePointSetData::create_cased_with_provider(const icu4x::DataProvider& provider) { +inline icu4x::diplomat::result, icu4x::DataError> icu4x::CodePointSetData::create_cased_with_provider(const icu4x::DataProvider& provider) { auto result = icu4x::capi::icu4x_CodePointSetData_create_cased_with_provider_mv1(provider.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DataError>(diplomat::Ok>(std::unique_ptr(icu4x::CodePointSetData::FromFFI(result.ok)))) : diplomat::result, icu4x::DataError>(diplomat::Err(icu4x::DataError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::CodePointSetData::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Err(icu4x::DataError::FromFFI(result.err))); } inline bool icu4x::CodePointSetData::case_ignorable_for_char(char32_t ch) { @@ -642,9 +642,9 @@ inline std::unique_ptr icu4x::CodePointSetData::create_ return std::unique_ptr(icu4x::CodePointSetData::FromFFI(result)); } -inline diplomat::result, icu4x::DataError> icu4x::CodePointSetData::create_case_ignorable_with_provider(const icu4x::DataProvider& provider) { +inline icu4x::diplomat::result, icu4x::DataError> icu4x::CodePointSetData::create_case_ignorable_with_provider(const icu4x::DataProvider& provider) { auto result = icu4x::capi::icu4x_CodePointSetData_create_case_ignorable_with_provider_mv1(provider.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DataError>(diplomat::Ok>(std::unique_ptr(icu4x::CodePointSetData::FromFFI(result.ok)))) : diplomat::result, icu4x::DataError>(diplomat::Err(icu4x::DataError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::CodePointSetData::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Err(icu4x::DataError::FromFFI(result.err))); } inline bool icu4x::CodePointSetData::full_composition_exclusion_for_char(char32_t ch) { @@ -657,9 +657,9 @@ inline std::unique_ptr icu4x::CodePointSetData::create_ return std::unique_ptr(icu4x::CodePointSetData::FromFFI(result)); } -inline diplomat::result, icu4x::DataError> icu4x::CodePointSetData::create_full_composition_exclusion_with_provider(const icu4x::DataProvider& provider) { +inline icu4x::diplomat::result, icu4x::DataError> icu4x::CodePointSetData::create_full_composition_exclusion_with_provider(const icu4x::DataProvider& provider) { auto result = icu4x::capi::icu4x_CodePointSetData_create_full_composition_exclusion_with_provider_mv1(provider.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DataError>(diplomat::Ok>(std::unique_ptr(icu4x::CodePointSetData::FromFFI(result.ok)))) : diplomat::result, icu4x::DataError>(diplomat::Err(icu4x::DataError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::CodePointSetData::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Err(icu4x::DataError::FromFFI(result.err))); } inline bool icu4x::CodePointSetData::changes_when_casefolded_for_char(char32_t ch) { @@ -672,9 +672,9 @@ inline std::unique_ptr icu4x::CodePointSetData::create_ return std::unique_ptr(icu4x::CodePointSetData::FromFFI(result)); } -inline diplomat::result, icu4x::DataError> icu4x::CodePointSetData::create_changes_when_casefolded_with_provider(const icu4x::DataProvider& provider) { +inline icu4x::diplomat::result, icu4x::DataError> icu4x::CodePointSetData::create_changes_when_casefolded_with_provider(const icu4x::DataProvider& provider) { auto result = icu4x::capi::icu4x_CodePointSetData_create_changes_when_casefolded_with_provider_mv1(provider.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DataError>(diplomat::Ok>(std::unique_ptr(icu4x::CodePointSetData::FromFFI(result.ok)))) : diplomat::result, icu4x::DataError>(diplomat::Err(icu4x::DataError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::CodePointSetData::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Err(icu4x::DataError::FromFFI(result.err))); } inline bool icu4x::CodePointSetData::changes_when_casemapped_for_char(char32_t ch) { @@ -687,9 +687,9 @@ inline std::unique_ptr icu4x::CodePointSetData::create_ return std::unique_ptr(icu4x::CodePointSetData::FromFFI(result)); } -inline diplomat::result, icu4x::DataError> icu4x::CodePointSetData::create_changes_when_casemapped_with_provider(const icu4x::DataProvider& provider) { +inline icu4x::diplomat::result, icu4x::DataError> icu4x::CodePointSetData::create_changes_when_casemapped_with_provider(const icu4x::DataProvider& provider) { auto result = icu4x::capi::icu4x_CodePointSetData_create_changes_when_casemapped_with_provider_mv1(provider.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DataError>(diplomat::Ok>(std::unique_ptr(icu4x::CodePointSetData::FromFFI(result.ok)))) : diplomat::result, icu4x::DataError>(diplomat::Err(icu4x::DataError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::CodePointSetData::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Err(icu4x::DataError::FromFFI(result.err))); } inline bool icu4x::CodePointSetData::changes_when_nfkc_casefolded_for_char(char32_t ch) { @@ -702,9 +702,9 @@ inline std::unique_ptr icu4x::CodePointSetData::create_ return std::unique_ptr(icu4x::CodePointSetData::FromFFI(result)); } -inline diplomat::result, icu4x::DataError> icu4x::CodePointSetData::create_changes_when_nfkc_casefolded_with_provider(const icu4x::DataProvider& provider) { +inline icu4x::diplomat::result, icu4x::DataError> icu4x::CodePointSetData::create_changes_when_nfkc_casefolded_with_provider(const icu4x::DataProvider& provider) { auto result = icu4x::capi::icu4x_CodePointSetData_create_changes_when_nfkc_casefolded_with_provider_mv1(provider.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DataError>(diplomat::Ok>(std::unique_ptr(icu4x::CodePointSetData::FromFFI(result.ok)))) : diplomat::result, icu4x::DataError>(diplomat::Err(icu4x::DataError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::CodePointSetData::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Err(icu4x::DataError::FromFFI(result.err))); } inline bool icu4x::CodePointSetData::changes_when_lowercased_for_char(char32_t ch) { @@ -717,9 +717,9 @@ inline std::unique_ptr icu4x::CodePointSetData::create_ return std::unique_ptr(icu4x::CodePointSetData::FromFFI(result)); } -inline diplomat::result, icu4x::DataError> icu4x::CodePointSetData::create_changes_when_lowercased_with_provider(const icu4x::DataProvider& provider) { +inline icu4x::diplomat::result, icu4x::DataError> icu4x::CodePointSetData::create_changes_when_lowercased_with_provider(const icu4x::DataProvider& provider) { auto result = icu4x::capi::icu4x_CodePointSetData_create_changes_when_lowercased_with_provider_mv1(provider.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DataError>(diplomat::Ok>(std::unique_ptr(icu4x::CodePointSetData::FromFFI(result.ok)))) : diplomat::result, icu4x::DataError>(diplomat::Err(icu4x::DataError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::CodePointSetData::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Err(icu4x::DataError::FromFFI(result.err))); } inline bool icu4x::CodePointSetData::changes_when_titlecased_for_char(char32_t ch) { @@ -732,9 +732,9 @@ inline std::unique_ptr icu4x::CodePointSetData::create_ return std::unique_ptr(icu4x::CodePointSetData::FromFFI(result)); } -inline diplomat::result, icu4x::DataError> icu4x::CodePointSetData::create_changes_when_titlecased_with_provider(const icu4x::DataProvider& provider) { +inline icu4x::diplomat::result, icu4x::DataError> icu4x::CodePointSetData::create_changes_when_titlecased_with_provider(const icu4x::DataProvider& provider) { auto result = icu4x::capi::icu4x_CodePointSetData_create_changes_when_titlecased_with_provider_mv1(provider.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DataError>(diplomat::Ok>(std::unique_ptr(icu4x::CodePointSetData::FromFFI(result.ok)))) : diplomat::result, icu4x::DataError>(diplomat::Err(icu4x::DataError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::CodePointSetData::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Err(icu4x::DataError::FromFFI(result.err))); } inline bool icu4x::CodePointSetData::changes_when_uppercased_for_char(char32_t ch) { @@ -747,9 +747,9 @@ inline std::unique_ptr icu4x::CodePointSetData::create_ return std::unique_ptr(icu4x::CodePointSetData::FromFFI(result)); } -inline diplomat::result, icu4x::DataError> icu4x::CodePointSetData::create_changes_when_uppercased_with_provider(const icu4x::DataProvider& provider) { +inline icu4x::diplomat::result, icu4x::DataError> icu4x::CodePointSetData::create_changes_when_uppercased_with_provider(const icu4x::DataProvider& provider) { auto result = icu4x::capi::icu4x_CodePointSetData_create_changes_when_uppercased_with_provider_mv1(provider.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DataError>(diplomat::Ok>(std::unique_ptr(icu4x::CodePointSetData::FromFFI(result.ok)))) : diplomat::result, icu4x::DataError>(diplomat::Err(icu4x::DataError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::CodePointSetData::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Err(icu4x::DataError::FromFFI(result.err))); } inline bool icu4x::CodePointSetData::dash_for_char(char32_t ch) { @@ -762,9 +762,9 @@ inline std::unique_ptr icu4x::CodePointSetData::create_ return std::unique_ptr(icu4x::CodePointSetData::FromFFI(result)); } -inline diplomat::result, icu4x::DataError> icu4x::CodePointSetData::create_dash_with_provider(const icu4x::DataProvider& provider) { +inline icu4x::diplomat::result, icu4x::DataError> icu4x::CodePointSetData::create_dash_with_provider(const icu4x::DataProvider& provider) { auto result = icu4x::capi::icu4x_CodePointSetData_create_dash_with_provider_mv1(provider.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DataError>(diplomat::Ok>(std::unique_ptr(icu4x::CodePointSetData::FromFFI(result.ok)))) : diplomat::result, icu4x::DataError>(diplomat::Err(icu4x::DataError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::CodePointSetData::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Err(icu4x::DataError::FromFFI(result.err))); } inline bool icu4x::CodePointSetData::deprecated_for_char(char32_t ch) { @@ -777,9 +777,9 @@ inline std::unique_ptr icu4x::CodePointSetData::create_ return std::unique_ptr(icu4x::CodePointSetData::FromFFI(result)); } -inline diplomat::result, icu4x::DataError> icu4x::CodePointSetData::create_deprecated_with_provider(const icu4x::DataProvider& provider) { +inline icu4x::diplomat::result, icu4x::DataError> icu4x::CodePointSetData::create_deprecated_with_provider(const icu4x::DataProvider& provider) { auto result = icu4x::capi::icu4x_CodePointSetData_create_deprecated_with_provider_mv1(provider.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DataError>(diplomat::Ok>(std::unique_ptr(icu4x::CodePointSetData::FromFFI(result.ok)))) : diplomat::result, icu4x::DataError>(diplomat::Err(icu4x::DataError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::CodePointSetData::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Err(icu4x::DataError::FromFFI(result.err))); } inline bool icu4x::CodePointSetData::default_ignorable_code_point_for_char(char32_t ch) { @@ -792,9 +792,9 @@ inline std::unique_ptr icu4x::CodePointSetData::create_ return std::unique_ptr(icu4x::CodePointSetData::FromFFI(result)); } -inline diplomat::result, icu4x::DataError> icu4x::CodePointSetData::create_default_ignorable_code_point_with_provider(const icu4x::DataProvider& provider) { +inline icu4x::diplomat::result, icu4x::DataError> icu4x::CodePointSetData::create_default_ignorable_code_point_with_provider(const icu4x::DataProvider& provider) { auto result = icu4x::capi::icu4x_CodePointSetData_create_default_ignorable_code_point_with_provider_mv1(provider.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DataError>(diplomat::Ok>(std::unique_ptr(icu4x::CodePointSetData::FromFFI(result.ok)))) : diplomat::result, icu4x::DataError>(diplomat::Err(icu4x::DataError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::CodePointSetData::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Err(icu4x::DataError::FromFFI(result.err))); } inline bool icu4x::CodePointSetData::diacritic_for_char(char32_t ch) { @@ -807,9 +807,9 @@ inline std::unique_ptr icu4x::CodePointSetData::create_ return std::unique_ptr(icu4x::CodePointSetData::FromFFI(result)); } -inline diplomat::result, icu4x::DataError> icu4x::CodePointSetData::create_diacritic_with_provider(const icu4x::DataProvider& provider) { +inline icu4x::diplomat::result, icu4x::DataError> icu4x::CodePointSetData::create_diacritic_with_provider(const icu4x::DataProvider& provider) { auto result = icu4x::capi::icu4x_CodePointSetData_create_diacritic_with_provider_mv1(provider.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DataError>(diplomat::Ok>(std::unique_ptr(icu4x::CodePointSetData::FromFFI(result.ok)))) : diplomat::result, icu4x::DataError>(diplomat::Err(icu4x::DataError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::CodePointSetData::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Err(icu4x::DataError::FromFFI(result.err))); } inline bool icu4x::CodePointSetData::emoji_modifier_base_for_char(char32_t ch) { @@ -822,9 +822,9 @@ inline std::unique_ptr icu4x::CodePointSetData::create_ return std::unique_ptr(icu4x::CodePointSetData::FromFFI(result)); } -inline diplomat::result, icu4x::DataError> icu4x::CodePointSetData::create_emoji_modifier_base_with_provider(const icu4x::DataProvider& provider) { +inline icu4x::diplomat::result, icu4x::DataError> icu4x::CodePointSetData::create_emoji_modifier_base_with_provider(const icu4x::DataProvider& provider) { auto result = icu4x::capi::icu4x_CodePointSetData_create_emoji_modifier_base_with_provider_mv1(provider.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DataError>(diplomat::Ok>(std::unique_ptr(icu4x::CodePointSetData::FromFFI(result.ok)))) : diplomat::result, icu4x::DataError>(diplomat::Err(icu4x::DataError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::CodePointSetData::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Err(icu4x::DataError::FromFFI(result.err))); } inline bool icu4x::CodePointSetData::emoji_component_for_char(char32_t ch) { @@ -837,9 +837,9 @@ inline std::unique_ptr icu4x::CodePointSetData::create_ return std::unique_ptr(icu4x::CodePointSetData::FromFFI(result)); } -inline diplomat::result, icu4x::DataError> icu4x::CodePointSetData::create_emoji_component_with_provider(const icu4x::DataProvider& provider) { +inline icu4x::diplomat::result, icu4x::DataError> icu4x::CodePointSetData::create_emoji_component_with_provider(const icu4x::DataProvider& provider) { auto result = icu4x::capi::icu4x_CodePointSetData_create_emoji_component_with_provider_mv1(provider.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DataError>(diplomat::Ok>(std::unique_ptr(icu4x::CodePointSetData::FromFFI(result.ok)))) : diplomat::result, icu4x::DataError>(diplomat::Err(icu4x::DataError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::CodePointSetData::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Err(icu4x::DataError::FromFFI(result.err))); } inline bool icu4x::CodePointSetData::emoji_modifier_for_char(char32_t ch) { @@ -852,9 +852,9 @@ inline std::unique_ptr icu4x::CodePointSetData::create_ return std::unique_ptr(icu4x::CodePointSetData::FromFFI(result)); } -inline diplomat::result, icu4x::DataError> icu4x::CodePointSetData::create_emoji_modifier_with_provider(const icu4x::DataProvider& provider) { +inline icu4x::diplomat::result, icu4x::DataError> icu4x::CodePointSetData::create_emoji_modifier_with_provider(const icu4x::DataProvider& provider) { auto result = icu4x::capi::icu4x_CodePointSetData_create_emoji_modifier_with_provider_mv1(provider.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DataError>(diplomat::Ok>(std::unique_ptr(icu4x::CodePointSetData::FromFFI(result.ok)))) : diplomat::result, icu4x::DataError>(diplomat::Err(icu4x::DataError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::CodePointSetData::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Err(icu4x::DataError::FromFFI(result.err))); } inline bool icu4x::CodePointSetData::emoji_for_char(char32_t ch) { @@ -867,9 +867,9 @@ inline std::unique_ptr icu4x::CodePointSetData::create_ return std::unique_ptr(icu4x::CodePointSetData::FromFFI(result)); } -inline diplomat::result, icu4x::DataError> icu4x::CodePointSetData::create_emoji_with_provider(const icu4x::DataProvider& provider) { +inline icu4x::diplomat::result, icu4x::DataError> icu4x::CodePointSetData::create_emoji_with_provider(const icu4x::DataProvider& provider) { auto result = icu4x::capi::icu4x_CodePointSetData_create_emoji_with_provider_mv1(provider.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DataError>(diplomat::Ok>(std::unique_ptr(icu4x::CodePointSetData::FromFFI(result.ok)))) : diplomat::result, icu4x::DataError>(diplomat::Err(icu4x::DataError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::CodePointSetData::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Err(icu4x::DataError::FromFFI(result.err))); } inline bool icu4x::CodePointSetData::emoji_presentation_for_char(char32_t ch) { @@ -882,9 +882,9 @@ inline std::unique_ptr icu4x::CodePointSetData::create_ return std::unique_ptr(icu4x::CodePointSetData::FromFFI(result)); } -inline diplomat::result, icu4x::DataError> icu4x::CodePointSetData::create_emoji_presentation_with_provider(const icu4x::DataProvider& provider) { +inline icu4x::diplomat::result, icu4x::DataError> icu4x::CodePointSetData::create_emoji_presentation_with_provider(const icu4x::DataProvider& provider) { auto result = icu4x::capi::icu4x_CodePointSetData_create_emoji_presentation_with_provider_mv1(provider.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DataError>(diplomat::Ok>(std::unique_ptr(icu4x::CodePointSetData::FromFFI(result.ok)))) : diplomat::result, icu4x::DataError>(diplomat::Err(icu4x::DataError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::CodePointSetData::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Err(icu4x::DataError::FromFFI(result.err))); } inline bool icu4x::CodePointSetData::extender_for_char(char32_t ch) { @@ -897,9 +897,9 @@ inline std::unique_ptr icu4x::CodePointSetData::create_ return std::unique_ptr(icu4x::CodePointSetData::FromFFI(result)); } -inline diplomat::result, icu4x::DataError> icu4x::CodePointSetData::create_extender_with_provider(const icu4x::DataProvider& provider) { +inline icu4x::diplomat::result, icu4x::DataError> icu4x::CodePointSetData::create_extender_with_provider(const icu4x::DataProvider& provider) { auto result = icu4x::capi::icu4x_CodePointSetData_create_extender_with_provider_mv1(provider.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DataError>(diplomat::Ok>(std::unique_ptr(icu4x::CodePointSetData::FromFFI(result.ok)))) : diplomat::result, icu4x::DataError>(diplomat::Err(icu4x::DataError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::CodePointSetData::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Err(icu4x::DataError::FromFFI(result.err))); } inline bool icu4x::CodePointSetData::extended_pictographic_for_char(char32_t ch) { @@ -912,9 +912,9 @@ inline std::unique_ptr icu4x::CodePointSetData::create_ return std::unique_ptr(icu4x::CodePointSetData::FromFFI(result)); } -inline diplomat::result, icu4x::DataError> icu4x::CodePointSetData::create_extended_pictographic_with_provider(const icu4x::DataProvider& provider) { +inline icu4x::diplomat::result, icu4x::DataError> icu4x::CodePointSetData::create_extended_pictographic_with_provider(const icu4x::DataProvider& provider) { auto result = icu4x::capi::icu4x_CodePointSetData_create_extended_pictographic_with_provider_mv1(provider.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DataError>(diplomat::Ok>(std::unique_ptr(icu4x::CodePointSetData::FromFFI(result.ok)))) : diplomat::result, icu4x::DataError>(diplomat::Err(icu4x::DataError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::CodePointSetData::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Err(icu4x::DataError::FromFFI(result.err))); } inline bool icu4x::CodePointSetData::graph_for_char(char32_t ch) { @@ -927,9 +927,9 @@ inline std::unique_ptr icu4x::CodePointSetData::create_ return std::unique_ptr(icu4x::CodePointSetData::FromFFI(result)); } -inline diplomat::result, icu4x::DataError> icu4x::CodePointSetData::create_graph_with_provider(const icu4x::DataProvider& provider) { +inline icu4x::diplomat::result, icu4x::DataError> icu4x::CodePointSetData::create_graph_with_provider(const icu4x::DataProvider& provider) { auto result = icu4x::capi::icu4x_CodePointSetData_create_graph_with_provider_mv1(provider.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DataError>(diplomat::Ok>(std::unique_ptr(icu4x::CodePointSetData::FromFFI(result.ok)))) : diplomat::result, icu4x::DataError>(diplomat::Err(icu4x::DataError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::CodePointSetData::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Err(icu4x::DataError::FromFFI(result.err))); } inline bool icu4x::CodePointSetData::grapheme_base_for_char(char32_t ch) { @@ -942,9 +942,9 @@ inline std::unique_ptr icu4x::CodePointSetData::create_ return std::unique_ptr(icu4x::CodePointSetData::FromFFI(result)); } -inline diplomat::result, icu4x::DataError> icu4x::CodePointSetData::create_grapheme_base_with_provider(const icu4x::DataProvider& provider) { +inline icu4x::diplomat::result, icu4x::DataError> icu4x::CodePointSetData::create_grapheme_base_with_provider(const icu4x::DataProvider& provider) { auto result = icu4x::capi::icu4x_CodePointSetData_create_grapheme_base_with_provider_mv1(provider.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DataError>(diplomat::Ok>(std::unique_ptr(icu4x::CodePointSetData::FromFFI(result.ok)))) : diplomat::result, icu4x::DataError>(diplomat::Err(icu4x::DataError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::CodePointSetData::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Err(icu4x::DataError::FromFFI(result.err))); } inline bool icu4x::CodePointSetData::grapheme_extend_for_char(char32_t ch) { @@ -957,9 +957,9 @@ inline std::unique_ptr icu4x::CodePointSetData::create_ return std::unique_ptr(icu4x::CodePointSetData::FromFFI(result)); } -inline diplomat::result, icu4x::DataError> icu4x::CodePointSetData::create_grapheme_extend_with_provider(const icu4x::DataProvider& provider) { +inline icu4x::diplomat::result, icu4x::DataError> icu4x::CodePointSetData::create_grapheme_extend_with_provider(const icu4x::DataProvider& provider) { auto result = icu4x::capi::icu4x_CodePointSetData_create_grapheme_extend_with_provider_mv1(provider.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DataError>(diplomat::Ok>(std::unique_ptr(icu4x::CodePointSetData::FromFFI(result.ok)))) : diplomat::result, icu4x::DataError>(diplomat::Err(icu4x::DataError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::CodePointSetData::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Err(icu4x::DataError::FromFFI(result.err))); } inline bool icu4x::CodePointSetData::grapheme_link_for_char(char32_t ch) { @@ -972,9 +972,9 @@ inline std::unique_ptr icu4x::CodePointSetData::create_ return std::unique_ptr(icu4x::CodePointSetData::FromFFI(result)); } -inline diplomat::result, icu4x::DataError> icu4x::CodePointSetData::create_grapheme_link_with_provider(const icu4x::DataProvider& provider) { +inline icu4x::diplomat::result, icu4x::DataError> icu4x::CodePointSetData::create_grapheme_link_with_provider(const icu4x::DataProvider& provider) { auto result = icu4x::capi::icu4x_CodePointSetData_create_grapheme_link_with_provider_mv1(provider.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DataError>(diplomat::Ok>(std::unique_ptr(icu4x::CodePointSetData::FromFFI(result.ok)))) : diplomat::result, icu4x::DataError>(diplomat::Err(icu4x::DataError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::CodePointSetData::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Err(icu4x::DataError::FromFFI(result.err))); } inline bool icu4x::CodePointSetData::hex_digit_for_char(char32_t ch) { @@ -987,9 +987,9 @@ inline std::unique_ptr icu4x::CodePointSetData::create_ return std::unique_ptr(icu4x::CodePointSetData::FromFFI(result)); } -inline diplomat::result, icu4x::DataError> icu4x::CodePointSetData::create_hex_digit_with_provider(const icu4x::DataProvider& provider) { +inline icu4x::diplomat::result, icu4x::DataError> icu4x::CodePointSetData::create_hex_digit_with_provider(const icu4x::DataProvider& provider) { auto result = icu4x::capi::icu4x_CodePointSetData_create_hex_digit_with_provider_mv1(provider.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DataError>(diplomat::Ok>(std::unique_ptr(icu4x::CodePointSetData::FromFFI(result.ok)))) : diplomat::result, icu4x::DataError>(diplomat::Err(icu4x::DataError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::CodePointSetData::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Err(icu4x::DataError::FromFFI(result.err))); } inline bool icu4x::CodePointSetData::hyphen_for_char(char32_t ch) { @@ -1002,9 +1002,9 @@ inline std::unique_ptr icu4x::CodePointSetData::create_ return std::unique_ptr(icu4x::CodePointSetData::FromFFI(result)); } -inline diplomat::result, icu4x::DataError> icu4x::CodePointSetData::create_hyphen_with_provider(const icu4x::DataProvider& provider) { +inline icu4x::diplomat::result, icu4x::DataError> icu4x::CodePointSetData::create_hyphen_with_provider(const icu4x::DataProvider& provider) { auto result = icu4x::capi::icu4x_CodePointSetData_create_hyphen_with_provider_mv1(provider.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DataError>(diplomat::Ok>(std::unique_ptr(icu4x::CodePointSetData::FromFFI(result.ok)))) : diplomat::result, icu4x::DataError>(diplomat::Err(icu4x::DataError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::CodePointSetData::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Err(icu4x::DataError::FromFFI(result.err))); } inline bool icu4x::CodePointSetData::id_continue_for_char(char32_t ch) { @@ -1017,9 +1017,9 @@ inline std::unique_ptr icu4x::CodePointSetData::create_ return std::unique_ptr(icu4x::CodePointSetData::FromFFI(result)); } -inline diplomat::result, icu4x::DataError> icu4x::CodePointSetData::create_id_continue_with_provider(const icu4x::DataProvider& provider) { +inline icu4x::diplomat::result, icu4x::DataError> icu4x::CodePointSetData::create_id_continue_with_provider(const icu4x::DataProvider& provider) { auto result = icu4x::capi::icu4x_CodePointSetData_create_id_continue_with_provider_mv1(provider.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DataError>(diplomat::Ok>(std::unique_ptr(icu4x::CodePointSetData::FromFFI(result.ok)))) : diplomat::result, icu4x::DataError>(diplomat::Err(icu4x::DataError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::CodePointSetData::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Err(icu4x::DataError::FromFFI(result.err))); } inline bool icu4x::CodePointSetData::ideographic_for_char(char32_t ch) { @@ -1032,9 +1032,9 @@ inline std::unique_ptr icu4x::CodePointSetData::create_ return std::unique_ptr(icu4x::CodePointSetData::FromFFI(result)); } -inline diplomat::result, icu4x::DataError> icu4x::CodePointSetData::create_ideographic_with_provider(const icu4x::DataProvider& provider) { +inline icu4x::diplomat::result, icu4x::DataError> icu4x::CodePointSetData::create_ideographic_with_provider(const icu4x::DataProvider& provider) { auto result = icu4x::capi::icu4x_CodePointSetData_create_ideographic_with_provider_mv1(provider.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DataError>(diplomat::Ok>(std::unique_ptr(icu4x::CodePointSetData::FromFFI(result.ok)))) : diplomat::result, icu4x::DataError>(diplomat::Err(icu4x::DataError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::CodePointSetData::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Err(icu4x::DataError::FromFFI(result.err))); } inline bool icu4x::CodePointSetData::id_start_for_char(char32_t ch) { @@ -1047,9 +1047,9 @@ inline std::unique_ptr icu4x::CodePointSetData::create_ return std::unique_ptr(icu4x::CodePointSetData::FromFFI(result)); } -inline diplomat::result, icu4x::DataError> icu4x::CodePointSetData::create_id_start_with_provider(const icu4x::DataProvider& provider) { +inline icu4x::diplomat::result, icu4x::DataError> icu4x::CodePointSetData::create_id_start_with_provider(const icu4x::DataProvider& provider) { auto result = icu4x::capi::icu4x_CodePointSetData_create_id_start_with_provider_mv1(provider.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DataError>(diplomat::Ok>(std::unique_ptr(icu4x::CodePointSetData::FromFFI(result.ok)))) : diplomat::result, icu4x::DataError>(diplomat::Err(icu4x::DataError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::CodePointSetData::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Err(icu4x::DataError::FromFFI(result.err))); } inline bool icu4x::CodePointSetData::ids_binary_operator_for_char(char32_t ch) { @@ -1062,9 +1062,9 @@ inline std::unique_ptr icu4x::CodePointSetData::create_ return std::unique_ptr(icu4x::CodePointSetData::FromFFI(result)); } -inline diplomat::result, icu4x::DataError> icu4x::CodePointSetData::create_ids_binary_operator_with_provider(const icu4x::DataProvider& provider) { +inline icu4x::diplomat::result, icu4x::DataError> icu4x::CodePointSetData::create_ids_binary_operator_with_provider(const icu4x::DataProvider& provider) { auto result = icu4x::capi::icu4x_CodePointSetData_create_ids_binary_operator_with_provider_mv1(provider.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DataError>(diplomat::Ok>(std::unique_ptr(icu4x::CodePointSetData::FromFFI(result.ok)))) : diplomat::result, icu4x::DataError>(diplomat::Err(icu4x::DataError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::CodePointSetData::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Err(icu4x::DataError::FromFFI(result.err))); } inline bool icu4x::CodePointSetData::ids_trinary_operator_for_char(char32_t ch) { @@ -1077,9 +1077,9 @@ inline std::unique_ptr icu4x::CodePointSetData::create_ return std::unique_ptr(icu4x::CodePointSetData::FromFFI(result)); } -inline diplomat::result, icu4x::DataError> icu4x::CodePointSetData::create_ids_trinary_operator_with_provider(const icu4x::DataProvider& provider) { +inline icu4x::diplomat::result, icu4x::DataError> icu4x::CodePointSetData::create_ids_trinary_operator_with_provider(const icu4x::DataProvider& provider) { auto result = icu4x::capi::icu4x_CodePointSetData_create_ids_trinary_operator_with_provider_mv1(provider.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DataError>(diplomat::Ok>(std::unique_ptr(icu4x::CodePointSetData::FromFFI(result.ok)))) : diplomat::result, icu4x::DataError>(diplomat::Err(icu4x::DataError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::CodePointSetData::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Err(icu4x::DataError::FromFFI(result.err))); } inline bool icu4x::CodePointSetData::join_control_for_char(char32_t ch) { @@ -1092,9 +1092,9 @@ inline std::unique_ptr icu4x::CodePointSetData::create_ return std::unique_ptr(icu4x::CodePointSetData::FromFFI(result)); } -inline diplomat::result, icu4x::DataError> icu4x::CodePointSetData::create_join_control_with_provider(const icu4x::DataProvider& provider) { +inline icu4x::diplomat::result, icu4x::DataError> icu4x::CodePointSetData::create_join_control_with_provider(const icu4x::DataProvider& provider) { auto result = icu4x::capi::icu4x_CodePointSetData_create_join_control_with_provider_mv1(provider.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DataError>(diplomat::Ok>(std::unique_ptr(icu4x::CodePointSetData::FromFFI(result.ok)))) : diplomat::result, icu4x::DataError>(diplomat::Err(icu4x::DataError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::CodePointSetData::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Err(icu4x::DataError::FromFFI(result.err))); } inline bool icu4x::CodePointSetData::logical_order_exception_for_char(char32_t ch) { @@ -1107,9 +1107,9 @@ inline std::unique_ptr icu4x::CodePointSetData::create_ return std::unique_ptr(icu4x::CodePointSetData::FromFFI(result)); } -inline diplomat::result, icu4x::DataError> icu4x::CodePointSetData::create_logical_order_exception_with_provider(const icu4x::DataProvider& provider) { +inline icu4x::diplomat::result, icu4x::DataError> icu4x::CodePointSetData::create_logical_order_exception_with_provider(const icu4x::DataProvider& provider) { auto result = icu4x::capi::icu4x_CodePointSetData_create_logical_order_exception_with_provider_mv1(provider.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DataError>(diplomat::Ok>(std::unique_ptr(icu4x::CodePointSetData::FromFFI(result.ok)))) : diplomat::result, icu4x::DataError>(diplomat::Err(icu4x::DataError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::CodePointSetData::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Err(icu4x::DataError::FromFFI(result.err))); } inline bool icu4x::CodePointSetData::lowercase_for_char(char32_t ch) { @@ -1122,9 +1122,9 @@ inline std::unique_ptr icu4x::CodePointSetData::create_ return std::unique_ptr(icu4x::CodePointSetData::FromFFI(result)); } -inline diplomat::result, icu4x::DataError> icu4x::CodePointSetData::create_lowercase_with_provider(const icu4x::DataProvider& provider) { +inline icu4x::diplomat::result, icu4x::DataError> icu4x::CodePointSetData::create_lowercase_with_provider(const icu4x::DataProvider& provider) { auto result = icu4x::capi::icu4x_CodePointSetData_create_lowercase_with_provider_mv1(provider.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DataError>(diplomat::Ok>(std::unique_ptr(icu4x::CodePointSetData::FromFFI(result.ok)))) : diplomat::result, icu4x::DataError>(diplomat::Err(icu4x::DataError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::CodePointSetData::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Err(icu4x::DataError::FromFFI(result.err))); } inline bool icu4x::CodePointSetData::math_for_char(char32_t ch) { @@ -1137,9 +1137,9 @@ inline std::unique_ptr icu4x::CodePointSetData::create_ return std::unique_ptr(icu4x::CodePointSetData::FromFFI(result)); } -inline diplomat::result, icu4x::DataError> icu4x::CodePointSetData::create_math_with_provider(const icu4x::DataProvider& provider) { +inline icu4x::diplomat::result, icu4x::DataError> icu4x::CodePointSetData::create_math_with_provider(const icu4x::DataProvider& provider) { auto result = icu4x::capi::icu4x_CodePointSetData_create_math_with_provider_mv1(provider.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DataError>(diplomat::Ok>(std::unique_ptr(icu4x::CodePointSetData::FromFFI(result.ok)))) : diplomat::result, icu4x::DataError>(diplomat::Err(icu4x::DataError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::CodePointSetData::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Err(icu4x::DataError::FromFFI(result.err))); } inline bool icu4x::CodePointSetData::noncharacter_code_point_for_char(char32_t ch) { @@ -1152,9 +1152,9 @@ inline std::unique_ptr icu4x::CodePointSetData::create_ return std::unique_ptr(icu4x::CodePointSetData::FromFFI(result)); } -inline diplomat::result, icu4x::DataError> icu4x::CodePointSetData::create_noncharacter_code_point_with_provider(const icu4x::DataProvider& provider) { +inline icu4x::diplomat::result, icu4x::DataError> icu4x::CodePointSetData::create_noncharacter_code_point_with_provider(const icu4x::DataProvider& provider) { auto result = icu4x::capi::icu4x_CodePointSetData_create_noncharacter_code_point_with_provider_mv1(provider.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DataError>(diplomat::Ok>(std::unique_ptr(icu4x::CodePointSetData::FromFFI(result.ok)))) : diplomat::result, icu4x::DataError>(diplomat::Err(icu4x::DataError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::CodePointSetData::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Err(icu4x::DataError::FromFFI(result.err))); } inline bool icu4x::CodePointSetData::nfc_inert_for_char(char32_t ch) { @@ -1167,9 +1167,9 @@ inline std::unique_ptr icu4x::CodePointSetData::create_ return std::unique_ptr(icu4x::CodePointSetData::FromFFI(result)); } -inline diplomat::result, icu4x::DataError> icu4x::CodePointSetData::create_nfc_inert_with_provider(const icu4x::DataProvider& provider) { +inline icu4x::diplomat::result, icu4x::DataError> icu4x::CodePointSetData::create_nfc_inert_with_provider(const icu4x::DataProvider& provider) { auto result = icu4x::capi::icu4x_CodePointSetData_create_nfc_inert_with_provider_mv1(provider.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DataError>(diplomat::Ok>(std::unique_ptr(icu4x::CodePointSetData::FromFFI(result.ok)))) : diplomat::result, icu4x::DataError>(diplomat::Err(icu4x::DataError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::CodePointSetData::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Err(icu4x::DataError::FromFFI(result.err))); } inline bool icu4x::CodePointSetData::nfd_inert_for_char(char32_t ch) { @@ -1182,9 +1182,9 @@ inline std::unique_ptr icu4x::CodePointSetData::create_ return std::unique_ptr(icu4x::CodePointSetData::FromFFI(result)); } -inline diplomat::result, icu4x::DataError> icu4x::CodePointSetData::create_nfd_inert_with_provider(const icu4x::DataProvider& provider) { +inline icu4x::diplomat::result, icu4x::DataError> icu4x::CodePointSetData::create_nfd_inert_with_provider(const icu4x::DataProvider& provider) { auto result = icu4x::capi::icu4x_CodePointSetData_create_nfd_inert_with_provider_mv1(provider.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DataError>(diplomat::Ok>(std::unique_ptr(icu4x::CodePointSetData::FromFFI(result.ok)))) : diplomat::result, icu4x::DataError>(diplomat::Err(icu4x::DataError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::CodePointSetData::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Err(icu4x::DataError::FromFFI(result.err))); } inline bool icu4x::CodePointSetData::nfkc_inert_for_char(char32_t ch) { @@ -1197,9 +1197,9 @@ inline std::unique_ptr icu4x::CodePointSetData::create_ return std::unique_ptr(icu4x::CodePointSetData::FromFFI(result)); } -inline diplomat::result, icu4x::DataError> icu4x::CodePointSetData::create_nfkc_inert_with_provider(const icu4x::DataProvider& provider) { +inline icu4x::diplomat::result, icu4x::DataError> icu4x::CodePointSetData::create_nfkc_inert_with_provider(const icu4x::DataProvider& provider) { auto result = icu4x::capi::icu4x_CodePointSetData_create_nfkc_inert_with_provider_mv1(provider.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DataError>(diplomat::Ok>(std::unique_ptr(icu4x::CodePointSetData::FromFFI(result.ok)))) : diplomat::result, icu4x::DataError>(diplomat::Err(icu4x::DataError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::CodePointSetData::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Err(icu4x::DataError::FromFFI(result.err))); } inline bool icu4x::CodePointSetData::nfkd_inert_for_char(char32_t ch) { @@ -1212,9 +1212,9 @@ inline std::unique_ptr icu4x::CodePointSetData::create_ return std::unique_ptr(icu4x::CodePointSetData::FromFFI(result)); } -inline diplomat::result, icu4x::DataError> icu4x::CodePointSetData::create_nfkd_inert_with_provider(const icu4x::DataProvider& provider) { +inline icu4x::diplomat::result, icu4x::DataError> icu4x::CodePointSetData::create_nfkd_inert_with_provider(const icu4x::DataProvider& provider) { auto result = icu4x::capi::icu4x_CodePointSetData_create_nfkd_inert_with_provider_mv1(provider.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DataError>(diplomat::Ok>(std::unique_ptr(icu4x::CodePointSetData::FromFFI(result.ok)))) : diplomat::result, icu4x::DataError>(diplomat::Err(icu4x::DataError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::CodePointSetData::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Err(icu4x::DataError::FromFFI(result.err))); } inline bool icu4x::CodePointSetData::pattern_syntax_for_char(char32_t ch) { @@ -1227,9 +1227,9 @@ inline std::unique_ptr icu4x::CodePointSetData::create_ return std::unique_ptr(icu4x::CodePointSetData::FromFFI(result)); } -inline diplomat::result, icu4x::DataError> icu4x::CodePointSetData::create_pattern_syntax_with_provider(const icu4x::DataProvider& provider) { +inline icu4x::diplomat::result, icu4x::DataError> icu4x::CodePointSetData::create_pattern_syntax_with_provider(const icu4x::DataProvider& provider) { auto result = icu4x::capi::icu4x_CodePointSetData_create_pattern_syntax_with_provider_mv1(provider.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DataError>(diplomat::Ok>(std::unique_ptr(icu4x::CodePointSetData::FromFFI(result.ok)))) : diplomat::result, icu4x::DataError>(diplomat::Err(icu4x::DataError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::CodePointSetData::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Err(icu4x::DataError::FromFFI(result.err))); } inline bool icu4x::CodePointSetData::pattern_white_space_for_char(char32_t ch) { @@ -1242,9 +1242,9 @@ inline std::unique_ptr icu4x::CodePointSetData::create_ return std::unique_ptr(icu4x::CodePointSetData::FromFFI(result)); } -inline diplomat::result, icu4x::DataError> icu4x::CodePointSetData::create_pattern_white_space_with_provider(const icu4x::DataProvider& provider) { +inline icu4x::diplomat::result, icu4x::DataError> icu4x::CodePointSetData::create_pattern_white_space_with_provider(const icu4x::DataProvider& provider) { auto result = icu4x::capi::icu4x_CodePointSetData_create_pattern_white_space_with_provider_mv1(provider.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DataError>(diplomat::Ok>(std::unique_ptr(icu4x::CodePointSetData::FromFFI(result.ok)))) : diplomat::result, icu4x::DataError>(diplomat::Err(icu4x::DataError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::CodePointSetData::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Err(icu4x::DataError::FromFFI(result.err))); } inline bool icu4x::CodePointSetData::prepended_concatenation_mark_for_char(char32_t ch) { @@ -1257,9 +1257,9 @@ inline std::unique_ptr icu4x::CodePointSetData::create_ return std::unique_ptr(icu4x::CodePointSetData::FromFFI(result)); } -inline diplomat::result, icu4x::DataError> icu4x::CodePointSetData::create_prepended_concatenation_mark_with_provider(const icu4x::DataProvider& provider) { +inline icu4x::diplomat::result, icu4x::DataError> icu4x::CodePointSetData::create_prepended_concatenation_mark_with_provider(const icu4x::DataProvider& provider) { auto result = icu4x::capi::icu4x_CodePointSetData_create_prepended_concatenation_mark_with_provider_mv1(provider.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DataError>(diplomat::Ok>(std::unique_ptr(icu4x::CodePointSetData::FromFFI(result.ok)))) : diplomat::result, icu4x::DataError>(diplomat::Err(icu4x::DataError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::CodePointSetData::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Err(icu4x::DataError::FromFFI(result.err))); } inline bool icu4x::CodePointSetData::print_for_char(char32_t ch) { @@ -1272,9 +1272,9 @@ inline std::unique_ptr icu4x::CodePointSetData::create_ return std::unique_ptr(icu4x::CodePointSetData::FromFFI(result)); } -inline diplomat::result, icu4x::DataError> icu4x::CodePointSetData::create_print_with_provider(const icu4x::DataProvider& provider) { +inline icu4x::diplomat::result, icu4x::DataError> icu4x::CodePointSetData::create_print_with_provider(const icu4x::DataProvider& provider) { auto result = icu4x::capi::icu4x_CodePointSetData_create_print_with_provider_mv1(provider.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DataError>(diplomat::Ok>(std::unique_ptr(icu4x::CodePointSetData::FromFFI(result.ok)))) : diplomat::result, icu4x::DataError>(diplomat::Err(icu4x::DataError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::CodePointSetData::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Err(icu4x::DataError::FromFFI(result.err))); } inline bool icu4x::CodePointSetData::quotation_mark_for_char(char32_t ch) { @@ -1287,9 +1287,9 @@ inline std::unique_ptr icu4x::CodePointSetData::create_ return std::unique_ptr(icu4x::CodePointSetData::FromFFI(result)); } -inline diplomat::result, icu4x::DataError> icu4x::CodePointSetData::create_quotation_mark_with_provider(const icu4x::DataProvider& provider) { +inline icu4x::diplomat::result, icu4x::DataError> icu4x::CodePointSetData::create_quotation_mark_with_provider(const icu4x::DataProvider& provider) { auto result = icu4x::capi::icu4x_CodePointSetData_create_quotation_mark_with_provider_mv1(provider.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DataError>(diplomat::Ok>(std::unique_ptr(icu4x::CodePointSetData::FromFFI(result.ok)))) : diplomat::result, icu4x::DataError>(diplomat::Err(icu4x::DataError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::CodePointSetData::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Err(icu4x::DataError::FromFFI(result.err))); } inline bool icu4x::CodePointSetData::radical_for_char(char32_t ch) { @@ -1302,9 +1302,9 @@ inline std::unique_ptr icu4x::CodePointSetData::create_ return std::unique_ptr(icu4x::CodePointSetData::FromFFI(result)); } -inline diplomat::result, icu4x::DataError> icu4x::CodePointSetData::create_radical_with_provider(const icu4x::DataProvider& provider) { +inline icu4x::diplomat::result, icu4x::DataError> icu4x::CodePointSetData::create_radical_with_provider(const icu4x::DataProvider& provider) { auto result = icu4x::capi::icu4x_CodePointSetData_create_radical_with_provider_mv1(provider.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DataError>(diplomat::Ok>(std::unique_ptr(icu4x::CodePointSetData::FromFFI(result.ok)))) : diplomat::result, icu4x::DataError>(diplomat::Err(icu4x::DataError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::CodePointSetData::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Err(icu4x::DataError::FromFFI(result.err))); } inline bool icu4x::CodePointSetData::regional_indicator_for_char(char32_t ch) { @@ -1317,9 +1317,9 @@ inline std::unique_ptr icu4x::CodePointSetData::create_ return std::unique_ptr(icu4x::CodePointSetData::FromFFI(result)); } -inline diplomat::result, icu4x::DataError> icu4x::CodePointSetData::create_regional_indicator_with_provider(const icu4x::DataProvider& provider) { +inline icu4x::diplomat::result, icu4x::DataError> icu4x::CodePointSetData::create_regional_indicator_with_provider(const icu4x::DataProvider& provider) { auto result = icu4x::capi::icu4x_CodePointSetData_create_regional_indicator_with_provider_mv1(provider.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DataError>(diplomat::Ok>(std::unique_ptr(icu4x::CodePointSetData::FromFFI(result.ok)))) : diplomat::result, icu4x::DataError>(diplomat::Err(icu4x::DataError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::CodePointSetData::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Err(icu4x::DataError::FromFFI(result.err))); } inline bool icu4x::CodePointSetData::soft_dotted_for_char(char32_t ch) { @@ -1332,9 +1332,9 @@ inline std::unique_ptr icu4x::CodePointSetData::create_ return std::unique_ptr(icu4x::CodePointSetData::FromFFI(result)); } -inline diplomat::result, icu4x::DataError> icu4x::CodePointSetData::create_soft_dotted_with_provider(const icu4x::DataProvider& provider) { +inline icu4x::diplomat::result, icu4x::DataError> icu4x::CodePointSetData::create_soft_dotted_with_provider(const icu4x::DataProvider& provider) { auto result = icu4x::capi::icu4x_CodePointSetData_create_soft_dotted_with_provider_mv1(provider.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DataError>(diplomat::Ok>(std::unique_ptr(icu4x::CodePointSetData::FromFFI(result.ok)))) : diplomat::result, icu4x::DataError>(diplomat::Err(icu4x::DataError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::CodePointSetData::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Err(icu4x::DataError::FromFFI(result.err))); } inline bool icu4x::CodePointSetData::segment_starter_for_char(char32_t ch) { @@ -1347,9 +1347,9 @@ inline std::unique_ptr icu4x::CodePointSetData::create_ return std::unique_ptr(icu4x::CodePointSetData::FromFFI(result)); } -inline diplomat::result, icu4x::DataError> icu4x::CodePointSetData::create_segment_starter_with_provider(const icu4x::DataProvider& provider) { +inline icu4x::diplomat::result, icu4x::DataError> icu4x::CodePointSetData::create_segment_starter_with_provider(const icu4x::DataProvider& provider) { auto result = icu4x::capi::icu4x_CodePointSetData_create_segment_starter_with_provider_mv1(provider.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DataError>(diplomat::Ok>(std::unique_ptr(icu4x::CodePointSetData::FromFFI(result.ok)))) : diplomat::result, icu4x::DataError>(diplomat::Err(icu4x::DataError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::CodePointSetData::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Err(icu4x::DataError::FromFFI(result.err))); } inline bool icu4x::CodePointSetData::case_sensitive_for_char(char32_t ch) { @@ -1362,9 +1362,9 @@ inline std::unique_ptr icu4x::CodePointSetData::create_ return std::unique_ptr(icu4x::CodePointSetData::FromFFI(result)); } -inline diplomat::result, icu4x::DataError> icu4x::CodePointSetData::create_case_sensitive_with_provider(const icu4x::DataProvider& provider) { +inline icu4x::diplomat::result, icu4x::DataError> icu4x::CodePointSetData::create_case_sensitive_with_provider(const icu4x::DataProvider& provider) { auto result = icu4x::capi::icu4x_CodePointSetData_create_case_sensitive_with_provider_mv1(provider.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DataError>(diplomat::Ok>(std::unique_ptr(icu4x::CodePointSetData::FromFFI(result.ok)))) : diplomat::result, icu4x::DataError>(diplomat::Err(icu4x::DataError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::CodePointSetData::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Err(icu4x::DataError::FromFFI(result.err))); } inline bool icu4x::CodePointSetData::sentence_terminal_for_char(char32_t ch) { @@ -1377,9 +1377,9 @@ inline std::unique_ptr icu4x::CodePointSetData::create_ return std::unique_ptr(icu4x::CodePointSetData::FromFFI(result)); } -inline diplomat::result, icu4x::DataError> icu4x::CodePointSetData::create_sentence_terminal_with_provider(const icu4x::DataProvider& provider) { +inline icu4x::diplomat::result, icu4x::DataError> icu4x::CodePointSetData::create_sentence_terminal_with_provider(const icu4x::DataProvider& provider) { auto result = icu4x::capi::icu4x_CodePointSetData_create_sentence_terminal_with_provider_mv1(provider.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DataError>(diplomat::Ok>(std::unique_ptr(icu4x::CodePointSetData::FromFFI(result.ok)))) : diplomat::result, icu4x::DataError>(diplomat::Err(icu4x::DataError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::CodePointSetData::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Err(icu4x::DataError::FromFFI(result.err))); } inline bool icu4x::CodePointSetData::terminal_punctuation_for_char(char32_t ch) { @@ -1392,9 +1392,9 @@ inline std::unique_ptr icu4x::CodePointSetData::create_ return std::unique_ptr(icu4x::CodePointSetData::FromFFI(result)); } -inline diplomat::result, icu4x::DataError> icu4x::CodePointSetData::create_terminal_punctuation_with_provider(const icu4x::DataProvider& provider) { +inline icu4x::diplomat::result, icu4x::DataError> icu4x::CodePointSetData::create_terminal_punctuation_with_provider(const icu4x::DataProvider& provider) { auto result = icu4x::capi::icu4x_CodePointSetData_create_terminal_punctuation_with_provider_mv1(provider.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DataError>(diplomat::Ok>(std::unique_ptr(icu4x::CodePointSetData::FromFFI(result.ok)))) : diplomat::result, icu4x::DataError>(diplomat::Err(icu4x::DataError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::CodePointSetData::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Err(icu4x::DataError::FromFFI(result.err))); } inline bool icu4x::CodePointSetData::unified_ideograph_for_char(char32_t ch) { @@ -1407,9 +1407,9 @@ inline std::unique_ptr icu4x::CodePointSetData::create_ return std::unique_ptr(icu4x::CodePointSetData::FromFFI(result)); } -inline diplomat::result, icu4x::DataError> icu4x::CodePointSetData::create_unified_ideograph_with_provider(const icu4x::DataProvider& provider) { +inline icu4x::diplomat::result, icu4x::DataError> icu4x::CodePointSetData::create_unified_ideograph_with_provider(const icu4x::DataProvider& provider) { auto result = icu4x::capi::icu4x_CodePointSetData_create_unified_ideograph_with_provider_mv1(provider.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DataError>(diplomat::Ok>(std::unique_ptr(icu4x::CodePointSetData::FromFFI(result.ok)))) : diplomat::result, icu4x::DataError>(diplomat::Err(icu4x::DataError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::CodePointSetData::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Err(icu4x::DataError::FromFFI(result.err))); } inline bool icu4x::CodePointSetData::uppercase_for_char(char32_t ch) { @@ -1422,9 +1422,9 @@ inline std::unique_ptr icu4x::CodePointSetData::create_ return std::unique_ptr(icu4x::CodePointSetData::FromFFI(result)); } -inline diplomat::result, icu4x::DataError> icu4x::CodePointSetData::create_uppercase_with_provider(const icu4x::DataProvider& provider) { +inline icu4x::diplomat::result, icu4x::DataError> icu4x::CodePointSetData::create_uppercase_with_provider(const icu4x::DataProvider& provider) { auto result = icu4x::capi::icu4x_CodePointSetData_create_uppercase_with_provider_mv1(provider.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DataError>(diplomat::Ok>(std::unique_ptr(icu4x::CodePointSetData::FromFFI(result.ok)))) : diplomat::result, icu4x::DataError>(diplomat::Err(icu4x::DataError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::CodePointSetData::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Err(icu4x::DataError::FromFFI(result.err))); } inline bool icu4x::CodePointSetData::variation_selector_for_char(char32_t ch) { @@ -1437,9 +1437,9 @@ inline std::unique_ptr icu4x::CodePointSetData::create_ return std::unique_ptr(icu4x::CodePointSetData::FromFFI(result)); } -inline diplomat::result, icu4x::DataError> icu4x::CodePointSetData::create_variation_selector_with_provider(const icu4x::DataProvider& provider) { +inline icu4x::diplomat::result, icu4x::DataError> icu4x::CodePointSetData::create_variation_selector_with_provider(const icu4x::DataProvider& provider) { auto result = icu4x::capi::icu4x_CodePointSetData_create_variation_selector_with_provider_mv1(provider.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DataError>(diplomat::Ok>(std::unique_ptr(icu4x::CodePointSetData::FromFFI(result.ok)))) : diplomat::result, icu4x::DataError>(diplomat::Err(icu4x::DataError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::CodePointSetData::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Err(icu4x::DataError::FromFFI(result.err))); } inline bool icu4x::CodePointSetData::white_space_for_char(char32_t ch) { @@ -1452,9 +1452,9 @@ inline std::unique_ptr icu4x::CodePointSetData::create_ return std::unique_ptr(icu4x::CodePointSetData::FromFFI(result)); } -inline diplomat::result, icu4x::DataError> icu4x::CodePointSetData::create_white_space_with_provider(const icu4x::DataProvider& provider) { +inline icu4x::diplomat::result, icu4x::DataError> icu4x::CodePointSetData::create_white_space_with_provider(const icu4x::DataProvider& provider) { auto result = icu4x::capi::icu4x_CodePointSetData_create_white_space_with_provider_mv1(provider.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DataError>(diplomat::Ok>(std::unique_ptr(icu4x::CodePointSetData::FromFFI(result.ok)))) : diplomat::result, icu4x::DataError>(diplomat::Err(icu4x::DataError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::CodePointSetData::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Err(icu4x::DataError::FromFFI(result.err))); } inline bool icu4x::CodePointSetData::xdigit_for_char(char32_t ch) { @@ -1467,9 +1467,9 @@ inline std::unique_ptr icu4x::CodePointSetData::create_ return std::unique_ptr(icu4x::CodePointSetData::FromFFI(result)); } -inline diplomat::result, icu4x::DataError> icu4x::CodePointSetData::create_xdigit_with_provider(const icu4x::DataProvider& provider) { +inline icu4x::diplomat::result, icu4x::DataError> icu4x::CodePointSetData::create_xdigit_with_provider(const icu4x::DataProvider& provider) { auto result = icu4x::capi::icu4x_CodePointSetData_create_xdigit_with_provider_mv1(provider.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DataError>(diplomat::Ok>(std::unique_ptr(icu4x::CodePointSetData::FromFFI(result.ok)))) : diplomat::result, icu4x::DataError>(diplomat::Err(icu4x::DataError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::CodePointSetData::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Err(icu4x::DataError::FromFFI(result.err))); } inline bool icu4x::CodePointSetData::xid_continue_for_char(char32_t ch) { @@ -1482,9 +1482,9 @@ inline std::unique_ptr icu4x::CodePointSetData::create_ return std::unique_ptr(icu4x::CodePointSetData::FromFFI(result)); } -inline diplomat::result, icu4x::DataError> icu4x::CodePointSetData::create_xid_continue_with_provider(const icu4x::DataProvider& provider) { +inline icu4x::diplomat::result, icu4x::DataError> icu4x::CodePointSetData::create_xid_continue_with_provider(const icu4x::DataProvider& provider) { auto result = icu4x::capi::icu4x_CodePointSetData_create_xid_continue_with_provider_mv1(provider.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DataError>(diplomat::Ok>(std::unique_ptr(icu4x::CodePointSetData::FromFFI(result.ok)))) : diplomat::result, icu4x::DataError>(diplomat::Err(icu4x::DataError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::CodePointSetData::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Err(icu4x::DataError::FromFFI(result.err))); } inline bool icu4x::CodePointSetData::xid_start_for_char(char32_t ch) { @@ -1497,20 +1497,20 @@ inline std::unique_ptr icu4x::CodePointSetData::create_ return std::unique_ptr(icu4x::CodePointSetData::FromFFI(result)); } -inline diplomat::result, icu4x::DataError> icu4x::CodePointSetData::create_xid_start_with_provider(const icu4x::DataProvider& provider) { +inline icu4x::diplomat::result, icu4x::DataError> icu4x::CodePointSetData::create_xid_start_with_provider(const icu4x::DataProvider& provider) { auto result = icu4x::capi::icu4x_CodePointSetData_create_xid_start_with_provider_mv1(provider.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DataError>(diplomat::Ok>(std::unique_ptr(icu4x::CodePointSetData::FromFFI(result.ok)))) : diplomat::result, icu4x::DataError>(diplomat::Err(icu4x::DataError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::CodePointSetData::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Err(icu4x::DataError::FromFFI(result.err))); } -inline diplomat::result, icu4x::DataError> icu4x::CodePointSetData::create_for_ecma262(std::string_view property_name) { +inline icu4x::diplomat::result, icu4x::DataError> icu4x::CodePointSetData::create_for_ecma262(std::string_view property_name) { auto result = icu4x::capi::icu4x_CodePointSetData_create_for_ecma262_mv1({property_name.data(), property_name.size()}); - return result.is_ok ? diplomat::result, icu4x::DataError>(diplomat::Ok>(std::unique_ptr(icu4x::CodePointSetData::FromFFI(result.ok)))) : diplomat::result, icu4x::DataError>(diplomat::Err(icu4x::DataError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::CodePointSetData::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Err(icu4x::DataError::FromFFI(result.err))); } -inline diplomat::result, icu4x::DataError> icu4x::CodePointSetData::create_for_ecma262_with_provider(const icu4x::DataProvider& provider, std::string_view property_name) { +inline icu4x::diplomat::result, icu4x::DataError> icu4x::CodePointSetData::create_for_ecma262_with_provider(const icu4x::DataProvider& provider, std::string_view property_name) { auto result = icu4x::capi::icu4x_CodePointSetData_create_for_ecma262_with_provider_mv1(provider.AsFFI(), {property_name.data(), property_name.size()}); - return result.is_ok ? diplomat::result, icu4x::DataError>(diplomat::Ok>(std::unique_ptr(icu4x::CodePointSetData::FromFFI(result.ok)))) : diplomat::result, icu4x::DataError>(diplomat::Err(icu4x::DataError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::CodePointSetData::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Err(icu4x::DataError::FromFFI(result.err))); } inline const icu4x::capi::CodePointSetData* icu4x::CodePointSetData::AsFFI() const { @@ -1534,4 +1534,4 @@ inline void icu4x::CodePointSetData::operator delete(void* ptr) { } -#endif // icu4x_CodePointSetData_HPP +#endif // ICU4X_CodePointSetData_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/Collator.d.hpp b/ffi/capi/bindings/cpp/icu4x/Collator.d.hpp index 8e125e17cde..e74fb716b28 100644 --- a/ffi/capi/bindings/cpp/icu4x/Collator.d.hpp +++ b/ffi/capi/bindings/cpp/icu4x/Collator.d.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_Collator_D_HPP -#define icu4x_Collator_D_HPP +#ifndef ICU4X_Collator_D_HPP +#define ICU4X_Collator_D_HPP #include #include @@ -9,8 +9,7 @@ #include #include #include -#include "../diplomat_runtime.hpp" - +#include "diplomat_runtime.hpp" namespace icu4x { namespace capi { struct Collator; } class Collator; @@ -21,7 +20,8 @@ class Locale; struct CollatorOptionsV1; struct CollatorResolvedOptionsV1; class DataError; -} +} // namespace icu4x + namespace icu4x { @@ -38,45 +38,45 @@ class Collator { public: /** - * Construct a new Collator instance using compiled data. - * - * See the [Rust documentation for `try_new`](https://docs.rs/icu/2.0.0/icu/collator/struct.Collator.html#method.try_new) for more information. + * Construct a new Collator instance using compiled data. + * + * See the [Rust documentation for `try_new`](https://docs.rs/icu/2.0.0/icu/collator/struct.Collator.html#method.try_new) for more information. */ - inline static diplomat::result, icu4x::DataError> create_v1(const icu4x::Locale& locale, icu4x::CollatorOptionsV1 options); + inline static icu4x::diplomat::result, icu4x::DataError> create_v1(const icu4x::Locale& locale, icu4x::CollatorOptionsV1 options); /** - * Construct a new Collator instance using a particular data source. - * - * See the [Rust documentation for `try_new`](https://docs.rs/icu/2.0.0/icu/collator/struct.Collator.html#method.try_new) for more information. + * Construct a new Collator instance using a particular data source. + * + * See the [Rust documentation for `try_new`](https://docs.rs/icu/2.0.0/icu/collator/struct.Collator.html#method.try_new) for more information. */ - inline static diplomat::result, icu4x::DataError> create_v1_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, icu4x::CollatorOptionsV1 options); + inline static icu4x::diplomat::result, icu4x::DataError> create_v1_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, icu4x::CollatorOptionsV1 options); /** - * Compare two strings. - * - * Ill-formed input is treated as if errors had been replaced with REPLACEMENT CHARACTERs according - * to the WHATWG Encoding Standard. - * - * See the [Rust documentation for `compare_utf8`](https://docs.rs/icu/2.0.0/icu/collator/struct.CollatorBorrowed.html#method.compare_utf8) for more information. + * Compare two strings. + * + * Ill-formed input is treated as if errors had been replaced with REPLACEMENT CHARACTERs according + * to the WHATWG Encoding Standard. + * + * See the [Rust documentation for `compare_utf8`](https://docs.rs/icu/2.0.0/icu/collator/struct.CollatorBorrowed.html#method.compare_utf8) for more information. */ inline int8_t compare(std::string_view left, std::string_view right) const; /** - * Compare two strings. - * - * Ill-formed input is treated as if errors had been replaced with REPLACEMENT CHARACTERs according - * to the WHATWG Encoding Standard. - * - * See the [Rust documentation for `compare_utf16`](https://docs.rs/icu/2.0.0/icu/collator/struct.CollatorBorrowed.html#method.compare_utf16) for more information. + * Compare two strings. + * + * Ill-formed input is treated as if errors had been replaced with REPLACEMENT CHARACTERs according + * to the WHATWG Encoding Standard. + * + * See the [Rust documentation for `compare_utf16`](https://docs.rs/icu/2.0.0/icu/collator/struct.CollatorBorrowed.html#method.compare_utf16) for more information. */ inline int8_t compare16(std::u16string_view left, std::u16string_view right) const; /** - * The resolved options showing how the default options, the requested options, - * and the options from locale data were combined. None of the struct fields - * will have `Auto` as the value. - * - * See the [Rust documentation for `resolved_options`](https://docs.rs/icu/2.0.0/icu/collator/struct.CollatorBorrowed.html#method.resolved_options) for more information. + * The resolved options showing how the default options, the requested options, + * and the options from locale data were combined. None of the struct fields + * will have `Auto` as the value. + * + * See the [Rust documentation for `resolved_options`](https://docs.rs/icu/2.0.0/icu/collator/struct.CollatorBorrowed.html#method.resolved_options) for more information. */ inline icu4x::CollatorResolvedOptionsV1 resolved_options_v1() const; @@ -95,4 +95,4 @@ class Collator { }; } // namespace -#endif // icu4x_Collator_D_HPP +#endif // ICU4X_Collator_D_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/Collator.hpp b/ffi/capi/bindings/cpp/icu4x/Collator.hpp index 4872043a917..33be479ae78 100644 --- a/ffi/capi/bindings/cpp/icu4x/Collator.hpp +++ b/ffi/capi/bindings/cpp/icu4x/Collator.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_Collator_HPP -#define icu4x_Collator_HPP +#ifndef ICU4X_Collator_HPP +#define ICU4X_Collator_HPP #include "Collator.d.hpp" @@ -11,12 +11,12 @@ #include #include #include -#include "../diplomat_runtime.hpp" #include "CollatorOptionsV1.hpp" #include "CollatorResolvedOptionsV1.hpp" #include "DataError.hpp" #include "DataProvider.hpp" #include "Locale.hpp" +#include "diplomat_runtime.hpp" namespace icu4x { @@ -29,9 +29,9 @@ namespace capi { typedef struct icu4x_Collator_create_v1_with_provider_mv1_result {union {icu4x::capi::Collator* ok; icu4x::capi::DataError err;}; bool is_ok;} icu4x_Collator_create_v1_with_provider_mv1_result; icu4x_Collator_create_v1_with_provider_mv1_result icu4x_Collator_create_v1_with_provider_mv1(const icu4x::capi::DataProvider* provider, const icu4x::capi::Locale* locale, icu4x::capi::CollatorOptionsV1 options); - int8_t icu4x_Collator_compare_utf8_mv1(const icu4x::capi::Collator* self, diplomat::capi::DiplomatStringView left, diplomat::capi::DiplomatStringView right); + int8_t icu4x_Collator_compare_utf8_mv1(const icu4x::capi::Collator* self, icu4x::diplomat::capi::DiplomatStringView left, icu4x::diplomat::capi::DiplomatStringView right); - int8_t icu4x_Collator_compare_utf16_mv1(const icu4x::capi::Collator* self, diplomat::capi::DiplomatString16View left, diplomat::capi::DiplomatString16View right); + int8_t icu4x_Collator_compare_utf16_mv1(const icu4x::capi::Collator* self, icu4x::diplomat::capi::DiplomatString16View left, icu4x::diplomat::capi::DiplomatString16View right); icu4x::capi::CollatorResolvedOptionsV1 icu4x_Collator_resolved_options_v1_mv1(const icu4x::capi::Collator* self); @@ -41,17 +41,17 @@ namespace capi { } // namespace capi } // namespace -inline diplomat::result, icu4x::DataError> icu4x::Collator::create_v1(const icu4x::Locale& locale, icu4x::CollatorOptionsV1 options) { +inline icu4x::diplomat::result, icu4x::DataError> icu4x::Collator::create_v1(const icu4x::Locale& locale, icu4x::CollatorOptionsV1 options) { auto result = icu4x::capi::icu4x_Collator_create_v1_mv1(locale.AsFFI(), options.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DataError>(diplomat::Ok>(std::unique_ptr(icu4x::Collator::FromFFI(result.ok)))) : diplomat::result, icu4x::DataError>(diplomat::Err(icu4x::DataError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::Collator::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Err(icu4x::DataError::FromFFI(result.err))); } -inline diplomat::result, icu4x::DataError> icu4x::Collator::create_v1_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, icu4x::CollatorOptionsV1 options) { +inline icu4x::diplomat::result, icu4x::DataError> icu4x::Collator::create_v1_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, icu4x::CollatorOptionsV1 options) { auto result = icu4x::capi::icu4x_Collator_create_v1_with_provider_mv1(provider.AsFFI(), locale.AsFFI(), options.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DataError>(diplomat::Ok>(std::unique_ptr(icu4x::Collator::FromFFI(result.ok)))) : diplomat::result, icu4x::DataError>(diplomat::Err(icu4x::DataError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::Collator::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Err(icu4x::DataError::FromFFI(result.err))); } inline int8_t icu4x::Collator::compare(std::string_view left, std::string_view right) const { @@ -94,4 +94,4 @@ inline void icu4x::Collator::operator delete(void* ptr) { } -#endif // icu4x_Collator_HPP +#endif // ICU4X_Collator_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/CollatorAlternateHandling.d.hpp b/ffi/capi/bindings/cpp/icu4x/CollatorAlternateHandling.d.hpp index bd710730c2c..1ee7bb85e3d 100644 --- a/ffi/capi/bindings/cpp/icu4x/CollatorAlternateHandling.d.hpp +++ b/ffi/capi/bindings/cpp/icu4x/CollatorAlternateHandling.d.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_CollatorAlternateHandling_D_HPP -#define icu4x_CollatorAlternateHandling_D_HPP +#ifndef ICU4X_CollatorAlternateHandling_D_HPP +#define ICU4X_CollatorAlternateHandling_D_HPP #include #include @@ -9,7 +9,7 @@ #include #include #include -#include "../diplomat_runtime.hpp" +#include "diplomat_runtime.hpp" namespace icu4x { @@ -49,4 +49,4 @@ class CollatorAlternateHandling { }; } // namespace -#endif // icu4x_CollatorAlternateHandling_D_HPP +#endif // ICU4X_CollatorAlternateHandling_D_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/CollatorAlternateHandling.hpp b/ffi/capi/bindings/cpp/icu4x/CollatorAlternateHandling.hpp index 5d8ef164278..0d779800387 100644 --- a/ffi/capi/bindings/cpp/icu4x/CollatorAlternateHandling.hpp +++ b/ffi/capi/bindings/cpp/icu4x/CollatorAlternateHandling.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_CollatorAlternateHandling_HPP -#define icu4x_CollatorAlternateHandling_HPP +#ifndef ICU4X_CollatorAlternateHandling_HPP +#define ICU4X_CollatorAlternateHandling_HPP #include "CollatorAlternateHandling.d.hpp" @@ -11,7 +11,7 @@ #include #include #include -#include "../diplomat_runtime.hpp" +#include "diplomat_runtime.hpp" namespace icu4x { @@ -35,4 +35,4 @@ inline icu4x::CollatorAlternateHandling icu4x::CollatorAlternateHandling::FromFF std::abort(); } } -#endif // icu4x_CollatorAlternateHandling_HPP +#endif // ICU4X_CollatorAlternateHandling_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/CollatorCaseFirst.d.hpp b/ffi/capi/bindings/cpp/icu4x/CollatorCaseFirst.d.hpp index 341053a110a..809300364fa 100644 --- a/ffi/capi/bindings/cpp/icu4x/CollatorCaseFirst.d.hpp +++ b/ffi/capi/bindings/cpp/icu4x/CollatorCaseFirst.d.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_CollatorCaseFirst_D_HPP -#define icu4x_CollatorCaseFirst_D_HPP +#ifndef ICU4X_CollatorCaseFirst_D_HPP +#define ICU4X_CollatorCaseFirst_D_HPP #include #include @@ -9,7 +9,7 @@ #include #include #include -#include "../diplomat_runtime.hpp" +#include "diplomat_runtime.hpp" namespace icu4x { @@ -51,4 +51,4 @@ class CollatorCaseFirst { }; } // namespace -#endif // icu4x_CollatorCaseFirst_D_HPP +#endif // ICU4X_CollatorCaseFirst_D_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/CollatorCaseFirst.hpp b/ffi/capi/bindings/cpp/icu4x/CollatorCaseFirst.hpp index 388d12c9c35..9cbf37ceae4 100644 --- a/ffi/capi/bindings/cpp/icu4x/CollatorCaseFirst.hpp +++ b/ffi/capi/bindings/cpp/icu4x/CollatorCaseFirst.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_CollatorCaseFirst_HPP -#define icu4x_CollatorCaseFirst_HPP +#ifndef ICU4X_CollatorCaseFirst_HPP +#define ICU4X_CollatorCaseFirst_HPP #include "CollatorCaseFirst.d.hpp" @@ -11,7 +11,7 @@ #include #include #include -#include "../diplomat_runtime.hpp" +#include "diplomat_runtime.hpp" namespace icu4x { @@ -36,4 +36,4 @@ inline icu4x::CollatorCaseFirst icu4x::CollatorCaseFirst::FromFFI(icu4x::capi::C std::abort(); } } -#endif // icu4x_CollatorCaseFirst_HPP +#endif // ICU4X_CollatorCaseFirst_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/CollatorCaseLevel.d.hpp b/ffi/capi/bindings/cpp/icu4x/CollatorCaseLevel.d.hpp index e0ba2607ae8..86724421209 100644 --- a/ffi/capi/bindings/cpp/icu4x/CollatorCaseLevel.d.hpp +++ b/ffi/capi/bindings/cpp/icu4x/CollatorCaseLevel.d.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_CollatorCaseLevel_D_HPP -#define icu4x_CollatorCaseLevel_D_HPP +#ifndef ICU4X_CollatorCaseLevel_D_HPP +#define ICU4X_CollatorCaseLevel_D_HPP #include #include @@ -9,7 +9,7 @@ #include #include #include -#include "../diplomat_runtime.hpp" +#include "diplomat_runtime.hpp" namespace icu4x { @@ -49,4 +49,4 @@ class CollatorCaseLevel { }; } // namespace -#endif // icu4x_CollatorCaseLevel_D_HPP +#endif // ICU4X_CollatorCaseLevel_D_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/CollatorCaseLevel.hpp b/ffi/capi/bindings/cpp/icu4x/CollatorCaseLevel.hpp index b252f91184d..06e2f929932 100644 --- a/ffi/capi/bindings/cpp/icu4x/CollatorCaseLevel.hpp +++ b/ffi/capi/bindings/cpp/icu4x/CollatorCaseLevel.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_CollatorCaseLevel_HPP -#define icu4x_CollatorCaseLevel_HPP +#ifndef ICU4X_CollatorCaseLevel_HPP +#define ICU4X_CollatorCaseLevel_HPP #include "CollatorCaseLevel.d.hpp" @@ -11,7 +11,7 @@ #include #include #include -#include "../diplomat_runtime.hpp" +#include "diplomat_runtime.hpp" namespace icu4x { @@ -35,4 +35,4 @@ inline icu4x::CollatorCaseLevel icu4x::CollatorCaseLevel::FromFFI(icu4x::capi::C std::abort(); } } -#endif // icu4x_CollatorCaseLevel_HPP +#endif // ICU4X_CollatorCaseLevel_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/CollatorMaxVariable.d.hpp b/ffi/capi/bindings/cpp/icu4x/CollatorMaxVariable.d.hpp index baf65d07f5d..5ad8d3f615f 100644 --- a/ffi/capi/bindings/cpp/icu4x/CollatorMaxVariable.d.hpp +++ b/ffi/capi/bindings/cpp/icu4x/CollatorMaxVariable.d.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_CollatorMaxVariable_D_HPP -#define icu4x_CollatorMaxVariable_D_HPP +#ifndef ICU4X_CollatorMaxVariable_D_HPP +#define ICU4X_CollatorMaxVariable_D_HPP #include #include @@ -9,7 +9,7 @@ #include #include #include -#include "../diplomat_runtime.hpp" +#include "diplomat_runtime.hpp" namespace icu4x { @@ -53,4 +53,4 @@ class CollatorMaxVariable { }; } // namespace -#endif // icu4x_CollatorMaxVariable_D_HPP +#endif // ICU4X_CollatorMaxVariable_D_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/CollatorMaxVariable.hpp b/ffi/capi/bindings/cpp/icu4x/CollatorMaxVariable.hpp index 975548b1063..9a8798fdcd8 100644 --- a/ffi/capi/bindings/cpp/icu4x/CollatorMaxVariable.hpp +++ b/ffi/capi/bindings/cpp/icu4x/CollatorMaxVariable.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_CollatorMaxVariable_HPP -#define icu4x_CollatorMaxVariable_HPP +#ifndef ICU4X_CollatorMaxVariable_HPP +#define ICU4X_CollatorMaxVariable_HPP #include "CollatorMaxVariable.d.hpp" @@ -11,7 +11,7 @@ #include #include #include -#include "../diplomat_runtime.hpp" +#include "diplomat_runtime.hpp" namespace icu4x { @@ -37,4 +37,4 @@ inline icu4x::CollatorMaxVariable icu4x::CollatorMaxVariable::FromFFI(icu4x::cap std::abort(); } } -#endif // icu4x_CollatorMaxVariable_HPP +#endif // ICU4X_CollatorMaxVariable_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/CollatorNumericOrdering.d.hpp b/ffi/capi/bindings/cpp/icu4x/CollatorNumericOrdering.d.hpp index 7c60ee0b6ea..3e6cdbd9d87 100644 --- a/ffi/capi/bindings/cpp/icu4x/CollatorNumericOrdering.d.hpp +++ b/ffi/capi/bindings/cpp/icu4x/CollatorNumericOrdering.d.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_CollatorNumericOrdering_D_HPP -#define icu4x_CollatorNumericOrdering_D_HPP +#ifndef ICU4X_CollatorNumericOrdering_D_HPP +#define ICU4X_CollatorNumericOrdering_D_HPP #include #include @@ -9,7 +9,7 @@ #include #include #include -#include "../diplomat_runtime.hpp" +#include "diplomat_runtime.hpp" namespace icu4x { @@ -49,4 +49,4 @@ class CollatorNumericOrdering { }; } // namespace -#endif // icu4x_CollatorNumericOrdering_D_HPP +#endif // ICU4X_CollatorNumericOrdering_D_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/CollatorNumericOrdering.hpp b/ffi/capi/bindings/cpp/icu4x/CollatorNumericOrdering.hpp index 3f3c7858c3e..4fe934019b0 100644 --- a/ffi/capi/bindings/cpp/icu4x/CollatorNumericOrdering.hpp +++ b/ffi/capi/bindings/cpp/icu4x/CollatorNumericOrdering.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_CollatorNumericOrdering_HPP -#define icu4x_CollatorNumericOrdering_HPP +#ifndef ICU4X_CollatorNumericOrdering_HPP +#define ICU4X_CollatorNumericOrdering_HPP #include "CollatorNumericOrdering.d.hpp" @@ -11,7 +11,7 @@ #include #include #include -#include "../diplomat_runtime.hpp" +#include "diplomat_runtime.hpp" namespace icu4x { @@ -35,4 +35,4 @@ inline icu4x::CollatorNumericOrdering icu4x::CollatorNumericOrdering::FromFFI(ic std::abort(); } } -#endif // icu4x_CollatorNumericOrdering_HPP +#endif // ICU4X_CollatorNumericOrdering_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/CollatorOptionsV1.d.hpp b/ffi/capi/bindings/cpp/icu4x/CollatorOptionsV1.d.hpp index 3a4fa2aaff1..607a3ad5d49 100644 --- a/ffi/capi/bindings/cpp/icu4x/CollatorOptionsV1.d.hpp +++ b/ffi/capi/bindings/cpp/icu4x/CollatorOptionsV1.d.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_CollatorOptionsV1_D_HPP -#define icu4x_CollatorOptionsV1_D_HPP +#ifndef ICU4X_CollatorOptionsV1_D_HPP +#define ICU4X_CollatorOptionsV1_D_HPP #include #include @@ -9,18 +9,18 @@ #include #include #include -#include "../diplomat_runtime.hpp" #include "CollatorAlternateHandling.d.hpp" #include "CollatorCaseLevel.d.hpp" #include "CollatorMaxVariable.d.hpp" #include "CollatorStrength.d.hpp" - +#include "diplomat_runtime.hpp" namespace icu4x { class CollatorAlternateHandling; class CollatorCaseLevel; class CollatorMaxVariable; class CollatorStrength; -} +} // namespace icu4x + namespace icu4x { @@ -52,4 +52,4 @@ struct CollatorOptionsV1 { }; } // namespace -#endif // icu4x_CollatorOptionsV1_D_HPP +#endif // ICU4X_CollatorOptionsV1_D_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/CollatorOptionsV1.hpp b/ffi/capi/bindings/cpp/icu4x/CollatorOptionsV1.hpp index ef661f96179..8759fc3bcb5 100644 --- a/ffi/capi/bindings/cpp/icu4x/CollatorOptionsV1.hpp +++ b/ffi/capi/bindings/cpp/icu4x/CollatorOptionsV1.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_CollatorOptionsV1_HPP -#define icu4x_CollatorOptionsV1_HPP +#ifndef ICU4X_CollatorOptionsV1_HPP +#define ICU4X_CollatorOptionsV1_HPP #include "CollatorOptionsV1.d.hpp" @@ -11,11 +11,11 @@ #include #include #include -#include "../diplomat_runtime.hpp" #include "CollatorAlternateHandling.hpp" #include "CollatorCaseLevel.hpp" #include "CollatorMaxVariable.hpp" #include "CollatorStrength.hpp" +#include "diplomat_runtime.hpp" namespace icu4x { @@ -46,4 +46,4 @@ inline icu4x::CollatorOptionsV1 icu4x::CollatorOptionsV1::FromFFI(icu4x::capi::C } -#endif // icu4x_CollatorOptionsV1_HPP +#endif // ICU4X_CollatorOptionsV1_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/CollatorResolvedOptionsV1.d.hpp b/ffi/capi/bindings/cpp/icu4x/CollatorResolvedOptionsV1.d.hpp index ead5f99a058..425b5239ae3 100644 --- a/ffi/capi/bindings/cpp/icu4x/CollatorResolvedOptionsV1.d.hpp +++ b/ffi/capi/bindings/cpp/icu4x/CollatorResolvedOptionsV1.d.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_CollatorResolvedOptionsV1_D_HPP -#define icu4x_CollatorResolvedOptionsV1_D_HPP +#ifndef ICU4X_CollatorResolvedOptionsV1_D_HPP +#define ICU4X_CollatorResolvedOptionsV1_D_HPP #include #include @@ -9,14 +9,13 @@ #include #include #include -#include "../diplomat_runtime.hpp" #include "CollatorAlternateHandling.d.hpp" #include "CollatorCaseFirst.d.hpp" #include "CollatorCaseLevel.d.hpp" #include "CollatorMaxVariable.d.hpp" #include "CollatorNumericOrdering.d.hpp" #include "CollatorStrength.d.hpp" - +#include "diplomat_runtime.hpp" namespace icu4x { class CollatorAlternateHandling; class CollatorCaseFirst; @@ -24,7 +23,8 @@ class CollatorCaseLevel; class CollatorMaxVariable; class CollatorNumericOrdering; class CollatorStrength; -} +} // namespace icu4x + namespace icu4x { @@ -60,4 +60,4 @@ struct CollatorResolvedOptionsV1 { }; } // namespace -#endif // icu4x_CollatorResolvedOptionsV1_D_HPP +#endif // ICU4X_CollatorResolvedOptionsV1_D_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/CollatorResolvedOptionsV1.hpp b/ffi/capi/bindings/cpp/icu4x/CollatorResolvedOptionsV1.hpp index 95e80c47a69..f9d20bbdd00 100644 --- a/ffi/capi/bindings/cpp/icu4x/CollatorResolvedOptionsV1.hpp +++ b/ffi/capi/bindings/cpp/icu4x/CollatorResolvedOptionsV1.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_CollatorResolvedOptionsV1_HPP -#define icu4x_CollatorResolvedOptionsV1_HPP +#ifndef ICU4X_CollatorResolvedOptionsV1_HPP +#define ICU4X_CollatorResolvedOptionsV1_HPP #include "CollatorResolvedOptionsV1.d.hpp" @@ -11,13 +11,13 @@ #include #include #include -#include "../diplomat_runtime.hpp" #include "CollatorAlternateHandling.hpp" #include "CollatorCaseFirst.hpp" #include "CollatorCaseLevel.hpp" #include "CollatorMaxVariable.hpp" #include "CollatorNumericOrdering.hpp" #include "CollatorStrength.hpp" +#include "diplomat_runtime.hpp" namespace icu4x { @@ -52,4 +52,4 @@ inline icu4x::CollatorResolvedOptionsV1 icu4x::CollatorResolvedOptionsV1::FromFF } -#endif // icu4x_CollatorResolvedOptionsV1_HPP +#endif // ICU4X_CollatorResolvedOptionsV1_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/CollatorStrength.d.hpp b/ffi/capi/bindings/cpp/icu4x/CollatorStrength.d.hpp index d2b5be9db0e..9404f251ad9 100644 --- a/ffi/capi/bindings/cpp/icu4x/CollatorStrength.d.hpp +++ b/ffi/capi/bindings/cpp/icu4x/CollatorStrength.d.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_CollatorStrength_D_HPP -#define icu4x_CollatorStrength_D_HPP +#ifndef ICU4X_CollatorStrength_D_HPP +#define ICU4X_CollatorStrength_D_HPP #include #include @@ -9,7 +9,7 @@ #include #include #include -#include "../diplomat_runtime.hpp" +#include "diplomat_runtime.hpp" namespace icu4x { @@ -55,4 +55,4 @@ class CollatorStrength { }; } // namespace -#endif // icu4x_CollatorStrength_D_HPP +#endif // ICU4X_CollatorStrength_D_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/CollatorStrength.hpp b/ffi/capi/bindings/cpp/icu4x/CollatorStrength.hpp index 3a2f5c82a6e..e831cc5cf2b 100644 --- a/ffi/capi/bindings/cpp/icu4x/CollatorStrength.hpp +++ b/ffi/capi/bindings/cpp/icu4x/CollatorStrength.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_CollatorStrength_HPP -#define icu4x_CollatorStrength_HPP +#ifndef ICU4X_CollatorStrength_HPP +#define ICU4X_CollatorStrength_HPP #include "CollatorStrength.d.hpp" @@ -11,7 +11,7 @@ #include #include #include -#include "../diplomat_runtime.hpp" +#include "diplomat_runtime.hpp" namespace icu4x { @@ -38,4 +38,4 @@ inline icu4x::CollatorStrength icu4x::CollatorStrength::FromFFI(icu4x::capi::Col std::abort(); } } -#endif // icu4x_CollatorStrength_HPP +#endif // ICU4X_CollatorStrength_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/ComposingNormalizer.d.hpp b/ffi/capi/bindings/cpp/icu4x/ComposingNormalizer.d.hpp index c5b9ac1ad36..7af20463dfa 100644 --- a/ffi/capi/bindings/cpp/icu4x/ComposingNormalizer.d.hpp +++ b/ffi/capi/bindings/cpp/icu4x/ComposingNormalizer.d.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_ComposingNormalizer_D_HPP -#define icu4x_ComposingNormalizer_D_HPP +#ifndef ICU4X_ComposingNormalizer_D_HPP +#define ICU4X_ComposingNormalizer_D_HPP #include #include @@ -9,15 +9,15 @@ #include #include #include -#include "../diplomat_runtime.hpp" - +#include "diplomat_runtime.hpp" namespace icu4x { namespace capi { struct ComposingNormalizer; } class ComposingNormalizer; namespace capi { struct DataProvider; } class DataProvider; class DataError; -} +} // namespace icu4x + namespace icu4x { @@ -34,78 +34,78 @@ class ComposingNormalizer { public: /** - * Construct a new ComposingNormalizer instance for NFC using compiled data. - * - * See the [Rust documentation for `new_nfc`](https://docs.rs/icu/2.0.0/icu/normalizer/struct.ComposingNormalizer.html#method.new_nfc) for more information. + * Construct a new ComposingNormalizer instance for NFC using compiled data. + * + * See the [Rust documentation for `new_nfc`](https://docs.rs/icu/2.0.0/icu/normalizer/struct.ComposingNormalizer.html#method.new_nfc) for more information. */ inline static std::unique_ptr create_nfc(); /** - * Construct a new ComposingNormalizer instance for NFC using a particular data source. - * - * See the [Rust documentation for `new_nfc`](https://docs.rs/icu/2.0.0/icu/normalizer/struct.ComposingNormalizer.html#method.new_nfc) for more information. + * Construct a new ComposingNormalizer instance for NFC using a particular data source. + * + * See the [Rust documentation for `new_nfc`](https://docs.rs/icu/2.0.0/icu/normalizer/struct.ComposingNormalizer.html#method.new_nfc) for more information. */ - inline static diplomat::result, icu4x::DataError> create_nfc_with_provider(const icu4x::DataProvider& provider); + inline static icu4x::diplomat::result, icu4x::DataError> create_nfc_with_provider(const icu4x::DataProvider& provider); /** - * Construct a new ComposingNormalizer instance for NFKC using compiled data. - * - * See the [Rust documentation for `new_nfkc`](https://docs.rs/icu/2.0.0/icu/normalizer/struct.ComposingNormalizer.html#method.new_nfkc) for more information. + * Construct a new ComposingNormalizer instance for NFKC using compiled data. + * + * See the [Rust documentation for `new_nfkc`](https://docs.rs/icu/2.0.0/icu/normalizer/struct.ComposingNormalizer.html#method.new_nfkc) for more information. */ inline static std::unique_ptr create_nfkc(); /** - * Construct a new ComposingNormalizer instance for NFKC using a particular data source. - * - * See the [Rust documentation for `new_nfkc`](https://docs.rs/icu/2.0.0/icu/normalizer/struct.ComposingNormalizer.html#method.new_nfkc) for more information. + * Construct a new ComposingNormalizer instance for NFKC using a particular data source. + * + * See the [Rust documentation for `new_nfkc`](https://docs.rs/icu/2.0.0/icu/normalizer/struct.ComposingNormalizer.html#method.new_nfkc) for more information. */ - inline static diplomat::result, icu4x::DataError> create_nfkc_with_provider(const icu4x::DataProvider& provider); + inline static icu4x::diplomat::result, icu4x::DataError> create_nfkc_with_provider(const icu4x::DataProvider& provider); /** - * Normalize a string - * - * Ill-formed input is treated as if errors had been replaced with REPLACEMENT CHARACTERs according - * to the WHATWG Encoding Standard. - * - * See the [Rust documentation for `normalize_utf8`](https://docs.rs/icu/2.0.0/icu/normalizer/struct.ComposingNormalizerBorrowed.html#method.normalize_utf8) for more information. + * Normalize a string + * + * Ill-formed input is treated as if errors had been replaced with REPLACEMENT CHARACTERs according + * to the WHATWG Encoding Standard. + * + * See the [Rust documentation for `normalize_utf8`](https://docs.rs/icu/2.0.0/icu/normalizer/struct.ComposingNormalizerBorrowed.html#method.normalize_utf8) for more information. */ inline std::string normalize(std::string_view s) const; template inline void normalize_write(std::string_view s, W& writeable_output) const; /** - * Check if a string is normalized - * - * Ill-formed input is treated as if errors had been replaced with REPLACEMENT CHARACTERs according - * to the WHATWG Encoding Standard. - * - * See the [Rust documentation for `is_normalized_utf8`](https://docs.rs/icu/2.0.0/icu/normalizer/struct.ComposingNormalizerBorrowed.html#method.is_normalized_utf8) for more information. + * Check if a string is normalized + * + * Ill-formed input is treated as if errors had been replaced with REPLACEMENT CHARACTERs according + * to the WHATWG Encoding Standard. + * + * See the [Rust documentation for `is_normalized_utf8`](https://docs.rs/icu/2.0.0/icu/normalizer/struct.ComposingNormalizerBorrowed.html#method.is_normalized_utf8) for more information. */ inline bool is_normalized(std::string_view s) const; /** - * Check if a string is normalized - * - * Ill-formed input is treated as if errors had been replaced with REPLACEMENT CHARACTERs according - * to the WHATWG Encoding Standard. - * - * See the [Rust documentation for `is_normalized_utf16`](https://docs.rs/icu/2.0.0/icu/normalizer/struct.ComposingNormalizerBorrowed.html#method.is_normalized_utf16) for more information. + * Check if a string is normalized + * + * Ill-formed input is treated as if errors had been replaced with REPLACEMENT CHARACTERs according + * to the WHATWG Encoding Standard. + * + * See the [Rust documentation for `is_normalized_utf16`](https://docs.rs/icu/2.0.0/icu/normalizer/struct.ComposingNormalizerBorrowed.html#method.is_normalized_utf16) for more information. */ inline bool is_normalized16(std::u16string_view s) const; /** - * Return the index a slice of potentially-invalid UTF-8 is normalized up to - * - * See the [Rust documentation for `split_normalized_utf8`](https://docs.rs/icu/2.0.0/icu/normalizer/struct.ComposingNormalizerBorrowed.html#method.split_normalized_utf8) for more information. - * - * See the [Rust documentation for `split_normalized`](https://docs.rs/icu/2.0.0/icu/normalizer/struct.ComposingNormalizerBorrowed.html#method.split_normalized) for more information. + * Return the index a slice of potentially-invalid UTF-8 is normalized up to + * + * See the [Rust documentation for `split_normalized_utf8`](https://docs.rs/icu/2.0.0/icu/normalizer/struct.ComposingNormalizerBorrowed.html#method.split_normalized_utf8) for more information. + * + * See the [Rust documentation for `split_normalized`](https://docs.rs/icu/2.0.0/icu/normalizer/struct.ComposingNormalizerBorrowed.html#method.split_normalized) for more information. */ inline size_t is_normalized_up_to(std::string_view s) const; /** - * Return the index a slice of potentially-invalid UTF-16 is normalized up to - * - * See the [Rust documentation for `split_normalized_utf16`](https://docs.rs/icu/2.0.0/icu/normalizer/struct.ComposingNormalizerBorrowed.html#method.split_normalized_utf16) for more information. + * Return the index a slice of potentially-invalid UTF-16 is normalized up to + * + * See the [Rust documentation for `split_normalized_utf16`](https://docs.rs/icu/2.0.0/icu/normalizer/struct.ComposingNormalizerBorrowed.html#method.split_normalized_utf16) for more information. */ inline size_t is_normalized16_up_to(std::u16string_view s) const; @@ -124,4 +124,4 @@ class ComposingNormalizer { }; } // namespace -#endif // icu4x_ComposingNormalizer_D_HPP +#endif // ICU4X_ComposingNormalizer_D_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/ComposingNormalizer.hpp b/ffi/capi/bindings/cpp/icu4x/ComposingNormalizer.hpp index c4fac147902..a4f0b323ed1 100644 --- a/ffi/capi/bindings/cpp/icu4x/ComposingNormalizer.hpp +++ b/ffi/capi/bindings/cpp/icu4x/ComposingNormalizer.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_ComposingNormalizer_HPP -#define icu4x_ComposingNormalizer_HPP +#ifndef ICU4X_ComposingNormalizer_HPP +#define ICU4X_ComposingNormalizer_HPP #include "ComposingNormalizer.d.hpp" @@ -11,9 +11,9 @@ #include #include #include -#include "../diplomat_runtime.hpp" #include "DataError.hpp" #include "DataProvider.hpp" +#include "diplomat_runtime.hpp" namespace icu4x { @@ -30,15 +30,15 @@ namespace capi { typedef struct icu4x_ComposingNormalizer_create_nfkc_with_provider_mv1_result {union {icu4x::capi::ComposingNormalizer* ok; icu4x::capi::DataError err;}; bool is_ok;} icu4x_ComposingNormalizer_create_nfkc_with_provider_mv1_result; icu4x_ComposingNormalizer_create_nfkc_with_provider_mv1_result icu4x_ComposingNormalizer_create_nfkc_with_provider_mv1(const icu4x::capi::DataProvider* provider); - void icu4x_ComposingNormalizer_normalize_mv1(const icu4x::capi::ComposingNormalizer* self, diplomat::capi::DiplomatStringView s, diplomat::capi::DiplomatWrite* write); + void icu4x_ComposingNormalizer_normalize_mv1(const icu4x::capi::ComposingNormalizer* self, icu4x::diplomat::capi::DiplomatStringView s, icu4x::diplomat::capi::DiplomatWrite* write); - bool icu4x_ComposingNormalizer_is_normalized_utf8_mv1(const icu4x::capi::ComposingNormalizer* self, diplomat::capi::DiplomatStringView s); + bool icu4x_ComposingNormalizer_is_normalized_utf8_mv1(const icu4x::capi::ComposingNormalizer* self, icu4x::diplomat::capi::DiplomatStringView s); - bool icu4x_ComposingNormalizer_is_normalized_utf16_mv1(const icu4x::capi::ComposingNormalizer* self, diplomat::capi::DiplomatString16View s); + bool icu4x_ComposingNormalizer_is_normalized_utf16_mv1(const icu4x::capi::ComposingNormalizer* self, icu4x::diplomat::capi::DiplomatString16View s); - size_t icu4x_ComposingNormalizer_is_normalized_utf8_up_to_mv1(const icu4x::capi::ComposingNormalizer* self, diplomat::capi::DiplomatStringView s); + size_t icu4x_ComposingNormalizer_is_normalized_utf8_up_to_mv1(const icu4x::capi::ComposingNormalizer* self, icu4x::diplomat::capi::DiplomatStringView s); - size_t icu4x_ComposingNormalizer_is_normalized_utf16_up_to_mv1(const icu4x::capi::ComposingNormalizer* self, diplomat::capi::DiplomatString16View s); + size_t icu4x_ComposingNormalizer_is_normalized_utf16_up_to_mv1(const icu4x::capi::ComposingNormalizer* self, icu4x::diplomat::capi::DiplomatString16View s); void icu4x_ComposingNormalizer_destroy_mv1(ComposingNormalizer* self); @@ -51,9 +51,9 @@ inline std::unique_ptr icu4x::ComposingNormalizer::c return std::unique_ptr(icu4x::ComposingNormalizer::FromFFI(result)); } -inline diplomat::result, icu4x::DataError> icu4x::ComposingNormalizer::create_nfc_with_provider(const icu4x::DataProvider& provider) { +inline icu4x::diplomat::result, icu4x::DataError> icu4x::ComposingNormalizer::create_nfc_with_provider(const icu4x::DataProvider& provider) { auto result = icu4x::capi::icu4x_ComposingNormalizer_create_nfc_with_provider_mv1(provider.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DataError>(diplomat::Ok>(std::unique_ptr(icu4x::ComposingNormalizer::FromFFI(result.ok)))) : diplomat::result, icu4x::DataError>(diplomat::Err(icu4x::DataError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::ComposingNormalizer::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Err(icu4x::DataError::FromFFI(result.err))); } inline std::unique_ptr icu4x::ComposingNormalizer::create_nfkc() { @@ -61,14 +61,14 @@ inline std::unique_ptr icu4x::ComposingNormalizer::c return std::unique_ptr(icu4x::ComposingNormalizer::FromFFI(result)); } -inline diplomat::result, icu4x::DataError> icu4x::ComposingNormalizer::create_nfkc_with_provider(const icu4x::DataProvider& provider) { +inline icu4x::diplomat::result, icu4x::DataError> icu4x::ComposingNormalizer::create_nfkc_with_provider(const icu4x::DataProvider& provider) { auto result = icu4x::capi::icu4x_ComposingNormalizer_create_nfkc_with_provider_mv1(provider.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DataError>(diplomat::Ok>(std::unique_ptr(icu4x::ComposingNormalizer::FromFFI(result.ok)))) : diplomat::result, icu4x::DataError>(diplomat::Err(icu4x::DataError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::ComposingNormalizer::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Err(icu4x::DataError::FromFFI(result.err))); } inline std::string icu4x::ComposingNormalizer::normalize(std::string_view s) const { std::string output; - diplomat::capi::DiplomatWrite write = diplomat::WriteFromString(output); + icu4x::diplomat::capi::DiplomatWrite write = icu4x::diplomat::WriteFromString(output); icu4x::capi::icu4x_ComposingNormalizer_normalize_mv1(this->AsFFI(), {s.data(), s.size()}, &write); @@ -76,7 +76,7 @@ inline std::string icu4x::ComposingNormalizer::normalize(std::string_view s) con } template inline void icu4x::ComposingNormalizer::normalize_write(std::string_view s, W& writeable) const { - diplomat::capi::DiplomatWrite write = diplomat::WriteTrait::Construct(writeable); + icu4x::diplomat::capi::DiplomatWrite write = icu4x::diplomat::WriteTrait::Construct(writeable); icu4x::capi::icu4x_ComposingNormalizer_normalize_mv1(this->AsFFI(), {s.data(), s.size()}, &write); @@ -127,4 +127,4 @@ inline void icu4x::ComposingNormalizer::operator delete(void* ptr) { } -#endif // icu4x_ComposingNormalizer_HPP +#endif // ICU4X_ComposingNormalizer_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/DataError.d.hpp b/ffi/capi/bindings/cpp/icu4x/DataError.d.hpp index bd048fc12c5..45d7424ff0a 100644 --- a/ffi/capi/bindings/cpp/icu4x/DataError.d.hpp +++ b/ffi/capi/bindings/cpp/icu4x/DataError.d.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_DataError_D_HPP -#define icu4x_DataError_D_HPP +#ifndef ICU4X_DataError_D_HPP +#define ICU4X_DataError_D_HPP #include #include @@ -9,7 +9,7 @@ #include #include #include -#include "../diplomat_runtime.hpp" +#include "diplomat_runtime.hpp" namespace icu4x { @@ -63,4 +63,4 @@ class DataError { }; } // namespace -#endif // icu4x_DataError_D_HPP +#endif // ICU4X_DataError_D_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/DataError.hpp b/ffi/capi/bindings/cpp/icu4x/DataError.hpp index 7b6d61cdfd3..aef0f38e2a8 100644 --- a/ffi/capi/bindings/cpp/icu4x/DataError.hpp +++ b/ffi/capi/bindings/cpp/icu4x/DataError.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_DataError_HPP -#define icu4x_DataError_HPP +#ifndef ICU4X_DataError_HPP +#define ICU4X_DataError_HPP #include "DataError.d.hpp" @@ -11,7 +11,7 @@ #include #include #include -#include "../diplomat_runtime.hpp" +#include "diplomat_runtime.hpp" namespace icu4x { @@ -42,4 +42,4 @@ inline icu4x::DataError icu4x::DataError::FromFFI(icu4x::capi::DataError c_enum) std::abort(); } } -#endif // icu4x_DataError_HPP +#endif // ICU4X_DataError_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/DataProvider.d.hpp b/ffi/capi/bindings/cpp/icu4x/DataProvider.d.hpp index 3fe20e69893..65b15077d23 100644 --- a/ffi/capi/bindings/cpp/icu4x/DataProvider.d.hpp +++ b/ffi/capi/bindings/cpp/icu4x/DataProvider.d.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_DataProvider_D_HPP -#define icu4x_DataProvider_D_HPP +#ifndef ICU4X_DataProvider_D_HPP +#define ICU4X_DataProvider_D_HPP #include #include @@ -9,15 +9,15 @@ #include #include #include -#include "../diplomat_runtime.hpp" - +#include "diplomat_runtime.hpp" namespace icu4x { namespace capi { struct DataProvider; } class DataProvider; namespace capi { struct LocaleFallbacker; } class LocaleFallbacker; class DataError; -} +} // namespace icu4x + namespace icu4x { @@ -41,44 +41,44 @@ class DataProvider { public: /** - * Constructs an `FsDataProvider` and returns it as an {@link DataProvider}. - * Requires the `provider_fs` Cargo feature. - * Not supported in WASM. - * - * See the [Rust documentation for `FsDataProvider`](https://docs.rs/icu_provider_fs/2.0.0/icu_provider_fs/struct.FsDataProvider.html) for more information. + * Constructs an `FsDataProvider` and returns it as an {@link DataProvider}. + * Requires the `provider_fs` Cargo feature. + * Not supported in WASM. + * + * See the [Rust documentation for `FsDataProvider`](https://docs.rs/icu_provider_fs/2.0.0/icu_provider_fs/struct.FsDataProvider.html) for more information. */ - inline static diplomat::result, icu4x::DataError> from_fs(std::string_view path); + inline static icu4x::diplomat::result, icu4x::DataError> from_fs(std::string_view path); /** - * Constructs a `BlobDataProvider` and returns it as an {@link DataProvider}. - * - * See the [Rust documentation for `try_new_from_static_blob`](https://docs.rs/icu_provider_blob/2.0.0/icu_provider_blob/struct.BlobDataProvider.html#method.try_new_from_static_blob) for more information. + * Constructs a `BlobDataProvider` and returns it as an {@link DataProvider}. + * + * See the [Rust documentation for `try_new_from_static_blob`](https://docs.rs/icu_provider_blob/2.0.0/icu_provider_blob/struct.BlobDataProvider.html#method.try_new_from_static_blob) for more information. */ - inline static diplomat::result, icu4x::DataError> from_byte_slice(diplomat::span blob); + inline static icu4x::diplomat::result, icu4x::DataError> from_byte_slice(icu4x::diplomat::span blob); /** - * Creates a provider that tries the current provider and then, if the current provider - * doesn't support the data key, another provider `other`. - * - * This takes ownership of the `other` provider, leaving an empty provider in its place. - * - * See the [Rust documentation for `ForkByMarkerProvider`](https://docs.rs/icu_provider_adapters/2.0.0/icu_provider_adapters/fork/type.ForkByMarkerProvider.html) for more information. + * Creates a provider that tries the current provider and then, if the current provider + * doesn't support the data key, another provider `other`. + * + * This takes ownership of the `other` provider, leaving an empty provider in its place. + * + * See the [Rust documentation for `ForkByMarkerProvider`](https://docs.rs/icu_provider_adapters/2.0.0/icu_provider_adapters/fork/type.ForkByMarkerProvider.html) for more information. */ - inline diplomat::result fork_by_marker(icu4x::DataProvider& other); + inline icu4x::diplomat::result fork_by_marker(icu4x::DataProvider& other); /** - * Same as `fork_by_key` but forks by locale instead of key. - * - * See the [Rust documentation for `IdentifierNotFoundPredicate`](https://docs.rs/icu_provider_adapters/2.0.0/icu_provider_adapters/fork/predicates/struct.IdentifierNotFoundPredicate.html) for more information. + * Same as `fork_by_key` but forks by locale instead of key. + * + * See the [Rust documentation for `IdentifierNotFoundPredicate`](https://docs.rs/icu_provider_adapters/2.0.0/icu_provider_adapters/fork/predicates/struct.IdentifierNotFoundPredicate.html) for more information. */ - inline diplomat::result fork_by_locale(icu4x::DataProvider& other); + inline icu4x::diplomat::result fork_by_locale(icu4x::DataProvider& other); /** - * See the [Rust documentation for `new`](https://docs.rs/icu_provider_adapters/2.0.0/icu_provider_adapters/fallback/struct.LocaleFallbackProvider.html#method.new) for more information. - * - * Additional information: [1](https://docs.rs/icu_provider_adapters/2.0.0/icu_provider_adapters/fallback/struct.LocaleFallbackProvider.html) + * See the [Rust documentation for `new`](https://docs.rs/icu_provider_adapters/2.0.0/icu_provider_adapters/fallback/struct.LocaleFallbackProvider.html#method.new) for more information. + * + * Additional information: [1](https://docs.rs/icu_provider_adapters/2.0.0/icu_provider_adapters/fallback/struct.LocaleFallbackProvider.html) */ - inline diplomat::result enable_locale_fallback_with(const icu4x::LocaleFallbacker& fallbacker); + inline icu4x::diplomat::result enable_locale_fallback_with(const icu4x::LocaleFallbacker& fallbacker); inline const icu4x::capi::DataProvider* AsFFI() const; inline icu4x::capi::DataProvider* AsFFI(); @@ -95,4 +95,4 @@ class DataProvider { }; } // namespace -#endif // icu4x_DataProvider_D_HPP +#endif // ICU4X_DataProvider_D_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/DataProvider.hpp b/ffi/capi/bindings/cpp/icu4x/DataProvider.hpp index 853781a56fd..dc21b499f5c 100644 --- a/ffi/capi/bindings/cpp/icu4x/DataProvider.hpp +++ b/ffi/capi/bindings/cpp/icu4x/DataProvider.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_DataProvider_HPP -#define icu4x_DataProvider_HPP +#ifndef ICU4X_DataProvider_HPP +#define ICU4X_DataProvider_HPP #include "DataProvider.d.hpp" @@ -11,9 +11,9 @@ #include #include #include -#include "../diplomat_runtime.hpp" #include "DataError.hpp" #include "LocaleFallbacker.hpp" +#include "diplomat_runtime.hpp" namespace icu4x { @@ -21,10 +21,10 @@ namespace capi { extern "C" { typedef struct icu4x_DataProvider_from_fs_mv1_result {union {icu4x::capi::DataProvider* ok; icu4x::capi::DataError err;}; bool is_ok;} icu4x_DataProvider_from_fs_mv1_result; - icu4x_DataProvider_from_fs_mv1_result icu4x_DataProvider_from_fs_mv1(diplomat::capi::DiplomatStringView path); + icu4x_DataProvider_from_fs_mv1_result icu4x_DataProvider_from_fs_mv1(icu4x::diplomat::capi::DiplomatStringView path); typedef struct icu4x_DataProvider_from_byte_slice_mv1_result {union {icu4x::capi::DataProvider* ok; icu4x::capi::DataError err;}; bool is_ok;} icu4x_DataProvider_from_byte_slice_mv1_result; - icu4x_DataProvider_from_byte_slice_mv1_result icu4x_DataProvider_from_byte_slice_mv1(diplomat::capi::DiplomatU8View blob); + icu4x_DataProvider_from_byte_slice_mv1_result icu4x_DataProvider_from_byte_slice_mv1(icu4x::diplomat::capi::DiplomatU8View blob); typedef struct icu4x_DataProvider_fork_by_marker_mv1_result {union { icu4x::capi::DataError err;}; bool is_ok;} icu4x_DataProvider_fork_by_marker_mv1_result; icu4x_DataProvider_fork_by_marker_mv1_result icu4x_DataProvider_fork_by_marker_mv1(icu4x::capi::DataProvider* self, icu4x::capi::DataProvider* other); @@ -41,32 +41,32 @@ namespace capi { } // namespace capi } // namespace -inline diplomat::result, icu4x::DataError> icu4x::DataProvider::from_fs(std::string_view path) { +inline icu4x::diplomat::result, icu4x::DataError> icu4x::DataProvider::from_fs(std::string_view path) { auto result = icu4x::capi::icu4x_DataProvider_from_fs_mv1({path.data(), path.size()}); - return result.is_ok ? diplomat::result, icu4x::DataError>(diplomat::Ok>(std::unique_ptr(icu4x::DataProvider::FromFFI(result.ok)))) : diplomat::result, icu4x::DataError>(diplomat::Err(icu4x::DataError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::DataProvider::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Err(icu4x::DataError::FromFFI(result.err))); } -inline diplomat::result, icu4x::DataError> icu4x::DataProvider::from_byte_slice(diplomat::span blob) { +inline icu4x::diplomat::result, icu4x::DataError> icu4x::DataProvider::from_byte_slice(icu4x::diplomat::span blob) { auto result = icu4x::capi::icu4x_DataProvider_from_byte_slice_mv1({blob.data(), blob.size()}); - return result.is_ok ? diplomat::result, icu4x::DataError>(diplomat::Ok>(std::unique_ptr(icu4x::DataProvider::FromFFI(result.ok)))) : diplomat::result, icu4x::DataError>(diplomat::Err(icu4x::DataError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::DataProvider::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Err(icu4x::DataError::FromFFI(result.err))); } -inline diplomat::result icu4x::DataProvider::fork_by_marker(icu4x::DataProvider& other) { +inline icu4x::diplomat::result icu4x::DataProvider::fork_by_marker(icu4x::DataProvider& other) { auto result = icu4x::capi::icu4x_DataProvider_fork_by_marker_mv1(this->AsFFI(), other.AsFFI()); - return result.is_ok ? diplomat::result(diplomat::Ok()) : diplomat::result(diplomat::Err(icu4x::DataError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result(icu4x::diplomat::Ok()) : icu4x::diplomat::result(icu4x::diplomat::Err(icu4x::DataError::FromFFI(result.err))); } -inline diplomat::result icu4x::DataProvider::fork_by_locale(icu4x::DataProvider& other) { +inline icu4x::diplomat::result icu4x::DataProvider::fork_by_locale(icu4x::DataProvider& other) { auto result = icu4x::capi::icu4x_DataProvider_fork_by_locale_mv1(this->AsFFI(), other.AsFFI()); - return result.is_ok ? diplomat::result(diplomat::Ok()) : diplomat::result(diplomat::Err(icu4x::DataError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result(icu4x::diplomat::Ok()) : icu4x::diplomat::result(icu4x::diplomat::Err(icu4x::DataError::FromFFI(result.err))); } -inline diplomat::result icu4x::DataProvider::enable_locale_fallback_with(const icu4x::LocaleFallbacker& fallbacker) { +inline icu4x::diplomat::result icu4x::DataProvider::enable_locale_fallback_with(const icu4x::LocaleFallbacker& fallbacker) { auto result = icu4x::capi::icu4x_DataProvider_enable_locale_fallback_with_mv1(this->AsFFI(), fallbacker.AsFFI()); - return result.is_ok ? diplomat::result(diplomat::Ok()) : diplomat::result(diplomat::Err(icu4x::DataError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result(icu4x::diplomat::Ok()) : icu4x::diplomat::result(icu4x::diplomat::Err(icu4x::DataError::FromFFI(result.err))); } inline const icu4x::capi::DataProvider* icu4x::DataProvider::AsFFI() const { @@ -90,4 +90,4 @@ inline void icu4x::DataProvider::operator delete(void* ptr) { } -#endif // icu4x_DataProvider_HPP +#endif // ICU4X_DataProvider_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/Date.d.hpp b/ffi/capi/bindings/cpp/icu4x/Date.d.hpp index d49649faf80..8186773e5b5 100644 --- a/ffi/capi/bindings/cpp/icu4x/Date.d.hpp +++ b/ffi/capi/bindings/cpp/icu4x/Date.d.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_Date_D_HPP -#define icu4x_Date_D_HPP +#ifndef ICU4X_Date_D_HPP +#define ICU4X_Date_D_HPP #include #include @@ -9,8 +9,7 @@ #include #include #include -#include "../diplomat_runtime.hpp" - +#include "diplomat_runtime.hpp" namespace icu4x { namespace capi { struct Calendar; } class Calendar; @@ -21,7 +20,8 @@ class IsoDate; class CalendarError; class Rfc9557ParseError; class Weekday; -} +} // namespace icu4x + namespace icu4x { @@ -40,175 +40,175 @@ class Date { public: /** - * Creates a new {@link Date} representing the ISO date - * given but in a given calendar - * - * See the [Rust documentation for `new_from_iso`](https://docs.rs/icu/2.0.0/icu/calendar/struct.Date.html#method.new_from_iso) for more information. + * Creates a new {@link Date} representing the ISO date + * given but in a given calendar + * + * See the [Rust documentation for `new_from_iso`](https://docs.rs/icu/2.0.0/icu/calendar/struct.Date.html#method.new_from_iso) for more information. */ - inline static diplomat::result, icu4x::CalendarError> from_iso_in_calendar(int32_t iso_year, uint8_t iso_month, uint8_t iso_day, const icu4x::Calendar& calendar); + inline static icu4x::diplomat::result, icu4x::CalendarError> from_iso_in_calendar(int32_t iso_year, uint8_t iso_month, uint8_t iso_day, const icu4x::Calendar& calendar); /** - * Creates a new {@link Date} from the given codes, which are interpreted in the given calendar system - * - * An empty era code will treat the year as an extended year - * - * See the [Rust documentation for `try_new_from_codes`](https://docs.rs/icu/2.0.0/icu/calendar/struct.Date.html#method.try_new_from_codes) for more information. + * Creates a new {@link Date} from the given codes, which are interpreted in the given calendar system + * + * An empty era code will treat the year as an extended year + * + * See the [Rust documentation for `try_new_from_codes`](https://docs.rs/icu/2.0.0/icu/calendar/struct.Date.html#method.try_new_from_codes) for more information. */ - inline static diplomat::result, icu4x::CalendarError> from_codes_in_calendar(std::string_view era_code, int32_t year, std::string_view month_code, uint8_t day, const icu4x::Calendar& calendar); + inline static icu4x::diplomat::result, icu4x::CalendarError> from_codes_in_calendar(std::string_view era_code, int32_t year, std::string_view month_code, uint8_t day, const icu4x::Calendar& calendar); /** - * Creates a new {@link Date} from the given Rata Die - * - * See the [Rust documentation for `from_rata_die`](https://docs.rs/icu/2.0.0/icu/calendar/struct.Date.html#method.from_rata_die) for more information. + * Creates a new {@link Date} from the given Rata Die + * + * See the [Rust documentation for `from_rata_die`](https://docs.rs/icu/2.0.0/icu/calendar/struct.Date.html#method.from_rata_die) for more information. */ - inline static diplomat::result, icu4x::CalendarError> from_rata_die(int64_t rd, const icu4x::Calendar& calendar); + inline static icu4x::diplomat::result, icu4x::CalendarError> from_rata_die(int64_t rd, const icu4x::Calendar& calendar); /** - * Creates a new {@link Date} from an IXDTF string. - * - * See the [Rust documentation for `try_from_str`](https://docs.rs/icu/2.0.0/icu/calendar/struct.Date.html#method.try_from_str) for more information. + * Creates a new {@link Date} from an IXDTF string. + * + * See the [Rust documentation for `try_from_str`](https://docs.rs/icu/2.0.0/icu/calendar/struct.Date.html#method.try_from_str) for more information. */ - inline static diplomat::result, icu4x::Rfc9557ParseError> from_string(std::string_view v, const icu4x::Calendar& calendar); + inline static icu4x::diplomat::result, icu4x::Rfc9557ParseError> from_string(std::string_view v, const icu4x::Calendar& calendar); /** - * Convert this date to one in a different calendar - * - * See the [Rust documentation for `to_calendar`](https://docs.rs/icu/2.0.0/icu/calendar/struct.Date.html#method.to_calendar) for more information. + * Convert this date to one in a different calendar + * + * See the [Rust documentation for `to_calendar`](https://docs.rs/icu/2.0.0/icu/calendar/struct.Date.html#method.to_calendar) for more information. */ inline std::unique_ptr to_calendar(const icu4x::Calendar& calendar) const; /** - * Converts this date to ISO - * - * See the [Rust documentation for `to_iso`](https://docs.rs/icu/2.0.0/icu/calendar/struct.Date.html#method.to_iso) for more information. + * Converts this date to ISO + * + * See the [Rust documentation for `to_iso`](https://docs.rs/icu/2.0.0/icu/calendar/struct.Date.html#method.to_iso) for more information. */ inline std::unique_ptr to_iso() const; /** - * Returns this date's Rata Die - * - * See the [Rust documentation for `to_rata_die`](https://docs.rs/icu/2.0.0/icu/calendar/struct.Date.html#method.to_rata_die) for more information. + * Returns this date's Rata Die + * + * See the [Rust documentation for `to_rata_die`](https://docs.rs/icu/2.0.0/icu/calendar/struct.Date.html#method.to_rata_die) for more information. */ inline int64_t to_rata_die() const; /** - * Returns the 1-indexed day in the year for this date - * - * See the [Rust documentation for `day_of_year`](https://docs.rs/icu/2.0.0/icu/calendar/struct.Date.html#method.day_of_year) for more information. + * Returns the 1-indexed day in the year for this date + * + * See the [Rust documentation for `day_of_year`](https://docs.rs/icu/2.0.0/icu/calendar/struct.Date.html#method.day_of_year) for more information. */ inline uint16_t day_of_year() const; /** - * Returns the 1-indexed day in the month for this date - * - * See the [Rust documentation for `day_of_month`](https://docs.rs/icu/2.0.0/icu/calendar/struct.Date.html#method.day_of_month) for more information. + * Returns the 1-indexed day in the month for this date + * + * See the [Rust documentation for `day_of_month`](https://docs.rs/icu/2.0.0/icu/calendar/struct.Date.html#method.day_of_month) for more information. */ inline uint8_t day_of_month() const; /** - * Returns the day in the week for this day - * - * See the [Rust documentation for `day_of_week`](https://docs.rs/icu/2.0.0/icu/calendar/struct.Date.html#method.day_of_week) for more information. + * Returns the day in the week for this day + * + * See the [Rust documentation for `day_of_week`](https://docs.rs/icu/2.0.0/icu/calendar/struct.Date.html#method.day_of_week) for more information. */ inline icu4x::Weekday day_of_week() const; /** - * Returns 1-indexed number of the month of this date in its year - * - * Note that for lunar calendars this may not lead to the same month - * having the same ordinal month across years; use month_code if you care - * about month identity. - * - * See the [Rust documentation for `month`](https://docs.rs/icu/2.0.0/icu/calendar/struct.Date.html#method.month) for more information. - * - * See the [Rust documentation for `ordinal`](https://docs.rs/icu/2.0.0/icu/calendar/types/struct.MonthInfo.html#structfield.ordinal) for more information. + * Returns 1-indexed number of the month of this date in its year + * + * Note that for lunar calendars this may not lead to the same month + * having the same ordinal month across years; use month_code if you care + * about month identity. + * + * See the [Rust documentation for `month`](https://docs.rs/icu/2.0.0/icu/calendar/struct.Date.html#method.month) for more information. + * + * See the [Rust documentation for `ordinal`](https://docs.rs/icu/2.0.0/icu/calendar/types/struct.MonthInfo.html#structfield.ordinal) for more information. */ inline uint8_t ordinal_month() const; /** - * Returns the month code for this date. Typically something - * like "M01", "M02", but can be more complicated for lunar calendars. - * - * See the [Rust documentation for `standard_code`](https://docs.rs/icu/2.0.0/icu/calendar/types/struct.MonthInfo.html#structfield.standard_code) for more information. - * - * Additional information: [1](https://docs.rs/icu/2.0.0/icu/calendar/struct.Date.html#method.month) + * Returns the month code for this date. Typically something + * like "M01", "M02", but can be more complicated for lunar calendars. + * + * See the [Rust documentation for `standard_code`](https://docs.rs/icu/2.0.0/icu/calendar/types/struct.MonthInfo.html#structfield.standard_code) for more information. + * + * Additional information: [1](https://docs.rs/icu/2.0.0/icu/calendar/struct.Date.html#method.month) */ inline std::string month_code() const; template inline void month_code_write(W& writeable_output) const; /** - * Returns the month number of this month. - * - * See the [Rust documentation for `month_number`](https://docs.rs/icu/2.0.0/icu/calendar/types/struct.MonthInfo.html#method.month_number) for more information. + * Returns the month number of this month. + * + * See the [Rust documentation for `month_number`](https://docs.rs/icu/2.0.0/icu/calendar/types/struct.MonthInfo.html#method.month_number) for more information. */ inline uint8_t month_number() const; /** - * Returns whether the month is a leap month. - * - * See the [Rust documentation for `is_leap`](https://docs.rs/icu/2.0.0/icu/calendar/types/struct.MonthInfo.html#method.is_leap) for more information. + * Returns whether the month is a leap month. + * + * See the [Rust documentation for `is_leap`](https://docs.rs/icu/2.0.0/icu/calendar/types/struct.MonthInfo.html#method.is_leap) for more information. */ inline bool month_is_leap() const; /** - * Returns the year number in the current era for this date - * - * For calendars without an era, returns the related ISO year. - * - * See the [Rust documentation for `era_year_or_related_iso`](https://docs.rs/icu/2.0.0/icu/calendar/types/enum.YearInfo.html#method.era_year_or_related_iso) for more information. - * - * Additional information: [1](https://docs.rs/icu/2.0.0/icu/calendar/types/struct.EraYear.html#structfield.year), [2](https://docs.rs/icu/2.0.0/icu/calendar/types/struct.CyclicYear.html#structfield.related_iso), [3](https://docs.rs/icu/2.0.0/icu/calendar/struct.Date.html#method.year) + * Returns the year number in the current era for this date + * + * For calendars without an era, returns the related ISO year. + * + * See the [Rust documentation for `era_year_or_related_iso`](https://docs.rs/icu/2.0.0/icu/calendar/types/enum.YearInfo.html#method.era_year_or_related_iso) for more information. + * + * Additional information: [1](https://docs.rs/icu/2.0.0/icu/calendar/types/struct.EraYear.html#structfield.year), [2](https://docs.rs/icu/2.0.0/icu/calendar/types/struct.CyclicYear.html#structfield.related_iso), [3](https://docs.rs/icu/2.0.0/icu/calendar/struct.Date.html#method.year) */ inline int32_t era_year_or_related_iso() const; /** - * Returns the extended year, which can be used for - * - * This year number can be used when you need a simple numeric representation - * of the year, and can be meaningfully compared with extended years from other - * eras or used in arithmetic. - * - * See the [Rust documentation for `extended_year`](https://docs.rs/icu/2.0.0/icu/calendar/struct.Date.html#method.extended_year) for more information. + * Returns the extended year, which can be used for + * + * This year number can be used when you need a simple numeric representation + * of the year, and can be meaningfully compared with extended years from other + * eras or used in arithmetic. + * + * See the [Rust documentation for `extended_year`](https://docs.rs/icu/2.0.0/icu/calendar/struct.Date.html#method.extended_year) for more information. */ inline int32_t extended_year() const; /** - * Returns the era for this date, or an empty string - * - * See the [Rust documentation for `era`](https://docs.rs/icu/2.0.0/icu/calendar/types/struct.EraYear.html#structfield.era) for more information. - * - * Additional information: [1](https://docs.rs/icu/2.0.0/icu/calendar/struct.Date.html#method.year) + * Returns the era for this date, or an empty string + * + * See the [Rust documentation for `era`](https://docs.rs/icu/2.0.0/icu/calendar/types/struct.EraYear.html#structfield.era) for more information. + * + * Additional information: [1](https://docs.rs/icu/2.0.0/icu/calendar/struct.Date.html#method.year) */ inline std::string era() const; template inline void era_write(W& writeable_output) const; /** - * Returns the number of months in the year represented by this date - * - * See the [Rust documentation for `months_in_year`](https://docs.rs/icu/2.0.0/icu/calendar/struct.Date.html#method.months_in_year) for more information. + * Returns the number of months in the year represented by this date + * + * See the [Rust documentation for `months_in_year`](https://docs.rs/icu/2.0.0/icu/calendar/struct.Date.html#method.months_in_year) for more information. */ inline uint8_t months_in_year() const; /** - * Returns the number of days in the month represented by this date - * - * See the [Rust documentation for `days_in_month`](https://docs.rs/icu/2.0.0/icu/calendar/struct.Date.html#method.days_in_month) for more information. + * Returns the number of days in the month represented by this date + * + * See the [Rust documentation for `days_in_month`](https://docs.rs/icu/2.0.0/icu/calendar/struct.Date.html#method.days_in_month) for more information. */ inline uint8_t days_in_month() const; /** - * Returns the number of days in the year represented by this date - * - * See the [Rust documentation for `days_in_year`](https://docs.rs/icu/2.0.0/icu/calendar/struct.Date.html#method.days_in_year) for more information. + * Returns the number of days in the year represented by this date + * + * See the [Rust documentation for `days_in_year`](https://docs.rs/icu/2.0.0/icu/calendar/struct.Date.html#method.days_in_year) for more information. */ inline uint16_t days_in_year() const; /** - * Returns the {@link Calendar} object backing this date - * - * See the [Rust documentation for `calendar`](https://docs.rs/icu/2.0.0/icu/calendar/struct.Date.html#method.calendar) for more information. + * Returns the {@link Calendar} object backing this date + * + * See the [Rust documentation for `calendar`](https://docs.rs/icu/2.0.0/icu/calendar/struct.Date.html#method.calendar) for more information. */ inline std::unique_ptr calendar() const; @@ -227,4 +227,4 @@ class Date { }; } // namespace -#endif // icu4x_Date_D_HPP +#endif // ICU4X_Date_D_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/Date.hpp b/ffi/capi/bindings/cpp/icu4x/Date.hpp index 6872026dd36..97c81aa7807 100644 --- a/ffi/capi/bindings/cpp/icu4x/Date.hpp +++ b/ffi/capi/bindings/cpp/icu4x/Date.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_Date_HPP -#define icu4x_Date_HPP +#ifndef ICU4X_Date_HPP +#define ICU4X_Date_HPP #include "Date.d.hpp" @@ -11,12 +11,12 @@ #include #include #include -#include "../diplomat_runtime.hpp" #include "Calendar.hpp" #include "CalendarError.hpp" #include "IsoDate.hpp" #include "Rfc9557ParseError.hpp" #include "Weekday.hpp" +#include "diplomat_runtime.hpp" namespace icu4x { @@ -27,13 +27,13 @@ namespace capi { icu4x_Date_from_iso_in_calendar_mv1_result icu4x_Date_from_iso_in_calendar_mv1(int32_t iso_year, uint8_t iso_month, uint8_t iso_day, const icu4x::capi::Calendar* calendar); typedef struct icu4x_Date_from_codes_in_calendar_mv1_result {union {icu4x::capi::Date* ok; icu4x::capi::CalendarError err;}; bool is_ok;} icu4x_Date_from_codes_in_calendar_mv1_result; - icu4x_Date_from_codes_in_calendar_mv1_result icu4x_Date_from_codes_in_calendar_mv1(diplomat::capi::DiplomatStringView era_code, int32_t year, diplomat::capi::DiplomatStringView month_code, uint8_t day, const icu4x::capi::Calendar* calendar); + icu4x_Date_from_codes_in_calendar_mv1_result icu4x_Date_from_codes_in_calendar_mv1(icu4x::diplomat::capi::DiplomatStringView era_code, int32_t year, icu4x::diplomat::capi::DiplomatStringView month_code, uint8_t day, const icu4x::capi::Calendar* calendar); typedef struct icu4x_Date_from_rata_die_mv1_result {union {icu4x::capi::Date* ok; icu4x::capi::CalendarError err;}; bool is_ok;} icu4x_Date_from_rata_die_mv1_result; icu4x_Date_from_rata_die_mv1_result icu4x_Date_from_rata_die_mv1(int64_t rd, const icu4x::capi::Calendar* calendar); typedef struct icu4x_Date_from_string_mv1_result {union {icu4x::capi::Date* ok; icu4x::capi::Rfc9557ParseError err;}; bool is_ok;} icu4x_Date_from_string_mv1_result; - icu4x_Date_from_string_mv1_result icu4x_Date_from_string_mv1(diplomat::capi::DiplomatStringView v, const icu4x::capi::Calendar* calendar); + icu4x_Date_from_string_mv1_result icu4x_Date_from_string_mv1(icu4x::diplomat::capi::DiplomatStringView v, const icu4x::capi::Calendar* calendar); icu4x::capi::Date* icu4x_Date_to_calendar_mv1(const icu4x::capi::Date* self, const icu4x::capi::Calendar* calendar); @@ -49,7 +49,7 @@ namespace capi { uint8_t icu4x_Date_ordinal_month_mv1(const icu4x::capi::Date* self); - void icu4x_Date_month_code_mv1(const icu4x::capi::Date* self, diplomat::capi::DiplomatWrite* write); + void icu4x_Date_month_code_mv1(const icu4x::capi::Date* self, icu4x::diplomat::capi::DiplomatWrite* write); uint8_t icu4x_Date_month_number_mv1(const icu4x::capi::Date* self); @@ -59,7 +59,7 @@ namespace capi { int32_t icu4x_Date_extended_year_mv1(const icu4x::capi::Date* self); - void icu4x_Date_era_mv1(const icu4x::capi::Date* self, diplomat::capi::DiplomatWrite* write); + void icu4x_Date_era_mv1(const icu4x::capi::Date* self, icu4x::diplomat::capi::DiplomatWrite* write); uint8_t icu4x_Date_months_in_year_mv1(const icu4x::capi::Date* self); @@ -75,33 +75,33 @@ namespace capi { } // namespace capi } // namespace -inline diplomat::result, icu4x::CalendarError> icu4x::Date::from_iso_in_calendar(int32_t iso_year, uint8_t iso_month, uint8_t iso_day, const icu4x::Calendar& calendar) { +inline icu4x::diplomat::result, icu4x::CalendarError> icu4x::Date::from_iso_in_calendar(int32_t iso_year, uint8_t iso_month, uint8_t iso_day, const icu4x::Calendar& calendar) { auto result = icu4x::capi::icu4x_Date_from_iso_in_calendar_mv1(iso_year, iso_month, iso_day, calendar.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::CalendarError>(diplomat::Ok>(std::unique_ptr(icu4x::Date::FromFFI(result.ok)))) : diplomat::result, icu4x::CalendarError>(diplomat::Err(icu4x::CalendarError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::CalendarError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::Date::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::CalendarError>(icu4x::diplomat::Err(icu4x::CalendarError::FromFFI(result.err))); } -inline diplomat::result, icu4x::CalendarError> icu4x::Date::from_codes_in_calendar(std::string_view era_code, int32_t year, std::string_view month_code, uint8_t day, const icu4x::Calendar& calendar) { +inline icu4x::diplomat::result, icu4x::CalendarError> icu4x::Date::from_codes_in_calendar(std::string_view era_code, int32_t year, std::string_view month_code, uint8_t day, const icu4x::Calendar& calendar) { auto result = icu4x::capi::icu4x_Date_from_codes_in_calendar_mv1({era_code.data(), era_code.size()}, year, {month_code.data(), month_code.size()}, day, calendar.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::CalendarError>(diplomat::Ok>(std::unique_ptr(icu4x::Date::FromFFI(result.ok)))) : diplomat::result, icu4x::CalendarError>(diplomat::Err(icu4x::CalendarError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::CalendarError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::Date::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::CalendarError>(icu4x::diplomat::Err(icu4x::CalendarError::FromFFI(result.err))); } -inline diplomat::result, icu4x::CalendarError> icu4x::Date::from_rata_die(int64_t rd, const icu4x::Calendar& calendar) { +inline icu4x::diplomat::result, icu4x::CalendarError> icu4x::Date::from_rata_die(int64_t rd, const icu4x::Calendar& calendar) { auto result = icu4x::capi::icu4x_Date_from_rata_die_mv1(rd, calendar.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::CalendarError>(diplomat::Ok>(std::unique_ptr(icu4x::Date::FromFFI(result.ok)))) : diplomat::result, icu4x::CalendarError>(diplomat::Err(icu4x::CalendarError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::CalendarError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::Date::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::CalendarError>(icu4x::diplomat::Err(icu4x::CalendarError::FromFFI(result.err))); } -inline diplomat::result, icu4x::Rfc9557ParseError> icu4x::Date::from_string(std::string_view v, const icu4x::Calendar& calendar) { +inline icu4x::diplomat::result, icu4x::Rfc9557ParseError> icu4x::Date::from_string(std::string_view v, const icu4x::Calendar& calendar) { auto result = icu4x::capi::icu4x_Date_from_string_mv1({v.data(), v.size()}, calendar.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::Rfc9557ParseError>(diplomat::Ok>(std::unique_ptr(icu4x::Date::FromFFI(result.ok)))) : diplomat::result, icu4x::Rfc9557ParseError>(diplomat::Err(icu4x::Rfc9557ParseError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::Rfc9557ParseError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::Date::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::Rfc9557ParseError>(icu4x::diplomat::Err(icu4x::Rfc9557ParseError::FromFFI(result.err))); } inline std::unique_ptr icu4x::Date::to_calendar(const icu4x::Calendar& calendar) const { @@ -142,14 +142,14 @@ inline uint8_t icu4x::Date::ordinal_month() const { inline std::string icu4x::Date::month_code() const { std::string output; - diplomat::capi::DiplomatWrite write = diplomat::WriteFromString(output); + icu4x::diplomat::capi::DiplomatWrite write = icu4x::diplomat::WriteFromString(output); icu4x::capi::icu4x_Date_month_code_mv1(this->AsFFI(), &write); return output; } template inline void icu4x::Date::month_code_write(W& writeable) const { - diplomat::capi::DiplomatWrite write = diplomat::WriteTrait::Construct(writeable); + icu4x::diplomat::capi::DiplomatWrite write = icu4x::diplomat::WriteTrait::Construct(writeable); icu4x::capi::icu4x_Date_month_code_mv1(this->AsFFI(), &write); } @@ -176,14 +176,14 @@ inline int32_t icu4x::Date::extended_year() const { inline std::string icu4x::Date::era() const { std::string output; - diplomat::capi::DiplomatWrite write = diplomat::WriteFromString(output); + icu4x::diplomat::capi::DiplomatWrite write = icu4x::diplomat::WriteFromString(output); icu4x::capi::icu4x_Date_era_mv1(this->AsFFI(), &write); return output; } template inline void icu4x::Date::era_write(W& writeable) const { - diplomat::capi::DiplomatWrite write = diplomat::WriteTrait::Construct(writeable); + icu4x::diplomat::capi::DiplomatWrite write = icu4x::diplomat::WriteTrait::Construct(writeable); icu4x::capi::icu4x_Date_era_mv1(this->AsFFI(), &write); } @@ -229,4 +229,4 @@ inline void icu4x::Date::operator delete(void* ptr) { } -#endif // icu4x_Date_HPP +#endif // ICU4X_Date_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/DateFormatter.d.hpp b/ffi/capi/bindings/cpp/icu4x/DateFormatter.d.hpp index 7b495be734b..dbd9719ad34 100644 --- a/ffi/capi/bindings/cpp/icu4x/DateFormatter.d.hpp +++ b/ffi/capi/bindings/cpp/icu4x/DateFormatter.d.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_DateFormatter_D_HPP -#define icu4x_DateFormatter_D_HPP +#ifndef ICU4X_DateFormatter_D_HPP +#define ICU4X_DateFormatter_D_HPP #include #include @@ -9,8 +9,7 @@ #include #include #include -#include "../diplomat_runtime.hpp" - +#include "diplomat_runtime.hpp" namespace icu4x { namespace capi { struct DataProvider; } class DataProvider; @@ -27,7 +26,8 @@ class DateTimeAlignment; class DateTimeFormatterLoadError; class DateTimeLength; class YearStyle; -} +} // namespace icu4x + namespace icu4x { @@ -44,198 +44,198 @@ class DateFormatter { public: /** - * See the [Rust documentation for `try_new`](https://docs.rs/icu/2.0.0/icu/datetime/struct.DateTimeFormatter.html#method.try_new) for more information. - * - * See the [Rust documentation for `D`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.D.html) for more information. - * - * Additional information: [1](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.D.html#method.with_alignment), [2](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.D.html#method.for_length) + * See the [Rust documentation for `try_new`](https://docs.rs/icu/2.0.0/icu/datetime/struct.DateTimeFormatter.html#method.try_new) for more information. + * + * See the [Rust documentation for `D`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.D.html) for more information. + * + * Additional information: [1](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.D.html#method.with_alignment), [2](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.D.html#method.for_length) */ - inline static diplomat::result, icu4x::DateTimeFormatterLoadError> create_d(const icu4x::Locale& locale, std::optional length, std::optional alignment); + inline static icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> create_d(const icu4x::Locale& locale, std::optional length, std::optional alignment); /** - * See the [Rust documentation for `try_new`](https://docs.rs/icu/2.0.0/icu/datetime/struct.DateTimeFormatter.html#method.try_new) for more information. - * - * See the [Rust documentation for `D`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.D.html) for more information. - * - * Additional information: [1](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.D.html#method.with_alignment), [2](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.D.html#method.for_length) + * See the [Rust documentation for `try_new`](https://docs.rs/icu/2.0.0/icu/datetime/struct.DateTimeFormatter.html#method.try_new) for more information. + * + * See the [Rust documentation for `D`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.D.html) for more information. + * + * Additional information: [1](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.D.html#method.with_alignment), [2](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.D.html#method.for_length) */ - inline static diplomat::result, icu4x::DateTimeFormatterLoadError> create_d_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, std::optional length, std::optional alignment); + inline static icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> create_d_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, std::optional length, std::optional alignment); /** - * See the [Rust documentation for `try_new`](https://docs.rs/icu/2.0.0/icu/datetime/struct.DateTimeFormatter.html#method.try_new) for more information. - * - * See the [Rust documentation for `MD`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.MD.html) for more information. - * - * Additional information: [1](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.MD.html#method.with_alignment), [2](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.MD.html#method.for_length) + * See the [Rust documentation for `try_new`](https://docs.rs/icu/2.0.0/icu/datetime/struct.DateTimeFormatter.html#method.try_new) for more information. + * + * See the [Rust documentation for `MD`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.MD.html) for more information. + * + * Additional information: [1](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.MD.html#method.with_alignment), [2](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.MD.html#method.for_length) */ - inline static diplomat::result, icu4x::DateTimeFormatterLoadError> create_md(const icu4x::Locale& locale, std::optional length, std::optional alignment); + inline static icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> create_md(const icu4x::Locale& locale, std::optional length, std::optional alignment); /** - * See the [Rust documentation for `try_new`](https://docs.rs/icu/2.0.0/icu/datetime/struct.DateTimeFormatter.html#method.try_new) for more information. - * - * See the [Rust documentation for `MD`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.MD.html) for more information. - * - * Additional information: [1](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.MD.html#method.with_alignment), [2](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.MD.html#method.for_length) + * See the [Rust documentation for `try_new`](https://docs.rs/icu/2.0.0/icu/datetime/struct.DateTimeFormatter.html#method.try_new) for more information. + * + * See the [Rust documentation for `MD`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.MD.html) for more information. + * + * Additional information: [1](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.MD.html#method.with_alignment), [2](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.MD.html#method.for_length) */ - inline static diplomat::result, icu4x::DateTimeFormatterLoadError> create_md_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, std::optional length, std::optional alignment); + inline static icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> create_md_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, std::optional length, std::optional alignment); /** - * See the [Rust documentation for `try_new`](https://docs.rs/icu/2.0.0/icu/datetime/struct.DateTimeFormatter.html#method.try_new) for more information. - * - * See the [Rust documentation for `YMD`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.YMD.html) for more information. - * - * Additional information: [1](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.YMD.html#method.with_alignment), [2](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.YMD.html#method.with_year_style), [3](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.YMD.html#method.for_length) + * See the [Rust documentation for `try_new`](https://docs.rs/icu/2.0.0/icu/datetime/struct.DateTimeFormatter.html#method.try_new) for more information. + * + * See the [Rust documentation for `YMD`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.YMD.html) for more information. + * + * Additional information: [1](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.YMD.html#method.with_alignment), [2](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.YMD.html#method.with_year_style), [3](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.YMD.html#method.for_length) */ - inline static diplomat::result, icu4x::DateTimeFormatterLoadError> create_ymd(const icu4x::Locale& locale, std::optional length, std::optional alignment, std::optional year_style); + inline static icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> create_ymd(const icu4x::Locale& locale, std::optional length, std::optional alignment, std::optional year_style); /** - * See the [Rust documentation for `try_new`](https://docs.rs/icu/2.0.0/icu/datetime/struct.DateTimeFormatter.html#method.try_new) for more information. - * - * See the [Rust documentation for `YMD`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.YMD.html) for more information. - * - * Additional information: [1](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.YMD.html#method.with_alignment), [2](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.YMD.html#method.with_year_style), [3](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.YMD.html#method.for_length) + * See the [Rust documentation for `try_new`](https://docs.rs/icu/2.0.0/icu/datetime/struct.DateTimeFormatter.html#method.try_new) for more information. + * + * See the [Rust documentation for `YMD`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.YMD.html) for more information. + * + * Additional information: [1](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.YMD.html#method.with_alignment), [2](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.YMD.html#method.with_year_style), [3](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.YMD.html#method.for_length) */ - inline static diplomat::result, icu4x::DateTimeFormatterLoadError> create_ymd_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, std::optional length, std::optional alignment, std::optional year_style); + inline static icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> create_ymd_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, std::optional length, std::optional alignment, std::optional year_style); /** - * See the [Rust documentation for `try_new`](https://docs.rs/icu/2.0.0/icu/datetime/struct.DateTimeFormatter.html#method.try_new) for more information. - * - * See the [Rust documentation for `DE`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.DE.html) for more information. - * - * Additional information: [1](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.DE.html#method.with_alignment), [2](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.DE.html#method.for_length) + * See the [Rust documentation for `try_new`](https://docs.rs/icu/2.0.0/icu/datetime/struct.DateTimeFormatter.html#method.try_new) for more information. + * + * See the [Rust documentation for `DE`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.DE.html) for more information. + * + * Additional information: [1](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.DE.html#method.with_alignment), [2](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.DE.html#method.for_length) */ - inline static diplomat::result, icu4x::DateTimeFormatterLoadError> create_de(const icu4x::Locale& locale, std::optional length, std::optional alignment); + inline static icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> create_de(const icu4x::Locale& locale, std::optional length, std::optional alignment); /** - * See the [Rust documentation for `try_new`](https://docs.rs/icu/2.0.0/icu/datetime/struct.DateTimeFormatter.html#method.try_new) for more information. - * - * See the [Rust documentation for `DE`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.DE.html) for more information. - * - * Additional information: [1](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.DE.html#method.with_alignment), [2](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.DE.html#method.for_length) + * See the [Rust documentation for `try_new`](https://docs.rs/icu/2.0.0/icu/datetime/struct.DateTimeFormatter.html#method.try_new) for more information. + * + * See the [Rust documentation for `DE`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.DE.html) for more information. + * + * Additional information: [1](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.DE.html#method.with_alignment), [2](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.DE.html#method.for_length) */ - inline static diplomat::result, icu4x::DateTimeFormatterLoadError> create_de_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, std::optional length, std::optional alignment); + inline static icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> create_de_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, std::optional length, std::optional alignment); /** - * See the [Rust documentation for `try_new`](https://docs.rs/icu/2.0.0/icu/datetime/struct.DateTimeFormatter.html#method.try_new) for more information. - * - * See the [Rust documentation for `MDE`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.MDE.html) for more information. - * - * Additional information: [1](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.MDE.html#method.with_alignment), [2](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.MDE.html#method.for_length) + * See the [Rust documentation for `try_new`](https://docs.rs/icu/2.0.0/icu/datetime/struct.DateTimeFormatter.html#method.try_new) for more information. + * + * See the [Rust documentation for `MDE`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.MDE.html) for more information. + * + * Additional information: [1](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.MDE.html#method.with_alignment), [2](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.MDE.html#method.for_length) */ - inline static diplomat::result, icu4x::DateTimeFormatterLoadError> create_mde(const icu4x::Locale& locale, std::optional length, std::optional alignment); + inline static icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> create_mde(const icu4x::Locale& locale, std::optional length, std::optional alignment); /** - * See the [Rust documentation for `try_new`](https://docs.rs/icu/2.0.0/icu/datetime/struct.DateTimeFormatter.html#method.try_new) for more information. - * - * See the [Rust documentation for `MDE`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.MDE.html) for more information. - * - * Additional information: [1](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.MDE.html#method.with_alignment), [2](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.MDE.html#method.for_length) + * See the [Rust documentation for `try_new`](https://docs.rs/icu/2.0.0/icu/datetime/struct.DateTimeFormatter.html#method.try_new) for more information. + * + * See the [Rust documentation for `MDE`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.MDE.html) for more information. + * + * Additional information: [1](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.MDE.html#method.with_alignment), [2](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.MDE.html#method.for_length) */ - inline static diplomat::result, icu4x::DateTimeFormatterLoadError> create_mde_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, std::optional length, std::optional alignment); + inline static icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> create_mde_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, std::optional length, std::optional alignment); /** - * See the [Rust documentation for `try_new`](https://docs.rs/icu/2.0.0/icu/datetime/struct.DateTimeFormatter.html#method.try_new) for more information. - * - * See the [Rust documentation for `YMDE`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.YMDE.html) for more information. - * - * Additional information: [1](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.YMDE.html#method.with_alignment), [2](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.YMDE.html#method.with_year_style), [3](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.YMDE.html#method.for_length) + * See the [Rust documentation for `try_new`](https://docs.rs/icu/2.0.0/icu/datetime/struct.DateTimeFormatter.html#method.try_new) for more information. + * + * See the [Rust documentation for `YMDE`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.YMDE.html) for more information. + * + * Additional information: [1](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.YMDE.html#method.with_alignment), [2](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.YMDE.html#method.with_year_style), [3](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.YMDE.html#method.for_length) */ - inline static diplomat::result, icu4x::DateTimeFormatterLoadError> create_ymde(const icu4x::Locale& locale, std::optional length, std::optional alignment, std::optional year_style); + inline static icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> create_ymde(const icu4x::Locale& locale, std::optional length, std::optional alignment, std::optional year_style); /** - * See the [Rust documentation for `try_new`](https://docs.rs/icu/2.0.0/icu/datetime/struct.DateTimeFormatter.html#method.try_new) for more information. - * - * See the [Rust documentation for `YMDE`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.YMDE.html) for more information. - * - * Additional information: [1](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.YMDE.html#method.with_alignment), [2](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.YMDE.html#method.with_year_style), [3](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.YMDE.html#method.for_length) + * See the [Rust documentation for `try_new`](https://docs.rs/icu/2.0.0/icu/datetime/struct.DateTimeFormatter.html#method.try_new) for more information. + * + * See the [Rust documentation for `YMDE`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.YMDE.html) for more information. + * + * Additional information: [1](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.YMDE.html#method.with_alignment), [2](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.YMDE.html#method.with_year_style), [3](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.YMDE.html#method.for_length) */ - inline static diplomat::result, icu4x::DateTimeFormatterLoadError> create_ymde_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, std::optional length, std::optional alignment, std::optional year_style); + inline static icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> create_ymde_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, std::optional length, std::optional alignment, std::optional year_style); /** - * See the [Rust documentation for `try_new`](https://docs.rs/icu/2.0.0/icu/datetime/struct.DateTimeFormatter.html#method.try_new) for more information. - * - * See the [Rust documentation for `E`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.E.html) for more information. - * - * Additional information: [1](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.E.html#method.for_length) + * See the [Rust documentation for `try_new`](https://docs.rs/icu/2.0.0/icu/datetime/struct.DateTimeFormatter.html#method.try_new) for more information. + * + * See the [Rust documentation for `E`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.E.html) for more information. + * + * Additional information: [1](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.E.html#method.for_length) */ - inline static diplomat::result, icu4x::DateTimeFormatterLoadError> create_e(const icu4x::Locale& locale, std::optional length); + inline static icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> create_e(const icu4x::Locale& locale, std::optional length); /** - * See the [Rust documentation for `try_new`](https://docs.rs/icu/2.0.0/icu/datetime/struct.DateTimeFormatter.html#method.try_new) for more information. - * - * See the [Rust documentation for `E`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.E.html) for more information. - * - * Additional information: [1](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.E.html#method.for_length) + * See the [Rust documentation for `try_new`](https://docs.rs/icu/2.0.0/icu/datetime/struct.DateTimeFormatter.html#method.try_new) for more information. + * + * See the [Rust documentation for `E`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.E.html) for more information. + * + * Additional information: [1](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.E.html#method.for_length) */ - inline static diplomat::result, icu4x::DateTimeFormatterLoadError> create_e_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, std::optional length); + inline static icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> create_e_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, std::optional length); /** - * See the [Rust documentation for `try_new`](https://docs.rs/icu/2.0.0/icu/datetime/struct.DateTimeFormatter.html#method.try_new) for more information. - * - * See the [Rust documentation for `M`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.M.html) for more information. - * - * Additional information: [1](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.M.html#method.with_alignment), [2](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.M.html#method.for_length) + * See the [Rust documentation for `try_new`](https://docs.rs/icu/2.0.0/icu/datetime/struct.DateTimeFormatter.html#method.try_new) for more information. + * + * See the [Rust documentation for `M`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.M.html) for more information. + * + * Additional information: [1](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.M.html#method.with_alignment), [2](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.M.html#method.for_length) */ - inline static diplomat::result, icu4x::DateTimeFormatterLoadError> create_m(const icu4x::Locale& locale, std::optional length, std::optional alignment); + inline static icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> create_m(const icu4x::Locale& locale, std::optional length, std::optional alignment); /** - * See the [Rust documentation for `try_new`](https://docs.rs/icu/2.0.0/icu/datetime/struct.DateTimeFormatter.html#method.try_new) for more information. - * - * See the [Rust documentation for `M`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.M.html) for more information. - * - * Additional information: [1](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.M.html#method.with_alignment), [2](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.M.html#method.for_length) + * See the [Rust documentation for `try_new`](https://docs.rs/icu/2.0.0/icu/datetime/struct.DateTimeFormatter.html#method.try_new) for more information. + * + * See the [Rust documentation for `M`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.M.html) for more information. + * + * Additional information: [1](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.M.html#method.with_alignment), [2](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.M.html#method.for_length) */ - inline static diplomat::result, icu4x::DateTimeFormatterLoadError> create_m_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, std::optional length, std::optional alignment); + inline static icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> create_m_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, std::optional length, std::optional alignment); /** - * See the [Rust documentation for `try_new`](https://docs.rs/icu/2.0.0/icu/datetime/struct.DateTimeFormatter.html#method.try_new) for more information. - * - * See the [Rust documentation for `YM`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.YM.html) for more information. - * - * Additional information: [1](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.YM.html#method.with_alignment), [2](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.YM.html#method.with_year_style), [3](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.YM.html#method.for_length) + * See the [Rust documentation for `try_new`](https://docs.rs/icu/2.0.0/icu/datetime/struct.DateTimeFormatter.html#method.try_new) for more information. + * + * See the [Rust documentation for `YM`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.YM.html) for more information. + * + * Additional information: [1](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.YM.html#method.with_alignment), [2](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.YM.html#method.with_year_style), [3](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.YM.html#method.for_length) */ - inline static diplomat::result, icu4x::DateTimeFormatterLoadError> create_ym(const icu4x::Locale& locale, std::optional length, std::optional alignment, std::optional year_style); + inline static icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> create_ym(const icu4x::Locale& locale, std::optional length, std::optional alignment, std::optional year_style); /** - * See the [Rust documentation for `try_new`](https://docs.rs/icu/2.0.0/icu/datetime/struct.DateTimeFormatter.html#method.try_new) for more information. - * - * See the [Rust documentation for `YM`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.YM.html) for more information. - * - * Additional information: [1](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.YM.html#method.with_alignment), [2](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.YM.html#method.with_year_style), [3](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.YM.html#method.for_length) + * See the [Rust documentation for `try_new`](https://docs.rs/icu/2.0.0/icu/datetime/struct.DateTimeFormatter.html#method.try_new) for more information. + * + * See the [Rust documentation for `YM`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.YM.html) for more information. + * + * Additional information: [1](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.YM.html#method.with_alignment), [2](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.YM.html#method.with_year_style), [3](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.YM.html#method.for_length) */ - inline static diplomat::result, icu4x::DateTimeFormatterLoadError> create_ym_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, std::optional length, std::optional alignment, std::optional year_style); + inline static icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> create_ym_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, std::optional length, std::optional alignment, std::optional year_style); /** - * See the [Rust documentation for `try_new`](https://docs.rs/icu/2.0.0/icu/datetime/struct.DateTimeFormatter.html#method.try_new) for more information. - * - * See the [Rust documentation for `Y`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.Y.html) for more information. - * - * Additional information: [1](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.Y.html#method.with_alignment), [2](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.Y.html#method.with_year_style), [3](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.Y.html#method.for_length) + * See the [Rust documentation for `try_new`](https://docs.rs/icu/2.0.0/icu/datetime/struct.DateTimeFormatter.html#method.try_new) for more information. + * + * See the [Rust documentation for `Y`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.Y.html) for more information. + * + * Additional information: [1](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.Y.html#method.with_alignment), [2](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.Y.html#method.with_year_style), [3](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.Y.html#method.for_length) */ - inline static diplomat::result, icu4x::DateTimeFormatterLoadError> create_y(const icu4x::Locale& locale, std::optional length, std::optional alignment, std::optional year_style); + inline static icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> create_y(const icu4x::Locale& locale, std::optional length, std::optional alignment, std::optional year_style); /** - * See the [Rust documentation for `try_new`](https://docs.rs/icu/2.0.0/icu/datetime/struct.DateTimeFormatter.html#method.try_new) for more information. - * - * See the [Rust documentation for `Y`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.Y.html) for more information. - * - * Additional information: [1](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.Y.html#method.with_alignment), [2](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.Y.html#method.with_year_style), [3](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.Y.html#method.for_length) + * See the [Rust documentation for `try_new`](https://docs.rs/icu/2.0.0/icu/datetime/struct.DateTimeFormatter.html#method.try_new) for more information. + * + * See the [Rust documentation for `Y`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.Y.html) for more information. + * + * Additional information: [1](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.Y.html#method.with_alignment), [2](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.Y.html#method.with_year_style), [3](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.Y.html#method.for_length) */ - inline static diplomat::result, icu4x::DateTimeFormatterLoadError> create_y_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, std::optional length, std::optional alignment, std::optional year_style); + inline static icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> create_y_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, std::optional length, std::optional alignment, std::optional year_style); /** - * See the [Rust documentation for `format`](https://docs.rs/icu/2.0.0/icu/datetime/struct.DateTimeFormatter.html#method.format) for more information. + * See the [Rust documentation for `format`](https://docs.rs/icu/2.0.0/icu/datetime/struct.DateTimeFormatter.html#method.format) for more information. */ inline std::string format_iso(const icu4x::IsoDate& iso_date) const; template inline void format_iso_write(const icu4x::IsoDate& iso_date, W& writeable_output) const; /** - * See the [Rust documentation for `format_same_calendar`](https://docs.rs/icu/2.0.0/icu/datetime/struct.DateTimeFormatter.html#method.format_same_calendar) for more information. + * See the [Rust documentation for `format_same_calendar`](https://docs.rs/icu/2.0.0/icu/datetime/struct.DateTimeFormatter.html#method.format_same_calendar) for more information. */ - inline diplomat::result format_same_calendar(const icu4x::Date& date) const; + inline icu4x::diplomat::result format_same_calendar(const icu4x::Date& date) const; template - inline diplomat::result format_same_calendar_write(const icu4x::Date& date, W& writeable_output) const; + inline icu4x::diplomat::result format_same_calendar_write(const icu4x::Date& date, W& writeable_output) const; inline const icu4x::capi::DateFormatter* AsFFI() const; inline icu4x::capi::DateFormatter* AsFFI(); @@ -252,4 +252,4 @@ class DateFormatter { }; } // namespace -#endif // icu4x_DateFormatter_D_HPP +#endif // ICU4X_DateFormatter_D_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/DateFormatter.hpp b/ffi/capi/bindings/cpp/icu4x/DateFormatter.hpp index 7e795d6fe64..f49bc541eea 100644 --- a/ffi/capi/bindings/cpp/icu4x/DateFormatter.hpp +++ b/ffi/capi/bindings/cpp/icu4x/DateFormatter.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_DateFormatter_HPP -#define icu4x_DateFormatter_HPP +#ifndef ICU4X_DateFormatter_HPP +#define ICU4X_DateFormatter_HPP #include "DateFormatter.d.hpp" @@ -11,7 +11,6 @@ #include #include #include -#include "../diplomat_runtime.hpp" #include "DataProvider.hpp" #include "Date.hpp" #include "DateTimeAlignment.hpp" @@ -21,6 +20,7 @@ #include "IsoDate.hpp" #include "Locale.hpp" #include "YearStyle.hpp" +#include "diplomat_runtime.hpp" namespace icu4x { @@ -87,10 +87,10 @@ namespace capi { typedef struct icu4x_DateFormatter_create_y_with_provider_mv1_result {union {icu4x::capi::DateFormatter* ok; icu4x::capi::DateTimeFormatterLoadError err;}; bool is_ok;} icu4x_DateFormatter_create_y_with_provider_mv1_result; icu4x_DateFormatter_create_y_with_provider_mv1_result icu4x_DateFormatter_create_y_with_provider_mv1(const icu4x::capi::DataProvider* provider, const icu4x::capi::Locale* locale, icu4x::capi::DateTimeLength_option length, icu4x::capi::DateTimeAlignment_option alignment, icu4x::capi::YearStyle_option year_style); - void icu4x_DateFormatter_format_iso_mv1(const icu4x::capi::DateFormatter* self, const icu4x::capi::IsoDate* iso_date, diplomat::capi::DiplomatWrite* write); + void icu4x_DateFormatter_format_iso_mv1(const icu4x::capi::DateFormatter* self, const icu4x::capi::IsoDate* iso_date, icu4x::diplomat::capi::DiplomatWrite* write); typedef struct icu4x_DateFormatter_format_same_calendar_mv1_result {union { icu4x::capi::DateTimeMismatchedCalendarError err;}; bool is_ok;} icu4x_DateFormatter_format_same_calendar_mv1_result; - icu4x_DateFormatter_format_same_calendar_mv1_result icu4x_DateFormatter_format_same_calendar_mv1(const icu4x::capi::DateFormatter* self, const icu4x::capi::Date* date, diplomat::capi::DiplomatWrite* write); + icu4x_DateFormatter_format_same_calendar_mv1_result icu4x_DateFormatter_format_same_calendar_mv1(const icu4x::capi::DateFormatter* self, const icu4x::capi::Date* date, icu4x::diplomat::capi::DiplomatWrite* write); void icu4x_DateFormatter_destroy_mv1(DateFormatter* self); @@ -98,165 +98,165 @@ namespace capi { } // namespace capi } // namespace -inline diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::DateFormatter::create_d(const icu4x::Locale& locale, std::optional length, std::optional alignment) { +inline icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::DateFormatter::create_d(const icu4x::Locale& locale, std::optional length, std::optional alignment) { auto result = icu4x::capi::icu4x_DateFormatter_create_d_mv1(locale.AsFFI(), length.has_value() ? (icu4x::capi::DateTimeLength_option{ { length.value().AsFFI() }, true }) : (icu4x::capi::DateTimeLength_option{ {}, false }), alignment.has_value() ? (icu4x::capi::DateTimeAlignment_option{ { alignment.value().AsFFI() }, true }) : (icu4x::capi::DateTimeAlignment_option{ {}, false })); - return result.is_ok ? diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Ok>(std::unique_ptr(icu4x::DateFormatter::FromFFI(result.ok)))) : diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::DateFormatter::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); } -inline diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::DateFormatter::create_d_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, std::optional length, std::optional alignment) { +inline icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::DateFormatter::create_d_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, std::optional length, std::optional alignment) { auto result = icu4x::capi::icu4x_DateFormatter_create_d_with_provider_mv1(provider.AsFFI(), locale.AsFFI(), length.has_value() ? (icu4x::capi::DateTimeLength_option{ { length.value().AsFFI() }, true }) : (icu4x::capi::DateTimeLength_option{ {}, false }), alignment.has_value() ? (icu4x::capi::DateTimeAlignment_option{ { alignment.value().AsFFI() }, true }) : (icu4x::capi::DateTimeAlignment_option{ {}, false })); - return result.is_ok ? diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Ok>(std::unique_ptr(icu4x::DateFormatter::FromFFI(result.ok)))) : diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::DateFormatter::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); } -inline diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::DateFormatter::create_md(const icu4x::Locale& locale, std::optional length, std::optional alignment) { +inline icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::DateFormatter::create_md(const icu4x::Locale& locale, std::optional length, std::optional alignment) { auto result = icu4x::capi::icu4x_DateFormatter_create_md_mv1(locale.AsFFI(), length.has_value() ? (icu4x::capi::DateTimeLength_option{ { length.value().AsFFI() }, true }) : (icu4x::capi::DateTimeLength_option{ {}, false }), alignment.has_value() ? (icu4x::capi::DateTimeAlignment_option{ { alignment.value().AsFFI() }, true }) : (icu4x::capi::DateTimeAlignment_option{ {}, false })); - return result.is_ok ? diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Ok>(std::unique_ptr(icu4x::DateFormatter::FromFFI(result.ok)))) : diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::DateFormatter::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); } -inline diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::DateFormatter::create_md_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, std::optional length, std::optional alignment) { +inline icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::DateFormatter::create_md_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, std::optional length, std::optional alignment) { auto result = icu4x::capi::icu4x_DateFormatter_create_md_with_provider_mv1(provider.AsFFI(), locale.AsFFI(), length.has_value() ? (icu4x::capi::DateTimeLength_option{ { length.value().AsFFI() }, true }) : (icu4x::capi::DateTimeLength_option{ {}, false }), alignment.has_value() ? (icu4x::capi::DateTimeAlignment_option{ { alignment.value().AsFFI() }, true }) : (icu4x::capi::DateTimeAlignment_option{ {}, false })); - return result.is_ok ? diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Ok>(std::unique_ptr(icu4x::DateFormatter::FromFFI(result.ok)))) : diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::DateFormatter::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); } -inline diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::DateFormatter::create_ymd(const icu4x::Locale& locale, std::optional length, std::optional alignment, std::optional year_style) { +inline icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::DateFormatter::create_ymd(const icu4x::Locale& locale, std::optional length, std::optional alignment, std::optional year_style) { auto result = icu4x::capi::icu4x_DateFormatter_create_ymd_mv1(locale.AsFFI(), length.has_value() ? (icu4x::capi::DateTimeLength_option{ { length.value().AsFFI() }, true }) : (icu4x::capi::DateTimeLength_option{ {}, false }), alignment.has_value() ? (icu4x::capi::DateTimeAlignment_option{ { alignment.value().AsFFI() }, true }) : (icu4x::capi::DateTimeAlignment_option{ {}, false }), year_style.has_value() ? (icu4x::capi::YearStyle_option{ { year_style.value().AsFFI() }, true }) : (icu4x::capi::YearStyle_option{ {}, false })); - return result.is_ok ? diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Ok>(std::unique_ptr(icu4x::DateFormatter::FromFFI(result.ok)))) : diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::DateFormatter::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); } -inline diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::DateFormatter::create_ymd_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, std::optional length, std::optional alignment, std::optional year_style) { +inline icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::DateFormatter::create_ymd_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, std::optional length, std::optional alignment, std::optional year_style) { auto result = icu4x::capi::icu4x_DateFormatter_create_ymd_with_provider_mv1(provider.AsFFI(), locale.AsFFI(), length.has_value() ? (icu4x::capi::DateTimeLength_option{ { length.value().AsFFI() }, true }) : (icu4x::capi::DateTimeLength_option{ {}, false }), alignment.has_value() ? (icu4x::capi::DateTimeAlignment_option{ { alignment.value().AsFFI() }, true }) : (icu4x::capi::DateTimeAlignment_option{ {}, false }), year_style.has_value() ? (icu4x::capi::YearStyle_option{ { year_style.value().AsFFI() }, true }) : (icu4x::capi::YearStyle_option{ {}, false })); - return result.is_ok ? diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Ok>(std::unique_ptr(icu4x::DateFormatter::FromFFI(result.ok)))) : diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::DateFormatter::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); } -inline diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::DateFormatter::create_de(const icu4x::Locale& locale, std::optional length, std::optional alignment) { +inline icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::DateFormatter::create_de(const icu4x::Locale& locale, std::optional length, std::optional alignment) { auto result = icu4x::capi::icu4x_DateFormatter_create_de_mv1(locale.AsFFI(), length.has_value() ? (icu4x::capi::DateTimeLength_option{ { length.value().AsFFI() }, true }) : (icu4x::capi::DateTimeLength_option{ {}, false }), alignment.has_value() ? (icu4x::capi::DateTimeAlignment_option{ { alignment.value().AsFFI() }, true }) : (icu4x::capi::DateTimeAlignment_option{ {}, false })); - return result.is_ok ? diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Ok>(std::unique_ptr(icu4x::DateFormatter::FromFFI(result.ok)))) : diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::DateFormatter::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); } -inline diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::DateFormatter::create_de_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, std::optional length, std::optional alignment) { +inline icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::DateFormatter::create_de_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, std::optional length, std::optional alignment) { auto result = icu4x::capi::icu4x_DateFormatter_create_de_with_provider_mv1(provider.AsFFI(), locale.AsFFI(), length.has_value() ? (icu4x::capi::DateTimeLength_option{ { length.value().AsFFI() }, true }) : (icu4x::capi::DateTimeLength_option{ {}, false }), alignment.has_value() ? (icu4x::capi::DateTimeAlignment_option{ { alignment.value().AsFFI() }, true }) : (icu4x::capi::DateTimeAlignment_option{ {}, false })); - return result.is_ok ? diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Ok>(std::unique_ptr(icu4x::DateFormatter::FromFFI(result.ok)))) : diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::DateFormatter::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); } -inline diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::DateFormatter::create_mde(const icu4x::Locale& locale, std::optional length, std::optional alignment) { +inline icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::DateFormatter::create_mde(const icu4x::Locale& locale, std::optional length, std::optional alignment) { auto result = icu4x::capi::icu4x_DateFormatter_create_mde_mv1(locale.AsFFI(), length.has_value() ? (icu4x::capi::DateTimeLength_option{ { length.value().AsFFI() }, true }) : (icu4x::capi::DateTimeLength_option{ {}, false }), alignment.has_value() ? (icu4x::capi::DateTimeAlignment_option{ { alignment.value().AsFFI() }, true }) : (icu4x::capi::DateTimeAlignment_option{ {}, false })); - return result.is_ok ? diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Ok>(std::unique_ptr(icu4x::DateFormatter::FromFFI(result.ok)))) : diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::DateFormatter::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); } -inline diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::DateFormatter::create_mde_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, std::optional length, std::optional alignment) { +inline icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::DateFormatter::create_mde_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, std::optional length, std::optional alignment) { auto result = icu4x::capi::icu4x_DateFormatter_create_mde_with_provider_mv1(provider.AsFFI(), locale.AsFFI(), length.has_value() ? (icu4x::capi::DateTimeLength_option{ { length.value().AsFFI() }, true }) : (icu4x::capi::DateTimeLength_option{ {}, false }), alignment.has_value() ? (icu4x::capi::DateTimeAlignment_option{ { alignment.value().AsFFI() }, true }) : (icu4x::capi::DateTimeAlignment_option{ {}, false })); - return result.is_ok ? diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Ok>(std::unique_ptr(icu4x::DateFormatter::FromFFI(result.ok)))) : diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::DateFormatter::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); } -inline diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::DateFormatter::create_ymde(const icu4x::Locale& locale, std::optional length, std::optional alignment, std::optional year_style) { +inline icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::DateFormatter::create_ymde(const icu4x::Locale& locale, std::optional length, std::optional alignment, std::optional year_style) { auto result = icu4x::capi::icu4x_DateFormatter_create_ymde_mv1(locale.AsFFI(), length.has_value() ? (icu4x::capi::DateTimeLength_option{ { length.value().AsFFI() }, true }) : (icu4x::capi::DateTimeLength_option{ {}, false }), alignment.has_value() ? (icu4x::capi::DateTimeAlignment_option{ { alignment.value().AsFFI() }, true }) : (icu4x::capi::DateTimeAlignment_option{ {}, false }), year_style.has_value() ? (icu4x::capi::YearStyle_option{ { year_style.value().AsFFI() }, true }) : (icu4x::capi::YearStyle_option{ {}, false })); - return result.is_ok ? diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Ok>(std::unique_ptr(icu4x::DateFormatter::FromFFI(result.ok)))) : diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::DateFormatter::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); } -inline diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::DateFormatter::create_ymde_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, std::optional length, std::optional alignment, std::optional year_style) { +inline icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::DateFormatter::create_ymde_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, std::optional length, std::optional alignment, std::optional year_style) { auto result = icu4x::capi::icu4x_DateFormatter_create_ymde_with_provider_mv1(provider.AsFFI(), locale.AsFFI(), length.has_value() ? (icu4x::capi::DateTimeLength_option{ { length.value().AsFFI() }, true }) : (icu4x::capi::DateTimeLength_option{ {}, false }), alignment.has_value() ? (icu4x::capi::DateTimeAlignment_option{ { alignment.value().AsFFI() }, true }) : (icu4x::capi::DateTimeAlignment_option{ {}, false }), year_style.has_value() ? (icu4x::capi::YearStyle_option{ { year_style.value().AsFFI() }, true }) : (icu4x::capi::YearStyle_option{ {}, false })); - return result.is_ok ? diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Ok>(std::unique_ptr(icu4x::DateFormatter::FromFFI(result.ok)))) : diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::DateFormatter::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); } -inline diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::DateFormatter::create_e(const icu4x::Locale& locale, std::optional length) { +inline icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::DateFormatter::create_e(const icu4x::Locale& locale, std::optional length) { auto result = icu4x::capi::icu4x_DateFormatter_create_e_mv1(locale.AsFFI(), length.has_value() ? (icu4x::capi::DateTimeLength_option{ { length.value().AsFFI() }, true }) : (icu4x::capi::DateTimeLength_option{ {}, false })); - return result.is_ok ? diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Ok>(std::unique_ptr(icu4x::DateFormatter::FromFFI(result.ok)))) : diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::DateFormatter::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); } -inline diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::DateFormatter::create_e_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, std::optional length) { +inline icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::DateFormatter::create_e_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, std::optional length) { auto result = icu4x::capi::icu4x_DateFormatter_create_e_with_provider_mv1(provider.AsFFI(), locale.AsFFI(), length.has_value() ? (icu4x::capi::DateTimeLength_option{ { length.value().AsFFI() }, true }) : (icu4x::capi::DateTimeLength_option{ {}, false })); - return result.is_ok ? diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Ok>(std::unique_ptr(icu4x::DateFormatter::FromFFI(result.ok)))) : diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::DateFormatter::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); } -inline diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::DateFormatter::create_m(const icu4x::Locale& locale, std::optional length, std::optional alignment) { +inline icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::DateFormatter::create_m(const icu4x::Locale& locale, std::optional length, std::optional alignment) { auto result = icu4x::capi::icu4x_DateFormatter_create_m_mv1(locale.AsFFI(), length.has_value() ? (icu4x::capi::DateTimeLength_option{ { length.value().AsFFI() }, true }) : (icu4x::capi::DateTimeLength_option{ {}, false }), alignment.has_value() ? (icu4x::capi::DateTimeAlignment_option{ { alignment.value().AsFFI() }, true }) : (icu4x::capi::DateTimeAlignment_option{ {}, false })); - return result.is_ok ? diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Ok>(std::unique_ptr(icu4x::DateFormatter::FromFFI(result.ok)))) : diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::DateFormatter::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); } -inline diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::DateFormatter::create_m_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, std::optional length, std::optional alignment) { +inline icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::DateFormatter::create_m_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, std::optional length, std::optional alignment) { auto result = icu4x::capi::icu4x_DateFormatter_create_m_with_provider_mv1(provider.AsFFI(), locale.AsFFI(), length.has_value() ? (icu4x::capi::DateTimeLength_option{ { length.value().AsFFI() }, true }) : (icu4x::capi::DateTimeLength_option{ {}, false }), alignment.has_value() ? (icu4x::capi::DateTimeAlignment_option{ { alignment.value().AsFFI() }, true }) : (icu4x::capi::DateTimeAlignment_option{ {}, false })); - return result.is_ok ? diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Ok>(std::unique_ptr(icu4x::DateFormatter::FromFFI(result.ok)))) : diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::DateFormatter::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); } -inline diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::DateFormatter::create_ym(const icu4x::Locale& locale, std::optional length, std::optional alignment, std::optional year_style) { +inline icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::DateFormatter::create_ym(const icu4x::Locale& locale, std::optional length, std::optional alignment, std::optional year_style) { auto result = icu4x::capi::icu4x_DateFormatter_create_ym_mv1(locale.AsFFI(), length.has_value() ? (icu4x::capi::DateTimeLength_option{ { length.value().AsFFI() }, true }) : (icu4x::capi::DateTimeLength_option{ {}, false }), alignment.has_value() ? (icu4x::capi::DateTimeAlignment_option{ { alignment.value().AsFFI() }, true }) : (icu4x::capi::DateTimeAlignment_option{ {}, false }), year_style.has_value() ? (icu4x::capi::YearStyle_option{ { year_style.value().AsFFI() }, true }) : (icu4x::capi::YearStyle_option{ {}, false })); - return result.is_ok ? diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Ok>(std::unique_ptr(icu4x::DateFormatter::FromFFI(result.ok)))) : diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::DateFormatter::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); } -inline diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::DateFormatter::create_ym_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, std::optional length, std::optional alignment, std::optional year_style) { +inline icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::DateFormatter::create_ym_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, std::optional length, std::optional alignment, std::optional year_style) { auto result = icu4x::capi::icu4x_DateFormatter_create_ym_with_provider_mv1(provider.AsFFI(), locale.AsFFI(), length.has_value() ? (icu4x::capi::DateTimeLength_option{ { length.value().AsFFI() }, true }) : (icu4x::capi::DateTimeLength_option{ {}, false }), alignment.has_value() ? (icu4x::capi::DateTimeAlignment_option{ { alignment.value().AsFFI() }, true }) : (icu4x::capi::DateTimeAlignment_option{ {}, false }), year_style.has_value() ? (icu4x::capi::YearStyle_option{ { year_style.value().AsFFI() }, true }) : (icu4x::capi::YearStyle_option{ {}, false })); - return result.is_ok ? diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Ok>(std::unique_ptr(icu4x::DateFormatter::FromFFI(result.ok)))) : diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::DateFormatter::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); } -inline diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::DateFormatter::create_y(const icu4x::Locale& locale, std::optional length, std::optional alignment, std::optional year_style) { +inline icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::DateFormatter::create_y(const icu4x::Locale& locale, std::optional length, std::optional alignment, std::optional year_style) { auto result = icu4x::capi::icu4x_DateFormatter_create_y_mv1(locale.AsFFI(), length.has_value() ? (icu4x::capi::DateTimeLength_option{ { length.value().AsFFI() }, true }) : (icu4x::capi::DateTimeLength_option{ {}, false }), alignment.has_value() ? (icu4x::capi::DateTimeAlignment_option{ { alignment.value().AsFFI() }, true }) : (icu4x::capi::DateTimeAlignment_option{ {}, false }), year_style.has_value() ? (icu4x::capi::YearStyle_option{ { year_style.value().AsFFI() }, true }) : (icu4x::capi::YearStyle_option{ {}, false })); - return result.is_ok ? diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Ok>(std::unique_ptr(icu4x::DateFormatter::FromFFI(result.ok)))) : diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::DateFormatter::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); } -inline diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::DateFormatter::create_y_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, std::optional length, std::optional alignment, std::optional year_style) { +inline icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::DateFormatter::create_y_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, std::optional length, std::optional alignment, std::optional year_style) { auto result = icu4x::capi::icu4x_DateFormatter_create_y_with_provider_mv1(provider.AsFFI(), locale.AsFFI(), length.has_value() ? (icu4x::capi::DateTimeLength_option{ { length.value().AsFFI() }, true }) : (icu4x::capi::DateTimeLength_option{ {}, false }), alignment.has_value() ? (icu4x::capi::DateTimeAlignment_option{ { alignment.value().AsFFI() }, true }) : (icu4x::capi::DateTimeAlignment_option{ {}, false }), year_style.has_value() ? (icu4x::capi::YearStyle_option{ { year_style.value().AsFFI() }, true }) : (icu4x::capi::YearStyle_option{ {}, false })); - return result.is_ok ? diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Ok>(std::unique_ptr(icu4x::DateFormatter::FromFFI(result.ok)))) : diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::DateFormatter::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); } inline std::string icu4x::DateFormatter::format_iso(const icu4x::IsoDate& iso_date) const { std::string output; - diplomat::capi::DiplomatWrite write = diplomat::WriteFromString(output); + icu4x::diplomat::capi::DiplomatWrite write = icu4x::diplomat::WriteFromString(output); icu4x::capi::icu4x_DateFormatter_format_iso_mv1(this->AsFFI(), iso_date.AsFFI(), &write); @@ -264,27 +264,27 @@ inline std::string icu4x::DateFormatter::format_iso(const icu4x::IsoDate& iso_da } template inline void icu4x::DateFormatter::format_iso_write(const icu4x::IsoDate& iso_date, W& writeable) const { - diplomat::capi::DiplomatWrite write = diplomat::WriteTrait::Construct(writeable); + icu4x::diplomat::capi::DiplomatWrite write = icu4x::diplomat::WriteTrait::Construct(writeable); icu4x::capi::icu4x_DateFormatter_format_iso_mv1(this->AsFFI(), iso_date.AsFFI(), &write); } -inline diplomat::result icu4x::DateFormatter::format_same_calendar(const icu4x::Date& date) const { +inline icu4x::diplomat::result icu4x::DateFormatter::format_same_calendar(const icu4x::Date& date) const { std::string output; - diplomat::capi::DiplomatWrite write = diplomat::WriteFromString(output); + icu4x::diplomat::capi::DiplomatWrite write = icu4x::diplomat::WriteFromString(output); auto result = icu4x::capi::icu4x_DateFormatter_format_same_calendar_mv1(this->AsFFI(), date.AsFFI(), &write); - return result.is_ok ? diplomat::result(diplomat::Ok(std::move(output))) : diplomat::result(diplomat::Err(icu4x::DateTimeMismatchedCalendarError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result(icu4x::diplomat::Ok(std::move(output))) : icu4x::diplomat::result(icu4x::diplomat::Err(icu4x::DateTimeMismatchedCalendarError::FromFFI(result.err))); } template -inline diplomat::result icu4x::DateFormatter::format_same_calendar_write(const icu4x::Date& date, W& writeable) const { - diplomat::capi::DiplomatWrite write = diplomat::WriteTrait::Construct(writeable); +inline icu4x::diplomat::result icu4x::DateFormatter::format_same_calendar_write(const icu4x::Date& date, W& writeable) const { + icu4x::diplomat::capi::DiplomatWrite write = icu4x::diplomat::WriteTrait::Construct(writeable); auto result = icu4x::capi::icu4x_DateFormatter_format_same_calendar_mv1(this->AsFFI(), date.AsFFI(), &write); - return result.is_ok ? diplomat::result(diplomat::Ok()) : diplomat::result(diplomat::Err(icu4x::DateTimeMismatchedCalendarError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result(icu4x::diplomat::Ok()) : icu4x::diplomat::result(icu4x::diplomat::Err(icu4x::DateTimeMismatchedCalendarError::FromFFI(result.err))); } inline const icu4x::capi::DateFormatter* icu4x::DateFormatter::AsFFI() const { @@ -308,4 +308,4 @@ inline void icu4x::DateFormatter::operator delete(void* ptr) { } -#endif // icu4x_DateFormatter_HPP +#endif // ICU4X_DateFormatter_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/DateFormatterGregorian.d.hpp b/ffi/capi/bindings/cpp/icu4x/DateFormatterGregorian.d.hpp index ff9bde44a32..221c1aba82c 100644 --- a/ffi/capi/bindings/cpp/icu4x/DateFormatterGregorian.d.hpp +++ b/ffi/capi/bindings/cpp/icu4x/DateFormatterGregorian.d.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_DateFormatterGregorian_D_HPP -#define icu4x_DateFormatterGregorian_D_HPP +#ifndef ICU4X_DateFormatterGregorian_D_HPP +#define ICU4X_DateFormatterGregorian_D_HPP #include #include @@ -9,8 +9,7 @@ #include #include #include -#include "../diplomat_runtime.hpp" - +#include "diplomat_runtime.hpp" namespace icu4x { namespace capi { struct DataProvider; } class DataProvider; @@ -24,7 +23,8 @@ class DateTimeAlignment; class DateTimeFormatterLoadError; class DateTimeLength; class YearStyle; -} +} // namespace icu4x + namespace icu4x { @@ -41,187 +41,187 @@ class DateFormatterGregorian { public: /** - * See the [Rust documentation for `try_new`](https://docs.rs/icu/2.0.0/icu/datetime/struct.FixedCalendarDateTimeFormatter.html#method.try_new) for more information. - * - * See the [Rust documentation for `D`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.D.html) for more information. - * - * Additional information: [1](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.D.html#method.with_alignment), [2](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.D.html#method.for_length) + * See the [Rust documentation for `try_new`](https://docs.rs/icu/2.0.0/icu/datetime/struct.FixedCalendarDateTimeFormatter.html#method.try_new) for more information. + * + * See the [Rust documentation for `D`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.D.html) for more information. + * + * Additional information: [1](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.D.html#method.with_alignment), [2](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.D.html#method.for_length) */ - inline static diplomat::result, icu4x::DateTimeFormatterLoadError> create_d(const icu4x::Locale& locale, std::optional length, std::optional alignment); + inline static icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> create_d(const icu4x::Locale& locale, std::optional length, std::optional alignment); /** - * See the [Rust documentation for `try_new`](https://docs.rs/icu/2.0.0/icu/datetime/struct.FixedCalendarDateTimeFormatter.html#method.try_new) for more information. - * - * See the [Rust documentation for `D`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.D.html) for more information. - * - * Additional information: [1](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.D.html#method.with_alignment), [2](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.D.html#method.for_length) + * See the [Rust documentation for `try_new`](https://docs.rs/icu/2.0.0/icu/datetime/struct.FixedCalendarDateTimeFormatter.html#method.try_new) for more information. + * + * See the [Rust documentation for `D`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.D.html) for more information. + * + * Additional information: [1](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.D.html#method.with_alignment), [2](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.D.html#method.for_length) */ - inline static diplomat::result, icu4x::DateTimeFormatterLoadError> create_d_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, std::optional length, std::optional alignment); + inline static icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> create_d_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, std::optional length, std::optional alignment); /** - * See the [Rust documentation for `try_new`](https://docs.rs/icu/2.0.0/icu/datetime/struct.FixedCalendarDateTimeFormatter.html#method.try_new) for more information. - * - * See the [Rust documentation for `MD`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.MD.html) for more information. - * - * Additional information: [1](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.MD.html#method.with_alignment), [2](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.MD.html#method.for_length) + * See the [Rust documentation for `try_new`](https://docs.rs/icu/2.0.0/icu/datetime/struct.FixedCalendarDateTimeFormatter.html#method.try_new) for more information. + * + * See the [Rust documentation for `MD`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.MD.html) for more information. + * + * Additional information: [1](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.MD.html#method.with_alignment), [2](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.MD.html#method.for_length) */ - inline static diplomat::result, icu4x::DateTimeFormatterLoadError> create_md(const icu4x::Locale& locale, std::optional length, std::optional alignment); + inline static icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> create_md(const icu4x::Locale& locale, std::optional length, std::optional alignment); /** - * See the [Rust documentation for `try_new`](https://docs.rs/icu/2.0.0/icu/datetime/struct.FixedCalendarDateTimeFormatter.html#method.try_new) for more information. - * - * See the [Rust documentation for `MD`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.MD.html) for more information. - * - * Additional information: [1](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.MD.html#method.with_alignment), [2](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.MD.html#method.for_length) + * See the [Rust documentation for `try_new`](https://docs.rs/icu/2.0.0/icu/datetime/struct.FixedCalendarDateTimeFormatter.html#method.try_new) for more information. + * + * See the [Rust documentation for `MD`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.MD.html) for more information. + * + * Additional information: [1](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.MD.html#method.with_alignment), [2](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.MD.html#method.for_length) */ - inline static diplomat::result, icu4x::DateTimeFormatterLoadError> create_md_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, std::optional length, std::optional alignment); + inline static icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> create_md_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, std::optional length, std::optional alignment); /** - * See the [Rust documentation for `try_new`](https://docs.rs/icu/2.0.0/icu/datetime/struct.FixedCalendarDateTimeFormatter.html#method.try_new) for more information. - * - * See the [Rust documentation for `YMD`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.YMD.html) for more information. - * - * Additional information: [1](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.YMD.html#method.with_alignment), [2](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.YMD.html#method.with_year_style), [3](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.YMD.html#method.for_length) + * See the [Rust documentation for `try_new`](https://docs.rs/icu/2.0.0/icu/datetime/struct.FixedCalendarDateTimeFormatter.html#method.try_new) for more information. + * + * See the [Rust documentation for `YMD`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.YMD.html) for more information. + * + * Additional information: [1](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.YMD.html#method.with_alignment), [2](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.YMD.html#method.with_year_style), [3](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.YMD.html#method.for_length) */ - inline static diplomat::result, icu4x::DateTimeFormatterLoadError> create_ymd(const icu4x::Locale& locale, std::optional length, std::optional alignment, std::optional year_style); + inline static icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> create_ymd(const icu4x::Locale& locale, std::optional length, std::optional alignment, std::optional year_style); /** - * See the [Rust documentation for `try_new`](https://docs.rs/icu/2.0.0/icu/datetime/struct.FixedCalendarDateTimeFormatter.html#method.try_new) for more information. - * - * See the [Rust documentation for `YMD`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.YMD.html) for more information. - * - * Additional information: [1](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.YMD.html#method.with_alignment), [2](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.YMD.html#method.with_year_style), [3](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.YMD.html#method.for_length) + * See the [Rust documentation for `try_new`](https://docs.rs/icu/2.0.0/icu/datetime/struct.FixedCalendarDateTimeFormatter.html#method.try_new) for more information. + * + * See the [Rust documentation for `YMD`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.YMD.html) for more information. + * + * Additional information: [1](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.YMD.html#method.with_alignment), [2](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.YMD.html#method.with_year_style), [3](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.YMD.html#method.for_length) */ - inline static diplomat::result, icu4x::DateTimeFormatterLoadError> create_ymd_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, std::optional length, std::optional alignment, std::optional year_style); + inline static icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> create_ymd_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, std::optional length, std::optional alignment, std::optional year_style); /** - * See the [Rust documentation for `try_new`](https://docs.rs/icu/2.0.0/icu/datetime/struct.FixedCalendarDateTimeFormatter.html#method.try_new) for more information. - * - * See the [Rust documentation for `DE`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.DE.html) for more information. - * - * Additional information: [1](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.DE.html#method.with_alignment), [2](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.DE.html#method.for_length) + * See the [Rust documentation for `try_new`](https://docs.rs/icu/2.0.0/icu/datetime/struct.FixedCalendarDateTimeFormatter.html#method.try_new) for more information. + * + * See the [Rust documentation for `DE`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.DE.html) for more information. + * + * Additional information: [1](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.DE.html#method.with_alignment), [2](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.DE.html#method.for_length) */ - inline static diplomat::result, icu4x::DateTimeFormatterLoadError> create_de(const icu4x::Locale& locale, std::optional length, std::optional alignment); + inline static icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> create_de(const icu4x::Locale& locale, std::optional length, std::optional alignment); /** - * See the [Rust documentation for `try_new`](https://docs.rs/icu/2.0.0/icu/datetime/struct.FixedCalendarDateTimeFormatter.html#method.try_new) for more information. - * - * See the [Rust documentation for `DE`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.DE.html) for more information. - * - * Additional information: [1](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.DE.html#method.with_alignment), [2](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.DE.html#method.for_length) + * See the [Rust documentation for `try_new`](https://docs.rs/icu/2.0.0/icu/datetime/struct.FixedCalendarDateTimeFormatter.html#method.try_new) for more information. + * + * See the [Rust documentation for `DE`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.DE.html) for more information. + * + * Additional information: [1](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.DE.html#method.with_alignment), [2](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.DE.html#method.for_length) */ - inline static diplomat::result, icu4x::DateTimeFormatterLoadError> create_de_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, std::optional length, std::optional alignment); + inline static icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> create_de_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, std::optional length, std::optional alignment); /** - * See the [Rust documentation for `try_new`](https://docs.rs/icu/2.0.0/icu/datetime/struct.FixedCalendarDateTimeFormatter.html#method.try_new) for more information. - * - * See the [Rust documentation for `MDE`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.MDE.html) for more information. - * - * Additional information: [1](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.MDE.html#method.with_alignment), [2](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.MDE.html#method.for_length) + * See the [Rust documentation for `try_new`](https://docs.rs/icu/2.0.0/icu/datetime/struct.FixedCalendarDateTimeFormatter.html#method.try_new) for more information. + * + * See the [Rust documentation for `MDE`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.MDE.html) for more information. + * + * Additional information: [1](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.MDE.html#method.with_alignment), [2](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.MDE.html#method.for_length) */ - inline static diplomat::result, icu4x::DateTimeFormatterLoadError> create_mde(const icu4x::Locale& locale, std::optional length, std::optional alignment); + inline static icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> create_mde(const icu4x::Locale& locale, std::optional length, std::optional alignment); /** - * See the [Rust documentation for `try_new`](https://docs.rs/icu/2.0.0/icu/datetime/struct.FixedCalendarDateTimeFormatter.html#method.try_new) for more information. - * - * See the [Rust documentation for `MDE`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.MDE.html) for more information. - * - * Additional information: [1](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.MDE.html#method.with_alignment), [2](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.MDE.html#method.for_length) + * See the [Rust documentation for `try_new`](https://docs.rs/icu/2.0.0/icu/datetime/struct.FixedCalendarDateTimeFormatter.html#method.try_new) for more information. + * + * See the [Rust documentation for `MDE`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.MDE.html) for more information. + * + * Additional information: [1](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.MDE.html#method.with_alignment), [2](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.MDE.html#method.for_length) */ - inline static diplomat::result, icu4x::DateTimeFormatterLoadError> create_mde_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, std::optional length, std::optional alignment); + inline static icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> create_mde_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, std::optional length, std::optional alignment); /** - * See the [Rust documentation for `try_new`](https://docs.rs/icu/2.0.0/icu/datetime/struct.FixedCalendarDateTimeFormatter.html#method.try_new) for more information. - * - * See the [Rust documentation for `YMDE`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.YMDE.html) for more information. - * - * Additional information: [1](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.YMDE.html#method.with_alignment), [2](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.YMDE.html#method.with_year_style), [3](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.YMDE.html#method.for_length) + * See the [Rust documentation for `try_new`](https://docs.rs/icu/2.0.0/icu/datetime/struct.FixedCalendarDateTimeFormatter.html#method.try_new) for more information. + * + * See the [Rust documentation for `YMDE`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.YMDE.html) for more information. + * + * Additional information: [1](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.YMDE.html#method.with_alignment), [2](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.YMDE.html#method.with_year_style), [3](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.YMDE.html#method.for_length) */ - inline static diplomat::result, icu4x::DateTimeFormatterLoadError> create_ymde(const icu4x::Locale& locale, std::optional length, std::optional alignment, std::optional year_style); + inline static icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> create_ymde(const icu4x::Locale& locale, std::optional length, std::optional alignment, std::optional year_style); /** - * See the [Rust documentation for `try_new`](https://docs.rs/icu/2.0.0/icu/datetime/struct.FixedCalendarDateTimeFormatter.html#method.try_new) for more information. - * - * See the [Rust documentation for `YMDE`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.YMDE.html) for more information. - * - * Additional information: [1](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.YMDE.html#method.with_alignment), [2](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.YMDE.html#method.with_year_style), [3](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.YMDE.html#method.for_length) + * See the [Rust documentation for `try_new`](https://docs.rs/icu/2.0.0/icu/datetime/struct.FixedCalendarDateTimeFormatter.html#method.try_new) for more information. + * + * See the [Rust documentation for `YMDE`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.YMDE.html) for more information. + * + * Additional information: [1](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.YMDE.html#method.with_alignment), [2](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.YMDE.html#method.with_year_style), [3](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.YMDE.html#method.for_length) */ - inline static diplomat::result, icu4x::DateTimeFormatterLoadError> create_ymde_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, std::optional length, std::optional alignment, std::optional year_style); + inline static icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> create_ymde_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, std::optional length, std::optional alignment, std::optional year_style); /** - * See the [Rust documentation for `try_new`](https://docs.rs/icu/2.0.0/icu/datetime/struct.FixedCalendarDateTimeFormatter.html#method.try_new) for more information. - * - * See the [Rust documentation for `E`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.E.html) for more information. - * - * Additional information: [1](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.E.html#method.for_length) + * See the [Rust documentation for `try_new`](https://docs.rs/icu/2.0.0/icu/datetime/struct.FixedCalendarDateTimeFormatter.html#method.try_new) for more information. + * + * See the [Rust documentation for `E`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.E.html) for more information. + * + * Additional information: [1](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.E.html#method.for_length) */ - inline static diplomat::result, icu4x::DateTimeFormatterLoadError> create_e(const icu4x::Locale& locale, std::optional length); + inline static icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> create_e(const icu4x::Locale& locale, std::optional length); /** - * See the [Rust documentation for `try_new`](https://docs.rs/icu/2.0.0/icu/datetime/struct.FixedCalendarDateTimeFormatter.html#method.try_new) for more information. - * - * See the [Rust documentation for `E`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.E.html) for more information. - * - * Additional information: [1](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.E.html#method.for_length) + * See the [Rust documentation for `try_new`](https://docs.rs/icu/2.0.0/icu/datetime/struct.FixedCalendarDateTimeFormatter.html#method.try_new) for more information. + * + * See the [Rust documentation for `E`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.E.html) for more information. + * + * Additional information: [1](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.E.html#method.for_length) */ - inline static diplomat::result, icu4x::DateTimeFormatterLoadError> create_e_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, std::optional length); + inline static icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> create_e_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, std::optional length); /** - * See the [Rust documentation for `try_new`](https://docs.rs/icu/2.0.0/icu/datetime/struct.FixedCalendarDateTimeFormatter.html#method.try_new) for more information. - * - * See the [Rust documentation for `M`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.M.html) for more information. - * - * Additional information: [1](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.M.html#method.with_alignment), [2](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.M.html#method.for_length) + * See the [Rust documentation for `try_new`](https://docs.rs/icu/2.0.0/icu/datetime/struct.FixedCalendarDateTimeFormatter.html#method.try_new) for more information. + * + * See the [Rust documentation for `M`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.M.html) for more information. + * + * Additional information: [1](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.M.html#method.with_alignment), [2](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.M.html#method.for_length) */ - inline static diplomat::result, icu4x::DateTimeFormatterLoadError> create_m(const icu4x::Locale& locale, std::optional length, std::optional alignment); + inline static icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> create_m(const icu4x::Locale& locale, std::optional length, std::optional alignment); /** - * See the [Rust documentation for `try_new`](https://docs.rs/icu/2.0.0/icu/datetime/struct.FixedCalendarDateTimeFormatter.html#method.try_new) for more information. - * - * See the [Rust documentation for `M`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.M.html) for more information. - * - * Additional information: [1](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.M.html#method.with_alignment), [2](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.M.html#method.for_length) + * See the [Rust documentation for `try_new`](https://docs.rs/icu/2.0.0/icu/datetime/struct.FixedCalendarDateTimeFormatter.html#method.try_new) for more information. + * + * See the [Rust documentation for `M`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.M.html) for more information. + * + * Additional information: [1](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.M.html#method.with_alignment), [2](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.M.html#method.for_length) */ - inline static diplomat::result, icu4x::DateTimeFormatterLoadError> create_m_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, std::optional length, std::optional alignment); + inline static icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> create_m_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, std::optional length, std::optional alignment); /** - * See the [Rust documentation for `try_new`](https://docs.rs/icu/2.0.0/icu/datetime/struct.FixedCalendarDateTimeFormatter.html#method.try_new) for more information. - * - * See the [Rust documentation for `YM`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.YM.html) for more information. - * - * Additional information: [1](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.YM.html#method.with_alignment), [2](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.YM.html#method.with_year_style), [3](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.YM.html#method.for_length) + * See the [Rust documentation for `try_new`](https://docs.rs/icu/2.0.0/icu/datetime/struct.FixedCalendarDateTimeFormatter.html#method.try_new) for more information. + * + * See the [Rust documentation for `YM`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.YM.html) for more information. + * + * Additional information: [1](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.YM.html#method.with_alignment), [2](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.YM.html#method.with_year_style), [3](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.YM.html#method.for_length) */ - inline static diplomat::result, icu4x::DateTimeFormatterLoadError> create_ym(const icu4x::Locale& locale, std::optional length, std::optional alignment, std::optional year_style); + inline static icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> create_ym(const icu4x::Locale& locale, std::optional length, std::optional alignment, std::optional year_style); /** - * See the [Rust documentation for `try_new`](https://docs.rs/icu/2.0.0/icu/datetime/struct.FixedCalendarDateTimeFormatter.html#method.try_new) for more information. - * - * See the [Rust documentation for `YM`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.YM.html) for more information. - * - * Additional information: [1](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.YM.html#method.with_alignment), [2](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.YM.html#method.with_year_style), [3](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.YM.html#method.for_length) + * See the [Rust documentation for `try_new`](https://docs.rs/icu/2.0.0/icu/datetime/struct.FixedCalendarDateTimeFormatter.html#method.try_new) for more information. + * + * See the [Rust documentation for `YM`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.YM.html) for more information. + * + * Additional information: [1](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.YM.html#method.with_alignment), [2](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.YM.html#method.with_year_style), [3](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.YM.html#method.for_length) */ - inline static diplomat::result, icu4x::DateTimeFormatterLoadError> create_ym_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, std::optional length, std::optional alignment, std::optional year_style); + inline static icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> create_ym_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, std::optional length, std::optional alignment, std::optional year_style); /** - * See the [Rust documentation for `try_new`](https://docs.rs/icu/2.0.0/icu/datetime/struct.FixedCalendarDateTimeFormatter.html#method.try_new) for more information. - * - * See the [Rust documentation for `Y`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.Y.html) for more information. - * - * Additional information: [1](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.Y.html#method.with_alignment), [2](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.Y.html#method.with_year_style), [3](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.Y.html#method.for_length) + * See the [Rust documentation for `try_new`](https://docs.rs/icu/2.0.0/icu/datetime/struct.FixedCalendarDateTimeFormatter.html#method.try_new) for more information. + * + * See the [Rust documentation for `Y`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.Y.html) for more information. + * + * Additional information: [1](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.Y.html#method.with_alignment), [2](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.Y.html#method.with_year_style), [3](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.Y.html#method.for_length) */ - inline static diplomat::result, icu4x::DateTimeFormatterLoadError> create_y(const icu4x::Locale& locale, std::optional length, std::optional alignment, std::optional year_style); + inline static icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> create_y(const icu4x::Locale& locale, std::optional length, std::optional alignment, std::optional year_style); /** - * See the [Rust documentation for `try_new`](https://docs.rs/icu/2.0.0/icu/datetime/struct.FixedCalendarDateTimeFormatter.html#method.try_new) for more information. - * - * See the [Rust documentation for `Y`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.Y.html) for more information. - * - * Additional information: [1](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.Y.html#method.with_alignment), [2](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.Y.html#method.with_year_style), [3](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.Y.html#method.for_length) + * See the [Rust documentation for `try_new`](https://docs.rs/icu/2.0.0/icu/datetime/struct.FixedCalendarDateTimeFormatter.html#method.try_new) for more information. + * + * See the [Rust documentation for `Y`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.Y.html) for more information. + * + * Additional information: [1](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.Y.html#method.with_alignment), [2](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.Y.html#method.with_year_style), [3](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.Y.html#method.for_length) */ - inline static diplomat::result, icu4x::DateTimeFormatterLoadError> create_y_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, std::optional length, std::optional alignment, std::optional year_style); + inline static icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> create_y_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, std::optional length, std::optional alignment, std::optional year_style); /** - * See the [Rust documentation for `format`](https://docs.rs/icu/2.0.0/icu/datetime/struct.FixedCalendarDateTimeFormatter.html#method.format) for more information. + * See the [Rust documentation for `format`](https://docs.rs/icu/2.0.0/icu/datetime/struct.FixedCalendarDateTimeFormatter.html#method.format) for more information. */ inline std::string format_iso(const icu4x::IsoDate& iso_date) const; template @@ -242,4 +242,4 @@ class DateFormatterGregorian { }; } // namespace -#endif // icu4x_DateFormatterGregorian_D_HPP +#endif // ICU4X_DateFormatterGregorian_D_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/DateFormatterGregorian.hpp b/ffi/capi/bindings/cpp/icu4x/DateFormatterGregorian.hpp index 43d3eaffac9..1807e98b487 100644 --- a/ffi/capi/bindings/cpp/icu4x/DateFormatterGregorian.hpp +++ b/ffi/capi/bindings/cpp/icu4x/DateFormatterGregorian.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_DateFormatterGregorian_HPP -#define icu4x_DateFormatterGregorian_HPP +#ifndef ICU4X_DateFormatterGregorian_HPP +#define ICU4X_DateFormatterGregorian_HPP #include "DateFormatterGregorian.d.hpp" @@ -11,7 +11,6 @@ #include #include #include -#include "../diplomat_runtime.hpp" #include "DataProvider.hpp" #include "DateTimeAlignment.hpp" #include "DateTimeFormatterLoadError.hpp" @@ -19,6 +18,7 @@ #include "IsoDate.hpp" #include "Locale.hpp" #include "YearStyle.hpp" +#include "diplomat_runtime.hpp" namespace icu4x { @@ -85,7 +85,7 @@ namespace capi { typedef struct icu4x_DateFormatterGregorian_create_y_with_provider_mv1_result {union {icu4x::capi::DateFormatterGregorian* ok; icu4x::capi::DateTimeFormatterLoadError err;}; bool is_ok;} icu4x_DateFormatterGregorian_create_y_with_provider_mv1_result; icu4x_DateFormatterGregorian_create_y_with_provider_mv1_result icu4x_DateFormatterGregorian_create_y_with_provider_mv1(const icu4x::capi::DataProvider* provider, const icu4x::capi::Locale* locale, icu4x::capi::DateTimeLength_option length, icu4x::capi::DateTimeAlignment_option alignment, icu4x::capi::YearStyle_option year_style); - void icu4x_DateFormatterGregorian_format_iso_mv1(const icu4x::capi::DateFormatterGregorian* self, const icu4x::capi::IsoDate* iso_date, diplomat::capi::DiplomatWrite* write); + void icu4x_DateFormatterGregorian_format_iso_mv1(const icu4x::capi::DateFormatterGregorian* self, const icu4x::capi::IsoDate* iso_date, icu4x::diplomat::capi::DiplomatWrite* write); void icu4x_DateFormatterGregorian_destroy_mv1(DateFormatterGregorian* self); @@ -93,165 +93,165 @@ namespace capi { } // namespace capi } // namespace -inline diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::DateFormatterGregorian::create_d(const icu4x::Locale& locale, std::optional length, std::optional alignment) { +inline icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::DateFormatterGregorian::create_d(const icu4x::Locale& locale, std::optional length, std::optional alignment) { auto result = icu4x::capi::icu4x_DateFormatterGregorian_create_d_mv1(locale.AsFFI(), length.has_value() ? (icu4x::capi::DateTimeLength_option{ { length.value().AsFFI() }, true }) : (icu4x::capi::DateTimeLength_option{ {}, false }), alignment.has_value() ? (icu4x::capi::DateTimeAlignment_option{ { alignment.value().AsFFI() }, true }) : (icu4x::capi::DateTimeAlignment_option{ {}, false })); - return result.is_ok ? diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Ok>(std::unique_ptr(icu4x::DateFormatterGregorian::FromFFI(result.ok)))) : diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::DateFormatterGregorian::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); } -inline diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::DateFormatterGregorian::create_d_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, std::optional length, std::optional alignment) { +inline icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::DateFormatterGregorian::create_d_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, std::optional length, std::optional alignment) { auto result = icu4x::capi::icu4x_DateFormatterGregorian_create_d_with_provider_mv1(provider.AsFFI(), locale.AsFFI(), length.has_value() ? (icu4x::capi::DateTimeLength_option{ { length.value().AsFFI() }, true }) : (icu4x::capi::DateTimeLength_option{ {}, false }), alignment.has_value() ? (icu4x::capi::DateTimeAlignment_option{ { alignment.value().AsFFI() }, true }) : (icu4x::capi::DateTimeAlignment_option{ {}, false })); - return result.is_ok ? diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Ok>(std::unique_ptr(icu4x::DateFormatterGregorian::FromFFI(result.ok)))) : diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::DateFormatterGregorian::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); } -inline diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::DateFormatterGregorian::create_md(const icu4x::Locale& locale, std::optional length, std::optional alignment) { +inline icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::DateFormatterGregorian::create_md(const icu4x::Locale& locale, std::optional length, std::optional alignment) { auto result = icu4x::capi::icu4x_DateFormatterGregorian_create_md_mv1(locale.AsFFI(), length.has_value() ? (icu4x::capi::DateTimeLength_option{ { length.value().AsFFI() }, true }) : (icu4x::capi::DateTimeLength_option{ {}, false }), alignment.has_value() ? (icu4x::capi::DateTimeAlignment_option{ { alignment.value().AsFFI() }, true }) : (icu4x::capi::DateTimeAlignment_option{ {}, false })); - return result.is_ok ? diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Ok>(std::unique_ptr(icu4x::DateFormatterGregorian::FromFFI(result.ok)))) : diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::DateFormatterGregorian::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); } -inline diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::DateFormatterGregorian::create_md_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, std::optional length, std::optional alignment) { +inline icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::DateFormatterGregorian::create_md_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, std::optional length, std::optional alignment) { auto result = icu4x::capi::icu4x_DateFormatterGregorian_create_md_with_provider_mv1(provider.AsFFI(), locale.AsFFI(), length.has_value() ? (icu4x::capi::DateTimeLength_option{ { length.value().AsFFI() }, true }) : (icu4x::capi::DateTimeLength_option{ {}, false }), alignment.has_value() ? (icu4x::capi::DateTimeAlignment_option{ { alignment.value().AsFFI() }, true }) : (icu4x::capi::DateTimeAlignment_option{ {}, false })); - return result.is_ok ? diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Ok>(std::unique_ptr(icu4x::DateFormatterGregorian::FromFFI(result.ok)))) : diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::DateFormatterGregorian::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); } -inline diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::DateFormatterGregorian::create_ymd(const icu4x::Locale& locale, std::optional length, std::optional alignment, std::optional year_style) { +inline icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::DateFormatterGregorian::create_ymd(const icu4x::Locale& locale, std::optional length, std::optional alignment, std::optional year_style) { auto result = icu4x::capi::icu4x_DateFormatterGregorian_create_ymd_mv1(locale.AsFFI(), length.has_value() ? (icu4x::capi::DateTimeLength_option{ { length.value().AsFFI() }, true }) : (icu4x::capi::DateTimeLength_option{ {}, false }), alignment.has_value() ? (icu4x::capi::DateTimeAlignment_option{ { alignment.value().AsFFI() }, true }) : (icu4x::capi::DateTimeAlignment_option{ {}, false }), year_style.has_value() ? (icu4x::capi::YearStyle_option{ { year_style.value().AsFFI() }, true }) : (icu4x::capi::YearStyle_option{ {}, false })); - return result.is_ok ? diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Ok>(std::unique_ptr(icu4x::DateFormatterGregorian::FromFFI(result.ok)))) : diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::DateFormatterGregorian::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); } -inline diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::DateFormatterGregorian::create_ymd_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, std::optional length, std::optional alignment, std::optional year_style) { +inline icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::DateFormatterGregorian::create_ymd_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, std::optional length, std::optional alignment, std::optional year_style) { auto result = icu4x::capi::icu4x_DateFormatterGregorian_create_ymd_with_provider_mv1(provider.AsFFI(), locale.AsFFI(), length.has_value() ? (icu4x::capi::DateTimeLength_option{ { length.value().AsFFI() }, true }) : (icu4x::capi::DateTimeLength_option{ {}, false }), alignment.has_value() ? (icu4x::capi::DateTimeAlignment_option{ { alignment.value().AsFFI() }, true }) : (icu4x::capi::DateTimeAlignment_option{ {}, false }), year_style.has_value() ? (icu4x::capi::YearStyle_option{ { year_style.value().AsFFI() }, true }) : (icu4x::capi::YearStyle_option{ {}, false })); - return result.is_ok ? diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Ok>(std::unique_ptr(icu4x::DateFormatterGregorian::FromFFI(result.ok)))) : diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::DateFormatterGregorian::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); } -inline diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::DateFormatterGregorian::create_de(const icu4x::Locale& locale, std::optional length, std::optional alignment) { +inline icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::DateFormatterGregorian::create_de(const icu4x::Locale& locale, std::optional length, std::optional alignment) { auto result = icu4x::capi::icu4x_DateFormatterGregorian_create_de_mv1(locale.AsFFI(), length.has_value() ? (icu4x::capi::DateTimeLength_option{ { length.value().AsFFI() }, true }) : (icu4x::capi::DateTimeLength_option{ {}, false }), alignment.has_value() ? (icu4x::capi::DateTimeAlignment_option{ { alignment.value().AsFFI() }, true }) : (icu4x::capi::DateTimeAlignment_option{ {}, false })); - return result.is_ok ? diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Ok>(std::unique_ptr(icu4x::DateFormatterGregorian::FromFFI(result.ok)))) : diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::DateFormatterGregorian::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); } -inline diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::DateFormatterGregorian::create_de_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, std::optional length, std::optional alignment) { +inline icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::DateFormatterGregorian::create_de_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, std::optional length, std::optional alignment) { auto result = icu4x::capi::icu4x_DateFormatterGregorian_create_de_with_provider_mv1(provider.AsFFI(), locale.AsFFI(), length.has_value() ? (icu4x::capi::DateTimeLength_option{ { length.value().AsFFI() }, true }) : (icu4x::capi::DateTimeLength_option{ {}, false }), alignment.has_value() ? (icu4x::capi::DateTimeAlignment_option{ { alignment.value().AsFFI() }, true }) : (icu4x::capi::DateTimeAlignment_option{ {}, false })); - return result.is_ok ? diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Ok>(std::unique_ptr(icu4x::DateFormatterGregorian::FromFFI(result.ok)))) : diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::DateFormatterGregorian::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); } -inline diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::DateFormatterGregorian::create_mde(const icu4x::Locale& locale, std::optional length, std::optional alignment) { +inline icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::DateFormatterGregorian::create_mde(const icu4x::Locale& locale, std::optional length, std::optional alignment) { auto result = icu4x::capi::icu4x_DateFormatterGregorian_create_mde_mv1(locale.AsFFI(), length.has_value() ? (icu4x::capi::DateTimeLength_option{ { length.value().AsFFI() }, true }) : (icu4x::capi::DateTimeLength_option{ {}, false }), alignment.has_value() ? (icu4x::capi::DateTimeAlignment_option{ { alignment.value().AsFFI() }, true }) : (icu4x::capi::DateTimeAlignment_option{ {}, false })); - return result.is_ok ? diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Ok>(std::unique_ptr(icu4x::DateFormatterGregorian::FromFFI(result.ok)))) : diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::DateFormatterGregorian::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); } -inline diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::DateFormatterGregorian::create_mde_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, std::optional length, std::optional alignment) { +inline icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::DateFormatterGregorian::create_mde_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, std::optional length, std::optional alignment) { auto result = icu4x::capi::icu4x_DateFormatterGregorian_create_mde_with_provider_mv1(provider.AsFFI(), locale.AsFFI(), length.has_value() ? (icu4x::capi::DateTimeLength_option{ { length.value().AsFFI() }, true }) : (icu4x::capi::DateTimeLength_option{ {}, false }), alignment.has_value() ? (icu4x::capi::DateTimeAlignment_option{ { alignment.value().AsFFI() }, true }) : (icu4x::capi::DateTimeAlignment_option{ {}, false })); - return result.is_ok ? diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Ok>(std::unique_ptr(icu4x::DateFormatterGregorian::FromFFI(result.ok)))) : diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::DateFormatterGregorian::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); } -inline diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::DateFormatterGregorian::create_ymde(const icu4x::Locale& locale, std::optional length, std::optional alignment, std::optional year_style) { +inline icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::DateFormatterGregorian::create_ymde(const icu4x::Locale& locale, std::optional length, std::optional alignment, std::optional year_style) { auto result = icu4x::capi::icu4x_DateFormatterGregorian_create_ymde_mv1(locale.AsFFI(), length.has_value() ? (icu4x::capi::DateTimeLength_option{ { length.value().AsFFI() }, true }) : (icu4x::capi::DateTimeLength_option{ {}, false }), alignment.has_value() ? (icu4x::capi::DateTimeAlignment_option{ { alignment.value().AsFFI() }, true }) : (icu4x::capi::DateTimeAlignment_option{ {}, false }), year_style.has_value() ? (icu4x::capi::YearStyle_option{ { year_style.value().AsFFI() }, true }) : (icu4x::capi::YearStyle_option{ {}, false })); - return result.is_ok ? diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Ok>(std::unique_ptr(icu4x::DateFormatterGregorian::FromFFI(result.ok)))) : diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::DateFormatterGregorian::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); } -inline diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::DateFormatterGregorian::create_ymde_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, std::optional length, std::optional alignment, std::optional year_style) { +inline icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::DateFormatterGregorian::create_ymde_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, std::optional length, std::optional alignment, std::optional year_style) { auto result = icu4x::capi::icu4x_DateFormatterGregorian_create_ymde_with_provider_mv1(provider.AsFFI(), locale.AsFFI(), length.has_value() ? (icu4x::capi::DateTimeLength_option{ { length.value().AsFFI() }, true }) : (icu4x::capi::DateTimeLength_option{ {}, false }), alignment.has_value() ? (icu4x::capi::DateTimeAlignment_option{ { alignment.value().AsFFI() }, true }) : (icu4x::capi::DateTimeAlignment_option{ {}, false }), year_style.has_value() ? (icu4x::capi::YearStyle_option{ { year_style.value().AsFFI() }, true }) : (icu4x::capi::YearStyle_option{ {}, false })); - return result.is_ok ? diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Ok>(std::unique_ptr(icu4x::DateFormatterGregorian::FromFFI(result.ok)))) : diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::DateFormatterGregorian::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); } -inline diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::DateFormatterGregorian::create_e(const icu4x::Locale& locale, std::optional length) { +inline icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::DateFormatterGregorian::create_e(const icu4x::Locale& locale, std::optional length) { auto result = icu4x::capi::icu4x_DateFormatterGregorian_create_e_mv1(locale.AsFFI(), length.has_value() ? (icu4x::capi::DateTimeLength_option{ { length.value().AsFFI() }, true }) : (icu4x::capi::DateTimeLength_option{ {}, false })); - return result.is_ok ? diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Ok>(std::unique_ptr(icu4x::DateFormatterGregorian::FromFFI(result.ok)))) : diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::DateFormatterGregorian::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); } -inline diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::DateFormatterGregorian::create_e_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, std::optional length) { +inline icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::DateFormatterGregorian::create_e_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, std::optional length) { auto result = icu4x::capi::icu4x_DateFormatterGregorian_create_e_with_provider_mv1(provider.AsFFI(), locale.AsFFI(), length.has_value() ? (icu4x::capi::DateTimeLength_option{ { length.value().AsFFI() }, true }) : (icu4x::capi::DateTimeLength_option{ {}, false })); - return result.is_ok ? diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Ok>(std::unique_ptr(icu4x::DateFormatterGregorian::FromFFI(result.ok)))) : diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::DateFormatterGregorian::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); } -inline diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::DateFormatterGregorian::create_m(const icu4x::Locale& locale, std::optional length, std::optional alignment) { +inline icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::DateFormatterGregorian::create_m(const icu4x::Locale& locale, std::optional length, std::optional alignment) { auto result = icu4x::capi::icu4x_DateFormatterGregorian_create_m_mv1(locale.AsFFI(), length.has_value() ? (icu4x::capi::DateTimeLength_option{ { length.value().AsFFI() }, true }) : (icu4x::capi::DateTimeLength_option{ {}, false }), alignment.has_value() ? (icu4x::capi::DateTimeAlignment_option{ { alignment.value().AsFFI() }, true }) : (icu4x::capi::DateTimeAlignment_option{ {}, false })); - return result.is_ok ? diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Ok>(std::unique_ptr(icu4x::DateFormatterGregorian::FromFFI(result.ok)))) : diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::DateFormatterGregorian::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); } -inline diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::DateFormatterGregorian::create_m_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, std::optional length, std::optional alignment) { +inline icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::DateFormatterGregorian::create_m_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, std::optional length, std::optional alignment) { auto result = icu4x::capi::icu4x_DateFormatterGregorian_create_m_with_provider_mv1(provider.AsFFI(), locale.AsFFI(), length.has_value() ? (icu4x::capi::DateTimeLength_option{ { length.value().AsFFI() }, true }) : (icu4x::capi::DateTimeLength_option{ {}, false }), alignment.has_value() ? (icu4x::capi::DateTimeAlignment_option{ { alignment.value().AsFFI() }, true }) : (icu4x::capi::DateTimeAlignment_option{ {}, false })); - return result.is_ok ? diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Ok>(std::unique_ptr(icu4x::DateFormatterGregorian::FromFFI(result.ok)))) : diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::DateFormatterGregorian::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); } -inline diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::DateFormatterGregorian::create_ym(const icu4x::Locale& locale, std::optional length, std::optional alignment, std::optional year_style) { +inline icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::DateFormatterGregorian::create_ym(const icu4x::Locale& locale, std::optional length, std::optional alignment, std::optional year_style) { auto result = icu4x::capi::icu4x_DateFormatterGregorian_create_ym_mv1(locale.AsFFI(), length.has_value() ? (icu4x::capi::DateTimeLength_option{ { length.value().AsFFI() }, true }) : (icu4x::capi::DateTimeLength_option{ {}, false }), alignment.has_value() ? (icu4x::capi::DateTimeAlignment_option{ { alignment.value().AsFFI() }, true }) : (icu4x::capi::DateTimeAlignment_option{ {}, false }), year_style.has_value() ? (icu4x::capi::YearStyle_option{ { year_style.value().AsFFI() }, true }) : (icu4x::capi::YearStyle_option{ {}, false })); - return result.is_ok ? diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Ok>(std::unique_ptr(icu4x::DateFormatterGregorian::FromFFI(result.ok)))) : diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::DateFormatterGregorian::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); } -inline diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::DateFormatterGregorian::create_ym_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, std::optional length, std::optional alignment, std::optional year_style) { +inline icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::DateFormatterGregorian::create_ym_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, std::optional length, std::optional alignment, std::optional year_style) { auto result = icu4x::capi::icu4x_DateFormatterGregorian_create_ym_with_provider_mv1(provider.AsFFI(), locale.AsFFI(), length.has_value() ? (icu4x::capi::DateTimeLength_option{ { length.value().AsFFI() }, true }) : (icu4x::capi::DateTimeLength_option{ {}, false }), alignment.has_value() ? (icu4x::capi::DateTimeAlignment_option{ { alignment.value().AsFFI() }, true }) : (icu4x::capi::DateTimeAlignment_option{ {}, false }), year_style.has_value() ? (icu4x::capi::YearStyle_option{ { year_style.value().AsFFI() }, true }) : (icu4x::capi::YearStyle_option{ {}, false })); - return result.is_ok ? diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Ok>(std::unique_ptr(icu4x::DateFormatterGregorian::FromFFI(result.ok)))) : diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::DateFormatterGregorian::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); } -inline diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::DateFormatterGregorian::create_y(const icu4x::Locale& locale, std::optional length, std::optional alignment, std::optional year_style) { +inline icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::DateFormatterGregorian::create_y(const icu4x::Locale& locale, std::optional length, std::optional alignment, std::optional year_style) { auto result = icu4x::capi::icu4x_DateFormatterGregorian_create_y_mv1(locale.AsFFI(), length.has_value() ? (icu4x::capi::DateTimeLength_option{ { length.value().AsFFI() }, true }) : (icu4x::capi::DateTimeLength_option{ {}, false }), alignment.has_value() ? (icu4x::capi::DateTimeAlignment_option{ { alignment.value().AsFFI() }, true }) : (icu4x::capi::DateTimeAlignment_option{ {}, false }), year_style.has_value() ? (icu4x::capi::YearStyle_option{ { year_style.value().AsFFI() }, true }) : (icu4x::capi::YearStyle_option{ {}, false })); - return result.is_ok ? diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Ok>(std::unique_ptr(icu4x::DateFormatterGregorian::FromFFI(result.ok)))) : diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::DateFormatterGregorian::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); } -inline diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::DateFormatterGregorian::create_y_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, std::optional length, std::optional alignment, std::optional year_style) { +inline icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::DateFormatterGregorian::create_y_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, std::optional length, std::optional alignment, std::optional year_style) { auto result = icu4x::capi::icu4x_DateFormatterGregorian_create_y_with_provider_mv1(provider.AsFFI(), locale.AsFFI(), length.has_value() ? (icu4x::capi::DateTimeLength_option{ { length.value().AsFFI() }, true }) : (icu4x::capi::DateTimeLength_option{ {}, false }), alignment.has_value() ? (icu4x::capi::DateTimeAlignment_option{ { alignment.value().AsFFI() }, true }) : (icu4x::capi::DateTimeAlignment_option{ {}, false }), year_style.has_value() ? (icu4x::capi::YearStyle_option{ { year_style.value().AsFFI() }, true }) : (icu4x::capi::YearStyle_option{ {}, false })); - return result.is_ok ? diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Ok>(std::unique_ptr(icu4x::DateFormatterGregorian::FromFFI(result.ok)))) : diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::DateFormatterGregorian::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); } inline std::string icu4x::DateFormatterGregorian::format_iso(const icu4x::IsoDate& iso_date) const { std::string output; - diplomat::capi::DiplomatWrite write = diplomat::WriteFromString(output); + icu4x::diplomat::capi::DiplomatWrite write = icu4x::diplomat::WriteFromString(output); icu4x::capi::icu4x_DateFormatterGregorian_format_iso_mv1(this->AsFFI(), iso_date.AsFFI(), &write); @@ -259,7 +259,7 @@ inline std::string icu4x::DateFormatterGregorian::format_iso(const icu4x::IsoDat } template inline void icu4x::DateFormatterGregorian::format_iso_write(const icu4x::IsoDate& iso_date, W& writeable) const { - diplomat::capi::DiplomatWrite write = diplomat::WriteTrait::Construct(writeable); + icu4x::diplomat::capi::DiplomatWrite write = icu4x::diplomat::WriteTrait::Construct(writeable); icu4x::capi::icu4x_DateFormatterGregorian_format_iso_mv1(this->AsFFI(), iso_date.AsFFI(), &write); @@ -286,4 +286,4 @@ inline void icu4x::DateFormatterGregorian::operator delete(void* ptr) { } -#endif // icu4x_DateFormatterGregorian_HPP +#endif // ICU4X_DateFormatterGregorian_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/DateTime.d.hpp b/ffi/capi/bindings/cpp/icu4x/DateTime.d.hpp index e89f116c021..8aedcd4a9dd 100644 --- a/ffi/capi/bindings/cpp/icu4x/DateTime.d.hpp +++ b/ffi/capi/bindings/cpp/icu4x/DateTime.d.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_DateTime_D_HPP -#define icu4x_DateTime_D_HPP +#ifndef ICU4X_DateTime_D_HPP +#define ICU4X_DateTime_D_HPP #include #include @@ -9,8 +9,7 @@ #include #include #include -#include "../diplomat_runtime.hpp" - +#include "diplomat_runtime.hpp" namespace icu4x { namespace capi { struct Calendar; } class Calendar; @@ -20,7 +19,8 @@ namespace capi { struct Time; } class Time; struct DateTime; class Rfc9557ParseError; -} +} // namespace icu4x + namespace icu4x { @@ -46,15 +46,15 @@ struct DateTime { std::unique_ptr time; /** - * Creates a new {@link DateTime} from an IXDTF string. - * - * See the [Rust documentation for `try_from_str`](https://docs.rs/icu/2.0.0/icu/time/struct.DateTime.html#method.try_from_str) for more information. + * Creates a new {@link DateTime} from an IXDTF string. + * + * See the [Rust documentation for `try_from_str`](https://docs.rs/icu/2.0.0/icu/time/struct.DateTime.html#method.try_from_str) for more information. */ - inline static diplomat::result from_string(std::string_view v, const icu4x::Calendar& calendar); + inline static icu4x::diplomat::result from_string(std::string_view v, const icu4x::Calendar& calendar); inline icu4x::capi::DateTime AsFFI() const; inline static icu4x::DateTime FromFFI(icu4x::capi::DateTime c_struct); }; } // namespace -#endif // icu4x_DateTime_D_HPP +#endif // ICU4X_DateTime_D_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/DateTime.hpp b/ffi/capi/bindings/cpp/icu4x/DateTime.hpp index 742a32efa43..32c90dc97dd 100644 --- a/ffi/capi/bindings/cpp/icu4x/DateTime.hpp +++ b/ffi/capi/bindings/cpp/icu4x/DateTime.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_DateTime_HPP -#define icu4x_DateTime_HPP +#ifndef ICU4X_DateTime_HPP +#define ICU4X_DateTime_HPP #include "DateTime.d.hpp" @@ -11,11 +11,11 @@ #include #include #include -#include "../diplomat_runtime.hpp" #include "Calendar.hpp" #include "Date.hpp" #include "Rfc9557ParseError.hpp" #include "Time.hpp" +#include "diplomat_runtime.hpp" namespace icu4x { @@ -23,16 +23,16 @@ namespace capi { extern "C" { typedef struct icu4x_DateTime_from_string_mv1_result {union {icu4x::capi::DateTime ok; icu4x::capi::Rfc9557ParseError err;}; bool is_ok;} icu4x_DateTime_from_string_mv1_result; - icu4x_DateTime_from_string_mv1_result icu4x_DateTime_from_string_mv1(diplomat::capi::DiplomatStringView v, const icu4x::capi::Calendar* calendar); + icu4x_DateTime_from_string_mv1_result icu4x_DateTime_from_string_mv1(icu4x::diplomat::capi::DiplomatStringView v, const icu4x::capi::Calendar* calendar); } // extern "C" } // namespace capi } // namespace -inline diplomat::result icu4x::DateTime::from_string(std::string_view v, const icu4x::Calendar& calendar) { +inline icu4x::diplomat::result icu4x::DateTime::from_string(std::string_view v, const icu4x::Calendar& calendar) { auto result = icu4x::capi::icu4x_DateTime_from_string_mv1({v.data(), v.size()}, calendar.AsFFI()); - return result.is_ok ? diplomat::result(diplomat::Ok(icu4x::DateTime::FromFFI(result.ok))) : diplomat::result(diplomat::Err(icu4x::Rfc9557ParseError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result(icu4x::diplomat::Ok(icu4x::DateTime::FromFFI(result.ok))) : icu4x::diplomat::result(icu4x::diplomat::Err(icu4x::Rfc9557ParseError::FromFFI(result.err))); } @@ -51,4 +51,4 @@ inline icu4x::DateTime icu4x::DateTime::FromFFI(icu4x::capi::DateTime c_struct) } -#endif // icu4x_DateTime_HPP +#endif // ICU4X_DateTime_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/DateTimeAlignment.d.hpp b/ffi/capi/bindings/cpp/icu4x/DateTimeAlignment.d.hpp index fdab6936799..c6388a0dff6 100644 --- a/ffi/capi/bindings/cpp/icu4x/DateTimeAlignment.d.hpp +++ b/ffi/capi/bindings/cpp/icu4x/DateTimeAlignment.d.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_DateTimeAlignment_D_HPP -#define icu4x_DateTimeAlignment_D_HPP +#ifndef ICU4X_DateTimeAlignment_D_HPP +#define ICU4X_DateTimeAlignment_D_HPP #include #include @@ -9,7 +9,7 @@ #include #include #include -#include "../diplomat_runtime.hpp" +#include "diplomat_runtime.hpp" namespace icu4x { @@ -49,4 +49,4 @@ class DateTimeAlignment { }; } // namespace -#endif // icu4x_DateTimeAlignment_D_HPP +#endif // ICU4X_DateTimeAlignment_D_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/DateTimeAlignment.hpp b/ffi/capi/bindings/cpp/icu4x/DateTimeAlignment.hpp index d6716e947ba..691a1c4a18c 100644 --- a/ffi/capi/bindings/cpp/icu4x/DateTimeAlignment.hpp +++ b/ffi/capi/bindings/cpp/icu4x/DateTimeAlignment.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_DateTimeAlignment_HPP -#define icu4x_DateTimeAlignment_HPP +#ifndef ICU4X_DateTimeAlignment_HPP +#define ICU4X_DateTimeAlignment_HPP #include "DateTimeAlignment.d.hpp" @@ -11,7 +11,7 @@ #include #include #include -#include "../diplomat_runtime.hpp" +#include "diplomat_runtime.hpp" namespace icu4x { @@ -35,4 +35,4 @@ inline icu4x::DateTimeAlignment icu4x::DateTimeAlignment::FromFFI(icu4x::capi::D std::abort(); } } -#endif // icu4x_DateTimeAlignment_HPP +#endif // ICU4X_DateTimeAlignment_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/DateTimeFormatter.d.hpp b/ffi/capi/bindings/cpp/icu4x/DateTimeFormatter.d.hpp index 154ef26f11c..2e8850cde00 100644 --- a/ffi/capi/bindings/cpp/icu4x/DateTimeFormatter.d.hpp +++ b/ffi/capi/bindings/cpp/icu4x/DateTimeFormatter.d.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_DateTimeFormatter_D_HPP -#define icu4x_DateTimeFormatter_D_HPP +#ifndef ICU4X_DateTimeFormatter_D_HPP +#define ICU4X_DateTimeFormatter_D_HPP #include #include @@ -9,8 +9,7 @@ #include #include #include -#include "../diplomat_runtime.hpp" - +#include "diplomat_runtime.hpp" namespace icu4x { namespace capi { struct DataProvider; } class DataProvider; @@ -30,7 +29,8 @@ class DateTimeFormatterLoadError; class DateTimeLength; class TimePrecision; class YearStyle; -} +} // namespace icu4x + namespace icu4x { @@ -47,144 +47,144 @@ class DateTimeFormatter { public: /** - * See the [Rust documentation for `try_new`](https://docs.rs/icu/2.0.0/icu/datetime/struct.DateTimeFormatter.html#method.try_new) for more information. - * - * See the [Rust documentation for `DT`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.DT.html) for more information. - * - * Additional information: [1](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.DT.html#method.with_time_precision), [2](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.DT.html#method.with_alignment), [3](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.DT.html#method.for_length) + * See the [Rust documentation for `try_new`](https://docs.rs/icu/2.0.0/icu/datetime/struct.DateTimeFormatter.html#method.try_new) for more information. + * + * See the [Rust documentation for `DT`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.DT.html) for more information. + * + * Additional information: [1](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.DT.html#method.with_time_precision), [2](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.DT.html#method.with_alignment), [3](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.DT.html#method.for_length) */ - inline static diplomat::result, icu4x::DateTimeFormatterLoadError> create_dt(const icu4x::Locale& locale, std::optional length, std::optional time_precision, std::optional alignment); + inline static icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> create_dt(const icu4x::Locale& locale, std::optional length, std::optional time_precision, std::optional alignment); /** - * See the [Rust documentation for `try_new`](https://docs.rs/icu/2.0.0/icu/datetime/struct.DateTimeFormatter.html#method.try_new) for more information. - * - * See the [Rust documentation for `DT`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.DT.html) for more information. - * - * Additional information: [1](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.DT.html#method.with_time_precision), [2](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.DT.html#method.with_alignment), [3](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.DT.html#method.for_length) + * See the [Rust documentation for `try_new`](https://docs.rs/icu/2.0.0/icu/datetime/struct.DateTimeFormatter.html#method.try_new) for more information. + * + * See the [Rust documentation for `DT`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.DT.html) for more information. + * + * Additional information: [1](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.DT.html#method.with_time_precision), [2](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.DT.html#method.with_alignment), [3](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.DT.html#method.for_length) */ - inline static diplomat::result, icu4x::DateTimeFormatterLoadError> create_dt_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, std::optional length, std::optional time_precision, std::optional alignment); + inline static icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> create_dt_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, std::optional length, std::optional time_precision, std::optional alignment); /** - * See the [Rust documentation for `try_new`](https://docs.rs/icu/2.0.0/icu/datetime/struct.DateTimeFormatter.html#method.try_new) for more information. - * - * See the [Rust documentation for `MDT`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.MDT.html) for more information. - * - * Additional information: [1](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.MDT.html#method.with_time_precision), [2](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.MDT.html#method.with_alignment), [3](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.MDT.html#method.for_length) + * See the [Rust documentation for `try_new`](https://docs.rs/icu/2.0.0/icu/datetime/struct.DateTimeFormatter.html#method.try_new) for more information. + * + * See the [Rust documentation for `MDT`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.MDT.html) for more information. + * + * Additional information: [1](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.MDT.html#method.with_time_precision), [2](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.MDT.html#method.with_alignment), [3](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.MDT.html#method.for_length) */ - inline static diplomat::result, icu4x::DateTimeFormatterLoadError> create_mdt(const icu4x::Locale& locale, std::optional length, std::optional time_precision, std::optional alignment); + inline static icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> create_mdt(const icu4x::Locale& locale, std::optional length, std::optional time_precision, std::optional alignment); /** - * See the [Rust documentation for `try_new`](https://docs.rs/icu/2.0.0/icu/datetime/struct.DateTimeFormatter.html#method.try_new) for more information. - * - * See the [Rust documentation for `MDT`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.MDT.html) for more information. - * - * Additional information: [1](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.MDT.html#method.with_time_precision), [2](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.MDT.html#method.with_alignment), [3](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.MDT.html#method.for_length) + * See the [Rust documentation for `try_new`](https://docs.rs/icu/2.0.0/icu/datetime/struct.DateTimeFormatter.html#method.try_new) for more information. + * + * See the [Rust documentation for `MDT`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.MDT.html) for more information. + * + * Additional information: [1](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.MDT.html#method.with_time_precision), [2](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.MDT.html#method.with_alignment), [3](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.MDT.html#method.for_length) */ - inline static diplomat::result, icu4x::DateTimeFormatterLoadError> create_mdt_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, std::optional length, std::optional time_precision, std::optional alignment); + inline static icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> create_mdt_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, std::optional length, std::optional time_precision, std::optional alignment); /** - * See the [Rust documentation for `try_new`](https://docs.rs/icu/2.0.0/icu/datetime/struct.DateTimeFormatter.html#method.try_new) for more information. - * - * See the [Rust documentation for `YMDT`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.YMDT.html) for more information. - * - * Additional information: [1](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.YMDT.html#method.with_time_precision), [2](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.YMDT.html#method.with_alignment), [3](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.YMDT.html#method.with_year_style), [4](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.YMDT.html#method.for_length) + * See the [Rust documentation for `try_new`](https://docs.rs/icu/2.0.0/icu/datetime/struct.DateTimeFormatter.html#method.try_new) for more information. + * + * See the [Rust documentation for `YMDT`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.YMDT.html) for more information. + * + * Additional information: [1](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.YMDT.html#method.with_time_precision), [2](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.YMDT.html#method.with_alignment), [3](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.YMDT.html#method.with_year_style), [4](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.YMDT.html#method.for_length) */ - inline static diplomat::result, icu4x::DateTimeFormatterLoadError> create_ymdt(const icu4x::Locale& locale, std::optional length, std::optional time_precision, std::optional alignment, std::optional year_style); + inline static icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> create_ymdt(const icu4x::Locale& locale, std::optional length, std::optional time_precision, std::optional alignment, std::optional year_style); /** - * See the [Rust documentation for `try_new`](https://docs.rs/icu/2.0.0/icu/datetime/struct.DateTimeFormatter.html#method.try_new) for more information. - * - * See the [Rust documentation for `YMDT`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.YMDT.html) for more information. - * - * Additional information: [1](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.YMDT.html#method.with_time_precision), [2](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.YMDT.html#method.with_alignment), [3](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.YMDT.html#method.with_year_style), [4](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.YMDT.html#method.for_length) + * See the [Rust documentation for `try_new`](https://docs.rs/icu/2.0.0/icu/datetime/struct.DateTimeFormatter.html#method.try_new) for more information. + * + * See the [Rust documentation for `YMDT`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.YMDT.html) for more information. + * + * Additional information: [1](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.YMDT.html#method.with_time_precision), [2](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.YMDT.html#method.with_alignment), [3](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.YMDT.html#method.with_year_style), [4](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.YMDT.html#method.for_length) */ - inline static diplomat::result, icu4x::DateTimeFormatterLoadError> create_ymdt_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, std::optional length, std::optional time_precision, std::optional alignment, std::optional year_style); + inline static icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> create_ymdt_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, std::optional length, std::optional time_precision, std::optional alignment, std::optional year_style); /** - * See the [Rust documentation for `try_new`](https://docs.rs/icu/2.0.0/icu/datetime/struct.DateTimeFormatter.html#method.try_new) for more information. - * - * See the [Rust documentation for `DET`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.DET.html) for more information. - * - * Additional information: [1](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.DET.html#method.with_time_precision), [2](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.DET.html#method.with_alignment), [3](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.DET.html#method.for_length) + * See the [Rust documentation for `try_new`](https://docs.rs/icu/2.0.0/icu/datetime/struct.DateTimeFormatter.html#method.try_new) for more information. + * + * See the [Rust documentation for `DET`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.DET.html) for more information. + * + * Additional information: [1](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.DET.html#method.with_time_precision), [2](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.DET.html#method.with_alignment), [3](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.DET.html#method.for_length) */ - inline static diplomat::result, icu4x::DateTimeFormatterLoadError> create_det(const icu4x::Locale& locale, std::optional length, std::optional time_precision, std::optional alignment); + inline static icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> create_det(const icu4x::Locale& locale, std::optional length, std::optional time_precision, std::optional alignment); /** - * See the [Rust documentation for `try_new`](https://docs.rs/icu/2.0.0/icu/datetime/struct.DateTimeFormatter.html#method.try_new) for more information. - * - * See the [Rust documentation for `DET`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.DET.html) for more information. - * - * Additional information: [1](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.DET.html#method.with_time_precision), [2](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.DET.html#method.with_alignment), [3](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.DET.html#method.for_length) + * See the [Rust documentation for `try_new`](https://docs.rs/icu/2.0.0/icu/datetime/struct.DateTimeFormatter.html#method.try_new) for more information. + * + * See the [Rust documentation for `DET`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.DET.html) for more information. + * + * Additional information: [1](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.DET.html#method.with_time_precision), [2](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.DET.html#method.with_alignment), [3](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.DET.html#method.for_length) */ - inline static diplomat::result, icu4x::DateTimeFormatterLoadError> create_det_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, std::optional length, std::optional time_precision, std::optional alignment); + inline static icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> create_det_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, std::optional length, std::optional time_precision, std::optional alignment); /** - * See the [Rust documentation for `try_new`](https://docs.rs/icu/2.0.0/icu/datetime/struct.DateTimeFormatter.html#method.try_new) for more information. - * - * See the [Rust documentation for `MDET`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.MDET.html) for more information. - * - * Additional information: [1](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.MDET.html#method.with_time_precision), [2](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.MDET.html#method.with_alignment), [3](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.MDET.html#method.for_length) + * See the [Rust documentation for `try_new`](https://docs.rs/icu/2.0.0/icu/datetime/struct.DateTimeFormatter.html#method.try_new) for more information. + * + * See the [Rust documentation for `MDET`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.MDET.html) for more information. + * + * Additional information: [1](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.MDET.html#method.with_time_precision), [2](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.MDET.html#method.with_alignment), [3](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.MDET.html#method.for_length) */ - inline static diplomat::result, icu4x::DateTimeFormatterLoadError> create_mdet(const icu4x::Locale& locale, std::optional length, std::optional time_precision, std::optional alignment); + inline static icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> create_mdet(const icu4x::Locale& locale, std::optional length, std::optional time_precision, std::optional alignment); /** - * See the [Rust documentation for `try_new`](https://docs.rs/icu/2.0.0/icu/datetime/struct.DateTimeFormatter.html#method.try_new) for more information. - * - * See the [Rust documentation for `MDET`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.MDET.html) for more information. - * - * Additional information: [1](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.MDET.html#method.with_time_precision), [2](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.MDET.html#method.with_alignment), [3](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.MDET.html#method.for_length) + * See the [Rust documentation for `try_new`](https://docs.rs/icu/2.0.0/icu/datetime/struct.DateTimeFormatter.html#method.try_new) for more information. + * + * See the [Rust documentation for `MDET`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.MDET.html) for more information. + * + * Additional information: [1](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.MDET.html#method.with_time_precision), [2](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.MDET.html#method.with_alignment), [3](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.MDET.html#method.for_length) */ - inline static diplomat::result, icu4x::DateTimeFormatterLoadError> create_mdet_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, std::optional length, std::optional time_precision, std::optional alignment); + inline static icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> create_mdet_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, std::optional length, std::optional time_precision, std::optional alignment); /** - * See the [Rust documentation for `try_new`](https://docs.rs/icu/2.0.0/icu/datetime/struct.DateTimeFormatter.html#method.try_new) for more information. - * - * See the [Rust documentation for `YMDET`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.YMDET.html) for more information. - * - * Additional information: [1](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.YMDET.html#method.with_time_precision), [2](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.YMDET.html#method.with_alignment), [3](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.YMDET.html#method.with_year_style), [4](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.YMDET.html#method.for_length) + * See the [Rust documentation for `try_new`](https://docs.rs/icu/2.0.0/icu/datetime/struct.DateTimeFormatter.html#method.try_new) for more information. + * + * See the [Rust documentation for `YMDET`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.YMDET.html) for more information. + * + * Additional information: [1](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.YMDET.html#method.with_time_precision), [2](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.YMDET.html#method.with_alignment), [3](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.YMDET.html#method.with_year_style), [4](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.YMDET.html#method.for_length) */ - inline static diplomat::result, icu4x::DateTimeFormatterLoadError> create_ymdet(const icu4x::Locale& locale, std::optional length, std::optional time_precision, std::optional alignment, std::optional year_style); + inline static icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> create_ymdet(const icu4x::Locale& locale, std::optional length, std::optional time_precision, std::optional alignment, std::optional year_style); /** - * See the [Rust documentation for `try_new`](https://docs.rs/icu/2.0.0/icu/datetime/struct.DateTimeFormatter.html#method.try_new) for more information. - * - * See the [Rust documentation for `YMDET`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.YMDET.html) for more information. - * - * Additional information: [1](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.YMDET.html#method.with_time_precision), [2](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.YMDET.html#method.with_alignment), [3](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.YMDET.html#method.with_year_style), [4](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.YMDET.html#method.for_length) + * See the [Rust documentation for `try_new`](https://docs.rs/icu/2.0.0/icu/datetime/struct.DateTimeFormatter.html#method.try_new) for more information. + * + * See the [Rust documentation for `YMDET`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.YMDET.html) for more information. + * + * Additional information: [1](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.YMDET.html#method.with_time_precision), [2](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.YMDET.html#method.with_alignment), [3](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.YMDET.html#method.with_year_style), [4](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.YMDET.html#method.for_length) */ - inline static diplomat::result, icu4x::DateTimeFormatterLoadError> create_ymdet_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, std::optional length, std::optional time_precision, std::optional alignment, std::optional year_style); + inline static icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> create_ymdet_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, std::optional length, std::optional time_precision, std::optional alignment, std::optional year_style); /** - * See the [Rust documentation for `try_new`](https://docs.rs/icu/2.0.0/icu/datetime/struct.DateTimeFormatter.html#method.try_new) for more information. - * - * See the [Rust documentation for `ET`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.ET.html) for more information. - * - * Additional information: [1](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.ET.html#method.with_time_precision), [2](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.ET.html#method.with_alignment), [3](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.ET.html#method.for_length) + * See the [Rust documentation for `try_new`](https://docs.rs/icu/2.0.0/icu/datetime/struct.DateTimeFormatter.html#method.try_new) for more information. + * + * See the [Rust documentation for `ET`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.ET.html) for more information. + * + * Additional information: [1](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.ET.html#method.with_time_precision), [2](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.ET.html#method.with_alignment), [3](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.ET.html#method.for_length) */ - inline static diplomat::result, icu4x::DateTimeFormatterLoadError> create_et(const icu4x::Locale& locale, std::optional length, std::optional time_precision, std::optional alignment); + inline static icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> create_et(const icu4x::Locale& locale, std::optional length, std::optional time_precision, std::optional alignment); /** - * See the [Rust documentation for `try_new`](https://docs.rs/icu/2.0.0/icu/datetime/struct.DateTimeFormatter.html#method.try_new) for more information. - * - * See the [Rust documentation for `ET`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.ET.html) for more information. - * - * Additional information: [1](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.ET.html#method.with_time_precision), [2](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.ET.html#method.with_alignment), [3](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.ET.html#method.for_length) + * See the [Rust documentation for `try_new`](https://docs.rs/icu/2.0.0/icu/datetime/struct.DateTimeFormatter.html#method.try_new) for more information. + * + * See the [Rust documentation for `ET`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.ET.html) for more information. + * + * Additional information: [1](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.ET.html#method.with_time_precision), [2](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.ET.html#method.with_alignment), [3](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.ET.html#method.for_length) */ - inline static diplomat::result, icu4x::DateTimeFormatterLoadError> create_et_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, std::optional length, std::optional time_precision, std::optional alignment); + inline static icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> create_et_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, std::optional length, std::optional time_precision, std::optional alignment); /** - * See the [Rust documentation for `format`](https://docs.rs/icu/2.0.0/icu/datetime/struct.DateTimeFormatter.html#method.format) for more information. + * See the [Rust documentation for `format`](https://docs.rs/icu/2.0.0/icu/datetime/struct.DateTimeFormatter.html#method.format) for more information. */ inline std::string format_iso(const icu4x::IsoDate& iso_date, const icu4x::Time& time) const; template inline void format_iso_write(const icu4x::IsoDate& iso_date, const icu4x::Time& time, W& writeable_output) const; /** - * See the [Rust documentation for `format_same_calendar`](https://docs.rs/icu/2.0.0/icu/datetime/struct.DateTimeFormatter.html#method.format_same_calendar) for more information. + * See the [Rust documentation for `format_same_calendar`](https://docs.rs/icu/2.0.0/icu/datetime/struct.DateTimeFormatter.html#method.format_same_calendar) for more information. */ - inline diplomat::result format_same_calendar(const icu4x::Date& date, const icu4x::Time& time) const; + inline icu4x::diplomat::result format_same_calendar(const icu4x::Date& date, const icu4x::Time& time) const; template - inline diplomat::result format_same_calendar_write(const icu4x::Date& date, const icu4x::Time& time, W& writeable_output) const; + inline icu4x::diplomat::result format_same_calendar_write(const icu4x::Date& date, const icu4x::Time& time, W& writeable_output) const; inline const icu4x::capi::DateTimeFormatter* AsFFI() const; inline icu4x::capi::DateTimeFormatter* AsFFI(); @@ -201,4 +201,4 @@ class DateTimeFormatter { }; } // namespace -#endif // icu4x_DateTimeFormatter_D_HPP +#endif // ICU4X_DateTimeFormatter_D_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/DateTimeFormatter.hpp b/ffi/capi/bindings/cpp/icu4x/DateTimeFormatter.hpp index 195c712cbfa..811e5f4f539 100644 --- a/ffi/capi/bindings/cpp/icu4x/DateTimeFormatter.hpp +++ b/ffi/capi/bindings/cpp/icu4x/DateTimeFormatter.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_DateTimeFormatter_HPP -#define icu4x_DateTimeFormatter_HPP +#ifndef ICU4X_DateTimeFormatter_HPP +#define ICU4X_DateTimeFormatter_HPP #include "DateTimeFormatter.d.hpp" @@ -11,7 +11,6 @@ #include #include #include -#include "../diplomat_runtime.hpp" #include "DataProvider.hpp" #include "Date.hpp" #include "DateTimeAlignment.hpp" @@ -23,6 +22,7 @@ #include "Time.hpp" #include "TimePrecision.hpp" #include "YearStyle.hpp" +#include "diplomat_runtime.hpp" namespace icu4x { @@ -71,10 +71,10 @@ namespace capi { typedef struct icu4x_DateTimeFormatter_create_et_with_provider_mv1_result {union {icu4x::capi::DateTimeFormatter* ok; icu4x::capi::DateTimeFormatterLoadError err;}; bool is_ok;} icu4x_DateTimeFormatter_create_et_with_provider_mv1_result; icu4x_DateTimeFormatter_create_et_with_provider_mv1_result icu4x_DateTimeFormatter_create_et_with_provider_mv1(const icu4x::capi::DataProvider* provider, const icu4x::capi::Locale* locale, icu4x::capi::DateTimeLength_option length, icu4x::capi::TimePrecision_option time_precision, icu4x::capi::DateTimeAlignment_option alignment); - void icu4x_DateTimeFormatter_format_iso_mv1(const icu4x::capi::DateTimeFormatter* self, const icu4x::capi::IsoDate* iso_date, const icu4x::capi::Time* time, diplomat::capi::DiplomatWrite* write); + void icu4x_DateTimeFormatter_format_iso_mv1(const icu4x::capi::DateTimeFormatter* self, const icu4x::capi::IsoDate* iso_date, const icu4x::capi::Time* time, icu4x::diplomat::capi::DiplomatWrite* write); typedef struct icu4x_DateTimeFormatter_format_same_calendar_mv1_result {union { icu4x::capi::DateTimeMismatchedCalendarError err;}; bool is_ok;} icu4x_DateTimeFormatter_format_same_calendar_mv1_result; - icu4x_DateTimeFormatter_format_same_calendar_mv1_result icu4x_DateTimeFormatter_format_same_calendar_mv1(const icu4x::capi::DateTimeFormatter* self, const icu4x::capi::Date* date, const icu4x::capi::Time* time, diplomat::capi::DiplomatWrite* write); + icu4x_DateTimeFormatter_format_same_calendar_mv1_result icu4x_DateTimeFormatter_format_same_calendar_mv1(const icu4x::capi::DateTimeFormatter* self, const icu4x::capi::Date* date, const icu4x::capi::Time* time, icu4x::diplomat::capi::DiplomatWrite* write); void icu4x_DateTimeFormatter_destroy_mv1(DateTimeFormatter* self); @@ -82,132 +82,132 @@ namespace capi { } // namespace capi } // namespace -inline diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::DateTimeFormatter::create_dt(const icu4x::Locale& locale, std::optional length, std::optional time_precision, std::optional alignment) { +inline icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::DateTimeFormatter::create_dt(const icu4x::Locale& locale, std::optional length, std::optional time_precision, std::optional alignment) { auto result = icu4x::capi::icu4x_DateTimeFormatter_create_dt_mv1(locale.AsFFI(), length.has_value() ? (icu4x::capi::DateTimeLength_option{ { length.value().AsFFI() }, true }) : (icu4x::capi::DateTimeLength_option{ {}, false }), time_precision.has_value() ? (icu4x::capi::TimePrecision_option{ { time_precision.value().AsFFI() }, true }) : (icu4x::capi::TimePrecision_option{ {}, false }), alignment.has_value() ? (icu4x::capi::DateTimeAlignment_option{ { alignment.value().AsFFI() }, true }) : (icu4x::capi::DateTimeAlignment_option{ {}, false })); - return result.is_ok ? diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Ok>(std::unique_ptr(icu4x::DateTimeFormatter::FromFFI(result.ok)))) : diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::DateTimeFormatter::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); } -inline diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::DateTimeFormatter::create_dt_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, std::optional length, std::optional time_precision, std::optional alignment) { +inline icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::DateTimeFormatter::create_dt_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, std::optional length, std::optional time_precision, std::optional alignment) { auto result = icu4x::capi::icu4x_DateTimeFormatter_create_dt_with_provider_mv1(provider.AsFFI(), locale.AsFFI(), length.has_value() ? (icu4x::capi::DateTimeLength_option{ { length.value().AsFFI() }, true }) : (icu4x::capi::DateTimeLength_option{ {}, false }), time_precision.has_value() ? (icu4x::capi::TimePrecision_option{ { time_precision.value().AsFFI() }, true }) : (icu4x::capi::TimePrecision_option{ {}, false }), alignment.has_value() ? (icu4x::capi::DateTimeAlignment_option{ { alignment.value().AsFFI() }, true }) : (icu4x::capi::DateTimeAlignment_option{ {}, false })); - return result.is_ok ? diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Ok>(std::unique_ptr(icu4x::DateTimeFormatter::FromFFI(result.ok)))) : diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::DateTimeFormatter::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); } -inline diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::DateTimeFormatter::create_mdt(const icu4x::Locale& locale, std::optional length, std::optional time_precision, std::optional alignment) { +inline icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::DateTimeFormatter::create_mdt(const icu4x::Locale& locale, std::optional length, std::optional time_precision, std::optional alignment) { auto result = icu4x::capi::icu4x_DateTimeFormatter_create_mdt_mv1(locale.AsFFI(), length.has_value() ? (icu4x::capi::DateTimeLength_option{ { length.value().AsFFI() }, true }) : (icu4x::capi::DateTimeLength_option{ {}, false }), time_precision.has_value() ? (icu4x::capi::TimePrecision_option{ { time_precision.value().AsFFI() }, true }) : (icu4x::capi::TimePrecision_option{ {}, false }), alignment.has_value() ? (icu4x::capi::DateTimeAlignment_option{ { alignment.value().AsFFI() }, true }) : (icu4x::capi::DateTimeAlignment_option{ {}, false })); - return result.is_ok ? diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Ok>(std::unique_ptr(icu4x::DateTimeFormatter::FromFFI(result.ok)))) : diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::DateTimeFormatter::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); } -inline diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::DateTimeFormatter::create_mdt_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, std::optional length, std::optional time_precision, std::optional alignment) { +inline icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::DateTimeFormatter::create_mdt_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, std::optional length, std::optional time_precision, std::optional alignment) { auto result = icu4x::capi::icu4x_DateTimeFormatter_create_mdt_with_provider_mv1(provider.AsFFI(), locale.AsFFI(), length.has_value() ? (icu4x::capi::DateTimeLength_option{ { length.value().AsFFI() }, true }) : (icu4x::capi::DateTimeLength_option{ {}, false }), time_precision.has_value() ? (icu4x::capi::TimePrecision_option{ { time_precision.value().AsFFI() }, true }) : (icu4x::capi::TimePrecision_option{ {}, false }), alignment.has_value() ? (icu4x::capi::DateTimeAlignment_option{ { alignment.value().AsFFI() }, true }) : (icu4x::capi::DateTimeAlignment_option{ {}, false })); - return result.is_ok ? diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Ok>(std::unique_ptr(icu4x::DateTimeFormatter::FromFFI(result.ok)))) : diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::DateTimeFormatter::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); } -inline diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::DateTimeFormatter::create_ymdt(const icu4x::Locale& locale, std::optional length, std::optional time_precision, std::optional alignment, std::optional year_style) { +inline icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::DateTimeFormatter::create_ymdt(const icu4x::Locale& locale, std::optional length, std::optional time_precision, std::optional alignment, std::optional year_style) { auto result = icu4x::capi::icu4x_DateTimeFormatter_create_ymdt_mv1(locale.AsFFI(), length.has_value() ? (icu4x::capi::DateTimeLength_option{ { length.value().AsFFI() }, true }) : (icu4x::capi::DateTimeLength_option{ {}, false }), time_precision.has_value() ? (icu4x::capi::TimePrecision_option{ { time_precision.value().AsFFI() }, true }) : (icu4x::capi::TimePrecision_option{ {}, false }), alignment.has_value() ? (icu4x::capi::DateTimeAlignment_option{ { alignment.value().AsFFI() }, true }) : (icu4x::capi::DateTimeAlignment_option{ {}, false }), year_style.has_value() ? (icu4x::capi::YearStyle_option{ { year_style.value().AsFFI() }, true }) : (icu4x::capi::YearStyle_option{ {}, false })); - return result.is_ok ? diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Ok>(std::unique_ptr(icu4x::DateTimeFormatter::FromFFI(result.ok)))) : diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::DateTimeFormatter::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); } -inline diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::DateTimeFormatter::create_ymdt_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, std::optional length, std::optional time_precision, std::optional alignment, std::optional year_style) { +inline icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::DateTimeFormatter::create_ymdt_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, std::optional length, std::optional time_precision, std::optional alignment, std::optional year_style) { auto result = icu4x::capi::icu4x_DateTimeFormatter_create_ymdt_with_provider_mv1(provider.AsFFI(), locale.AsFFI(), length.has_value() ? (icu4x::capi::DateTimeLength_option{ { length.value().AsFFI() }, true }) : (icu4x::capi::DateTimeLength_option{ {}, false }), time_precision.has_value() ? (icu4x::capi::TimePrecision_option{ { time_precision.value().AsFFI() }, true }) : (icu4x::capi::TimePrecision_option{ {}, false }), alignment.has_value() ? (icu4x::capi::DateTimeAlignment_option{ { alignment.value().AsFFI() }, true }) : (icu4x::capi::DateTimeAlignment_option{ {}, false }), year_style.has_value() ? (icu4x::capi::YearStyle_option{ { year_style.value().AsFFI() }, true }) : (icu4x::capi::YearStyle_option{ {}, false })); - return result.is_ok ? diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Ok>(std::unique_ptr(icu4x::DateTimeFormatter::FromFFI(result.ok)))) : diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::DateTimeFormatter::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); } -inline diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::DateTimeFormatter::create_det(const icu4x::Locale& locale, std::optional length, std::optional time_precision, std::optional alignment) { +inline icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::DateTimeFormatter::create_det(const icu4x::Locale& locale, std::optional length, std::optional time_precision, std::optional alignment) { auto result = icu4x::capi::icu4x_DateTimeFormatter_create_det_mv1(locale.AsFFI(), length.has_value() ? (icu4x::capi::DateTimeLength_option{ { length.value().AsFFI() }, true }) : (icu4x::capi::DateTimeLength_option{ {}, false }), time_precision.has_value() ? (icu4x::capi::TimePrecision_option{ { time_precision.value().AsFFI() }, true }) : (icu4x::capi::TimePrecision_option{ {}, false }), alignment.has_value() ? (icu4x::capi::DateTimeAlignment_option{ { alignment.value().AsFFI() }, true }) : (icu4x::capi::DateTimeAlignment_option{ {}, false })); - return result.is_ok ? diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Ok>(std::unique_ptr(icu4x::DateTimeFormatter::FromFFI(result.ok)))) : diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::DateTimeFormatter::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); } -inline diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::DateTimeFormatter::create_det_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, std::optional length, std::optional time_precision, std::optional alignment) { +inline icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::DateTimeFormatter::create_det_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, std::optional length, std::optional time_precision, std::optional alignment) { auto result = icu4x::capi::icu4x_DateTimeFormatter_create_det_with_provider_mv1(provider.AsFFI(), locale.AsFFI(), length.has_value() ? (icu4x::capi::DateTimeLength_option{ { length.value().AsFFI() }, true }) : (icu4x::capi::DateTimeLength_option{ {}, false }), time_precision.has_value() ? (icu4x::capi::TimePrecision_option{ { time_precision.value().AsFFI() }, true }) : (icu4x::capi::TimePrecision_option{ {}, false }), alignment.has_value() ? (icu4x::capi::DateTimeAlignment_option{ { alignment.value().AsFFI() }, true }) : (icu4x::capi::DateTimeAlignment_option{ {}, false })); - return result.is_ok ? diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Ok>(std::unique_ptr(icu4x::DateTimeFormatter::FromFFI(result.ok)))) : diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::DateTimeFormatter::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); } -inline diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::DateTimeFormatter::create_mdet(const icu4x::Locale& locale, std::optional length, std::optional time_precision, std::optional alignment) { +inline icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::DateTimeFormatter::create_mdet(const icu4x::Locale& locale, std::optional length, std::optional time_precision, std::optional alignment) { auto result = icu4x::capi::icu4x_DateTimeFormatter_create_mdet_mv1(locale.AsFFI(), length.has_value() ? (icu4x::capi::DateTimeLength_option{ { length.value().AsFFI() }, true }) : (icu4x::capi::DateTimeLength_option{ {}, false }), time_precision.has_value() ? (icu4x::capi::TimePrecision_option{ { time_precision.value().AsFFI() }, true }) : (icu4x::capi::TimePrecision_option{ {}, false }), alignment.has_value() ? (icu4x::capi::DateTimeAlignment_option{ { alignment.value().AsFFI() }, true }) : (icu4x::capi::DateTimeAlignment_option{ {}, false })); - return result.is_ok ? diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Ok>(std::unique_ptr(icu4x::DateTimeFormatter::FromFFI(result.ok)))) : diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::DateTimeFormatter::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); } -inline diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::DateTimeFormatter::create_mdet_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, std::optional length, std::optional time_precision, std::optional alignment) { +inline icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::DateTimeFormatter::create_mdet_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, std::optional length, std::optional time_precision, std::optional alignment) { auto result = icu4x::capi::icu4x_DateTimeFormatter_create_mdet_with_provider_mv1(provider.AsFFI(), locale.AsFFI(), length.has_value() ? (icu4x::capi::DateTimeLength_option{ { length.value().AsFFI() }, true }) : (icu4x::capi::DateTimeLength_option{ {}, false }), time_precision.has_value() ? (icu4x::capi::TimePrecision_option{ { time_precision.value().AsFFI() }, true }) : (icu4x::capi::TimePrecision_option{ {}, false }), alignment.has_value() ? (icu4x::capi::DateTimeAlignment_option{ { alignment.value().AsFFI() }, true }) : (icu4x::capi::DateTimeAlignment_option{ {}, false })); - return result.is_ok ? diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Ok>(std::unique_ptr(icu4x::DateTimeFormatter::FromFFI(result.ok)))) : diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::DateTimeFormatter::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); } -inline diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::DateTimeFormatter::create_ymdet(const icu4x::Locale& locale, std::optional length, std::optional time_precision, std::optional alignment, std::optional year_style) { +inline icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::DateTimeFormatter::create_ymdet(const icu4x::Locale& locale, std::optional length, std::optional time_precision, std::optional alignment, std::optional year_style) { auto result = icu4x::capi::icu4x_DateTimeFormatter_create_ymdet_mv1(locale.AsFFI(), length.has_value() ? (icu4x::capi::DateTimeLength_option{ { length.value().AsFFI() }, true }) : (icu4x::capi::DateTimeLength_option{ {}, false }), time_precision.has_value() ? (icu4x::capi::TimePrecision_option{ { time_precision.value().AsFFI() }, true }) : (icu4x::capi::TimePrecision_option{ {}, false }), alignment.has_value() ? (icu4x::capi::DateTimeAlignment_option{ { alignment.value().AsFFI() }, true }) : (icu4x::capi::DateTimeAlignment_option{ {}, false }), year_style.has_value() ? (icu4x::capi::YearStyle_option{ { year_style.value().AsFFI() }, true }) : (icu4x::capi::YearStyle_option{ {}, false })); - return result.is_ok ? diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Ok>(std::unique_ptr(icu4x::DateTimeFormatter::FromFFI(result.ok)))) : diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::DateTimeFormatter::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); } -inline diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::DateTimeFormatter::create_ymdet_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, std::optional length, std::optional time_precision, std::optional alignment, std::optional year_style) { +inline icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::DateTimeFormatter::create_ymdet_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, std::optional length, std::optional time_precision, std::optional alignment, std::optional year_style) { auto result = icu4x::capi::icu4x_DateTimeFormatter_create_ymdet_with_provider_mv1(provider.AsFFI(), locale.AsFFI(), length.has_value() ? (icu4x::capi::DateTimeLength_option{ { length.value().AsFFI() }, true }) : (icu4x::capi::DateTimeLength_option{ {}, false }), time_precision.has_value() ? (icu4x::capi::TimePrecision_option{ { time_precision.value().AsFFI() }, true }) : (icu4x::capi::TimePrecision_option{ {}, false }), alignment.has_value() ? (icu4x::capi::DateTimeAlignment_option{ { alignment.value().AsFFI() }, true }) : (icu4x::capi::DateTimeAlignment_option{ {}, false }), year_style.has_value() ? (icu4x::capi::YearStyle_option{ { year_style.value().AsFFI() }, true }) : (icu4x::capi::YearStyle_option{ {}, false })); - return result.is_ok ? diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Ok>(std::unique_ptr(icu4x::DateTimeFormatter::FromFFI(result.ok)))) : diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::DateTimeFormatter::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); } -inline diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::DateTimeFormatter::create_et(const icu4x::Locale& locale, std::optional length, std::optional time_precision, std::optional alignment) { +inline icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::DateTimeFormatter::create_et(const icu4x::Locale& locale, std::optional length, std::optional time_precision, std::optional alignment) { auto result = icu4x::capi::icu4x_DateTimeFormatter_create_et_mv1(locale.AsFFI(), length.has_value() ? (icu4x::capi::DateTimeLength_option{ { length.value().AsFFI() }, true }) : (icu4x::capi::DateTimeLength_option{ {}, false }), time_precision.has_value() ? (icu4x::capi::TimePrecision_option{ { time_precision.value().AsFFI() }, true }) : (icu4x::capi::TimePrecision_option{ {}, false }), alignment.has_value() ? (icu4x::capi::DateTimeAlignment_option{ { alignment.value().AsFFI() }, true }) : (icu4x::capi::DateTimeAlignment_option{ {}, false })); - return result.is_ok ? diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Ok>(std::unique_ptr(icu4x::DateTimeFormatter::FromFFI(result.ok)))) : diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::DateTimeFormatter::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); } -inline diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::DateTimeFormatter::create_et_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, std::optional length, std::optional time_precision, std::optional alignment) { +inline icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::DateTimeFormatter::create_et_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, std::optional length, std::optional time_precision, std::optional alignment) { auto result = icu4x::capi::icu4x_DateTimeFormatter_create_et_with_provider_mv1(provider.AsFFI(), locale.AsFFI(), length.has_value() ? (icu4x::capi::DateTimeLength_option{ { length.value().AsFFI() }, true }) : (icu4x::capi::DateTimeLength_option{ {}, false }), time_precision.has_value() ? (icu4x::capi::TimePrecision_option{ { time_precision.value().AsFFI() }, true }) : (icu4x::capi::TimePrecision_option{ {}, false }), alignment.has_value() ? (icu4x::capi::DateTimeAlignment_option{ { alignment.value().AsFFI() }, true }) : (icu4x::capi::DateTimeAlignment_option{ {}, false })); - return result.is_ok ? diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Ok>(std::unique_ptr(icu4x::DateTimeFormatter::FromFFI(result.ok)))) : diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::DateTimeFormatter::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); } inline std::string icu4x::DateTimeFormatter::format_iso(const icu4x::IsoDate& iso_date, const icu4x::Time& time) const { std::string output; - diplomat::capi::DiplomatWrite write = diplomat::WriteFromString(output); + icu4x::diplomat::capi::DiplomatWrite write = icu4x::diplomat::WriteFromString(output); icu4x::capi::icu4x_DateTimeFormatter_format_iso_mv1(this->AsFFI(), iso_date.AsFFI(), time.AsFFI(), @@ -216,30 +216,30 @@ inline std::string icu4x::DateTimeFormatter::format_iso(const icu4x::IsoDate& is } template inline void icu4x::DateTimeFormatter::format_iso_write(const icu4x::IsoDate& iso_date, const icu4x::Time& time, W& writeable) const { - diplomat::capi::DiplomatWrite write = diplomat::WriteTrait::Construct(writeable); + icu4x::diplomat::capi::DiplomatWrite write = icu4x::diplomat::WriteTrait::Construct(writeable); icu4x::capi::icu4x_DateTimeFormatter_format_iso_mv1(this->AsFFI(), iso_date.AsFFI(), time.AsFFI(), &write); } -inline diplomat::result icu4x::DateTimeFormatter::format_same_calendar(const icu4x::Date& date, const icu4x::Time& time) const { +inline icu4x::diplomat::result icu4x::DateTimeFormatter::format_same_calendar(const icu4x::Date& date, const icu4x::Time& time) const { std::string output; - diplomat::capi::DiplomatWrite write = diplomat::WriteFromString(output); + icu4x::diplomat::capi::DiplomatWrite write = icu4x::diplomat::WriteFromString(output); auto result = icu4x::capi::icu4x_DateTimeFormatter_format_same_calendar_mv1(this->AsFFI(), date.AsFFI(), time.AsFFI(), &write); - return result.is_ok ? diplomat::result(diplomat::Ok(std::move(output))) : diplomat::result(diplomat::Err(icu4x::DateTimeMismatchedCalendarError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result(icu4x::diplomat::Ok(std::move(output))) : icu4x::diplomat::result(icu4x::diplomat::Err(icu4x::DateTimeMismatchedCalendarError::FromFFI(result.err))); } template -inline diplomat::result icu4x::DateTimeFormatter::format_same_calendar_write(const icu4x::Date& date, const icu4x::Time& time, W& writeable) const { - diplomat::capi::DiplomatWrite write = diplomat::WriteTrait::Construct(writeable); +inline icu4x::diplomat::result icu4x::DateTimeFormatter::format_same_calendar_write(const icu4x::Date& date, const icu4x::Time& time, W& writeable) const { + icu4x::diplomat::capi::DiplomatWrite write = icu4x::diplomat::WriteTrait::Construct(writeable); auto result = icu4x::capi::icu4x_DateTimeFormatter_format_same_calendar_mv1(this->AsFFI(), date.AsFFI(), time.AsFFI(), &write); - return result.is_ok ? diplomat::result(diplomat::Ok()) : diplomat::result(diplomat::Err(icu4x::DateTimeMismatchedCalendarError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result(icu4x::diplomat::Ok()) : icu4x::diplomat::result(icu4x::diplomat::Err(icu4x::DateTimeMismatchedCalendarError::FromFFI(result.err))); } inline const icu4x::capi::DateTimeFormatter* icu4x::DateTimeFormatter::AsFFI() const { @@ -263,4 +263,4 @@ inline void icu4x::DateTimeFormatter::operator delete(void* ptr) { } -#endif // icu4x_DateTimeFormatter_HPP +#endif // ICU4X_DateTimeFormatter_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/DateTimeFormatterGregorian.d.hpp b/ffi/capi/bindings/cpp/icu4x/DateTimeFormatterGregorian.d.hpp index 4b888e9711f..0c76885490b 100644 --- a/ffi/capi/bindings/cpp/icu4x/DateTimeFormatterGregorian.d.hpp +++ b/ffi/capi/bindings/cpp/icu4x/DateTimeFormatterGregorian.d.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_DateTimeFormatterGregorian_D_HPP -#define icu4x_DateTimeFormatterGregorian_D_HPP +#ifndef ICU4X_DateTimeFormatterGregorian_D_HPP +#define ICU4X_DateTimeFormatterGregorian_D_HPP #include #include @@ -9,8 +9,7 @@ #include #include #include -#include "../diplomat_runtime.hpp" - +#include "diplomat_runtime.hpp" namespace icu4x { namespace capi { struct DataProvider; } class DataProvider; @@ -27,7 +26,8 @@ class DateTimeFormatterLoadError; class DateTimeLength; class TimePrecision; class YearStyle; -} +} // namespace icu4x + namespace icu4x { @@ -44,133 +44,133 @@ class DateTimeFormatterGregorian { public: /** - * See the [Rust documentation for `try_new`](https://docs.rs/icu/2.0.0/icu/datetime/struct.FixedCalendarDateTimeFormatter.html#method.try_new) for more information. - * - * See the [Rust documentation for `DT`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.DT.html) for more information. - * - * Additional information: [1](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.DT.html#method.with_time_precision), [2](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.DT.html#method.with_alignment), [3](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.DT.html#method.for_length) + * See the [Rust documentation for `try_new`](https://docs.rs/icu/2.0.0/icu/datetime/struct.FixedCalendarDateTimeFormatter.html#method.try_new) for more information. + * + * See the [Rust documentation for `DT`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.DT.html) for more information. + * + * Additional information: [1](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.DT.html#method.with_time_precision), [2](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.DT.html#method.with_alignment), [3](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.DT.html#method.for_length) */ - inline static diplomat::result, icu4x::DateTimeFormatterLoadError> create_dt(const icu4x::Locale& locale, std::optional length, std::optional time_precision, std::optional alignment); + inline static icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> create_dt(const icu4x::Locale& locale, std::optional length, std::optional time_precision, std::optional alignment); /** - * See the [Rust documentation for `try_new`](https://docs.rs/icu/2.0.0/icu/datetime/struct.FixedCalendarDateTimeFormatter.html#method.try_new) for more information. - * - * See the [Rust documentation for `DT`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.DT.html) for more information. - * - * Additional information: [1](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.DT.html#method.with_time_precision), [2](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.DT.html#method.with_alignment), [3](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.DT.html#method.for_length) + * See the [Rust documentation for `try_new`](https://docs.rs/icu/2.0.0/icu/datetime/struct.FixedCalendarDateTimeFormatter.html#method.try_new) for more information. + * + * See the [Rust documentation for `DT`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.DT.html) for more information. + * + * Additional information: [1](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.DT.html#method.with_time_precision), [2](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.DT.html#method.with_alignment), [3](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.DT.html#method.for_length) */ - inline static diplomat::result, icu4x::DateTimeFormatterLoadError> create_dt_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, std::optional length, std::optional time_precision, std::optional alignment); + inline static icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> create_dt_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, std::optional length, std::optional time_precision, std::optional alignment); /** - * See the [Rust documentation for `try_new`](https://docs.rs/icu/2.0.0/icu/datetime/struct.FixedCalendarDateTimeFormatter.html#method.try_new) for more information. - * - * See the [Rust documentation for `MDT`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.MDT.html) for more information. - * - * Additional information: [1](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.MDT.html#method.with_time_precision), [2](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.MDT.html#method.with_alignment), [3](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.MDT.html#method.for_length) + * See the [Rust documentation for `try_new`](https://docs.rs/icu/2.0.0/icu/datetime/struct.FixedCalendarDateTimeFormatter.html#method.try_new) for more information. + * + * See the [Rust documentation for `MDT`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.MDT.html) for more information. + * + * Additional information: [1](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.MDT.html#method.with_time_precision), [2](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.MDT.html#method.with_alignment), [3](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.MDT.html#method.for_length) */ - inline static diplomat::result, icu4x::DateTimeFormatterLoadError> create_mdt(const icu4x::Locale& locale, std::optional length, std::optional time_precision, std::optional alignment); + inline static icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> create_mdt(const icu4x::Locale& locale, std::optional length, std::optional time_precision, std::optional alignment); /** - * See the [Rust documentation for `try_new`](https://docs.rs/icu/2.0.0/icu/datetime/struct.FixedCalendarDateTimeFormatter.html#method.try_new) for more information. - * - * See the [Rust documentation for `MDT`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.MDT.html) for more information. - * - * Additional information: [1](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.MDT.html#method.with_time_precision), [2](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.MDT.html#method.with_alignment), [3](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.MDT.html#method.for_length) + * See the [Rust documentation for `try_new`](https://docs.rs/icu/2.0.0/icu/datetime/struct.FixedCalendarDateTimeFormatter.html#method.try_new) for more information. + * + * See the [Rust documentation for `MDT`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.MDT.html) for more information. + * + * Additional information: [1](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.MDT.html#method.with_time_precision), [2](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.MDT.html#method.with_alignment), [3](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.MDT.html#method.for_length) */ - inline static diplomat::result, icu4x::DateTimeFormatterLoadError> create_mdt_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, std::optional length, std::optional time_precision, std::optional alignment); + inline static icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> create_mdt_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, std::optional length, std::optional time_precision, std::optional alignment); /** - * See the [Rust documentation for `try_new`](https://docs.rs/icu/2.0.0/icu/datetime/struct.FixedCalendarDateTimeFormatter.html#method.try_new) for more information. - * - * See the [Rust documentation for `YMDT`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.YMDT.html) for more information. - * - * Additional information: [1](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.YMDT.html#method.with_time_precision), [2](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.YMDT.html#method.with_alignment), [3](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.YMDT.html#method.with_year_style), [4](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.YMDT.html#method.for_length) + * See the [Rust documentation for `try_new`](https://docs.rs/icu/2.0.0/icu/datetime/struct.FixedCalendarDateTimeFormatter.html#method.try_new) for more information. + * + * See the [Rust documentation for `YMDT`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.YMDT.html) for more information. + * + * Additional information: [1](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.YMDT.html#method.with_time_precision), [2](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.YMDT.html#method.with_alignment), [3](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.YMDT.html#method.with_year_style), [4](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.YMDT.html#method.for_length) */ - inline static diplomat::result, icu4x::DateTimeFormatterLoadError> create_ymdt(const icu4x::Locale& locale, std::optional length, std::optional time_precision, std::optional alignment, std::optional year_style); + inline static icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> create_ymdt(const icu4x::Locale& locale, std::optional length, std::optional time_precision, std::optional alignment, std::optional year_style); /** - * See the [Rust documentation for `try_new`](https://docs.rs/icu/2.0.0/icu/datetime/struct.FixedCalendarDateTimeFormatter.html#method.try_new) for more information. - * - * See the [Rust documentation for `YMDT`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.YMDT.html) for more information. - * - * Additional information: [1](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.YMDT.html#method.with_time_precision), [2](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.YMDT.html#method.with_alignment), [3](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.YMDT.html#method.with_year_style), [4](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.YMDT.html#method.for_length) + * See the [Rust documentation for `try_new`](https://docs.rs/icu/2.0.0/icu/datetime/struct.FixedCalendarDateTimeFormatter.html#method.try_new) for more information. + * + * See the [Rust documentation for `YMDT`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.YMDT.html) for more information. + * + * Additional information: [1](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.YMDT.html#method.with_time_precision), [2](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.YMDT.html#method.with_alignment), [3](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.YMDT.html#method.with_year_style), [4](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.YMDT.html#method.for_length) */ - inline static diplomat::result, icu4x::DateTimeFormatterLoadError> create_ymdt_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, std::optional length, std::optional time_precision, std::optional alignment, std::optional year_style); + inline static icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> create_ymdt_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, std::optional length, std::optional time_precision, std::optional alignment, std::optional year_style); /** - * See the [Rust documentation for `try_new`](https://docs.rs/icu/2.0.0/icu/datetime/struct.FixedCalendarDateTimeFormatter.html#method.try_new) for more information. - * - * See the [Rust documentation for `DET`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.DET.html) for more information. - * - * Additional information: [1](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.DET.html#method.with_time_precision), [2](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.DET.html#method.with_alignment), [3](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.DET.html#method.for_length) + * See the [Rust documentation for `try_new`](https://docs.rs/icu/2.0.0/icu/datetime/struct.FixedCalendarDateTimeFormatter.html#method.try_new) for more information. + * + * See the [Rust documentation for `DET`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.DET.html) for more information. + * + * Additional information: [1](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.DET.html#method.with_time_precision), [2](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.DET.html#method.with_alignment), [3](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.DET.html#method.for_length) */ - inline static diplomat::result, icu4x::DateTimeFormatterLoadError> create_det(const icu4x::Locale& locale, std::optional length, std::optional time_precision, std::optional alignment); + inline static icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> create_det(const icu4x::Locale& locale, std::optional length, std::optional time_precision, std::optional alignment); /** - * See the [Rust documentation for `try_new`](https://docs.rs/icu/2.0.0/icu/datetime/struct.FixedCalendarDateTimeFormatter.html#method.try_new) for more information. - * - * See the [Rust documentation for `DET`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.DET.html) for more information. - * - * Additional information: [1](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.DET.html#method.with_time_precision), [2](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.DET.html#method.with_alignment), [3](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.DET.html#method.for_length) + * See the [Rust documentation for `try_new`](https://docs.rs/icu/2.0.0/icu/datetime/struct.FixedCalendarDateTimeFormatter.html#method.try_new) for more information. + * + * See the [Rust documentation for `DET`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.DET.html) for more information. + * + * Additional information: [1](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.DET.html#method.with_time_precision), [2](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.DET.html#method.with_alignment), [3](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.DET.html#method.for_length) */ - inline static diplomat::result, icu4x::DateTimeFormatterLoadError> create_det_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, std::optional length, std::optional time_precision, std::optional alignment); + inline static icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> create_det_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, std::optional length, std::optional time_precision, std::optional alignment); /** - * See the [Rust documentation for `try_new`](https://docs.rs/icu/2.0.0/icu/datetime/struct.FixedCalendarDateTimeFormatter.html#method.try_new) for more information. - * - * See the [Rust documentation for `MDET`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.MDET.html) for more information. - * - * Additional information: [1](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.MDET.html#method.with_time_precision), [2](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.MDET.html#method.with_alignment), [3](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.MDET.html#method.for_length) + * See the [Rust documentation for `try_new`](https://docs.rs/icu/2.0.0/icu/datetime/struct.FixedCalendarDateTimeFormatter.html#method.try_new) for more information. + * + * See the [Rust documentation for `MDET`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.MDET.html) for more information. + * + * Additional information: [1](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.MDET.html#method.with_time_precision), [2](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.MDET.html#method.with_alignment), [3](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.MDET.html#method.for_length) */ - inline static diplomat::result, icu4x::DateTimeFormatterLoadError> create_mdet(const icu4x::Locale& locale, std::optional length, std::optional time_precision, std::optional alignment); + inline static icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> create_mdet(const icu4x::Locale& locale, std::optional length, std::optional time_precision, std::optional alignment); /** - * See the [Rust documentation for `try_new`](https://docs.rs/icu/2.0.0/icu/datetime/struct.FixedCalendarDateTimeFormatter.html#method.try_new) for more information. - * - * See the [Rust documentation for `MDET`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.MDET.html) for more information. - * - * Additional information: [1](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.MDET.html#method.with_time_precision), [2](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.MDET.html#method.with_alignment), [3](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.MDET.html#method.for_length) + * See the [Rust documentation for `try_new`](https://docs.rs/icu/2.0.0/icu/datetime/struct.FixedCalendarDateTimeFormatter.html#method.try_new) for more information. + * + * See the [Rust documentation for `MDET`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.MDET.html) for more information. + * + * Additional information: [1](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.MDET.html#method.with_time_precision), [2](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.MDET.html#method.with_alignment), [3](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.MDET.html#method.for_length) */ - inline static diplomat::result, icu4x::DateTimeFormatterLoadError> create_mdet_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, std::optional length, std::optional time_precision, std::optional alignment); + inline static icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> create_mdet_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, std::optional length, std::optional time_precision, std::optional alignment); /** - * See the [Rust documentation for `try_new`](https://docs.rs/icu/2.0.0/icu/datetime/struct.FixedCalendarDateTimeFormatter.html#method.try_new) for more information. - * - * See the [Rust documentation for `YMDET`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.YMDET.html) for more information. - * - * Additional information: [1](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.YMDET.html#method.with_time_precision), [2](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.YMDET.html#method.with_alignment), [3](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.YMDET.html#method.with_year_style), [4](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.YMDET.html#method.for_length) + * See the [Rust documentation for `try_new`](https://docs.rs/icu/2.0.0/icu/datetime/struct.FixedCalendarDateTimeFormatter.html#method.try_new) for more information. + * + * See the [Rust documentation for `YMDET`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.YMDET.html) for more information. + * + * Additional information: [1](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.YMDET.html#method.with_time_precision), [2](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.YMDET.html#method.with_alignment), [3](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.YMDET.html#method.with_year_style), [4](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.YMDET.html#method.for_length) */ - inline static diplomat::result, icu4x::DateTimeFormatterLoadError> create_ymdet(const icu4x::Locale& locale, std::optional length, std::optional time_precision, std::optional alignment, std::optional year_style); + inline static icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> create_ymdet(const icu4x::Locale& locale, std::optional length, std::optional time_precision, std::optional alignment, std::optional year_style); /** - * See the [Rust documentation for `try_new`](https://docs.rs/icu/2.0.0/icu/datetime/struct.FixedCalendarDateTimeFormatter.html#method.try_new) for more information. - * - * See the [Rust documentation for `YMDET`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.YMDET.html) for more information. - * - * Additional information: [1](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.YMDET.html#method.with_time_precision), [2](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.YMDET.html#method.with_alignment), [3](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.YMDET.html#method.with_year_style), [4](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.YMDET.html#method.for_length) + * See the [Rust documentation for `try_new`](https://docs.rs/icu/2.0.0/icu/datetime/struct.FixedCalendarDateTimeFormatter.html#method.try_new) for more information. + * + * See the [Rust documentation for `YMDET`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.YMDET.html) for more information. + * + * Additional information: [1](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.YMDET.html#method.with_time_precision), [2](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.YMDET.html#method.with_alignment), [3](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.YMDET.html#method.with_year_style), [4](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.YMDET.html#method.for_length) */ - inline static diplomat::result, icu4x::DateTimeFormatterLoadError> create_ymdet_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, std::optional length, std::optional time_precision, std::optional alignment, std::optional year_style); + inline static icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> create_ymdet_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, std::optional length, std::optional time_precision, std::optional alignment, std::optional year_style); /** - * See the [Rust documentation for `try_new`](https://docs.rs/icu/2.0.0/icu/datetime/struct.FixedCalendarDateTimeFormatter.html#method.try_new) for more information. - * - * See the [Rust documentation for `ET`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.ET.html) for more information. - * - * Additional information: [1](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.ET.html#method.with_time_precision), [2](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.ET.html#method.with_alignment), [3](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.ET.html#method.for_length) + * See the [Rust documentation for `try_new`](https://docs.rs/icu/2.0.0/icu/datetime/struct.FixedCalendarDateTimeFormatter.html#method.try_new) for more information. + * + * See the [Rust documentation for `ET`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.ET.html) for more information. + * + * Additional information: [1](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.ET.html#method.with_time_precision), [2](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.ET.html#method.with_alignment), [3](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.ET.html#method.for_length) */ - inline static diplomat::result, icu4x::DateTimeFormatterLoadError> create_et(const icu4x::Locale& locale, std::optional length, std::optional time_precision, std::optional alignment); + inline static icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> create_et(const icu4x::Locale& locale, std::optional length, std::optional time_precision, std::optional alignment); /** - * See the [Rust documentation for `try_new`](https://docs.rs/icu/2.0.0/icu/datetime/struct.FixedCalendarDateTimeFormatter.html#method.try_new) for more information. - * - * See the [Rust documentation for `ET`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.ET.html) for more information. - * - * Additional information: [1](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.ET.html#method.with_time_precision), [2](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.ET.html#method.with_alignment), [3](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.ET.html#method.for_length) + * See the [Rust documentation for `try_new`](https://docs.rs/icu/2.0.0/icu/datetime/struct.FixedCalendarDateTimeFormatter.html#method.try_new) for more information. + * + * See the [Rust documentation for `ET`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.ET.html) for more information. + * + * Additional information: [1](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.ET.html#method.with_time_precision), [2](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.ET.html#method.with_alignment), [3](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.ET.html#method.for_length) */ - inline static diplomat::result, icu4x::DateTimeFormatterLoadError> create_et_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, std::optional length, std::optional time_precision, std::optional alignment); + inline static icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> create_et_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, std::optional length, std::optional time_precision, std::optional alignment); /** - * See the [Rust documentation for `format`](https://docs.rs/icu/2.0.0/icu/datetime/struct.FixedCalendarDateTimeFormatter.html#method.format) for more information. + * See the [Rust documentation for `format`](https://docs.rs/icu/2.0.0/icu/datetime/struct.FixedCalendarDateTimeFormatter.html#method.format) for more information. */ inline std::string format_iso(const icu4x::IsoDate& iso_date, const icu4x::Time& time) const; template @@ -191,4 +191,4 @@ class DateTimeFormatterGregorian { }; } // namespace -#endif // icu4x_DateTimeFormatterGregorian_D_HPP +#endif // ICU4X_DateTimeFormatterGregorian_D_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/DateTimeFormatterGregorian.hpp b/ffi/capi/bindings/cpp/icu4x/DateTimeFormatterGregorian.hpp index a1efe4aa350..8f73ad79d3c 100644 --- a/ffi/capi/bindings/cpp/icu4x/DateTimeFormatterGregorian.hpp +++ b/ffi/capi/bindings/cpp/icu4x/DateTimeFormatterGregorian.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_DateTimeFormatterGregorian_HPP -#define icu4x_DateTimeFormatterGregorian_HPP +#ifndef ICU4X_DateTimeFormatterGregorian_HPP +#define ICU4X_DateTimeFormatterGregorian_HPP #include "DateTimeFormatterGregorian.d.hpp" @@ -11,7 +11,6 @@ #include #include #include -#include "../diplomat_runtime.hpp" #include "DataProvider.hpp" #include "DateTimeAlignment.hpp" #include "DateTimeFormatterLoadError.hpp" @@ -21,6 +20,7 @@ #include "Time.hpp" #include "TimePrecision.hpp" #include "YearStyle.hpp" +#include "diplomat_runtime.hpp" namespace icu4x { @@ -69,7 +69,7 @@ namespace capi { typedef struct icu4x_DateTimeFormatterGregorian_create_et_with_provider_mv1_result {union {icu4x::capi::DateTimeFormatterGregorian* ok; icu4x::capi::DateTimeFormatterLoadError err;}; bool is_ok;} icu4x_DateTimeFormatterGregorian_create_et_with_provider_mv1_result; icu4x_DateTimeFormatterGregorian_create_et_with_provider_mv1_result icu4x_DateTimeFormatterGregorian_create_et_with_provider_mv1(const icu4x::capi::DataProvider* provider, const icu4x::capi::Locale* locale, icu4x::capi::DateTimeLength_option length, icu4x::capi::TimePrecision_option time_precision, icu4x::capi::DateTimeAlignment_option alignment); - void icu4x_DateTimeFormatterGregorian_format_iso_mv1(const icu4x::capi::DateTimeFormatterGregorian* self, const icu4x::capi::IsoDate* iso_date, const icu4x::capi::Time* time, diplomat::capi::DiplomatWrite* write); + void icu4x_DateTimeFormatterGregorian_format_iso_mv1(const icu4x::capi::DateTimeFormatterGregorian* self, const icu4x::capi::IsoDate* iso_date, const icu4x::capi::Time* time, icu4x::diplomat::capi::DiplomatWrite* write); void icu4x_DateTimeFormatterGregorian_destroy_mv1(DateTimeFormatterGregorian* self); @@ -77,132 +77,132 @@ namespace capi { } // namespace capi } // namespace -inline diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::DateTimeFormatterGregorian::create_dt(const icu4x::Locale& locale, std::optional length, std::optional time_precision, std::optional alignment) { +inline icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::DateTimeFormatterGregorian::create_dt(const icu4x::Locale& locale, std::optional length, std::optional time_precision, std::optional alignment) { auto result = icu4x::capi::icu4x_DateTimeFormatterGregorian_create_dt_mv1(locale.AsFFI(), length.has_value() ? (icu4x::capi::DateTimeLength_option{ { length.value().AsFFI() }, true }) : (icu4x::capi::DateTimeLength_option{ {}, false }), time_precision.has_value() ? (icu4x::capi::TimePrecision_option{ { time_precision.value().AsFFI() }, true }) : (icu4x::capi::TimePrecision_option{ {}, false }), alignment.has_value() ? (icu4x::capi::DateTimeAlignment_option{ { alignment.value().AsFFI() }, true }) : (icu4x::capi::DateTimeAlignment_option{ {}, false })); - return result.is_ok ? diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Ok>(std::unique_ptr(icu4x::DateTimeFormatterGregorian::FromFFI(result.ok)))) : diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::DateTimeFormatterGregorian::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); } -inline diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::DateTimeFormatterGregorian::create_dt_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, std::optional length, std::optional time_precision, std::optional alignment) { +inline icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::DateTimeFormatterGregorian::create_dt_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, std::optional length, std::optional time_precision, std::optional alignment) { auto result = icu4x::capi::icu4x_DateTimeFormatterGregorian_create_dt_with_provider_mv1(provider.AsFFI(), locale.AsFFI(), length.has_value() ? (icu4x::capi::DateTimeLength_option{ { length.value().AsFFI() }, true }) : (icu4x::capi::DateTimeLength_option{ {}, false }), time_precision.has_value() ? (icu4x::capi::TimePrecision_option{ { time_precision.value().AsFFI() }, true }) : (icu4x::capi::TimePrecision_option{ {}, false }), alignment.has_value() ? (icu4x::capi::DateTimeAlignment_option{ { alignment.value().AsFFI() }, true }) : (icu4x::capi::DateTimeAlignment_option{ {}, false })); - return result.is_ok ? diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Ok>(std::unique_ptr(icu4x::DateTimeFormatterGregorian::FromFFI(result.ok)))) : diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::DateTimeFormatterGregorian::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); } -inline diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::DateTimeFormatterGregorian::create_mdt(const icu4x::Locale& locale, std::optional length, std::optional time_precision, std::optional alignment) { +inline icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::DateTimeFormatterGregorian::create_mdt(const icu4x::Locale& locale, std::optional length, std::optional time_precision, std::optional alignment) { auto result = icu4x::capi::icu4x_DateTimeFormatterGregorian_create_mdt_mv1(locale.AsFFI(), length.has_value() ? (icu4x::capi::DateTimeLength_option{ { length.value().AsFFI() }, true }) : (icu4x::capi::DateTimeLength_option{ {}, false }), time_precision.has_value() ? (icu4x::capi::TimePrecision_option{ { time_precision.value().AsFFI() }, true }) : (icu4x::capi::TimePrecision_option{ {}, false }), alignment.has_value() ? (icu4x::capi::DateTimeAlignment_option{ { alignment.value().AsFFI() }, true }) : (icu4x::capi::DateTimeAlignment_option{ {}, false })); - return result.is_ok ? diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Ok>(std::unique_ptr(icu4x::DateTimeFormatterGregorian::FromFFI(result.ok)))) : diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::DateTimeFormatterGregorian::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); } -inline diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::DateTimeFormatterGregorian::create_mdt_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, std::optional length, std::optional time_precision, std::optional alignment) { +inline icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::DateTimeFormatterGregorian::create_mdt_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, std::optional length, std::optional time_precision, std::optional alignment) { auto result = icu4x::capi::icu4x_DateTimeFormatterGregorian_create_mdt_with_provider_mv1(provider.AsFFI(), locale.AsFFI(), length.has_value() ? (icu4x::capi::DateTimeLength_option{ { length.value().AsFFI() }, true }) : (icu4x::capi::DateTimeLength_option{ {}, false }), time_precision.has_value() ? (icu4x::capi::TimePrecision_option{ { time_precision.value().AsFFI() }, true }) : (icu4x::capi::TimePrecision_option{ {}, false }), alignment.has_value() ? (icu4x::capi::DateTimeAlignment_option{ { alignment.value().AsFFI() }, true }) : (icu4x::capi::DateTimeAlignment_option{ {}, false })); - return result.is_ok ? diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Ok>(std::unique_ptr(icu4x::DateTimeFormatterGregorian::FromFFI(result.ok)))) : diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::DateTimeFormatterGregorian::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); } -inline diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::DateTimeFormatterGregorian::create_ymdt(const icu4x::Locale& locale, std::optional length, std::optional time_precision, std::optional alignment, std::optional year_style) { +inline icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::DateTimeFormatterGregorian::create_ymdt(const icu4x::Locale& locale, std::optional length, std::optional time_precision, std::optional alignment, std::optional year_style) { auto result = icu4x::capi::icu4x_DateTimeFormatterGregorian_create_ymdt_mv1(locale.AsFFI(), length.has_value() ? (icu4x::capi::DateTimeLength_option{ { length.value().AsFFI() }, true }) : (icu4x::capi::DateTimeLength_option{ {}, false }), time_precision.has_value() ? (icu4x::capi::TimePrecision_option{ { time_precision.value().AsFFI() }, true }) : (icu4x::capi::TimePrecision_option{ {}, false }), alignment.has_value() ? (icu4x::capi::DateTimeAlignment_option{ { alignment.value().AsFFI() }, true }) : (icu4x::capi::DateTimeAlignment_option{ {}, false }), year_style.has_value() ? (icu4x::capi::YearStyle_option{ { year_style.value().AsFFI() }, true }) : (icu4x::capi::YearStyle_option{ {}, false })); - return result.is_ok ? diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Ok>(std::unique_ptr(icu4x::DateTimeFormatterGregorian::FromFFI(result.ok)))) : diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::DateTimeFormatterGregorian::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); } -inline diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::DateTimeFormatterGregorian::create_ymdt_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, std::optional length, std::optional time_precision, std::optional alignment, std::optional year_style) { +inline icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::DateTimeFormatterGregorian::create_ymdt_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, std::optional length, std::optional time_precision, std::optional alignment, std::optional year_style) { auto result = icu4x::capi::icu4x_DateTimeFormatterGregorian_create_ymdt_with_provider_mv1(provider.AsFFI(), locale.AsFFI(), length.has_value() ? (icu4x::capi::DateTimeLength_option{ { length.value().AsFFI() }, true }) : (icu4x::capi::DateTimeLength_option{ {}, false }), time_precision.has_value() ? (icu4x::capi::TimePrecision_option{ { time_precision.value().AsFFI() }, true }) : (icu4x::capi::TimePrecision_option{ {}, false }), alignment.has_value() ? (icu4x::capi::DateTimeAlignment_option{ { alignment.value().AsFFI() }, true }) : (icu4x::capi::DateTimeAlignment_option{ {}, false }), year_style.has_value() ? (icu4x::capi::YearStyle_option{ { year_style.value().AsFFI() }, true }) : (icu4x::capi::YearStyle_option{ {}, false })); - return result.is_ok ? diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Ok>(std::unique_ptr(icu4x::DateTimeFormatterGregorian::FromFFI(result.ok)))) : diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::DateTimeFormatterGregorian::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); } -inline diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::DateTimeFormatterGregorian::create_det(const icu4x::Locale& locale, std::optional length, std::optional time_precision, std::optional alignment) { +inline icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::DateTimeFormatterGregorian::create_det(const icu4x::Locale& locale, std::optional length, std::optional time_precision, std::optional alignment) { auto result = icu4x::capi::icu4x_DateTimeFormatterGregorian_create_det_mv1(locale.AsFFI(), length.has_value() ? (icu4x::capi::DateTimeLength_option{ { length.value().AsFFI() }, true }) : (icu4x::capi::DateTimeLength_option{ {}, false }), time_precision.has_value() ? (icu4x::capi::TimePrecision_option{ { time_precision.value().AsFFI() }, true }) : (icu4x::capi::TimePrecision_option{ {}, false }), alignment.has_value() ? (icu4x::capi::DateTimeAlignment_option{ { alignment.value().AsFFI() }, true }) : (icu4x::capi::DateTimeAlignment_option{ {}, false })); - return result.is_ok ? diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Ok>(std::unique_ptr(icu4x::DateTimeFormatterGregorian::FromFFI(result.ok)))) : diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::DateTimeFormatterGregorian::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); } -inline diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::DateTimeFormatterGregorian::create_det_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, std::optional length, std::optional time_precision, std::optional alignment) { +inline icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::DateTimeFormatterGregorian::create_det_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, std::optional length, std::optional time_precision, std::optional alignment) { auto result = icu4x::capi::icu4x_DateTimeFormatterGregorian_create_det_with_provider_mv1(provider.AsFFI(), locale.AsFFI(), length.has_value() ? (icu4x::capi::DateTimeLength_option{ { length.value().AsFFI() }, true }) : (icu4x::capi::DateTimeLength_option{ {}, false }), time_precision.has_value() ? (icu4x::capi::TimePrecision_option{ { time_precision.value().AsFFI() }, true }) : (icu4x::capi::TimePrecision_option{ {}, false }), alignment.has_value() ? (icu4x::capi::DateTimeAlignment_option{ { alignment.value().AsFFI() }, true }) : (icu4x::capi::DateTimeAlignment_option{ {}, false })); - return result.is_ok ? diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Ok>(std::unique_ptr(icu4x::DateTimeFormatterGregorian::FromFFI(result.ok)))) : diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::DateTimeFormatterGregorian::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); } -inline diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::DateTimeFormatterGregorian::create_mdet(const icu4x::Locale& locale, std::optional length, std::optional time_precision, std::optional alignment) { +inline icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::DateTimeFormatterGregorian::create_mdet(const icu4x::Locale& locale, std::optional length, std::optional time_precision, std::optional alignment) { auto result = icu4x::capi::icu4x_DateTimeFormatterGregorian_create_mdet_mv1(locale.AsFFI(), length.has_value() ? (icu4x::capi::DateTimeLength_option{ { length.value().AsFFI() }, true }) : (icu4x::capi::DateTimeLength_option{ {}, false }), time_precision.has_value() ? (icu4x::capi::TimePrecision_option{ { time_precision.value().AsFFI() }, true }) : (icu4x::capi::TimePrecision_option{ {}, false }), alignment.has_value() ? (icu4x::capi::DateTimeAlignment_option{ { alignment.value().AsFFI() }, true }) : (icu4x::capi::DateTimeAlignment_option{ {}, false })); - return result.is_ok ? diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Ok>(std::unique_ptr(icu4x::DateTimeFormatterGregorian::FromFFI(result.ok)))) : diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::DateTimeFormatterGregorian::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); } -inline diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::DateTimeFormatterGregorian::create_mdet_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, std::optional length, std::optional time_precision, std::optional alignment) { +inline icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::DateTimeFormatterGregorian::create_mdet_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, std::optional length, std::optional time_precision, std::optional alignment) { auto result = icu4x::capi::icu4x_DateTimeFormatterGregorian_create_mdet_with_provider_mv1(provider.AsFFI(), locale.AsFFI(), length.has_value() ? (icu4x::capi::DateTimeLength_option{ { length.value().AsFFI() }, true }) : (icu4x::capi::DateTimeLength_option{ {}, false }), time_precision.has_value() ? (icu4x::capi::TimePrecision_option{ { time_precision.value().AsFFI() }, true }) : (icu4x::capi::TimePrecision_option{ {}, false }), alignment.has_value() ? (icu4x::capi::DateTimeAlignment_option{ { alignment.value().AsFFI() }, true }) : (icu4x::capi::DateTimeAlignment_option{ {}, false })); - return result.is_ok ? diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Ok>(std::unique_ptr(icu4x::DateTimeFormatterGregorian::FromFFI(result.ok)))) : diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::DateTimeFormatterGregorian::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); } -inline diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::DateTimeFormatterGregorian::create_ymdet(const icu4x::Locale& locale, std::optional length, std::optional time_precision, std::optional alignment, std::optional year_style) { +inline icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::DateTimeFormatterGregorian::create_ymdet(const icu4x::Locale& locale, std::optional length, std::optional time_precision, std::optional alignment, std::optional year_style) { auto result = icu4x::capi::icu4x_DateTimeFormatterGregorian_create_ymdet_mv1(locale.AsFFI(), length.has_value() ? (icu4x::capi::DateTimeLength_option{ { length.value().AsFFI() }, true }) : (icu4x::capi::DateTimeLength_option{ {}, false }), time_precision.has_value() ? (icu4x::capi::TimePrecision_option{ { time_precision.value().AsFFI() }, true }) : (icu4x::capi::TimePrecision_option{ {}, false }), alignment.has_value() ? (icu4x::capi::DateTimeAlignment_option{ { alignment.value().AsFFI() }, true }) : (icu4x::capi::DateTimeAlignment_option{ {}, false }), year_style.has_value() ? (icu4x::capi::YearStyle_option{ { year_style.value().AsFFI() }, true }) : (icu4x::capi::YearStyle_option{ {}, false })); - return result.is_ok ? diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Ok>(std::unique_ptr(icu4x::DateTimeFormatterGregorian::FromFFI(result.ok)))) : diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::DateTimeFormatterGregorian::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); } -inline diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::DateTimeFormatterGregorian::create_ymdet_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, std::optional length, std::optional time_precision, std::optional alignment, std::optional year_style) { +inline icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::DateTimeFormatterGregorian::create_ymdet_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, std::optional length, std::optional time_precision, std::optional alignment, std::optional year_style) { auto result = icu4x::capi::icu4x_DateTimeFormatterGregorian_create_ymdet_with_provider_mv1(provider.AsFFI(), locale.AsFFI(), length.has_value() ? (icu4x::capi::DateTimeLength_option{ { length.value().AsFFI() }, true }) : (icu4x::capi::DateTimeLength_option{ {}, false }), time_precision.has_value() ? (icu4x::capi::TimePrecision_option{ { time_precision.value().AsFFI() }, true }) : (icu4x::capi::TimePrecision_option{ {}, false }), alignment.has_value() ? (icu4x::capi::DateTimeAlignment_option{ { alignment.value().AsFFI() }, true }) : (icu4x::capi::DateTimeAlignment_option{ {}, false }), year_style.has_value() ? (icu4x::capi::YearStyle_option{ { year_style.value().AsFFI() }, true }) : (icu4x::capi::YearStyle_option{ {}, false })); - return result.is_ok ? diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Ok>(std::unique_ptr(icu4x::DateTimeFormatterGregorian::FromFFI(result.ok)))) : diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::DateTimeFormatterGregorian::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); } -inline diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::DateTimeFormatterGregorian::create_et(const icu4x::Locale& locale, std::optional length, std::optional time_precision, std::optional alignment) { +inline icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::DateTimeFormatterGregorian::create_et(const icu4x::Locale& locale, std::optional length, std::optional time_precision, std::optional alignment) { auto result = icu4x::capi::icu4x_DateTimeFormatterGregorian_create_et_mv1(locale.AsFFI(), length.has_value() ? (icu4x::capi::DateTimeLength_option{ { length.value().AsFFI() }, true }) : (icu4x::capi::DateTimeLength_option{ {}, false }), time_precision.has_value() ? (icu4x::capi::TimePrecision_option{ { time_precision.value().AsFFI() }, true }) : (icu4x::capi::TimePrecision_option{ {}, false }), alignment.has_value() ? (icu4x::capi::DateTimeAlignment_option{ { alignment.value().AsFFI() }, true }) : (icu4x::capi::DateTimeAlignment_option{ {}, false })); - return result.is_ok ? diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Ok>(std::unique_ptr(icu4x::DateTimeFormatterGregorian::FromFFI(result.ok)))) : diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::DateTimeFormatterGregorian::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); } -inline diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::DateTimeFormatterGregorian::create_et_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, std::optional length, std::optional time_precision, std::optional alignment) { +inline icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::DateTimeFormatterGregorian::create_et_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, std::optional length, std::optional time_precision, std::optional alignment) { auto result = icu4x::capi::icu4x_DateTimeFormatterGregorian_create_et_with_provider_mv1(provider.AsFFI(), locale.AsFFI(), length.has_value() ? (icu4x::capi::DateTimeLength_option{ { length.value().AsFFI() }, true }) : (icu4x::capi::DateTimeLength_option{ {}, false }), time_precision.has_value() ? (icu4x::capi::TimePrecision_option{ { time_precision.value().AsFFI() }, true }) : (icu4x::capi::TimePrecision_option{ {}, false }), alignment.has_value() ? (icu4x::capi::DateTimeAlignment_option{ { alignment.value().AsFFI() }, true }) : (icu4x::capi::DateTimeAlignment_option{ {}, false })); - return result.is_ok ? diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Ok>(std::unique_ptr(icu4x::DateTimeFormatterGregorian::FromFFI(result.ok)))) : diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::DateTimeFormatterGregorian::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); } inline std::string icu4x::DateTimeFormatterGregorian::format_iso(const icu4x::IsoDate& iso_date, const icu4x::Time& time) const { std::string output; - diplomat::capi::DiplomatWrite write = diplomat::WriteFromString(output); + icu4x::diplomat::capi::DiplomatWrite write = icu4x::diplomat::WriteFromString(output); icu4x::capi::icu4x_DateTimeFormatterGregorian_format_iso_mv1(this->AsFFI(), iso_date.AsFFI(), time.AsFFI(), @@ -211,7 +211,7 @@ inline std::string icu4x::DateTimeFormatterGregorian::format_iso(const icu4x::Is } template inline void icu4x::DateTimeFormatterGregorian::format_iso_write(const icu4x::IsoDate& iso_date, const icu4x::Time& time, W& writeable) const { - diplomat::capi::DiplomatWrite write = diplomat::WriteTrait::Construct(writeable); + icu4x::diplomat::capi::DiplomatWrite write = icu4x::diplomat::WriteTrait::Construct(writeable); icu4x::capi::icu4x_DateTimeFormatterGregorian_format_iso_mv1(this->AsFFI(), iso_date.AsFFI(), time.AsFFI(), @@ -239,4 +239,4 @@ inline void icu4x::DateTimeFormatterGregorian::operator delete(void* ptr) { } -#endif // icu4x_DateTimeFormatterGregorian_HPP +#endif // ICU4X_DateTimeFormatterGregorian_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/DateTimeFormatterLoadError.d.hpp b/ffi/capi/bindings/cpp/icu4x/DateTimeFormatterLoadError.d.hpp index 56f80c53107..ff4e5fa134d 100644 --- a/ffi/capi/bindings/cpp/icu4x/DateTimeFormatterLoadError.d.hpp +++ b/ffi/capi/bindings/cpp/icu4x/DateTimeFormatterLoadError.d.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_DateTimeFormatterLoadError_D_HPP -#define icu4x_DateTimeFormatterLoadError_D_HPP +#ifndef ICU4X_DateTimeFormatterLoadError_D_HPP +#define ICU4X_DateTimeFormatterLoadError_D_HPP #include #include @@ -9,7 +9,7 @@ #include #include #include -#include "../diplomat_runtime.hpp" +#include "diplomat_runtime.hpp" namespace icu4x { @@ -71,4 +71,4 @@ class DateTimeFormatterLoadError { }; } // namespace -#endif // icu4x_DateTimeFormatterLoadError_D_HPP +#endif // ICU4X_DateTimeFormatterLoadError_D_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/DateTimeFormatterLoadError.hpp b/ffi/capi/bindings/cpp/icu4x/DateTimeFormatterLoadError.hpp index 4232a6cef0f..f33931cf45c 100644 --- a/ffi/capi/bindings/cpp/icu4x/DateTimeFormatterLoadError.hpp +++ b/ffi/capi/bindings/cpp/icu4x/DateTimeFormatterLoadError.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_DateTimeFormatterLoadError_HPP -#define icu4x_DateTimeFormatterLoadError_HPP +#ifndef ICU4X_DateTimeFormatterLoadError_HPP +#define ICU4X_DateTimeFormatterLoadError_HPP #include "DateTimeFormatterLoadError.d.hpp" @@ -11,7 +11,7 @@ #include #include #include -#include "../diplomat_runtime.hpp" +#include "diplomat_runtime.hpp" namespace icu4x { @@ -46,4 +46,4 @@ inline icu4x::DateTimeFormatterLoadError icu4x::DateTimeFormatterLoadError::From std::abort(); } } -#endif // icu4x_DateTimeFormatterLoadError_HPP +#endif // ICU4X_DateTimeFormatterLoadError_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/DateTimeLength.d.hpp b/ffi/capi/bindings/cpp/icu4x/DateTimeLength.d.hpp index 1bfdb93ed39..9c41e779722 100644 --- a/ffi/capi/bindings/cpp/icu4x/DateTimeLength.d.hpp +++ b/ffi/capi/bindings/cpp/icu4x/DateTimeLength.d.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_DateTimeLength_D_HPP -#define icu4x_DateTimeLength_D_HPP +#ifndef ICU4X_DateTimeLength_D_HPP +#define ICU4X_DateTimeLength_D_HPP #include #include @@ -9,7 +9,7 @@ #include #include #include -#include "../diplomat_runtime.hpp" +#include "diplomat_runtime.hpp" namespace icu4x { @@ -51,4 +51,4 @@ class DateTimeLength { }; } // namespace -#endif // icu4x_DateTimeLength_D_HPP +#endif // ICU4X_DateTimeLength_D_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/DateTimeLength.hpp b/ffi/capi/bindings/cpp/icu4x/DateTimeLength.hpp index 20f7c422c6b..c21e739e67b 100644 --- a/ffi/capi/bindings/cpp/icu4x/DateTimeLength.hpp +++ b/ffi/capi/bindings/cpp/icu4x/DateTimeLength.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_DateTimeLength_HPP -#define icu4x_DateTimeLength_HPP +#ifndef ICU4X_DateTimeLength_HPP +#define ICU4X_DateTimeLength_HPP #include "DateTimeLength.d.hpp" @@ -11,7 +11,7 @@ #include #include #include -#include "../diplomat_runtime.hpp" +#include "diplomat_runtime.hpp" namespace icu4x { @@ -36,4 +36,4 @@ inline icu4x::DateTimeLength icu4x::DateTimeLength::FromFFI(icu4x::capi::DateTim std::abort(); } } -#endif // icu4x_DateTimeLength_HPP +#endif // ICU4X_DateTimeLength_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/DateTimeMismatchedCalendarError.d.hpp b/ffi/capi/bindings/cpp/icu4x/DateTimeMismatchedCalendarError.d.hpp index 419756517f7..a5238e6c2fa 100644 --- a/ffi/capi/bindings/cpp/icu4x/DateTimeMismatchedCalendarError.d.hpp +++ b/ffi/capi/bindings/cpp/icu4x/DateTimeMismatchedCalendarError.d.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_DateTimeMismatchedCalendarError_D_HPP -#define icu4x_DateTimeMismatchedCalendarError_D_HPP +#ifndef ICU4X_DateTimeMismatchedCalendarError_D_HPP +#define ICU4X_DateTimeMismatchedCalendarError_D_HPP #include #include @@ -9,12 +9,12 @@ #include #include #include -#include "../diplomat_runtime.hpp" #include "CalendarKind.d.hpp" - +#include "diplomat_runtime.hpp" namespace icu4x { class CalendarKind; -} +} // namespace icu4x + namespace icu4x { @@ -42,4 +42,4 @@ struct DateTimeMismatchedCalendarError { }; } // namespace -#endif // icu4x_DateTimeMismatchedCalendarError_D_HPP +#endif // ICU4X_DateTimeMismatchedCalendarError_D_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/DateTimeMismatchedCalendarError.hpp b/ffi/capi/bindings/cpp/icu4x/DateTimeMismatchedCalendarError.hpp index f0164c5414c..c4fa4d786b5 100644 --- a/ffi/capi/bindings/cpp/icu4x/DateTimeMismatchedCalendarError.hpp +++ b/ffi/capi/bindings/cpp/icu4x/DateTimeMismatchedCalendarError.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_DateTimeMismatchedCalendarError_HPP -#define icu4x_DateTimeMismatchedCalendarError_HPP +#ifndef ICU4X_DateTimeMismatchedCalendarError_HPP +#define ICU4X_DateTimeMismatchedCalendarError_HPP #include "DateTimeMismatchedCalendarError.d.hpp" @@ -11,8 +11,8 @@ #include #include #include -#include "../diplomat_runtime.hpp" #include "CalendarKind.hpp" +#include "diplomat_runtime.hpp" namespace icu4x { @@ -39,4 +39,4 @@ inline icu4x::DateTimeMismatchedCalendarError icu4x::DateTimeMismatchedCalendarE } -#endif // icu4x_DateTimeMismatchedCalendarError_HPP +#endif // ICU4X_DateTimeMismatchedCalendarError_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/DateTimeWriteError.d.hpp b/ffi/capi/bindings/cpp/icu4x/DateTimeWriteError.d.hpp index efd4cdbac25..da4e284631e 100644 --- a/ffi/capi/bindings/cpp/icu4x/DateTimeWriteError.d.hpp +++ b/ffi/capi/bindings/cpp/icu4x/DateTimeWriteError.d.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_DateTimeWriteError_D_HPP -#define icu4x_DateTimeWriteError_D_HPP +#ifndef ICU4X_DateTimeWriteError_D_HPP +#define ICU4X_DateTimeWriteError_D_HPP #include #include @@ -9,7 +9,7 @@ #include #include #include -#include "../diplomat_runtime.hpp" +#include "diplomat_runtime.hpp" namespace icu4x { @@ -53,4 +53,4 @@ class DateTimeWriteError { }; } // namespace -#endif // icu4x_DateTimeWriteError_D_HPP +#endif // ICU4X_DateTimeWriteError_D_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/DateTimeWriteError.hpp b/ffi/capi/bindings/cpp/icu4x/DateTimeWriteError.hpp index 5840f418347..055e698d136 100644 --- a/ffi/capi/bindings/cpp/icu4x/DateTimeWriteError.hpp +++ b/ffi/capi/bindings/cpp/icu4x/DateTimeWriteError.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_DateTimeWriteError_HPP -#define icu4x_DateTimeWriteError_HPP +#ifndef ICU4X_DateTimeWriteError_HPP +#define ICU4X_DateTimeWriteError_HPP #include "DateTimeWriteError.d.hpp" @@ -11,7 +11,7 @@ #include #include #include -#include "../diplomat_runtime.hpp" +#include "diplomat_runtime.hpp" namespace icu4x { @@ -35,4 +35,4 @@ inline icu4x::DateTimeWriteError icu4x::DateTimeWriteError::FromFFI(icu4x::capi: std::abort(); } } -#endif // icu4x_DateTimeWriteError_HPP +#endif // ICU4X_DateTimeWriteError_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/Decimal.d.hpp b/ffi/capi/bindings/cpp/icu4x/Decimal.d.hpp index 82193fd96ed..9dc1b6266fb 100644 --- a/ffi/capi/bindings/cpp/icu4x/Decimal.d.hpp +++ b/ffi/capi/bindings/cpp/icu4x/Decimal.d.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_Decimal_D_HPP -#define icu4x_Decimal_D_HPP +#ifndef ICU4X_Decimal_D_HPP +#define ICU4X_Decimal_D_HPP #include #include @@ -9,8 +9,7 @@ #include #include #include -#include "../diplomat_runtime.hpp" - +#include "diplomat_runtime.hpp" namespace icu4x { namespace capi { struct Decimal; } class Decimal; @@ -20,7 +19,8 @@ class DecimalRoundingIncrement; class DecimalSign; class DecimalSignDisplay; class DecimalSignedRoundingMode; -} +} // namespace icu4x + namespace icu4x { @@ -37,223 +37,223 @@ class Decimal { public: /** - * Construct an {@link Decimal} from an integer. - * - * See the [Rust documentation for `Decimal`](https://docs.rs/fixed_decimal/0.7.0/fixed_decimal/type.Decimal.html) for more information. + * Construct an {@link Decimal} from an integer. + * + * See the [Rust documentation for `Decimal`](https://docs.rs/fixed_decimal/0.7.0/fixed_decimal/type.Decimal.html) for more information. */ inline static std::unique_ptr from(int32_t v); /** - * Construct an {@link Decimal} from an integer. - * - * See the [Rust documentation for `Decimal`](https://docs.rs/fixed_decimal/0.7.0/fixed_decimal/type.Decimal.html) for more information. + * Construct an {@link Decimal} from an integer. + * + * See the [Rust documentation for `Decimal`](https://docs.rs/fixed_decimal/0.7.0/fixed_decimal/type.Decimal.html) for more information. */ inline static std::unique_ptr from(uint32_t v); /** - * Construct an {@link Decimal} from an integer. - * - * See the [Rust documentation for `Decimal`](https://docs.rs/fixed_decimal/0.7.0/fixed_decimal/type.Decimal.html) for more information. + * Construct an {@link Decimal} from an integer. + * + * See the [Rust documentation for `Decimal`](https://docs.rs/fixed_decimal/0.7.0/fixed_decimal/type.Decimal.html) for more information. */ inline static std::unique_ptr from(int64_t v); /** - * Construct an {@link Decimal} from an integer. - * - * See the [Rust documentation for `Decimal`](https://docs.rs/fixed_decimal/0.7.0/fixed_decimal/type.Decimal.html) for more information. + * Construct an {@link Decimal} from an integer. + * + * See the [Rust documentation for `Decimal`](https://docs.rs/fixed_decimal/0.7.0/fixed_decimal/type.Decimal.html) for more information. */ inline static std::unique_ptr from(uint64_t v); /** - * Construct an {@link Decimal} from an integer-valued float - * - * See the [Rust documentation for `try_from_f64`](https://docs.rs/fixed_decimal/0.7.0/fixed_decimal/type.Decimal.html#method.try_from_f64) for more information. - * - * See the [Rust documentation for `FloatPrecision`](https://docs.rs/fixed_decimal/0.7.0/fixed_decimal/enum.FloatPrecision.html) for more information. + * Construct an {@link Decimal} from an integer-valued float + * + * See the [Rust documentation for `try_from_f64`](https://docs.rs/fixed_decimal/0.7.0/fixed_decimal/type.Decimal.html#method.try_from_f64) for more information. + * + * See the [Rust documentation for `FloatPrecision`](https://docs.rs/fixed_decimal/0.7.0/fixed_decimal/enum.FloatPrecision.html) for more information. */ - inline static diplomat::result, icu4x::DecimalLimitError> from_double_with_integer_precision(double f); + inline static icu4x::diplomat::result, icu4x::DecimalLimitError> from_double_with_integer_precision(double f); /** - * Construct an {@link Decimal} from an float, with a given power of 10 for the lower magnitude - * - * See the [Rust documentation for `try_from_f64`](https://docs.rs/fixed_decimal/0.7.0/fixed_decimal/type.Decimal.html#method.try_from_f64) for more information. - * - * See the [Rust documentation for `FloatPrecision`](https://docs.rs/fixed_decimal/0.7.0/fixed_decimal/enum.FloatPrecision.html) for more information. + * Construct an {@link Decimal} from an float, with a given power of 10 for the lower magnitude + * + * See the [Rust documentation for `try_from_f64`](https://docs.rs/fixed_decimal/0.7.0/fixed_decimal/type.Decimal.html#method.try_from_f64) for more information. + * + * See the [Rust documentation for `FloatPrecision`](https://docs.rs/fixed_decimal/0.7.0/fixed_decimal/enum.FloatPrecision.html) for more information. */ - inline static diplomat::result, icu4x::DecimalLimitError> from_double_with_lower_magnitude(double f, int16_t magnitude); + inline static icu4x::diplomat::result, icu4x::DecimalLimitError> from_double_with_lower_magnitude(double f, int16_t magnitude); /** - * Construct an {@link Decimal} from an float, for a given number of significant digits - * - * See the [Rust documentation for `try_from_f64`](https://docs.rs/fixed_decimal/0.7.0/fixed_decimal/type.Decimal.html#method.try_from_f64) for more information. - * - * See the [Rust documentation for `FloatPrecision`](https://docs.rs/fixed_decimal/0.7.0/fixed_decimal/enum.FloatPrecision.html) for more information. + * Construct an {@link Decimal} from an float, for a given number of significant digits + * + * See the [Rust documentation for `try_from_f64`](https://docs.rs/fixed_decimal/0.7.0/fixed_decimal/type.Decimal.html#method.try_from_f64) for more information. + * + * See the [Rust documentation for `FloatPrecision`](https://docs.rs/fixed_decimal/0.7.0/fixed_decimal/enum.FloatPrecision.html) for more information. */ - inline static diplomat::result, icu4x::DecimalLimitError> from_double_with_significant_digits(double f, uint8_t digits); + inline static icu4x::diplomat::result, icu4x::DecimalLimitError> from_double_with_significant_digits(double f, uint8_t digits); /** - * Construct an {@link Decimal} from an float, with enough digits to recover - * the original floating point in IEEE 754 without needing trailing zeros - * - * See the [Rust documentation for `try_from_f64`](https://docs.rs/fixed_decimal/0.7.0/fixed_decimal/type.Decimal.html#method.try_from_f64) for more information. - * - * See the [Rust documentation for `FloatPrecision`](https://docs.rs/fixed_decimal/0.7.0/fixed_decimal/enum.FloatPrecision.html) for more information. + * Construct an {@link Decimal} from an float, with enough digits to recover + * the original floating point in IEEE 754 without needing trailing zeros + * + * See the [Rust documentation for `try_from_f64`](https://docs.rs/fixed_decimal/0.7.0/fixed_decimal/type.Decimal.html#method.try_from_f64) for more information. + * + * See the [Rust documentation for `FloatPrecision`](https://docs.rs/fixed_decimal/0.7.0/fixed_decimal/enum.FloatPrecision.html) for more information. */ - inline static diplomat::result, icu4x::DecimalLimitError> from_double_with_round_trip_precision(double f); + inline static icu4x::diplomat::result, icu4x::DecimalLimitError> from_double_with_round_trip_precision(double f); /** - * Construct an {@link Decimal} from a string. - * - * See the [Rust documentation for `try_from_str`](https://docs.rs/fixed_decimal/0.7.0/fixed_decimal/type.Decimal.html#method.try_from_str) for more information. + * Construct an {@link Decimal} from a string. + * + * See the [Rust documentation for `try_from_str`](https://docs.rs/fixed_decimal/0.7.0/fixed_decimal/type.Decimal.html#method.try_from_str) for more information. */ - inline static diplomat::result, icu4x::DecimalParseError> from_string(std::string_view v); + inline static icu4x::diplomat::result, icu4x::DecimalParseError> from_string(std::string_view v); /** - * See the [Rust documentation for `digit_at`](https://docs.rs/fixed_decimal/0.7.0/fixed_decimal/type.Decimal.html#method.digit_at) for more information. + * See the [Rust documentation for `digit_at`](https://docs.rs/fixed_decimal/0.7.0/fixed_decimal/type.Decimal.html#method.digit_at) for more information. */ inline uint8_t digit_at(int16_t magnitude) const; /** - * See the [Rust documentation for `magnitude_range`](https://docs.rs/fixed_decimal/0.7.0/fixed_decimal/type.Decimal.html#method.magnitude_range) for more information. + * See the [Rust documentation for `magnitude_range`](https://docs.rs/fixed_decimal/0.7.0/fixed_decimal/type.Decimal.html#method.magnitude_range) for more information. */ inline int16_t magnitude_start() const; /** - * See the [Rust documentation for `magnitude_range`](https://docs.rs/fixed_decimal/0.7.0/fixed_decimal/type.Decimal.html#method.magnitude_range) for more information. + * See the [Rust documentation for `magnitude_range`](https://docs.rs/fixed_decimal/0.7.0/fixed_decimal/type.Decimal.html#method.magnitude_range) for more information. */ inline int16_t magnitude_end() const; /** - * See the [Rust documentation for `nonzero_magnitude_start`](https://docs.rs/fixed_decimal/0.7.0/fixed_decimal/type.Decimal.html#method.nonzero_magnitude_start) for more information. + * See the [Rust documentation for `nonzero_magnitude_start`](https://docs.rs/fixed_decimal/0.7.0/fixed_decimal/type.Decimal.html#method.nonzero_magnitude_start) for more information. */ inline int16_t nonzero_magnitude_start() const; /** - * See the [Rust documentation for `nonzero_magnitude_end`](https://docs.rs/fixed_decimal/0.7.0/fixed_decimal/type.Decimal.html#method.nonzero_magnitude_end) for more information. + * See the [Rust documentation for `nonzero_magnitude_end`](https://docs.rs/fixed_decimal/0.7.0/fixed_decimal/type.Decimal.html#method.nonzero_magnitude_end) for more information. */ inline int16_t nonzero_magnitude_end() const; /** - * See the [Rust documentation for `is_zero`](https://docs.rs/fixed_decimal/0.7.0/fixed_decimal/type.Decimal.html#method.is_zero) for more information. + * See the [Rust documentation for `is_zero`](https://docs.rs/fixed_decimal/0.7.0/fixed_decimal/type.Decimal.html#method.is_zero) for more information. */ inline bool is_zero() const; /** - * Multiply the {@link Decimal} by a given power of ten. - * - * See the [Rust documentation for `multiply_pow10`](https://docs.rs/fixed_decimal/0.7.0/fixed_decimal/type.Decimal.html#method.multiply_pow10) for more information. + * Multiply the {@link Decimal} by a given power of ten. + * + * See the [Rust documentation for `multiply_pow10`](https://docs.rs/fixed_decimal/0.7.0/fixed_decimal/type.Decimal.html#method.multiply_pow10) for more information. */ inline void multiply_pow10(int16_t power); /** - * See the [Rust documentation for `sign`](https://docs.rs/fixed_decimal/0.7.0/fixed_decimal/type.Decimal.html#method.sign) for more information. + * See the [Rust documentation for `sign`](https://docs.rs/fixed_decimal/0.7.0/fixed_decimal/type.Decimal.html#method.sign) for more information. */ inline icu4x::DecimalSign sign() const; /** - * Set the sign of the {@link Decimal}. - * - * See the [Rust documentation for `set_sign`](https://docs.rs/fixed_decimal/0.7.0/fixed_decimal/type.Decimal.html#method.set_sign) for more information. + * Set the sign of the {@link Decimal}. + * + * See the [Rust documentation for `set_sign`](https://docs.rs/fixed_decimal/0.7.0/fixed_decimal/type.Decimal.html#method.set_sign) for more information. */ inline void set_sign(icu4x::DecimalSign sign); /** - * See the [Rust documentation for `apply_sign_display`](https://docs.rs/fixed_decimal/0.7.0/fixed_decimal/type.Decimal.html#method.apply_sign_display) for more information. + * See the [Rust documentation for `apply_sign_display`](https://docs.rs/fixed_decimal/0.7.0/fixed_decimal/type.Decimal.html#method.apply_sign_display) for more information. */ inline void apply_sign_display(icu4x::DecimalSignDisplay sign_display); /** - * See the [Rust documentation for `trim_start`](https://docs.rs/fixed_decimal/0.7.0/fixed_decimal/type.Decimal.html#method.trim_start) for more information. + * See the [Rust documentation for `trim_start`](https://docs.rs/fixed_decimal/0.7.0/fixed_decimal/type.Decimal.html#method.trim_start) for more information. */ inline void trim_start(); /** - * See the [Rust documentation for `trim_end`](https://docs.rs/fixed_decimal/0.7.0/fixed_decimal/type.Decimal.html#method.trim_end) for more information. + * See the [Rust documentation for `trim_end`](https://docs.rs/fixed_decimal/0.7.0/fixed_decimal/type.Decimal.html#method.trim_end) for more information. */ inline void trim_end(); /** - * See the [Rust documentation for `trim_end_if_integer`](https://docs.rs/fixed_decimal/0.7.0/fixed_decimal/type.Decimal.html#method.trim_end_if_integer) for more information. + * See the [Rust documentation for `trim_end_if_integer`](https://docs.rs/fixed_decimal/0.7.0/fixed_decimal/type.Decimal.html#method.trim_end_if_integer) for more information. */ inline void trim_end_if_integer(); /** - * Zero-pad the {@link Decimal} on the left to a particular position - * - * See the [Rust documentation for `pad_start`](https://docs.rs/fixed_decimal/0.7.0/fixed_decimal/type.Decimal.html#method.pad_start) for more information. + * Zero-pad the {@link Decimal} on the left to a particular position + * + * See the [Rust documentation for `pad_start`](https://docs.rs/fixed_decimal/0.7.0/fixed_decimal/type.Decimal.html#method.pad_start) for more information. */ inline void pad_start(int16_t position); /** - * Zero-pad the {@link Decimal} on the right to a particular position - * - * See the [Rust documentation for `pad_end`](https://docs.rs/fixed_decimal/0.7.0/fixed_decimal/type.Decimal.html#method.pad_end) for more information. + * Zero-pad the {@link Decimal} on the right to a particular position + * + * See the [Rust documentation for `pad_end`](https://docs.rs/fixed_decimal/0.7.0/fixed_decimal/type.Decimal.html#method.pad_end) for more information. */ inline void pad_end(int16_t position); /** - * Truncate the {@link Decimal} on the left to a particular position, deleting digits if necessary. This is useful for, e.g. abbreviating years - * ("2022" -> "22") - * - * See the [Rust documentation for `set_max_position`](https://docs.rs/fixed_decimal/0.7.0/fixed_decimal/type.Decimal.html#method.set_max_position) for more information. + * Truncate the {@link Decimal} on the left to a particular position, deleting digits if necessary. This is useful for, e.g. abbreviating years + * ("2022" -> "22") + * + * See the [Rust documentation for `set_max_position`](https://docs.rs/fixed_decimal/0.7.0/fixed_decimal/type.Decimal.html#method.set_max_position) for more information. */ inline void set_max_position(int16_t position); /** - * Round the number at a particular digit position. - * - * This uses half to even rounding, which resolves ties by selecting the nearest - * even integer to the original value. - * - * See the [Rust documentation for `round`](https://docs.rs/fixed_decimal/0.7.0/fixed_decimal/type.Decimal.html#method.round) for more information. + * Round the number at a particular digit position. + * + * This uses half to even rounding, which resolves ties by selecting the nearest + * even integer to the original value. + * + * See the [Rust documentation for `round`](https://docs.rs/fixed_decimal/0.7.0/fixed_decimal/type.Decimal.html#method.round) for more information. */ inline void round(int16_t position); /** - * See the [Rust documentation for `ceil`](https://docs.rs/fixed_decimal/0.7.0/fixed_decimal/type.Decimal.html#method.ceil) for more information. + * See the [Rust documentation for `ceil`](https://docs.rs/fixed_decimal/0.7.0/fixed_decimal/type.Decimal.html#method.ceil) for more information. */ inline void ceil(int16_t position); /** - * See the [Rust documentation for `expand`](https://docs.rs/fixed_decimal/0.7.0/fixed_decimal/type.Decimal.html#method.expand) for more information. + * See the [Rust documentation for `expand`](https://docs.rs/fixed_decimal/0.7.0/fixed_decimal/type.Decimal.html#method.expand) for more information. */ inline void expand(int16_t position); /** - * See the [Rust documentation for `floor`](https://docs.rs/fixed_decimal/0.7.0/fixed_decimal/type.Decimal.html#method.floor) for more information. + * See the [Rust documentation for `floor`](https://docs.rs/fixed_decimal/0.7.0/fixed_decimal/type.Decimal.html#method.floor) for more information. */ inline void floor(int16_t position); /** - * See the [Rust documentation for `trunc`](https://docs.rs/fixed_decimal/0.7.0/fixed_decimal/type.Decimal.html#method.trunc) for more information. + * See the [Rust documentation for `trunc`](https://docs.rs/fixed_decimal/0.7.0/fixed_decimal/type.Decimal.html#method.trunc) for more information. */ inline void trunc(int16_t position); /** - * See the [Rust documentation for `round_with_mode`](https://docs.rs/fixed_decimal/0.7.0/fixed_decimal/type.Decimal.html#method.round_with_mode) for more information. + * See the [Rust documentation for `round_with_mode`](https://docs.rs/fixed_decimal/0.7.0/fixed_decimal/type.Decimal.html#method.round_with_mode) for more information. */ inline void round_with_mode(int16_t position, icu4x::DecimalSignedRoundingMode mode); /** - * See the [Rust documentation for `round_with_mode_and_increment`](https://docs.rs/fixed_decimal/0.7.0/fixed_decimal/type.Decimal.html#method.round_with_mode_and_increment) for more information. + * See the [Rust documentation for `round_with_mode_and_increment`](https://docs.rs/fixed_decimal/0.7.0/fixed_decimal/type.Decimal.html#method.round_with_mode_and_increment) for more information. */ inline void round_with_mode_and_increment(int16_t position, icu4x::DecimalSignedRoundingMode mode, icu4x::DecimalRoundingIncrement increment); /** - * Concatenates `other` to the end of `self`. - * - * If successful, `other` will be set to 0 and a successful status is returned. - * - * If not successful, `other` will be unchanged and an error is returned. - * - * See the [Rust documentation for `concatenate_end`](https://docs.rs/fixed_decimal/0.7.0/fixed_decimal/type.Decimal.html#method.concatenate_end) for more information. + * Concatenates `other` to the end of `self`. + * + * If successful, `other` will be set to 0 and a successful status is returned. + * + * If not successful, `other` will be unchanged and an error is returned. + * + * See the [Rust documentation for `concatenate_end`](https://docs.rs/fixed_decimal/0.7.0/fixed_decimal/type.Decimal.html#method.concatenate_end) for more information. */ - inline diplomat::result concatenate_end(icu4x::Decimal& other); + inline icu4x::diplomat::result concatenate_end(icu4x::Decimal& other); /** - * Format the {@link Decimal} as a string. - * - * See the [Rust documentation for `write_to`](https://docs.rs/fixed_decimal/0.7.0/fixed_decimal/type.Decimal.html#method.write_to) for more information. + * Format the {@link Decimal} as a string. + * + * See the [Rust documentation for `write_to`](https://docs.rs/fixed_decimal/0.7.0/fixed_decimal/type.Decimal.html#method.write_to) for more information. */ inline std::string to_string() const; template @@ -274,4 +274,4 @@ class Decimal { }; } // namespace -#endif // icu4x_Decimal_D_HPP +#endif // ICU4X_Decimal_D_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/Decimal.hpp b/ffi/capi/bindings/cpp/icu4x/Decimal.hpp index dcbc17034f6..d6e9f6c671f 100644 --- a/ffi/capi/bindings/cpp/icu4x/Decimal.hpp +++ b/ffi/capi/bindings/cpp/icu4x/Decimal.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_Decimal_HPP -#define icu4x_Decimal_HPP +#ifndef ICU4X_Decimal_HPP +#define ICU4X_Decimal_HPP #include "Decimal.d.hpp" @@ -11,13 +11,13 @@ #include #include #include -#include "../diplomat_runtime.hpp" #include "DecimalLimitError.hpp" #include "DecimalParseError.hpp" #include "DecimalRoundingIncrement.hpp" #include "DecimalSign.hpp" #include "DecimalSignDisplay.hpp" #include "DecimalSignedRoundingMode.hpp" +#include "diplomat_runtime.hpp" namespace icu4x { @@ -45,7 +45,7 @@ namespace capi { icu4x_Decimal_from_double_with_round_trip_precision_mv1_result icu4x_Decimal_from_double_with_round_trip_precision_mv1(double f); typedef struct icu4x_Decimal_from_string_mv1_result {union {icu4x::capi::Decimal* ok; icu4x::capi::DecimalParseError err;}; bool is_ok;} icu4x_Decimal_from_string_mv1_result; - icu4x_Decimal_from_string_mv1_result icu4x_Decimal_from_string_mv1(diplomat::capi::DiplomatStringView v); + icu4x_Decimal_from_string_mv1_result icu4x_Decimal_from_string_mv1(icu4x::diplomat::capi::DiplomatStringView v); uint8_t icu4x_Decimal_digit_at_mv1(const icu4x::capi::Decimal* self, int16_t magnitude); @@ -96,7 +96,7 @@ namespace capi { typedef struct icu4x_Decimal_concatenate_end_mv1_result { bool is_ok;} icu4x_Decimal_concatenate_end_mv1_result; icu4x_Decimal_concatenate_end_mv1_result icu4x_Decimal_concatenate_end_mv1(icu4x::capi::Decimal* self, icu4x::capi::Decimal* other); - void icu4x_Decimal_to_string_mv1(const icu4x::capi::Decimal* self, diplomat::capi::DiplomatWrite* write); + void icu4x_Decimal_to_string_mv1(const icu4x::capi::Decimal* self, icu4x::diplomat::capi::DiplomatWrite* write); void icu4x_Decimal_destroy_mv1(Decimal* self); @@ -124,31 +124,31 @@ inline std::unique_ptr icu4x::Decimal::from(uint64_t v) { return std::unique_ptr(icu4x::Decimal::FromFFI(result)); } -inline diplomat::result, icu4x::DecimalLimitError> icu4x::Decimal::from_double_with_integer_precision(double f) { +inline icu4x::diplomat::result, icu4x::DecimalLimitError> icu4x::Decimal::from_double_with_integer_precision(double f) { auto result = icu4x::capi::icu4x_Decimal_from_double_with_integer_precision_mv1(f); - return result.is_ok ? diplomat::result, icu4x::DecimalLimitError>(diplomat::Ok>(std::unique_ptr(icu4x::Decimal::FromFFI(result.ok)))) : diplomat::result, icu4x::DecimalLimitError>(diplomat::Err(icu4x::DecimalLimitError {})); + return result.is_ok ? icu4x::diplomat::result, icu4x::DecimalLimitError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::Decimal::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DecimalLimitError>(icu4x::diplomat::Err(icu4x::DecimalLimitError {})); } -inline diplomat::result, icu4x::DecimalLimitError> icu4x::Decimal::from_double_with_lower_magnitude(double f, int16_t magnitude) { +inline icu4x::diplomat::result, icu4x::DecimalLimitError> icu4x::Decimal::from_double_with_lower_magnitude(double f, int16_t magnitude) { auto result = icu4x::capi::icu4x_Decimal_from_double_with_lower_magnitude_mv1(f, magnitude); - return result.is_ok ? diplomat::result, icu4x::DecimalLimitError>(diplomat::Ok>(std::unique_ptr(icu4x::Decimal::FromFFI(result.ok)))) : diplomat::result, icu4x::DecimalLimitError>(diplomat::Err(icu4x::DecimalLimitError {})); + return result.is_ok ? icu4x::diplomat::result, icu4x::DecimalLimitError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::Decimal::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DecimalLimitError>(icu4x::diplomat::Err(icu4x::DecimalLimitError {})); } -inline diplomat::result, icu4x::DecimalLimitError> icu4x::Decimal::from_double_with_significant_digits(double f, uint8_t digits) { +inline icu4x::diplomat::result, icu4x::DecimalLimitError> icu4x::Decimal::from_double_with_significant_digits(double f, uint8_t digits) { auto result = icu4x::capi::icu4x_Decimal_from_double_with_significant_digits_mv1(f, digits); - return result.is_ok ? diplomat::result, icu4x::DecimalLimitError>(diplomat::Ok>(std::unique_ptr(icu4x::Decimal::FromFFI(result.ok)))) : diplomat::result, icu4x::DecimalLimitError>(diplomat::Err(icu4x::DecimalLimitError {})); + return result.is_ok ? icu4x::diplomat::result, icu4x::DecimalLimitError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::Decimal::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DecimalLimitError>(icu4x::diplomat::Err(icu4x::DecimalLimitError {})); } -inline diplomat::result, icu4x::DecimalLimitError> icu4x::Decimal::from_double_with_round_trip_precision(double f) { +inline icu4x::diplomat::result, icu4x::DecimalLimitError> icu4x::Decimal::from_double_with_round_trip_precision(double f) { auto result = icu4x::capi::icu4x_Decimal_from_double_with_round_trip_precision_mv1(f); - return result.is_ok ? diplomat::result, icu4x::DecimalLimitError>(diplomat::Ok>(std::unique_ptr(icu4x::Decimal::FromFFI(result.ok)))) : diplomat::result, icu4x::DecimalLimitError>(diplomat::Err(icu4x::DecimalLimitError {})); + return result.is_ok ? icu4x::diplomat::result, icu4x::DecimalLimitError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::Decimal::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DecimalLimitError>(icu4x::diplomat::Err(icu4x::DecimalLimitError {})); } -inline diplomat::result, icu4x::DecimalParseError> icu4x::Decimal::from_string(std::string_view v) { +inline icu4x::diplomat::result, icu4x::DecimalParseError> icu4x::Decimal::from_string(std::string_view v) { auto result = icu4x::capi::icu4x_Decimal_from_string_mv1({v.data(), v.size()}); - return result.is_ok ? diplomat::result, icu4x::DecimalParseError>(diplomat::Ok>(std::unique_ptr(icu4x::Decimal::FromFFI(result.ok)))) : diplomat::result, icu4x::DecimalParseError>(diplomat::Err(icu4x::DecimalParseError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DecimalParseError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::Decimal::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DecimalParseError>(icu4x::diplomat::Err(icu4x::DecimalParseError::FromFFI(result.err))); } inline uint8_t icu4x::Decimal::digit_at(int16_t magnitude) const { @@ -267,22 +267,22 @@ inline void icu4x::Decimal::round_with_mode_and_increment(int16_t position, icu4 increment.AsFFI()); } -inline diplomat::result icu4x::Decimal::concatenate_end(icu4x::Decimal& other) { +inline icu4x::diplomat::result icu4x::Decimal::concatenate_end(icu4x::Decimal& other) { auto result = icu4x::capi::icu4x_Decimal_concatenate_end_mv1(this->AsFFI(), other.AsFFI()); - return result.is_ok ? diplomat::result(diplomat::Ok()) : diplomat::result(diplomat::Err()); + return result.is_ok ? icu4x::diplomat::result(icu4x::diplomat::Ok()) : icu4x::diplomat::result(icu4x::diplomat::Err()); } inline std::string icu4x::Decimal::to_string() const { std::string output; - diplomat::capi::DiplomatWrite write = diplomat::WriteFromString(output); + icu4x::diplomat::capi::DiplomatWrite write = icu4x::diplomat::WriteFromString(output); icu4x::capi::icu4x_Decimal_to_string_mv1(this->AsFFI(), &write); return output; } template inline void icu4x::Decimal::to_string_write(W& writeable) const { - diplomat::capi::DiplomatWrite write = diplomat::WriteTrait::Construct(writeable); + icu4x::diplomat::capi::DiplomatWrite write = icu4x::diplomat::WriteTrait::Construct(writeable); icu4x::capi::icu4x_Decimal_to_string_mv1(this->AsFFI(), &write); } @@ -308,4 +308,4 @@ inline void icu4x::Decimal::operator delete(void* ptr) { } -#endif // icu4x_Decimal_HPP +#endif // ICU4X_Decimal_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/DecimalFormatter.d.hpp b/ffi/capi/bindings/cpp/icu4x/DecimalFormatter.d.hpp index 0554743c81c..897142c2ca4 100644 --- a/ffi/capi/bindings/cpp/icu4x/DecimalFormatter.d.hpp +++ b/ffi/capi/bindings/cpp/icu4x/DecimalFormatter.d.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_DecimalFormatter_D_HPP -#define icu4x_DecimalFormatter_D_HPP +#ifndef ICU4X_DecimalFormatter_D_HPP +#define ICU4X_DecimalFormatter_D_HPP #include #include @@ -9,8 +9,7 @@ #include #include #include -#include "../diplomat_runtime.hpp" - +#include "diplomat_runtime.hpp" namespace icu4x { namespace capi { struct DataProvider; } class DataProvider; @@ -22,7 +21,8 @@ namespace capi { struct Locale; } class Locale; class DataError; class DecimalGroupingStrategy; -} +} // namespace icu4x + namespace icu4x { @@ -41,30 +41,30 @@ class DecimalFormatter { public: /** - * Creates a new {@link DecimalFormatter}, using compiled data - * - * See the [Rust documentation for `try_new`](https://docs.rs/icu/2.0.0/icu/decimal/struct.DecimalFormatter.html#method.try_new) for more information. + * Creates a new {@link DecimalFormatter}, using compiled data + * + * See the [Rust documentation for `try_new`](https://docs.rs/icu/2.0.0/icu/decimal/struct.DecimalFormatter.html#method.try_new) for more information. */ - inline static diplomat::result, icu4x::DataError> create_with_grouping_strategy(const icu4x::Locale& locale, std::optional grouping_strategy); + inline static icu4x::diplomat::result, icu4x::DataError> create_with_grouping_strategy(const icu4x::Locale& locale, std::optional grouping_strategy); /** - * Creates a new {@link DecimalFormatter}, using a particular data source. - * - * See the [Rust documentation for `try_new`](https://docs.rs/icu/2.0.0/icu/decimal/struct.DecimalFormatter.html#method.try_new) for more information. + * Creates a new {@link DecimalFormatter}, using a particular data source. + * + * See the [Rust documentation for `try_new`](https://docs.rs/icu/2.0.0/icu/decimal/struct.DecimalFormatter.html#method.try_new) for more information. */ - inline static diplomat::result, icu4x::DataError> create_with_grouping_strategy_and_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, std::optional grouping_strategy); + inline static icu4x::diplomat::result, icu4x::DataError> create_with_grouping_strategy_and_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, std::optional grouping_strategy); /** - * Creates a new {@link DecimalFormatter} from preconstructed locale data. - * - * See the [Rust documentation for `DecimalSymbolsV1`](https://docs.rs/icu/2.0.0/icu/decimal/provider/struct.DecimalSymbolsV1.html) for more information. + * Creates a new {@link DecimalFormatter} from preconstructed locale data. + * + * See the [Rust documentation for `DecimalSymbolsV1`](https://docs.rs/icu/2.0.0/icu/decimal/provider/struct.DecimalSymbolsV1.html) for more information. */ - inline static diplomat::result, icu4x::DataError> create_with_manual_data(std::string_view plus_sign_prefix, std::string_view plus_sign_suffix, std::string_view minus_sign_prefix, std::string_view minus_sign_suffix, std::string_view decimal_separator, std::string_view grouping_separator, uint8_t primary_group_size, uint8_t secondary_group_size, uint8_t min_group_size, diplomat::span digits, std::optional grouping_strategy); + inline static icu4x::diplomat::result, icu4x::DataError> create_with_manual_data(std::string_view plus_sign_prefix, std::string_view plus_sign_suffix, std::string_view minus_sign_prefix, std::string_view minus_sign_suffix, std::string_view decimal_separator, std::string_view grouping_separator, uint8_t primary_group_size, uint8_t secondary_group_size, uint8_t min_group_size, icu4x::diplomat::span digits, std::optional grouping_strategy); /** - * Formats a {@link Decimal} to a string. - * - * See the [Rust documentation for `format`](https://docs.rs/icu/2.0.0/icu/decimal/struct.DecimalFormatter.html#method.format) for more information. + * Formats a {@link Decimal} to a string. + * + * See the [Rust documentation for `format`](https://docs.rs/icu/2.0.0/icu/decimal/struct.DecimalFormatter.html#method.format) for more information. */ inline std::string format(const icu4x::Decimal& value) const; template @@ -85,4 +85,4 @@ class DecimalFormatter { }; } // namespace -#endif // icu4x_DecimalFormatter_D_HPP +#endif // ICU4X_DecimalFormatter_D_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/DecimalFormatter.hpp b/ffi/capi/bindings/cpp/icu4x/DecimalFormatter.hpp index 1f0687c57d8..40ebfd3a82c 100644 --- a/ffi/capi/bindings/cpp/icu4x/DecimalFormatter.hpp +++ b/ffi/capi/bindings/cpp/icu4x/DecimalFormatter.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_DecimalFormatter_HPP -#define icu4x_DecimalFormatter_HPP +#ifndef ICU4X_DecimalFormatter_HPP +#define ICU4X_DecimalFormatter_HPP #include "DecimalFormatter.d.hpp" @@ -11,12 +11,12 @@ #include #include #include -#include "../diplomat_runtime.hpp" #include "DataError.hpp" #include "DataProvider.hpp" #include "Decimal.hpp" #include "DecimalGroupingStrategy.hpp" #include "Locale.hpp" +#include "diplomat_runtime.hpp" namespace icu4x { @@ -30,9 +30,9 @@ namespace capi { icu4x_DecimalFormatter_create_with_grouping_strategy_and_provider_mv1_result icu4x_DecimalFormatter_create_with_grouping_strategy_and_provider_mv1(const icu4x::capi::DataProvider* provider, const icu4x::capi::Locale* locale, icu4x::capi::DecimalGroupingStrategy_option grouping_strategy); typedef struct icu4x_DecimalFormatter_create_with_manual_data_mv1_result {union {icu4x::capi::DecimalFormatter* ok; icu4x::capi::DataError err;}; bool is_ok;} icu4x_DecimalFormatter_create_with_manual_data_mv1_result; - icu4x_DecimalFormatter_create_with_manual_data_mv1_result icu4x_DecimalFormatter_create_with_manual_data_mv1(diplomat::capi::DiplomatStringView plus_sign_prefix, diplomat::capi::DiplomatStringView plus_sign_suffix, diplomat::capi::DiplomatStringView minus_sign_prefix, diplomat::capi::DiplomatStringView minus_sign_suffix, diplomat::capi::DiplomatStringView decimal_separator, diplomat::capi::DiplomatStringView grouping_separator, uint8_t primary_group_size, uint8_t secondary_group_size, uint8_t min_group_size, diplomat::capi::DiplomatCharView digits, icu4x::capi::DecimalGroupingStrategy_option grouping_strategy); + icu4x_DecimalFormatter_create_with_manual_data_mv1_result icu4x_DecimalFormatter_create_with_manual_data_mv1(icu4x::diplomat::capi::DiplomatStringView plus_sign_prefix, icu4x::diplomat::capi::DiplomatStringView plus_sign_suffix, icu4x::diplomat::capi::DiplomatStringView minus_sign_prefix, icu4x::diplomat::capi::DiplomatStringView minus_sign_suffix, icu4x::diplomat::capi::DiplomatStringView decimal_separator, icu4x::diplomat::capi::DiplomatStringView grouping_separator, uint8_t primary_group_size, uint8_t secondary_group_size, uint8_t min_group_size, icu4x::diplomat::capi::DiplomatCharView digits, icu4x::capi::DecimalGroupingStrategy_option grouping_strategy); - void icu4x_DecimalFormatter_format_mv1(const icu4x::capi::DecimalFormatter* self, const icu4x::capi::Decimal* value, diplomat::capi::DiplomatWrite* write); + void icu4x_DecimalFormatter_format_mv1(const icu4x::capi::DecimalFormatter* self, const icu4x::capi::Decimal* value, icu4x::diplomat::capi::DiplomatWrite* write); void icu4x_DecimalFormatter_destroy_mv1(DecimalFormatter* self); @@ -40,20 +40,20 @@ namespace capi { } // namespace capi } // namespace -inline diplomat::result, icu4x::DataError> icu4x::DecimalFormatter::create_with_grouping_strategy(const icu4x::Locale& locale, std::optional grouping_strategy) { +inline icu4x::diplomat::result, icu4x::DataError> icu4x::DecimalFormatter::create_with_grouping_strategy(const icu4x::Locale& locale, std::optional grouping_strategy) { auto result = icu4x::capi::icu4x_DecimalFormatter_create_with_grouping_strategy_mv1(locale.AsFFI(), grouping_strategy.has_value() ? (icu4x::capi::DecimalGroupingStrategy_option{ { grouping_strategy.value().AsFFI() }, true }) : (icu4x::capi::DecimalGroupingStrategy_option{ {}, false })); - return result.is_ok ? diplomat::result, icu4x::DataError>(diplomat::Ok>(std::unique_ptr(icu4x::DecimalFormatter::FromFFI(result.ok)))) : diplomat::result, icu4x::DataError>(diplomat::Err(icu4x::DataError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::DecimalFormatter::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Err(icu4x::DataError::FromFFI(result.err))); } -inline diplomat::result, icu4x::DataError> icu4x::DecimalFormatter::create_with_grouping_strategy_and_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, std::optional grouping_strategy) { +inline icu4x::diplomat::result, icu4x::DataError> icu4x::DecimalFormatter::create_with_grouping_strategy_and_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, std::optional grouping_strategy) { auto result = icu4x::capi::icu4x_DecimalFormatter_create_with_grouping_strategy_and_provider_mv1(provider.AsFFI(), locale.AsFFI(), grouping_strategy.has_value() ? (icu4x::capi::DecimalGroupingStrategy_option{ { grouping_strategy.value().AsFFI() }, true }) : (icu4x::capi::DecimalGroupingStrategy_option{ {}, false })); - return result.is_ok ? diplomat::result, icu4x::DataError>(diplomat::Ok>(std::unique_ptr(icu4x::DecimalFormatter::FromFFI(result.ok)))) : diplomat::result, icu4x::DataError>(diplomat::Err(icu4x::DataError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::DecimalFormatter::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Err(icu4x::DataError::FromFFI(result.err))); } -inline diplomat::result, icu4x::DataError> icu4x::DecimalFormatter::create_with_manual_data(std::string_view plus_sign_prefix, std::string_view plus_sign_suffix, std::string_view minus_sign_prefix, std::string_view minus_sign_suffix, std::string_view decimal_separator, std::string_view grouping_separator, uint8_t primary_group_size, uint8_t secondary_group_size, uint8_t min_group_size, diplomat::span digits, std::optional grouping_strategy) { +inline icu4x::diplomat::result, icu4x::DataError> icu4x::DecimalFormatter::create_with_manual_data(std::string_view plus_sign_prefix, std::string_view plus_sign_suffix, std::string_view minus_sign_prefix, std::string_view minus_sign_suffix, std::string_view decimal_separator, std::string_view grouping_separator, uint8_t primary_group_size, uint8_t secondary_group_size, uint8_t min_group_size, icu4x::diplomat::span digits, std::optional grouping_strategy) { auto result = icu4x::capi::icu4x_DecimalFormatter_create_with_manual_data_mv1({plus_sign_prefix.data(), plus_sign_prefix.size()}, {plus_sign_suffix.data(), plus_sign_suffix.size()}, {minus_sign_prefix.data(), minus_sign_prefix.size()}, @@ -65,12 +65,12 @@ inline diplomat::result, icu4x::DataErr min_group_size, {digits.data(), digits.size()}, grouping_strategy.has_value() ? (icu4x::capi::DecimalGroupingStrategy_option{ { grouping_strategy.value().AsFFI() }, true }) : (icu4x::capi::DecimalGroupingStrategy_option{ {}, false })); - return result.is_ok ? diplomat::result, icu4x::DataError>(diplomat::Ok>(std::unique_ptr(icu4x::DecimalFormatter::FromFFI(result.ok)))) : diplomat::result, icu4x::DataError>(diplomat::Err(icu4x::DataError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::DecimalFormatter::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Err(icu4x::DataError::FromFFI(result.err))); } inline std::string icu4x::DecimalFormatter::format(const icu4x::Decimal& value) const { std::string output; - diplomat::capi::DiplomatWrite write = diplomat::WriteFromString(output); + icu4x::diplomat::capi::DiplomatWrite write = icu4x::diplomat::WriteFromString(output); icu4x::capi::icu4x_DecimalFormatter_format_mv1(this->AsFFI(), value.AsFFI(), &write); @@ -78,7 +78,7 @@ inline std::string icu4x::DecimalFormatter::format(const icu4x::Decimal& value) } template inline void icu4x::DecimalFormatter::format_write(const icu4x::Decimal& value, W& writeable) const { - diplomat::capi::DiplomatWrite write = diplomat::WriteTrait::Construct(writeable); + icu4x::diplomat::capi::DiplomatWrite write = icu4x::diplomat::WriteTrait::Construct(writeable); icu4x::capi::icu4x_DecimalFormatter_format_mv1(this->AsFFI(), value.AsFFI(), &write); @@ -105,4 +105,4 @@ inline void icu4x::DecimalFormatter::operator delete(void* ptr) { } -#endif // icu4x_DecimalFormatter_HPP +#endif // ICU4X_DecimalFormatter_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/DecimalGroupingStrategy.d.hpp b/ffi/capi/bindings/cpp/icu4x/DecimalGroupingStrategy.d.hpp index 8d58e1f0782..4c46696d335 100644 --- a/ffi/capi/bindings/cpp/icu4x/DecimalGroupingStrategy.d.hpp +++ b/ffi/capi/bindings/cpp/icu4x/DecimalGroupingStrategy.d.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_DecimalGroupingStrategy_D_HPP -#define icu4x_DecimalGroupingStrategy_D_HPP +#ifndef ICU4X_DecimalGroupingStrategy_D_HPP +#define ICU4X_DecimalGroupingStrategy_D_HPP #include #include @@ -9,7 +9,7 @@ #include #include #include -#include "../diplomat_runtime.hpp" +#include "diplomat_runtime.hpp" namespace icu4x { @@ -53,4 +53,4 @@ class DecimalGroupingStrategy { }; } // namespace -#endif // icu4x_DecimalGroupingStrategy_D_HPP +#endif // ICU4X_DecimalGroupingStrategy_D_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/DecimalGroupingStrategy.hpp b/ffi/capi/bindings/cpp/icu4x/DecimalGroupingStrategy.hpp index 275d6b19255..bce6e8a43b0 100644 --- a/ffi/capi/bindings/cpp/icu4x/DecimalGroupingStrategy.hpp +++ b/ffi/capi/bindings/cpp/icu4x/DecimalGroupingStrategy.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_DecimalGroupingStrategy_HPP -#define icu4x_DecimalGroupingStrategy_HPP +#ifndef ICU4X_DecimalGroupingStrategy_HPP +#define ICU4X_DecimalGroupingStrategy_HPP #include "DecimalGroupingStrategy.d.hpp" @@ -11,7 +11,7 @@ #include #include #include -#include "../diplomat_runtime.hpp" +#include "diplomat_runtime.hpp" namespace icu4x { @@ -37,4 +37,4 @@ inline icu4x::DecimalGroupingStrategy icu4x::DecimalGroupingStrategy::FromFFI(ic std::abort(); } } -#endif // icu4x_DecimalGroupingStrategy_HPP +#endif // ICU4X_DecimalGroupingStrategy_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/DecimalLimitError.d.hpp b/ffi/capi/bindings/cpp/icu4x/DecimalLimitError.d.hpp index 112cacc9fff..45fd733450f 100644 --- a/ffi/capi/bindings/cpp/icu4x/DecimalLimitError.d.hpp +++ b/ffi/capi/bindings/cpp/icu4x/DecimalLimitError.d.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_DecimalLimitError_D_HPP -#define icu4x_DecimalLimitError_D_HPP +#ifndef ICU4X_DecimalLimitError_D_HPP +#define ICU4X_DecimalLimitError_D_HPP #include #include @@ -9,7 +9,7 @@ #include #include #include -#include "../diplomat_runtime.hpp" +#include "diplomat_runtime.hpp" namespace icu4x { @@ -28,4 +28,4 @@ struct DecimalLimitError { }; } // namespace -#endif // icu4x_DecimalLimitError_D_HPP +#endif // ICU4X_DecimalLimitError_D_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/DecimalLimitError.hpp b/ffi/capi/bindings/cpp/icu4x/DecimalLimitError.hpp index ada7a693f8b..8eea411cc15 100644 --- a/ffi/capi/bindings/cpp/icu4x/DecimalLimitError.hpp +++ b/ffi/capi/bindings/cpp/icu4x/DecimalLimitError.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_DecimalLimitError_HPP -#define icu4x_DecimalLimitError_HPP +#ifndef ICU4X_DecimalLimitError_HPP +#define ICU4X_DecimalLimitError_HPP #include "DecimalLimitError.d.hpp" @@ -11,7 +11,7 @@ #include #include #include -#include "../diplomat_runtime.hpp" +#include "diplomat_runtime.hpp" namespace icu4x { @@ -25,4 +25,4 @@ namespace capi { -#endif // icu4x_DecimalLimitError_HPP +#endif // ICU4X_DecimalLimitError_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/DecimalParseError.d.hpp b/ffi/capi/bindings/cpp/icu4x/DecimalParseError.d.hpp index 615a95f46bb..0ab492d0bbf 100644 --- a/ffi/capi/bindings/cpp/icu4x/DecimalParseError.d.hpp +++ b/ffi/capi/bindings/cpp/icu4x/DecimalParseError.d.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_DecimalParseError_D_HPP -#define icu4x_DecimalParseError_D_HPP +#ifndef ICU4X_DecimalParseError_D_HPP +#define ICU4X_DecimalParseError_D_HPP #include #include @@ -9,7 +9,7 @@ #include #include #include -#include "../diplomat_runtime.hpp" +#include "diplomat_runtime.hpp" namespace icu4x { @@ -51,4 +51,4 @@ class DecimalParseError { }; } // namespace -#endif // icu4x_DecimalParseError_D_HPP +#endif // ICU4X_DecimalParseError_D_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/DecimalParseError.hpp b/ffi/capi/bindings/cpp/icu4x/DecimalParseError.hpp index 0782d5b5b26..792ef0db0e6 100644 --- a/ffi/capi/bindings/cpp/icu4x/DecimalParseError.hpp +++ b/ffi/capi/bindings/cpp/icu4x/DecimalParseError.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_DecimalParseError_HPP -#define icu4x_DecimalParseError_HPP +#ifndef ICU4X_DecimalParseError_HPP +#define ICU4X_DecimalParseError_HPP #include "DecimalParseError.d.hpp" @@ -11,7 +11,7 @@ #include #include #include -#include "../diplomat_runtime.hpp" +#include "diplomat_runtime.hpp" namespace icu4x { @@ -36,4 +36,4 @@ inline icu4x::DecimalParseError icu4x::DecimalParseError::FromFFI(icu4x::capi::D std::abort(); } } -#endif // icu4x_DecimalParseError_HPP +#endif // ICU4X_DecimalParseError_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/DecimalRoundingIncrement.d.hpp b/ffi/capi/bindings/cpp/icu4x/DecimalRoundingIncrement.d.hpp index 3b7919be107..a3400ea5de7 100644 --- a/ffi/capi/bindings/cpp/icu4x/DecimalRoundingIncrement.d.hpp +++ b/ffi/capi/bindings/cpp/icu4x/DecimalRoundingIncrement.d.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_DecimalRoundingIncrement_D_HPP -#define icu4x_DecimalRoundingIncrement_D_HPP +#ifndef ICU4X_DecimalRoundingIncrement_D_HPP +#define ICU4X_DecimalRoundingIncrement_D_HPP #include #include @@ -9,7 +9,7 @@ #include #include #include -#include "../diplomat_runtime.hpp" +#include "diplomat_runtime.hpp" namespace icu4x { @@ -55,4 +55,4 @@ class DecimalRoundingIncrement { }; } // namespace -#endif // icu4x_DecimalRoundingIncrement_D_HPP +#endif // ICU4X_DecimalRoundingIncrement_D_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/DecimalRoundingIncrement.hpp b/ffi/capi/bindings/cpp/icu4x/DecimalRoundingIncrement.hpp index d6b6a9ac26d..12edf463d1d 100644 --- a/ffi/capi/bindings/cpp/icu4x/DecimalRoundingIncrement.hpp +++ b/ffi/capi/bindings/cpp/icu4x/DecimalRoundingIncrement.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_DecimalRoundingIncrement_HPP -#define icu4x_DecimalRoundingIncrement_HPP +#ifndef ICU4X_DecimalRoundingIncrement_HPP +#define ICU4X_DecimalRoundingIncrement_HPP #include "DecimalRoundingIncrement.d.hpp" @@ -11,7 +11,7 @@ #include #include #include -#include "../diplomat_runtime.hpp" +#include "diplomat_runtime.hpp" namespace icu4x { @@ -37,4 +37,4 @@ inline icu4x::DecimalRoundingIncrement icu4x::DecimalRoundingIncrement::FromFFI( std::abort(); } } -#endif // icu4x_DecimalRoundingIncrement_HPP +#endif // ICU4X_DecimalRoundingIncrement_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/DecimalSign.d.hpp b/ffi/capi/bindings/cpp/icu4x/DecimalSign.d.hpp index cfb55dd73ad..fc18c36667a 100644 --- a/ffi/capi/bindings/cpp/icu4x/DecimalSign.d.hpp +++ b/ffi/capi/bindings/cpp/icu4x/DecimalSign.d.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_DecimalSign_D_HPP -#define icu4x_DecimalSign_D_HPP +#ifndef ICU4X_DecimalSign_D_HPP +#define ICU4X_DecimalSign_D_HPP #include #include @@ -9,7 +9,7 @@ #include #include #include -#include "../diplomat_runtime.hpp" +#include "diplomat_runtime.hpp" namespace icu4x { @@ -53,4 +53,4 @@ class DecimalSign { }; } // namespace -#endif // icu4x_DecimalSign_D_HPP +#endif // ICU4X_DecimalSign_D_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/DecimalSign.hpp b/ffi/capi/bindings/cpp/icu4x/DecimalSign.hpp index af219debaba..e5c2a746378 100644 --- a/ffi/capi/bindings/cpp/icu4x/DecimalSign.hpp +++ b/ffi/capi/bindings/cpp/icu4x/DecimalSign.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_DecimalSign_HPP -#define icu4x_DecimalSign_HPP +#ifndef ICU4X_DecimalSign_HPP +#define ICU4X_DecimalSign_HPP #include "DecimalSign.d.hpp" @@ -11,7 +11,7 @@ #include #include #include -#include "../diplomat_runtime.hpp" +#include "diplomat_runtime.hpp" namespace icu4x { @@ -36,4 +36,4 @@ inline icu4x::DecimalSign icu4x::DecimalSign::FromFFI(icu4x::capi::DecimalSign c std::abort(); } } -#endif // icu4x_DecimalSign_HPP +#endif // ICU4X_DecimalSign_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/DecimalSignDisplay.d.hpp b/ffi/capi/bindings/cpp/icu4x/DecimalSignDisplay.d.hpp index f429424a06b..8d8bf03e358 100644 --- a/ffi/capi/bindings/cpp/icu4x/DecimalSignDisplay.d.hpp +++ b/ffi/capi/bindings/cpp/icu4x/DecimalSignDisplay.d.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_DecimalSignDisplay_D_HPP -#define icu4x_DecimalSignDisplay_D_HPP +#ifndef ICU4X_DecimalSignDisplay_D_HPP +#define ICU4X_DecimalSignDisplay_D_HPP #include #include @@ -9,7 +9,7 @@ #include #include #include -#include "../diplomat_runtime.hpp" +#include "diplomat_runtime.hpp" namespace icu4x { @@ -57,4 +57,4 @@ class DecimalSignDisplay { }; } // namespace -#endif // icu4x_DecimalSignDisplay_D_HPP +#endif // ICU4X_DecimalSignDisplay_D_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/DecimalSignDisplay.hpp b/ffi/capi/bindings/cpp/icu4x/DecimalSignDisplay.hpp index 3b826291563..1b604ee8744 100644 --- a/ffi/capi/bindings/cpp/icu4x/DecimalSignDisplay.hpp +++ b/ffi/capi/bindings/cpp/icu4x/DecimalSignDisplay.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_DecimalSignDisplay_HPP -#define icu4x_DecimalSignDisplay_HPP +#ifndef ICU4X_DecimalSignDisplay_HPP +#define ICU4X_DecimalSignDisplay_HPP #include "DecimalSignDisplay.d.hpp" @@ -11,7 +11,7 @@ #include #include #include -#include "../diplomat_runtime.hpp" +#include "diplomat_runtime.hpp" namespace icu4x { @@ -38,4 +38,4 @@ inline icu4x::DecimalSignDisplay icu4x::DecimalSignDisplay::FromFFI(icu4x::capi: std::abort(); } } -#endif // icu4x_DecimalSignDisplay_HPP +#endif // ICU4X_DecimalSignDisplay_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/DecimalSignedRoundingMode.d.hpp b/ffi/capi/bindings/cpp/icu4x/DecimalSignedRoundingMode.d.hpp index ae07e1c9a72..a9dc8eef73b 100644 --- a/ffi/capi/bindings/cpp/icu4x/DecimalSignedRoundingMode.d.hpp +++ b/ffi/capi/bindings/cpp/icu4x/DecimalSignedRoundingMode.d.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_DecimalSignedRoundingMode_D_HPP -#define icu4x_DecimalSignedRoundingMode_D_HPP +#ifndef ICU4X_DecimalSignedRoundingMode_D_HPP +#define ICU4X_DecimalSignedRoundingMode_D_HPP #include #include @@ -9,7 +9,7 @@ #include #include #include -#include "../diplomat_runtime.hpp" +#include "diplomat_runtime.hpp" namespace icu4x { @@ -65,4 +65,4 @@ class DecimalSignedRoundingMode { }; } // namespace -#endif // icu4x_DecimalSignedRoundingMode_D_HPP +#endif // ICU4X_DecimalSignedRoundingMode_D_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/DecimalSignedRoundingMode.hpp b/ffi/capi/bindings/cpp/icu4x/DecimalSignedRoundingMode.hpp index f1e7e34e61b..3b1a6aa4df7 100644 --- a/ffi/capi/bindings/cpp/icu4x/DecimalSignedRoundingMode.hpp +++ b/ffi/capi/bindings/cpp/icu4x/DecimalSignedRoundingMode.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_DecimalSignedRoundingMode_HPP -#define icu4x_DecimalSignedRoundingMode_HPP +#ifndef ICU4X_DecimalSignedRoundingMode_HPP +#define ICU4X_DecimalSignedRoundingMode_HPP #include "DecimalSignedRoundingMode.d.hpp" @@ -11,7 +11,7 @@ #include #include #include -#include "../diplomat_runtime.hpp" +#include "diplomat_runtime.hpp" namespace icu4x { @@ -42,4 +42,4 @@ inline icu4x::DecimalSignedRoundingMode icu4x::DecimalSignedRoundingMode::FromFF std::abort(); } } -#endif // icu4x_DecimalSignedRoundingMode_HPP +#endif // ICU4X_DecimalSignedRoundingMode_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/Decomposed.d.hpp b/ffi/capi/bindings/cpp/icu4x/Decomposed.d.hpp index 59760a92bf8..e55cb0802cc 100644 --- a/ffi/capi/bindings/cpp/icu4x/Decomposed.d.hpp +++ b/ffi/capi/bindings/cpp/icu4x/Decomposed.d.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_Decomposed_D_HPP -#define icu4x_Decomposed_D_HPP +#ifndef ICU4X_Decomposed_D_HPP +#define ICU4X_Decomposed_D_HPP #include #include @@ -9,7 +9,7 @@ #include #include #include -#include "../diplomat_runtime.hpp" +#include "diplomat_runtime.hpp" namespace icu4x { @@ -41,4 +41,4 @@ struct Decomposed { }; } // namespace -#endif // icu4x_Decomposed_D_HPP +#endif // ICU4X_Decomposed_D_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/Decomposed.hpp b/ffi/capi/bindings/cpp/icu4x/Decomposed.hpp index 0041ecfbb6a..7c682d36289 100644 --- a/ffi/capi/bindings/cpp/icu4x/Decomposed.hpp +++ b/ffi/capi/bindings/cpp/icu4x/Decomposed.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_Decomposed_HPP -#define icu4x_Decomposed_HPP +#ifndef ICU4X_Decomposed_HPP +#define ICU4X_Decomposed_HPP #include "Decomposed.d.hpp" @@ -11,7 +11,7 @@ #include #include #include -#include "../diplomat_runtime.hpp" +#include "diplomat_runtime.hpp" namespace icu4x { @@ -38,4 +38,4 @@ inline icu4x::Decomposed icu4x::Decomposed::FromFFI(icu4x::capi::Decomposed c_st } -#endif // icu4x_Decomposed_HPP +#endif // ICU4X_Decomposed_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/DecomposingNormalizer.d.hpp b/ffi/capi/bindings/cpp/icu4x/DecomposingNormalizer.d.hpp index 71aab638287..c2b8d404701 100644 --- a/ffi/capi/bindings/cpp/icu4x/DecomposingNormalizer.d.hpp +++ b/ffi/capi/bindings/cpp/icu4x/DecomposingNormalizer.d.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_DecomposingNormalizer_D_HPP -#define icu4x_DecomposingNormalizer_D_HPP +#ifndef ICU4X_DecomposingNormalizer_D_HPP +#define ICU4X_DecomposingNormalizer_D_HPP #include #include @@ -9,15 +9,15 @@ #include #include #include -#include "../diplomat_runtime.hpp" - +#include "diplomat_runtime.hpp" namespace icu4x { namespace capi { struct DataProvider; } class DataProvider; namespace capi { struct DecomposingNormalizer; } class DecomposingNormalizer; class DataError; -} +} // namespace icu4x + namespace icu4x { @@ -34,78 +34,78 @@ class DecomposingNormalizer { public: /** - * Construct a new DecomposingNormalizer instance for NFD using compiled data. - * - * See the [Rust documentation for `new_nfd`](https://docs.rs/icu/2.0.0/icu/normalizer/struct.DecomposingNormalizer.html#method.new_nfd) for more information. + * Construct a new DecomposingNormalizer instance for NFD using compiled data. + * + * See the [Rust documentation for `new_nfd`](https://docs.rs/icu/2.0.0/icu/normalizer/struct.DecomposingNormalizer.html#method.new_nfd) for more information. */ inline static std::unique_ptr create_nfd(); /** - * Construct a new DecomposingNormalizer instance for NFD using a particular data source. - * - * See the [Rust documentation for `new_nfd`](https://docs.rs/icu/2.0.0/icu/normalizer/struct.DecomposingNormalizer.html#method.new_nfd) for more information. + * Construct a new DecomposingNormalizer instance for NFD using a particular data source. + * + * See the [Rust documentation for `new_nfd`](https://docs.rs/icu/2.0.0/icu/normalizer/struct.DecomposingNormalizer.html#method.new_nfd) for more information. */ - inline static diplomat::result, icu4x::DataError> create_nfd_with_provider(const icu4x::DataProvider& provider); + inline static icu4x::diplomat::result, icu4x::DataError> create_nfd_with_provider(const icu4x::DataProvider& provider); /** - * Construct a new DecomposingNormalizer instance for NFKD using compiled data. - * - * See the [Rust documentation for `new_nfkd`](https://docs.rs/icu/2.0.0/icu/normalizer/struct.DecomposingNormalizer.html#method.new_nfkd) for more information. + * Construct a new DecomposingNormalizer instance for NFKD using compiled data. + * + * See the [Rust documentation for `new_nfkd`](https://docs.rs/icu/2.0.0/icu/normalizer/struct.DecomposingNormalizer.html#method.new_nfkd) for more information. */ inline static std::unique_ptr create_nfkd(); /** - * Construct a new DecomposingNormalizer instance for NFKD using a particular data source. - * - * See the [Rust documentation for `new_nfkd`](https://docs.rs/icu/2.0.0/icu/normalizer/struct.DecomposingNormalizer.html#method.new_nfkd) for more information. + * Construct a new DecomposingNormalizer instance for NFKD using a particular data source. + * + * See the [Rust documentation for `new_nfkd`](https://docs.rs/icu/2.0.0/icu/normalizer/struct.DecomposingNormalizer.html#method.new_nfkd) for more information. */ - inline static diplomat::result, icu4x::DataError> create_nfkd_with_provider(const icu4x::DataProvider& provider); + inline static icu4x::diplomat::result, icu4x::DataError> create_nfkd_with_provider(const icu4x::DataProvider& provider); /** - * Normalize a string - * - * Ill-formed input is treated as if errors had been replaced with REPLACEMENT CHARACTERs according - * to the WHATWG Encoding Standard. - * - * See the [Rust documentation for `normalize_utf8`](https://docs.rs/icu/2.0.0/icu/normalizer/struct.DecomposingNormalizerBorrowed.html#method.normalize_utf8) for more information. + * Normalize a string + * + * Ill-formed input is treated as if errors had been replaced with REPLACEMENT CHARACTERs according + * to the WHATWG Encoding Standard. + * + * See the [Rust documentation for `normalize_utf8`](https://docs.rs/icu/2.0.0/icu/normalizer/struct.DecomposingNormalizerBorrowed.html#method.normalize_utf8) for more information. */ inline std::string normalize(std::string_view s) const; template inline void normalize_write(std::string_view s, W& writeable_output) const; /** - * Check if a string is normalized - * - * Ill-formed input is treated as if errors had been replaced with REPLACEMENT CHARACTERs according - * to the WHATWG Encoding Standard. - * - * See the [Rust documentation for `is_normalized_utf8`](https://docs.rs/icu/2.0.0/icu/normalizer/struct.DecomposingNormalizerBorrowed.html#method.is_normalized_utf8) for more information. + * Check if a string is normalized + * + * Ill-formed input is treated as if errors had been replaced with REPLACEMENT CHARACTERs according + * to the WHATWG Encoding Standard. + * + * See the [Rust documentation for `is_normalized_utf8`](https://docs.rs/icu/2.0.0/icu/normalizer/struct.DecomposingNormalizerBorrowed.html#method.is_normalized_utf8) for more information. */ inline bool is_normalized(std::string_view s) const; /** - * Check if a string is normalized - * - * Ill-formed input is treated as if errors had been replaced with REPLACEMENT CHARACTERs according - * to the WHATWG Encoding Standard. - * - * See the [Rust documentation for `is_normalized_utf16`](https://docs.rs/icu/2.0.0/icu/normalizer/struct.DecomposingNormalizerBorrowed.html#method.is_normalized_utf16) for more information. + * Check if a string is normalized + * + * Ill-formed input is treated as if errors had been replaced with REPLACEMENT CHARACTERs according + * to the WHATWG Encoding Standard. + * + * See the [Rust documentation for `is_normalized_utf16`](https://docs.rs/icu/2.0.0/icu/normalizer/struct.DecomposingNormalizerBorrowed.html#method.is_normalized_utf16) for more information. */ inline bool is_normalized16(std::u16string_view s) const; /** - * Return the index a slice of potentially-invalid UTF-8 is normalized up to - * - * See the [Rust documentation for `split_normalized_utf8`](https://docs.rs/icu/2.0.0/icu/normalizer/struct.DecomposingNormalizerBorrowed.html#method.split_normalized_utf8) for more information. - * - * See the [Rust documentation for `split_normalized`](https://docs.rs/icu/2.0.0/icu/normalizer/struct.DecomposingNormalizerBorrowed.html#method.split_normalized) for more information. + * Return the index a slice of potentially-invalid UTF-8 is normalized up to + * + * See the [Rust documentation for `split_normalized_utf8`](https://docs.rs/icu/2.0.0/icu/normalizer/struct.DecomposingNormalizerBorrowed.html#method.split_normalized_utf8) for more information. + * + * See the [Rust documentation for `split_normalized`](https://docs.rs/icu/2.0.0/icu/normalizer/struct.DecomposingNormalizerBorrowed.html#method.split_normalized) for more information. */ inline size_t is_normalized_up_to(std::string_view s) const; /** - * Return the index a slice of potentially-invalid UTF-16 is normalized up to - * - * See the [Rust documentation for `split_normalized_utf16`](https://docs.rs/icu/2.0.0/icu/normalizer/struct.DecomposingNormalizerBorrowed.html#method.split_normalized_utf16) for more information. + * Return the index a slice of potentially-invalid UTF-16 is normalized up to + * + * See the [Rust documentation for `split_normalized_utf16`](https://docs.rs/icu/2.0.0/icu/normalizer/struct.DecomposingNormalizerBorrowed.html#method.split_normalized_utf16) for more information. */ inline size_t is_normalized16_up_to(std::u16string_view s) const; @@ -124,4 +124,4 @@ class DecomposingNormalizer { }; } // namespace -#endif // icu4x_DecomposingNormalizer_D_HPP +#endif // ICU4X_DecomposingNormalizer_D_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/DecomposingNormalizer.hpp b/ffi/capi/bindings/cpp/icu4x/DecomposingNormalizer.hpp index 641c2098486..f9442d42bf6 100644 --- a/ffi/capi/bindings/cpp/icu4x/DecomposingNormalizer.hpp +++ b/ffi/capi/bindings/cpp/icu4x/DecomposingNormalizer.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_DecomposingNormalizer_HPP -#define icu4x_DecomposingNormalizer_HPP +#ifndef ICU4X_DecomposingNormalizer_HPP +#define ICU4X_DecomposingNormalizer_HPP #include "DecomposingNormalizer.d.hpp" @@ -11,9 +11,9 @@ #include #include #include -#include "../diplomat_runtime.hpp" #include "DataError.hpp" #include "DataProvider.hpp" +#include "diplomat_runtime.hpp" namespace icu4x { @@ -30,15 +30,15 @@ namespace capi { typedef struct icu4x_DecomposingNormalizer_create_nfkd_with_provider_mv1_result {union {icu4x::capi::DecomposingNormalizer* ok; icu4x::capi::DataError err;}; bool is_ok;} icu4x_DecomposingNormalizer_create_nfkd_with_provider_mv1_result; icu4x_DecomposingNormalizer_create_nfkd_with_provider_mv1_result icu4x_DecomposingNormalizer_create_nfkd_with_provider_mv1(const icu4x::capi::DataProvider* provider); - void icu4x_DecomposingNormalizer_normalize_mv1(const icu4x::capi::DecomposingNormalizer* self, diplomat::capi::DiplomatStringView s, diplomat::capi::DiplomatWrite* write); + void icu4x_DecomposingNormalizer_normalize_mv1(const icu4x::capi::DecomposingNormalizer* self, icu4x::diplomat::capi::DiplomatStringView s, icu4x::diplomat::capi::DiplomatWrite* write); - bool icu4x_DecomposingNormalizer_is_normalized_mv1(const icu4x::capi::DecomposingNormalizer* self, diplomat::capi::DiplomatStringView s); + bool icu4x_DecomposingNormalizer_is_normalized_mv1(const icu4x::capi::DecomposingNormalizer* self, icu4x::diplomat::capi::DiplomatStringView s); - bool icu4x_DecomposingNormalizer_is_normalized_utf16_mv1(const icu4x::capi::DecomposingNormalizer* self, diplomat::capi::DiplomatString16View s); + bool icu4x_DecomposingNormalizer_is_normalized_utf16_mv1(const icu4x::capi::DecomposingNormalizer* self, icu4x::diplomat::capi::DiplomatString16View s); - size_t icu4x_DecomposingNormalizer_is_normalized_up_to_mv1(const icu4x::capi::DecomposingNormalizer* self, diplomat::capi::DiplomatStringView s); + size_t icu4x_DecomposingNormalizer_is_normalized_up_to_mv1(const icu4x::capi::DecomposingNormalizer* self, icu4x::diplomat::capi::DiplomatStringView s); - size_t icu4x_DecomposingNormalizer_is_normalized_utf16_up_to_mv1(const icu4x::capi::DecomposingNormalizer* self, diplomat::capi::DiplomatString16View s); + size_t icu4x_DecomposingNormalizer_is_normalized_utf16_up_to_mv1(const icu4x::capi::DecomposingNormalizer* self, icu4x::diplomat::capi::DiplomatString16View s); void icu4x_DecomposingNormalizer_destroy_mv1(DecomposingNormalizer* self); @@ -51,9 +51,9 @@ inline std::unique_ptr icu4x::DecomposingNormalize return std::unique_ptr(icu4x::DecomposingNormalizer::FromFFI(result)); } -inline diplomat::result, icu4x::DataError> icu4x::DecomposingNormalizer::create_nfd_with_provider(const icu4x::DataProvider& provider) { +inline icu4x::diplomat::result, icu4x::DataError> icu4x::DecomposingNormalizer::create_nfd_with_provider(const icu4x::DataProvider& provider) { auto result = icu4x::capi::icu4x_DecomposingNormalizer_create_nfd_with_provider_mv1(provider.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DataError>(diplomat::Ok>(std::unique_ptr(icu4x::DecomposingNormalizer::FromFFI(result.ok)))) : diplomat::result, icu4x::DataError>(diplomat::Err(icu4x::DataError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::DecomposingNormalizer::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Err(icu4x::DataError::FromFFI(result.err))); } inline std::unique_ptr icu4x::DecomposingNormalizer::create_nfkd() { @@ -61,14 +61,14 @@ inline std::unique_ptr icu4x::DecomposingNormalize return std::unique_ptr(icu4x::DecomposingNormalizer::FromFFI(result)); } -inline diplomat::result, icu4x::DataError> icu4x::DecomposingNormalizer::create_nfkd_with_provider(const icu4x::DataProvider& provider) { +inline icu4x::diplomat::result, icu4x::DataError> icu4x::DecomposingNormalizer::create_nfkd_with_provider(const icu4x::DataProvider& provider) { auto result = icu4x::capi::icu4x_DecomposingNormalizer_create_nfkd_with_provider_mv1(provider.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DataError>(diplomat::Ok>(std::unique_ptr(icu4x::DecomposingNormalizer::FromFFI(result.ok)))) : diplomat::result, icu4x::DataError>(diplomat::Err(icu4x::DataError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::DecomposingNormalizer::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Err(icu4x::DataError::FromFFI(result.err))); } inline std::string icu4x::DecomposingNormalizer::normalize(std::string_view s) const { std::string output; - diplomat::capi::DiplomatWrite write = diplomat::WriteFromString(output); + icu4x::diplomat::capi::DiplomatWrite write = icu4x::diplomat::WriteFromString(output); icu4x::capi::icu4x_DecomposingNormalizer_normalize_mv1(this->AsFFI(), {s.data(), s.size()}, &write); @@ -76,7 +76,7 @@ inline std::string icu4x::DecomposingNormalizer::normalize(std::string_view s) c } template inline void icu4x::DecomposingNormalizer::normalize_write(std::string_view s, W& writeable) const { - diplomat::capi::DiplomatWrite write = diplomat::WriteTrait::Construct(writeable); + icu4x::diplomat::capi::DiplomatWrite write = icu4x::diplomat::WriteTrait::Construct(writeable); icu4x::capi::icu4x_DecomposingNormalizer_normalize_mv1(this->AsFFI(), {s.data(), s.size()}, &write); @@ -127,4 +127,4 @@ inline void icu4x::DecomposingNormalizer::operator delete(void* ptr) { } -#endif // icu4x_DecomposingNormalizer_HPP +#endif // ICU4X_DecomposingNormalizer_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/DisplayNamesFallback.d.hpp b/ffi/capi/bindings/cpp/icu4x/DisplayNamesFallback.d.hpp index 2f2c844bcf7..08832f9603e 100644 --- a/ffi/capi/bindings/cpp/icu4x/DisplayNamesFallback.d.hpp +++ b/ffi/capi/bindings/cpp/icu4x/DisplayNamesFallback.d.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_DisplayNamesFallback_D_HPP -#define icu4x_DisplayNamesFallback_D_HPP +#ifndef ICU4X_DisplayNamesFallback_D_HPP +#define ICU4X_DisplayNamesFallback_D_HPP #include #include @@ -9,7 +9,7 @@ #include #include #include -#include "../diplomat_runtime.hpp" +#include "diplomat_runtime.hpp" namespace icu4x { @@ -51,4 +51,4 @@ class DisplayNamesFallback { }; } // namespace -#endif // icu4x_DisplayNamesFallback_D_HPP +#endif // ICU4X_DisplayNamesFallback_D_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/DisplayNamesFallback.hpp b/ffi/capi/bindings/cpp/icu4x/DisplayNamesFallback.hpp index 5d070379674..b34e2a47d30 100644 --- a/ffi/capi/bindings/cpp/icu4x/DisplayNamesFallback.hpp +++ b/ffi/capi/bindings/cpp/icu4x/DisplayNamesFallback.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_DisplayNamesFallback_HPP -#define icu4x_DisplayNamesFallback_HPP +#ifndef ICU4X_DisplayNamesFallback_HPP +#define ICU4X_DisplayNamesFallback_HPP #include "DisplayNamesFallback.d.hpp" @@ -11,7 +11,7 @@ #include #include #include -#include "../diplomat_runtime.hpp" +#include "diplomat_runtime.hpp" namespace icu4x { @@ -35,4 +35,4 @@ inline icu4x::DisplayNamesFallback icu4x::DisplayNamesFallback::FromFFI(icu4x::c std::abort(); } } -#endif // icu4x_DisplayNamesFallback_HPP +#endif // ICU4X_DisplayNamesFallback_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/DisplayNamesOptionsV1.d.hpp b/ffi/capi/bindings/cpp/icu4x/DisplayNamesOptionsV1.d.hpp index 857c9fc9e4b..a70e6dd7ab7 100644 --- a/ffi/capi/bindings/cpp/icu4x/DisplayNamesOptionsV1.d.hpp +++ b/ffi/capi/bindings/cpp/icu4x/DisplayNamesOptionsV1.d.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_DisplayNamesOptionsV1_D_HPP -#define icu4x_DisplayNamesOptionsV1_D_HPP +#ifndef ICU4X_DisplayNamesOptionsV1_D_HPP +#define ICU4X_DisplayNamesOptionsV1_D_HPP #include #include @@ -9,16 +9,16 @@ #include #include #include -#include "../diplomat_runtime.hpp" #include "DisplayNamesFallback.d.hpp" #include "DisplayNamesStyle.d.hpp" #include "LanguageDisplay.d.hpp" - +#include "diplomat_runtime.hpp" namespace icu4x { class DisplayNamesFallback; class DisplayNamesStyle; class LanguageDisplay; -} +} // namespace icu4x + namespace icu4x { @@ -50,4 +50,4 @@ struct DisplayNamesOptionsV1 { }; } // namespace -#endif // icu4x_DisplayNamesOptionsV1_D_HPP +#endif // ICU4X_DisplayNamesOptionsV1_D_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/DisplayNamesOptionsV1.hpp b/ffi/capi/bindings/cpp/icu4x/DisplayNamesOptionsV1.hpp index f2fc53dbc54..14639e2d7f4 100644 --- a/ffi/capi/bindings/cpp/icu4x/DisplayNamesOptionsV1.hpp +++ b/ffi/capi/bindings/cpp/icu4x/DisplayNamesOptionsV1.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_DisplayNamesOptionsV1_HPP -#define icu4x_DisplayNamesOptionsV1_HPP +#ifndef ICU4X_DisplayNamesOptionsV1_HPP +#define ICU4X_DisplayNamesOptionsV1_HPP #include "DisplayNamesOptionsV1.d.hpp" @@ -11,10 +11,10 @@ #include #include #include -#include "../diplomat_runtime.hpp" #include "DisplayNamesFallback.hpp" #include "DisplayNamesStyle.hpp" #include "LanguageDisplay.hpp" +#include "diplomat_runtime.hpp" namespace icu4x { @@ -43,4 +43,4 @@ inline icu4x::DisplayNamesOptionsV1 icu4x::DisplayNamesOptionsV1::FromFFI(icu4x: } -#endif // icu4x_DisplayNamesOptionsV1_HPP +#endif // ICU4X_DisplayNamesOptionsV1_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/DisplayNamesStyle.d.hpp b/ffi/capi/bindings/cpp/icu4x/DisplayNamesStyle.d.hpp index 058d1ecef6e..413f3532765 100644 --- a/ffi/capi/bindings/cpp/icu4x/DisplayNamesStyle.d.hpp +++ b/ffi/capi/bindings/cpp/icu4x/DisplayNamesStyle.d.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_DisplayNamesStyle_D_HPP -#define icu4x_DisplayNamesStyle_D_HPP +#ifndef ICU4X_DisplayNamesStyle_D_HPP +#define ICU4X_DisplayNamesStyle_D_HPP #include #include @@ -9,7 +9,7 @@ #include #include #include -#include "../diplomat_runtime.hpp" +#include "diplomat_runtime.hpp" namespace icu4x { @@ -55,4 +55,4 @@ class DisplayNamesStyle { }; } // namespace -#endif // icu4x_DisplayNamesStyle_D_HPP +#endif // ICU4X_DisplayNamesStyle_D_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/DisplayNamesStyle.hpp b/ffi/capi/bindings/cpp/icu4x/DisplayNamesStyle.hpp index ca5eee3dedb..747cbe6bcbc 100644 --- a/ffi/capi/bindings/cpp/icu4x/DisplayNamesStyle.hpp +++ b/ffi/capi/bindings/cpp/icu4x/DisplayNamesStyle.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_DisplayNamesStyle_HPP -#define icu4x_DisplayNamesStyle_HPP +#ifndef ICU4X_DisplayNamesStyle_HPP +#define ICU4X_DisplayNamesStyle_HPP #include "DisplayNamesStyle.d.hpp" @@ -11,7 +11,7 @@ #include #include #include -#include "../diplomat_runtime.hpp" +#include "diplomat_runtime.hpp" namespace icu4x { @@ -37,4 +37,4 @@ inline icu4x::DisplayNamesStyle icu4x::DisplayNamesStyle::FromFFI(icu4x::capi::D std::abort(); } } -#endif // icu4x_DisplayNamesStyle_HPP +#endif // ICU4X_DisplayNamesStyle_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/EastAsianWidth.d.hpp b/ffi/capi/bindings/cpp/icu4x/EastAsianWidth.d.hpp index 24ba5ae047e..8691c564983 100644 --- a/ffi/capi/bindings/cpp/icu4x/EastAsianWidth.d.hpp +++ b/ffi/capi/bindings/cpp/icu4x/EastAsianWidth.d.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_EastAsianWidth_D_HPP -#define icu4x_EastAsianWidth_D_HPP +#ifndef ICU4X_EastAsianWidth_D_HPP +#define ICU4X_EastAsianWidth_D_HPP #include #include @@ -9,11 +9,11 @@ #include #include #include -#include "../diplomat_runtime.hpp" - +#include "diplomat_runtime.hpp" namespace icu4x { class EastAsianWidth; -} +} // namespace icu4x + namespace icu4x { @@ -55,35 +55,35 @@ class EastAsianWidth { explicit operator bool() const = delete; /** - * See the [Rust documentation for `for_char`](https://docs.rs/icu/2.0.0/icu/properties/props/trait.EnumeratedProperty.html#tymethod.for_char) for more information. + * See the [Rust documentation for `for_char`](https://docs.rs/icu/2.0.0/icu/properties/props/trait.EnumeratedProperty.html#tymethod.for_char) for more information. */ inline static icu4x::EastAsianWidth for_char(char32_t ch); /** - * Get the "long" name of this property value (returns empty if property value is unknown) - * - * See the [Rust documentation for `get`](https://docs.rs/icu/2.0.0/icu/properties/struct.PropertyNamesLongBorrowed.html#method.get) for more information. + * Get the "long" name of this property value (returns empty if property value is unknown) + * + * See the [Rust documentation for `get`](https://docs.rs/icu/2.0.0/icu/properties/struct.PropertyNamesLongBorrowed.html#method.get) for more information. */ inline std::optional long_name() const; /** - * Get the "short" name of this property value (returns empty if property value is unknown) - * - * See the [Rust documentation for `get`](https://docs.rs/icu/2.0.0/icu/properties/struct.PropertyNamesShortBorrowed.html#method.get) for more information. + * Get the "short" name of this property value (returns empty if property value is unknown) + * + * See the [Rust documentation for `get`](https://docs.rs/icu/2.0.0/icu/properties/struct.PropertyNamesShortBorrowed.html#method.get) for more information. */ inline std::optional short_name() const; /** - * Convert to an integer value usable with ICU4C and CodePointMapData - * - * See the [Rust documentation for `to_icu4c_value`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.EastAsianWidth.html#method.to_icu4c_value) for more information. + * Convert to an integer value usable with ICU4C and CodePointMapData + * + * See the [Rust documentation for `to_icu4c_value`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.EastAsianWidth.html#method.to_icu4c_value) for more information. */ inline uint8_t to_integer_value() const; /** - * Convert from an integer value from ICU4C or CodePointMapData - * - * See the [Rust documentation for `from_icu4c_value`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.EastAsianWidth.html#method.from_icu4c_value) for more information. + * Convert from an integer value from ICU4C or CodePointMapData + * + * See the [Rust documentation for `from_icu4c_value`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.EastAsianWidth.html#method.from_icu4c_value) for more information. */ inline static std::optional from_integer_value(uint8_t other); @@ -94,4 +94,4 @@ class EastAsianWidth { }; } // namespace -#endif // icu4x_EastAsianWidth_D_HPP +#endif // ICU4X_EastAsianWidth_D_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/EastAsianWidth.hpp b/ffi/capi/bindings/cpp/icu4x/EastAsianWidth.hpp index 94c6c3b87e6..aa3425dc694 100644 --- a/ffi/capi/bindings/cpp/icu4x/EastAsianWidth.hpp +++ b/ffi/capi/bindings/cpp/icu4x/EastAsianWidth.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_EastAsianWidth_HPP -#define icu4x_EastAsianWidth_HPP +#ifndef ICU4X_EastAsianWidth_HPP +#define ICU4X_EastAsianWidth_HPP #include "EastAsianWidth.d.hpp" @@ -11,7 +11,7 @@ #include #include #include -#include "../diplomat_runtime.hpp" +#include "diplomat_runtime.hpp" namespace icu4x { @@ -20,10 +20,10 @@ namespace capi { icu4x::capi::EastAsianWidth icu4x_EastAsianWidth_for_char_mv1(char32_t ch); - typedef struct icu4x_EastAsianWidth_long_name_mv1_result {union {diplomat::capi::DiplomatStringView ok; }; bool is_ok;} icu4x_EastAsianWidth_long_name_mv1_result; + typedef struct icu4x_EastAsianWidth_long_name_mv1_result {union {icu4x::diplomat::capi::DiplomatStringView ok; }; bool is_ok;} icu4x_EastAsianWidth_long_name_mv1_result; icu4x_EastAsianWidth_long_name_mv1_result icu4x_EastAsianWidth_long_name_mv1(icu4x::capi::EastAsianWidth self); - typedef struct icu4x_EastAsianWidth_short_name_mv1_result {union {diplomat::capi::DiplomatStringView ok; }; bool is_ok;} icu4x_EastAsianWidth_short_name_mv1_result; + typedef struct icu4x_EastAsianWidth_short_name_mv1_result {union {icu4x::diplomat::capi::DiplomatStringView ok; }; bool is_ok;} icu4x_EastAsianWidth_short_name_mv1_result; icu4x_EastAsianWidth_short_name_mv1_result icu4x_EastAsianWidth_short_name_mv1(icu4x::capi::EastAsianWidth self); uint8_t icu4x_EastAsianWidth_to_integer_value_mv1(icu4x::capi::EastAsianWidth self); @@ -77,4 +77,4 @@ inline std::optional icu4x::EastAsianWidth::from_integer_ auto result = icu4x::capi::icu4x_EastAsianWidth_from_integer_value_mv1(other); return result.is_ok ? std::optional(icu4x::EastAsianWidth::FromFFI(result.ok)) : std::nullopt; } -#endif // icu4x_EastAsianWidth_HPP +#endif // ICU4X_EastAsianWidth_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/EmojiSetData.d.hpp b/ffi/capi/bindings/cpp/icu4x/EmojiSetData.d.hpp index 7acef084de7..a717fbe7005 100644 --- a/ffi/capi/bindings/cpp/icu4x/EmojiSetData.d.hpp +++ b/ffi/capi/bindings/cpp/icu4x/EmojiSetData.d.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_EmojiSetData_D_HPP -#define icu4x_EmojiSetData_D_HPP +#ifndef ICU4X_EmojiSetData_D_HPP +#define ICU4X_EmojiSetData_D_HPP #include #include @@ -9,15 +9,15 @@ #include #include #include -#include "../diplomat_runtime.hpp" - +#include "diplomat_runtime.hpp" namespace icu4x { namespace capi { struct DataProvider; } class DataProvider; namespace capi { struct EmojiSetData; } class EmojiSetData; class DataError; -} +} // namespace icu4x + namespace icu4x { @@ -42,32 +42,32 @@ class EmojiSetData { public: /** - * Checks whether the string is in the set. - * - * See the [Rust documentation for `contains_str`](https://docs.rs/icu/2.0.0/icu/properties/struct.EmojiSetDataBorrowed.html#method.contains_str) for more information. + * Checks whether the string is in the set. + * + * See the [Rust documentation for `contains_str`](https://docs.rs/icu/2.0.0/icu/properties/struct.EmojiSetDataBorrowed.html#method.contains_str) for more information. */ inline bool contains(std::string_view s) const; /** - * Checks whether the code point is in the set. - * - * See the [Rust documentation for `contains`](https://docs.rs/icu/2.0.0/icu/properties/struct.EmojiSetDataBorrowed.html#method.contains) for more information. + * Checks whether the code point is in the set. + * + * See the [Rust documentation for `contains`](https://docs.rs/icu/2.0.0/icu/properties/struct.EmojiSetDataBorrowed.html#method.contains) for more information. */ inline bool contains(char32_t cp) const; /** - * Create a map for the `Basic_Emoji` property, using compiled data. - * - * See the [Rust documentation for `BasicEmoji`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.BasicEmoji.html) for more information. + * Create a map for the `Basic_Emoji` property, using compiled data. + * + * See the [Rust documentation for `BasicEmoji`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.BasicEmoji.html) for more information. */ inline static std::unique_ptr create_basic(); /** - * Create a map for the `Basic_Emoji` property, using a particular data source. - * - * See the [Rust documentation for `BasicEmoji`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.BasicEmoji.html) for more information. + * Create a map for the `Basic_Emoji` property, using a particular data source. + * + * See the [Rust documentation for `BasicEmoji`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.BasicEmoji.html) for more information. */ - inline static diplomat::result, icu4x::DataError> create_basic_with_provider(const icu4x::DataProvider& provider); + inline static icu4x::diplomat::result, icu4x::DataError> create_basic_with_provider(const icu4x::DataProvider& provider); inline const icu4x::capi::EmojiSetData* AsFFI() const; inline icu4x::capi::EmojiSetData* AsFFI(); @@ -84,4 +84,4 @@ class EmojiSetData { }; } // namespace -#endif // icu4x_EmojiSetData_D_HPP +#endif // ICU4X_EmojiSetData_D_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/EmojiSetData.hpp b/ffi/capi/bindings/cpp/icu4x/EmojiSetData.hpp index fce3d6d517e..ec65c472168 100644 --- a/ffi/capi/bindings/cpp/icu4x/EmojiSetData.hpp +++ b/ffi/capi/bindings/cpp/icu4x/EmojiSetData.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_EmojiSetData_HPP -#define icu4x_EmojiSetData_HPP +#ifndef ICU4X_EmojiSetData_HPP +#define ICU4X_EmojiSetData_HPP #include "EmojiSetData.d.hpp" @@ -11,16 +11,16 @@ #include #include #include -#include "../diplomat_runtime.hpp" #include "DataError.hpp" #include "DataProvider.hpp" +#include "diplomat_runtime.hpp" namespace icu4x { namespace capi { extern "C" { - bool icu4x_EmojiSetData_contains_str_mv1(const icu4x::capi::EmojiSetData* self, diplomat::capi::DiplomatStringView s); + bool icu4x_EmojiSetData_contains_str_mv1(const icu4x::capi::EmojiSetData* self, icu4x::diplomat::capi::DiplomatStringView s); bool icu4x_EmojiSetData_contains_mv1(const icu4x::capi::EmojiSetData* self, char32_t cp); @@ -52,9 +52,9 @@ inline std::unique_ptr icu4x::EmojiSetData::create_basic() return std::unique_ptr(icu4x::EmojiSetData::FromFFI(result)); } -inline diplomat::result, icu4x::DataError> icu4x::EmojiSetData::create_basic_with_provider(const icu4x::DataProvider& provider) { +inline icu4x::diplomat::result, icu4x::DataError> icu4x::EmojiSetData::create_basic_with_provider(const icu4x::DataProvider& provider) { auto result = icu4x::capi::icu4x_EmojiSetData_create_basic_with_provider_mv1(provider.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DataError>(diplomat::Ok>(std::unique_ptr(icu4x::EmojiSetData::FromFFI(result.ok)))) : diplomat::result, icu4x::DataError>(diplomat::Err(icu4x::DataError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::EmojiSetData::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Err(icu4x::DataError::FromFFI(result.err))); } inline const icu4x::capi::EmojiSetData* icu4x::EmojiSetData::AsFFI() const { @@ -78,4 +78,4 @@ inline void icu4x::EmojiSetData::operator delete(void* ptr) { } -#endif // icu4x_EmojiSetData_HPP +#endif // ICU4X_EmojiSetData_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/ExemplarCharacters.d.hpp b/ffi/capi/bindings/cpp/icu4x/ExemplarCharacters.d.hpp index 6119888232f..84c2aedbc64 100644 --- a/ffi/capi/bindings/cpp/icu4x/ExemplarCharacters.d.hpp +++ b/ffi/capi/bindings/cpp/icu4x/ExemplarCharacters.d.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_ExemplarCharacters_D_HPP -#define icu4x_ExemplarCharacters_D_HPP +#ifndef ICU4X_ExemplarCharacters_D_HPP +#define ICU4X_ExemplarCharacters_D_HPP #include #include @@ -9,8 +9,7 @@ #include #include #include -#include "../diplomat_runtime.hpp" - +#include "diplomat_runtime.hpp" namespace icu4x { namespace capi { struct DataProvider; } class DataProvider; @@ -19,7 +18,8 @@ class ExemplarCharacters; namespace capi { struct Locale; } class Locale; class DataError; -} +} // namespace icu4x + namespace icu4x { @@ -42,88 +42,88 @@ class ExemplarCharacters { public: /** - * Checks whether the string is in the set. - * - * See the [Rust documentation for `contains_str`](https://docs.rs/icu/2.0.0/icu/collections/codepointinvliststringlist/struct.CodePointInversionListAndStringList.html#method.contains_str) for more information. + * Checks whether the string is in the set. + * + * See the [Rust documentation for `contains_str`](https://docs.rs/icu/2.0.0/icu/collections/codepointinvliststringlist/struct.CodePointInversionListAndStringList.html#method.contains_str) for more information. */ inline bool contains(std::string_view s) const; /** - * Checks whether the code point is in the set. - * - * See the [Rust documentation for `contains`](https://docs.rs/icu/2.0.0/icu/collections/codepointinvliststringlist/struct.CodePointInversionListAndStringList.html#method.contains) for more information. + * Checks whether the code point is in the set. + * + * See the [Rust documentation for `contains`](https://docs.rs/icu/2.0.0/icu/collections/codepointinvliststringlist/struct.CodePointInversionListAndStringList.html#method.contains) for more information. */ inline bool contains(char32_t cp) const; /** - * Create an {@link ExemplarCharacters} for the "main" set of exemplar characters for a given locale, using compiled data. - * - * See the [Rust documentation for `try_new_main`](https://docs.rs/icu/2.0.0/icu/locale/exemplar_chars/struct.ExemplarCharacters.html#method.try_new_main) for more information. + * Create an {@link ExemplarCharacters} for the "main" set of exemplar characters for a given locale, using compiled data. + * + * See the [Rust documentation for `try_new_main`](https://docs.rs/icu/2.0.0/icu/locale/exemplar_chars/struct.ExemplarCharacters.html#method.try_new_main) for more information. */ - inline static diplomat::result, icu4x::DataError> create_main(const icu4x::Locale& locale); + inline static icu4x::diplomat::result, icu4x::DataError> create_main(const icu4x::Locale& locale); /** - * Create an {@link ExemplarCharacters} for the "main" set of exemplar characters for a given locale, using a particular data source - * - * See the [Rust documentation for `try_new_main`](https://docs.rs/icu/2.0.0/icu/locale/exemplar_chars/struct.ExemplarCharacters.html#method.try_new_main) for more information. + * Create an {@link ExemplarCharacters} for the "main" set of exemplar characters for a given locale, using a particular data source + * + * See the [Rust documentation for `try_new_main`](https://docs.rs/icu/2.0.0/icu/locale/exemplar_chars/struct.ExemplarCharacters.html#method.try_new_main) for more information. */ - inline static diplomat::result, icu4x::DataError> create_main_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale); + inline static icu4x::diplomat::result, icu4x::DataError> create_main_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale); /** - * Create an {@link ExemplarCharacters} for the "auxiliary" set of exemplar characters for a given locale, using compiled data. - * - * See the [Rust documentation for `try_new_auxiliary`](https://docs.rs/icu/2.0.0/icu/locale/exemplar_chars/struct.ExemplarCharacters.html#method.try_new_auxiliary) for more information. + * Create an {@link ExemplarCharacters} for the "auxiliary" set of exemplar characters for a given locale, using compiled data. + * + * See the [Rust documentation for `try_new_auxiliary`](https://docs.rs/icu/2.0.0/icu/locale/exemplar_chars/struct.ExemplarCharacters.html#method.try_new_auxiliary) for more information. */ - inline static diplomat::result, icu4x::DataError> create_auxiliary(const icu4x::Locale& locale); + inline static icu4x::diplomat::result, icu4x::DataError> create_auxiliary(const icu4x::Locale& locale); /** - * Create an {@link ExemplarCharacters} for the "auxiliary" set of exemplar characters for a given locale, using compiled data. - * - * See the [Rust documentation for `try_new_auxiliary`](https://docs.rs/icu/2.0.0/icu/locale/exemplar_chars/struct.ExemplarCharacters.html#method.try_new_auxiliary) for more information. + * Create an {@link ExemplarCharacters} for the "auxiliary" set of exemplar characters for a given locale, using compiled data. + * + * See the [Rust documentation for `try_new_auxiliary`](https://docs.rs/icu/2.0.0/icu/locale/exemplar_chars/struct.ExemplarCharacters.html#method.try_new_auxiliary) for more information. */ - inline static diplomat::result, icu4x::DataError> create_auxiliary_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale); + inline static icu4x::diplomat::result, icu4x::DataError> create_auxiliary_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale); /** - * Create an {@link ExemplarCharacters} for the "punctuation" set of exemplar characters for a given locale, using compiled data. - * - * See the [Rust documentation for `try_new_punctuation`](https://docs.rs/icu/2.0.0/icu/locale/exemplar_chars/struct.ExemplarCharacters.html#method.try_new_punctuation) for more information. + * Create an {@link ExemplarCharacters} for the "punctuation" set of exemplar characters for a given locale, using compiled data. + * + * See the [Rust documentation for `try_new_punctuation`](https://docs.rs/icu/2.0.0/icu/locale/exemplar_chars/struct.ExemplarCharacters.html#method.try_new_punctuation) for more information. */ - inline static diplomat::result, icu4x::DataError> create_punctuation(const icu4x::Locale& locale); + inline static icu4x::diplomat::result, icu4x::DataError> create_punctuation(const icu4x::Locale& locale); /** - * Create an {@link ExemplarCharacters} for the "punctuation" set of exemplar characters for a given locale, using compiled data. - * - * See the [Rust documentation for `try_new_punctuation`](https://docs.rs/icu/2.0.0/icu/locale/exemplar_chars/struct.ExemplarCharacters.html#method.try_new_punctuation) for more information. + * Create an {@link ExemplarCharacters} for the "punctuation" set of exemplar characters for a given locale, using compiled data. + * + * See the [Rust documentation for `try_new_punctuation`](https://docs.rs/icu/2.0.0/icu/locale/exemplar_chars/struct.ExemplarCharacters.html#method.try_new_punctuation) for more information. */ - inline static diplomat::result, icu4x::DataError> create_punctuation_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale); + inline static icu4x::diplomat::result, icu4x::DataError> create_punctuation_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale); /** - * Create an {@link ExemplarCharacters} for the "numbers" set of exemplar characters for a given locale, using compiled data. - * - * See the [Rust documentation for `try_new_numbers`](https://docs.rs/icu/2.0.0/icu/locale/exemplar_chars/struct.ExemplarCharacters.html#method.try_new_numbers) for more information. + * Create an {@link ExemplarCharacters} for the "numbers" set of exemplar characters for a given locale, using compiled data. + * + * See the [Rust documentation for `try_new_numbers`](https://docs.rs/icu/2.0.0/icu/locale/exemplar_chars/struct.ExemplarCharacters.html#method.try_new_numbers) for more information. */ - inline static diplomat::result, icu4x::DataError> create_numbers(const icu4x::Locale& locale); + inline static icu4x::diplomat::result, icu4x::DataError> create_numbers(const icu4x::Locale& locale); /** - * Create an {@link ExemplarCharacters} for the "numbers" set of exemplar characters for a given locale, using compiled data. - * - * See the [Rust documentation for `try_new_numbers`](https://docs.rs/icu/2.0.0/icu/locale/exemplar_chars/struct.ExemplarCharacters.html#method.try_new_numbers) for more information. + * Create an {@link ExemplarCharacters} for the "numbers" set of exemplar characters for a given locale, using compiled data. + * + * See the [Rust documentation for `try_new_numbers`](https://docs.rs/icu/2.0.0/icu/locale/exemplar_chars/struct.ExemplarCharacters.html#method.try_new_numbers) for more information. */ - inline static diplomat::result, icu4x::DataError> create_numbers_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale); + inline static icu4x::diplomat::result, icu4x::DataError> create_numbers_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale); /** - * Create an {@link ExemplarCharacters} for the "index" set of exemplar characters for a given locale, using compiled data. - * - * See the [Rust documentation for `try_new_index`](https://docs.rs/icu/2.0.0/icu/locale/exemplar_chars/struct.ExemplarCharacters.html#method.try_new_index) for more information. + * Create an {@link ExemplarCharacters} for the "index" set of exemplar characters for a given locale, using compiled data. + * + * See the [Rust documentation for `try_new_index`](https://docs.rs/icu/2.0.0/icu/locale/exemplar_chars/struct.ExemplarCharacters.html#method.try_new_index) for more information. */ - inline static diplomat::result, icu4x::DataError> create_index(const icu4x::Locale& locale); + inline static icu4x::diplomat::result, icu4x::DataError> create_index(const icu4x::Locale& locale); /** - * Create an {@link ExemplarCharacters} for the "index" set of exemplar characters for a given locale, using compiled data. - * - * See the [Rust documentation for `try_new_index`](https://docs.rs/icu/2.0.0/icu/locale/exemplar_chars/struct.ExemplarCharacters.html#method.try_new_index) for more information. + * Create an {@link ExemplarCharacters} for the "index" set of exemplar characters for a given locale, using compiled data. + * + * See the [Rust documentation for `try_new_index`](https://docs.rs/icu/2.0.0/icu/locale/exemplar_chars/struct.ExemplarCharacters.html#method.try_new_index) for more information. */ - inline static diplomat::result, icu4x::DataError> create_index_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale); + inline static icu4x::diplomat::result, icu4x::DataError> create_index_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale); inline const icu4x::capi::ExemplarCharacters* AsFFI() const; inline icu4x::capi::ExemplarCharacters* AsFFI(); @@ -140,4 +140,4 @@ class ExemplarCharacters { }; } // namespace -#endif // icu4x_ExemplarCharacters_D_HPP +#endif // ICU4X_ExemplarCharacters_D_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/ExemplarCharacters.hpp b/ffi/capi/bindings/cpp/icu4x/ExemplarCharacters.hpp index 886bda45318..e8e9cfb9606 100644 --- a/ffi/capi/bindings/cpp/icu4x/ExemplarCharacters.hpp +++ b/ffi/capi/bindings/cpp/icu4x/ExemplarCharacters.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_ExemplarCharacters_HPP -#define icu4x_ExemplarCharacters_HPP +#ifndef ICU4X_ExemplarCharacters_HPP +#define ICU4X_ExemplarCharacters_HPP #include "ExemplarCharacters.d.hpp" @@ -11,17 +11,17 @@ #include #include #include -#include "../diplomat_runtime.hpp" #include "DataError.hpp" #include "DataProvider.hpp" #include "Locale.hpp" +#include "diplomat_runtime.hpp" namespace icu4x { namespace capi { extern "C" { - bool icu4x_ExemplarCharacters_contains_str_mv1(const icu4x::capi::ExemplarCharacters* self, diplomat::capi::DiplomatStringView s); + bool icu4x_ExemplarCharacters_contains_str_mv1(const icu4x::capi::ExemplarCharacters* self, icu4x::diplomat::capi::DiplomatStringView s); bool icu4x_ExemplarCharacters_contains_mv1(const icu4x::capi::ExemplarCharacters* self, char32_t cp); @@ -73,59 +73,59 @@ inline bool icu4x::ExemplarCharacters::contains(char32_t cp) const { return result; } -inline diplomat::result, icu4x::DataError> icu4x::ExemplarCharacters::create_main(const icu4x::Locale& locale) { +inline icu4x::diplomat::result, icu4x::DataError> icu4x::ExemplarCharacters::create_main(const icu4x::Locale& locale) { auto result = icu4x::capi::icu4x_ExemplarCharacters_create_main_mv1(locale.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DataError>(diplomat::Ok>(std::unique_ptr(icu4x::ExemplarCharacters::FromFFI(result.ok)))) : diplomat::result, icu4x::DataError>(diplomat::Err(icu4x::DataError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::ExemplarCharacters::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Err(icu4x::DataError::FromFFI(result.err))); } -inline diplomat::result, icu4x::DataError> icu4x::ExemplarCharacters::create_main_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale) { +inline icu4x::diplomat::result, icu4x::DataError> icu4x::ExemplarCharacters::create_main_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale) { auto result = icu4x::capi::icu4x_ExemplarCharacters_create_main_with_provider_mv1(provider.AsFFI(), locale.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DataError>(diplomat::Ok>(std::unique_ptr(icu4x::ExemplarCharacters::FromFFI(result.ok)))) : diplomat::result, icu4x::DataError>(diplomat::Err(icu4x::DataError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::ExemplarCharacters::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Err(icu4x::DataError::FromFFI(result.err))); } -inline diplomat::result, icu4x::DataError> icu4x::ExemplarCharacters::create_auxiliary(const icu4x::Locale& locale) { +inline icu4x::diplomat::result, icu4x::DataError> icu4x::ExemplarCharacters::create_auxiliary(const icu4x::Locale& locale) { auto result = icu4x::capi::icu4x_ExemplarCharacters_create_auxiliary_mv1(locale.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DataError>(diplomat::Ok>(std::unique_ptr(icu4x::ExemplarCharacters::FromFFI(result.ok)))) : diplomat::result, icu4x::DataError>(diplomat::Err(icu4x::DataError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::ExemplarCharacters::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Err(icu4x::DataError::FromFFI(result.err))); } -inline diplomat::result, icu4x::DataError> icu4x::ExemplarCharacters::create_auxiliary_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale) { +inline icu4x::diplomat::result, icu4x::DataError> icu4x::ExemplarCharacters::create_auxiliary_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale) { auto result = icu4x::capi::icu4x_ExemplarCharacters_create_auxiliary_with_provider_mv1(provider.AsFFI(), locale.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DataError>(diplomat::Ok>(std::unique_ptr(icu4x::ExemplarCharacters::FromFFI(result.ok)))) : diplomat::result, icu4x::DataError>(diplomat::Err(icu4x::DataError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::ExemplarCharacters::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Err(icu4x::DataError::FromFFI(result.err))); } -inline diplomat::result, icu4x::DataError> icu4x::ExemplarCharacters::create_punctuation(const icu4x::Locale& locale) { +inline icu4x::diplomat::result, icu4x::DataError> icu4x::ExemplarCharacters::create_punctuation(const icu4x::Locale& locale) { auto result = icu4x::capi::icu4x_ExemplarCharacters_create_punctuation_mv1(locale.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DataError>(diplomat::Ok>(std::unique_ptr(icu4x::ExemplarCharacters::FromFFI(result.ok)))) : diplomat::result, icu4x::DataError>(diplomat::Err(icu4x::DataError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::ExemplarCharacters::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Err(icu4x::DataError::FromFFI(result.err))); } -inline diplomat::result, icu4x::DataError> icu4x::ExemplarCharacters::create_punctuation_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale) { +inline icu4x::diplomat::result, icu4x::DataError> icu4x::ExemplarCharacters::create_punctuation_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale) { auto result = icu4x::capi::icu4x_ExemplarCharacters_create_punctuation_with_provider_mv1(provider.AsFFI(), locale.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DataError>(diplomat::Ok>(std::unique_ptr(icu4x::ExemplarCharacters::FromFFI(result.ok)))) : diplomat::result, icu4x::DataError>(diplomat::Err(icu4x::DataError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::ExemplarCharacters::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Err(icu4x::DataError::FromFFI(result.err))); } -inline diplomat::result, icu4x::DataError> icu4x::ExemplarCharacters::create_numbers(const icu4x::Locale& locale) { +inline icu4x::diplomat::result, icu4x::DataError> icu4x::ExemplarCharacters::create_numbers(const icu4x::Locale& locale) { auto result = icu4x::capi::icu4x_ExemplarCharacters_create_numbers_mv1(locale.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DataError>(diplomat::Ok>(std::unique_ptr(icu4x::ExemplarCharacters::FromFFI(result.ok)))) : diplomat::result, icu4x::DataError>(diplomat::Err(icu4x::DataError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::ExemplarCharacters::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Err(icu4x::DataError::FromFFI(result.err))); } -inline diplomat::result, icu4x::DataError> icu4x::ExemplarCharacters::create_numbers_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale) { +inline icu4x::diplomat::result, icu4x::DataError> icu4x::ExemplarCharacters::create_numbers_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale) { auto result = icu4x::capi::icu4x_ExemplarCharacters_create_numbers_with_provider_mv1(provider.AsFFI(), locale.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DataError>(diplomat::Ok>(std::unique_ptr(icu4x::ExemplarCharacters::FromFFI(result.ok)))) : diplomat::result, icu4x::DataError>(diplomat::Err(icu4x::DataError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::ExemplarCharacters::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Err(icu4x::DataError::FromFFI(result.err))); } -inline diplomat::result, icu4x::DataError> icu4x::ExemplarCharacters::create_index(const icu4x::Locale& locale) { +inline icu4x::diplomat::result, icu4x::DataError> icu4x::ExemplarCharacters::create_index(const icu4x::Locale& locale) { auto result = icu4x::capi::icu4x_ExemplarCharacters_create_index_mv1(locale.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DataError>(diplomat::Ok>(std::unique_ptr(icu4x::ExemplarCharacters::FromFFI(result.ok)))) : diplomat::result, icu4x::DataError>(diplomat::Err(icu4x::DataError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::ExemplarCharacters::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Err(icu4x::DataError::FromFFI(result.err))); } -inline diplomat::result, icu4x::DataError> icu4x::ExemplarCharacters::create_index_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale) { +inline icu4x::diplomat::result, icu4x::DataError> icu4x::ExemplarCharacters::create_index_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale) { auto result = icu4x::capi::icu4x_ExemplarCharacters_create_index_with_provider_mv1(provider.AsFFI(), locale.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DataError>(diplomat::Ok>(std::unique_ptr(icu4x::ExemplarCharacters::FromFFI(result.ok)))) : diplomat::result, icu4x::DataError>(diplomat::Err(icu4x::DataError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::ExemplarCharacters::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Err(icu4x::DataError::FromFFI(result.err))); } inline const icu4x::capi::ExemplarCharacters* icu4x::ExemplarCharacters::AsFFI() const { @@ -149,4 +149,4 @@ inline void icu4x::ExemplarCharacters::operator delete(void* ptr) { } -#endif // icu4x_ExemplarCharacters_HPP +#endif // ICU4X_ExemplarCharacters_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/GeneralCategory.d.hpp b/ffi/capi/bindings/cpp/icu4x/GeneralCategory.d.hpp index 0950ffbd488..b44b89dd703 100644 --- a/ffi/capi/bindings/cpp/icu4x/GeneralCategory.d.hpp +++ b/ffi/capi/bindings/cpp/icu4x/GeneralCategory.d.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_GeneralCategory_D_HPP -#define icu4x_GeneralCategory_D_HPP +#ifndef ICU4X_GeneralCategory_D_HPP +#define ICU4X_GeneralCategory_D_HPP #include #include @@ -9,12 +9,12 @@ #include #include #include -#include "../diplomat_runtime.hpp" - +#include "diplomat_runtime.hpp" namespace icu4x { struct GeneralCategoryGroup; class GeneralCategory; -} +} // namespace icu4x + namespace icu4x { @@ -104,40 +104,40 @@ class GeneralCategory { explicit operator bool() const = delete; /** - * See the [Rust documentation for `for_char`](https://docs.rs/icu/2.0.0/icu/properties/props/trait.EnumeratedProperty.html#tymethod.for_char) for more information. + * See the [Rust documentation for `for_char`](https://docs.rs/icu/2.0.0/icu/properties/props/trait.EnumeratedProperty.html#tymethod.for_char) for more information. */ inline static icu4x::GeneralCategory for_char(char32_t ch); /** - * Convert to an integer using the ICU4C integer mappings for `General_Category` - * Get the "long" name of this property value (returns empty if property value is unknown) - * - * See the [Rust documentation for `get`](https://docs.rs/icu/2.0.0/icu/properties/struct.PropertyNamesLongBorrowed.html#method.get) for more information. + * Convert to an integer using the ICU4C integer mappings for `General_Category` + * Get the "long" name of this property value (returns empty if property value is unknown) + * + * See the [Rust documentation for `get`](https://docs.rs/icu/2.0.0/icu/properties/struct.PropertyNamesLongBorrowed.html#method.get) for more information. */ inline std::optional long_name() const; /** - * Get the "short" name of this property value (returns empty if property value is unknown) - * - * See the [Rust documentation for `get`](https://docs.rs/icu/2.0.0/icu/properties/struct.PropertyNamesShortBorrowed.html#method.get) for more information. + * Get the "short" name of this property value (returns empty if property value is unknown) + * + * See the [Rust documentation for `get`](https://docs.rs/icu/2.0.0/icu/properties/struct.PropertyNamesShortBorrowed.html#method.get) for more information. */ inline std::optional short_name() const; /** - * Convert to an integer value usable with ICU4C and CodePointMapData + * Convert to an integer value usable with ICU4C and CodePointMapData */ inline uint8_t to_integer_value() const; /** - * Produces a GeneralCategoryGroup mask that can represent a group of general categories - * - * See the [Rust documentation for `GeneralCategoryGroup`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.GeneralCategoryGroup.html) for more information. + * Produces a GeneralCategoryGroup mask that can represent a group of general categories + * + * See the [Rust documentation for `GeneralCategoryGroup`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.GeneralCategoryGroup.html) for more information. */ inline icu4x::GeneralCategoryGroup to_group() const; /** - * Convert from an integer using the ICU4C integer mappings for `General_Category` - * Convert from an integer value from ICU4C or CodePointMapData + * Convert from an integer using the ICU4C integer mappings for `General_Category` + * Convert from an integer value from ICU4C or CodePointMapData */ inline static std::optional from_integer_value(uint8_t other); @@ -148,4 +148,4 @@ class GeneralCategory { }; } // namespace -#endif // icu4x_GeneralCategory_D_HPP +#endif // ICU4X_GeneralCategory_D_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/GeneralCategory.hpp b/ffi/capi/bindings/cpp/icu4x/GeneralCategory.hpp index c44adbb4e19..cca3e954146 100644 --- a/ffi/capi/bindings/cpp/icu4x/GeneralCategory.hpp +++ b/ffi/capi/bindings/cpp/icu4x/GeneralCategory.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_GeneralCategory_HPP -#define icu4x_GeneralCategory_HPP +#ifndef ICU4X_GeneralCategory_HPP +#define ICU4X_GeneralCategory_HPP #include "GeneralCategory.d.hpp" @@ -11,8 +11,8 @@ #include #include #include -#include "../diplomat_runtime.hpp" #include "GeneralCategoryGroup.hpp" +#include "diplomat_runtime.hpp" namespace icu4x { @@ -21,10 +21,10 @@ namespace capi { icu4x::capi::GeneralCategory icu4x_GeneralCategory_for_char_mv1(char32_t ch); - typedef struct icu4x_GeneralCategory_long_name_mv1_result {union {diplomat::capi::DiplomatStringView ok; }; bool is_ok;} icu4x_GeneralCategory_long_name_mv1_result; + typedef struct icu4x_GeneralCategory_long_name_mv1_result {union {icu4x::diplomat::capi::DiplomatStringView ok; }; bool is_ok;} icu4x_GeneralCategory_long_name_mv1_result; icu4x_GeneralCategory_long_name_mv1_result icu4x_GeneralCategory_long_name_mv1(icu4x::capi::GeneralCategory self); - typedef struct icu4x_GeneralCategory_short_name_mv1_result {union {diplomat::capi::DiplomatStringView ok; }; bool is_ok;} icu4x_GeneralCategory_short_name_mv1_result; + typedef struct icu4x_GeneralCategory_short_name_mv1_result {union {icu4x::diplomat::capi::DiplomatStringView ok; }; bool is_ok;} icu4x_GeneralCategory_short_name_mv1_result; icu4x_GeneralCategory_short_name_mv1_result icu4x_GeneralCategory_short_name_mv1(icu4x::capi::GeneralCategory self); uint8_t icu4x_GeneralCategory_to_integer_value_mv1(icu4x::capi::GeneralCategory self); @@ -109,4 +109,4 @@ inline std::optional icu4x::GeneralCategory::from_intege auto result = icu4x::capi::icu4x_GeneralCategory_from_integer_value_mv1(other); return result.is_ok ? std::optional(icu4x::GeneralCategory::FromFFI(result.ok)) : std::nullopt; } -#endif // icu4x_GeneralCategory_HPP +#endif // ICU4X_GeneralCategory_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/GeneralCategoryGroup.d.hpp b/ffi/capi/bindings/cpp/icu4x/GeneralCategoryGroup.d.hpp index 7e57311e337..9812b659653 100644 --- a/ffi/capi/bindings/cpp/icu4x/GeneralCategoryGroup.d.hpp +++ b/ffi/capi/bindings/cpp/icu4x/GeneralCategoryGroup.d.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_GeneralCategoryGroup_D_HPP -#define icu4x_GeneralCategoryGroup_D_HPP +#ifndef ICU4X_GeneralCategoryGroup_D_HPP +#define ICU4X_GeneralCategoryGroup_D_HPP #include #include @@ -9,12 +9,12 @@ #include #include #include -#include "../diplomat_runtime.hpp" - +#include "diplomat_runtime.hpp" namespace icu4x { struct GeneralCategoryGroup; class GeneralCategory; -} +} // namespace icu4x + namespace icu4x { @@ -38,72 +38,72 @@ struct GeneralCategoryGroup { uint32_t mask; /** - * See the [Rust documentation for `contains`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.GeneralCategoryGroup.html#method.contains) for more information. + * See the [Rust documentation for `contains`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.GeneralCategoryGroup.html#method.contains) for more information. */ inline bool contains(icu4x::GeneralCategory val) const; /** - * See the [Rust documentation for `complement`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.GeneralCategoryGroup.html#method.complement) for more information. + * See the [Rust documentation for `complement`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.GeneralCategoryGroup.html#method.complement) for more information. */ inline icu4x::GeneralCategoryGroup complement() const; /** - * See the [Rust documentation for `all`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.GeneralCategoryGroup.html#method.all) for more information. + * See the [Rust documentation for `all`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.GeneralCategoryGroup.html#method.all) for more information. */ inline static icu4x::GeneralCategoryGroup all(); /** - * See the [Rust documentation for `empty`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.GeneralCategoryGroup.html#method.empty) for more information. + * See the [Rust documentation for `empty`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.GeneralCategoryGroup.html#method.empty) for more information. */ inline static icu4x::GeneralCategoryGroup empty(); /** - * See the [Rust documentation for `union`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.GeneralCategoryGroup.html#method.union) for more information. + * See the [Rust documentation for `union`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.GeneralCategoryGroup.html#method.union) for more information. */ inline icu4x::GeneralCategoryGroup union_(icu4x::GeneralCategoryGroup other) const; /** - * See the [Rust documentation for `intersection`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.GeneralCategoryGroup.html#method.intersection) for more information. + * See the [Rust documentation for `intersection`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.GeneralCategoryGroup.html#method.intersection) for more information. */ inline icu4x::GeneralCategoryGroup intersection(icu4x::GeneralCategoryGroup other) const; /** - * See the [Rust documentation for `CasedLetter`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.GeneralCategoryGroup.html#associatedconstant.CasedLetter) for more information. + * See the [Rust documentation for `CasedLetter`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.GeneralCategoryGroup.html#associatedconstant.CasedLetter) for more information. */ inline static icu4x::GeneralCategoryGroup cased_letter(); /** - * See the [Rust documentation for `Letter`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.GeneralCategoryGroup.html#associatedconstant.Letter) for more information. + * See the [Rust documentation for `Letter`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.GeneralCategoryGroup.html#associatedconstant.Letter) for more information. */ inline static icu4x::GeneralCategoryGroup letter(); /** - * See the [Rust documentation for `Mark`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.GeneralCategoryGroup.html#associatedconstant.Mark) for more information. + * See the [Rust documentation for `Mark`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.GeneralCategoryGroup.html#associatedconstant.Mark) for more information. */ inline static icu4x::GeneralCategoryGroup mark(); /** - * See the [Rust documentation for `Number`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.GeneralCategoryGroup.html#associatedconstant.Number) for more information. + * See the [Rust documentation for `Number`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.GeneralCategoryGroup.html#associatedconstant.Number) for more information. */ inline static icu4x::GeneralCategoryGroup number(); /** - * See the [Rust documentation for `Other`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.GeneralCategoryGroup.html#associatedconstant.Other) for more information. + * See the [Rust documentation for `Other`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.GeneralCategoryGroup.html#associatedconstant.Other) for more information. */ inline static icu4x::GeneralCategoryGroup separator(); /** - * See the [Rust documentation for `Letter`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.GeneralCategoryGroup.html#associatedconstant.Letter) for more information. + * See the [Rust documentation for `Letter`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.GeneralCategoryGroup.html#associatedconstant.Letter) for more information. */ inline static icu4x::GeneralCategoryGroup other(); /** - * See the [Rust documentation for `Punctuation`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.GeneralCategoryGroup.html#associatedconstant.Punctuation) for more information. + * See the [Rust documentation for `Punctuation`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.GeneralCategoryGroup.html#associatedconstant.Punctuation) for more information. */ inline static icu4x::GeneralCategoryGroup punctuation(); /** - * See the [Rust documentation for `Symbol`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.GeneralCategoryGroup.html#associatedconstant.Symbol) for more information. + * See the [Rust documentation for `Symbol`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.GeneralCategoryGroup.html#associatedconstant.Symbol) for more information. */ inline static icu4x::GeneralCategoryGroup symbol(); @@ -112,4 +112,4 @@ struct GeneralCategoryGroup { }; } // namespace -#endif // icu4x_GeneralCategoryGroup_D_HPP +#endif // ICU4X_GeneralCategoryGroup_D_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/GeneralCategoryGroup.hpp b/ffi/capi/bindings/cpp/icu4x/GeneralCategoryGroup.hpp index 6e09de9968e..914ad2a5d46 100644 --- a/ffi/capi/bindings/cpp/icu4x/GeneralCategoryGroup.hpp +++ b/ffi/capi/bindings/cpp/icu4x/GeneralCategoryGroup.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_GeneralCategoryGroup_HPP -#define icu4x_GeneralCategoryGroup_HPP +#ifndef ICU4X_GeneralCategoryGroup_HPP +#define ICU4X_GeneralCategoryGroup_HPP #include "GeneralCategoryGroup.d.hpp" @@ -11,8 +11,8 @@ #include #include #include -#include "../diplomat_runtime.hpp" #include "GeneralCategory.hpp" +#include "diplomat_runtime.hpp" namespace icu4x { @@ -138,4 +138,4 @@ inline icu4x::GeneralCategoryGroup icu4x::GeneralCategoryGroup::FromFFI(icu4x::c } -#endif // icu4x_GeneralCategoryGroup_HPP +#endif // ICU4X_GeneralCategoryGroup_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/GeneralCategoryNameToGroupMapper.d.hpp b/ffi/capi/bindings/cpp/icu4x/GeneralCategoryNameToGroupMapper.d.hpp index 6ef6ee6a365..7d9b95b8fff 100644 --- a/ffi/capi/bindings/cpp/icu4x/GeneralCategoryNameToGroupMapper.d.hpp +++ b/ffi/capi/bindings/cpp/icu4x/GeneralCategoryNameToGroupMapper.d.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_GeneralCategoryNameToGroupMapper_D_HPP -#define icu4x_GeneralCategoryNameToGroupMapper_D_HPP +#ifndef ICU4X_GeneralCategoryNameToGroupMapper_D_HPP +#define ICU4X_GeneralCategoryNameToGroupMapper_D_HPP #include #include @@ -9,8 +9,7 @@ #include #include #include -#include "../diplomat_runtime.hpp" - +#include "diplomat_runtime.hpp" namespace icu4x { namespace capi { struct DataProvider; } class DataProvider; @@ -18,7 +17,8 @@ namespace capi { struct GeneralCategoryNameToGroupMapper; } class GeneralCategoryNameToGroupMapper; struct GeneralCategoryGroup; class DataError; -} +} // namespace icu4x + namespace icu4x { @@ -39,36 +39,36 @@ class GeneralCategoryNameToGroupMapper { public: /** - * Get the mask value matching the given name, using strict matching - * - * Returns 0 if the name is unknown for this property - * - * See the [Rust documentation for `get_strict`](https://docs.rs/icu/2.0.0/icu/properties/struct.PropertyParserBorrowed.html#method.get_strict) for more information. + * Get the mask value matching the given name, using strict matching + * + * Returns 0 if the name is unknown for this property + * + * See the [Rust documentation for `get_strict`](https://docs.rs/icu/2.0.0/icu/properties/struct.PropertyParserBorrowed.html#method.get_strict) for more information. */ inline icu4x::GeneralCategoryGroup get_strict(std::string_view name) const; /** - * Get the mask value matching the given name, using loose matching - * - * Returns 0 if the name is unknown for this property - * - * See the [Rust documentation for `get_loose`](https://docs.rs/icu/2.0.0/icu/properties/struct.PropertyParserBorrowed.html#method.get_loose) for more information. + * Get the mask value matching the given name, using loose matching + * + * Returns 0 if the name is unknown for this property + * + * See the [Rust documentation for `get_loose`](https://docs.rs/icu/2.0.0/icu/properties/struct.PropertyParserBorrowed.html#method.get_loose) for more information. */ inline icu4x::GeneralCategoryGroup get_loose(std::string_view name) const; /** - * Create a name-to-mask mapper for the `General_Category` property, using compiled data. - * - * See the [Rust documentation for `GeneralCategoryGroup`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.GeneralCategoryGroup.html) for more information. + * Create a name-to-mask mapper for the `General_Category` property, using compiled data. + * + * See the [Rust documentation for `GeneralCategoryGroup`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.GeneralCategoryGroup.html) for more information. */ inline static std::unique_ptr create(); /** - * Create a name-to-mask mapper for the `General_Category` property, using a particular data source. - * - * See the [Rust documentation for `GeneralCategoryGroup`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.GeneralCategoryGroup.html) for more information. + * Create a name-to-mask mapper for the `General_Category` property, using a particular data source. + * + * See the [Rust documentation for `GeneralCategoryGroup`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.GeneralCategoryGroup.html) for more information. */ - inline static diplomat::result, icu4x::DataError> create_with_provider(const icu4x::DataProvider& provider); + inline static icu4x::diplomat::result, icu4x::DataError> create_with_provider(const icu4x::DataProvider& provider); inline const icu4x::capi::GeneralCategoryNameToGroupMapper* AsFFI() const; inline icu4x::capi::GeneralCategoryNameToGroupMapper* AsFFI(); @@ -85,4 +85,4 @@ class GeneralCategoryNameToGroupMapper { }; } // namespace -#endif // icu4x_GeneralCategoryNameToGroupMapper_D_HPP +#endif // ICU4X_GeneralCategoryNameToGroupMapper_D_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/GeneralCategoryNameToGroupMapper.hpp b/ffi/capi/bindings/cpp/icu4x/GeneralCategoryNameToGroupMapper.hpp index 27ba2108233..cc9b556769c 100644 --- a/ffi/capi/bindings/cpp/icu4x/GeneralCategoryNameToGroupMapper.hpp +++ b/ffi/capi/bindings/cpp/icu4x/GeneralCategoryNameToGroupMapper.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_GeneralCategoryNameToGroupMapper_HPP -#define icu4x_GeneralCategoryNameToGroupMapper_HPP +#ifndef ICU4X_GeneralCategoryNameToGroupMapper_HPP +#define ICU4X_GeneralCategoryNameToGroupMapper_HPP #include "GeneralCategoryNameToGroupMapper.d.hpp" @@ -11,19 +11,19 @@ #include #include #include -#include "../diplomat_runtime.hpp" #include "DataError.hpp" #include "DataProvider.hpp" #include "GeneralCategoryGroup.hpp" +#include "diplomat_runtime.hpp" namespace icu4x { namespace capi { extern "C" { - icu4x::capi::GeneralCategoryGroup icu4x_GeneralCategoryNameToGroupMapper_get_strict_mv1(const icu4x::capi::GeneralCategoryNameToGroupMapper* self, diplomat::capi::DiplomatStringView name); + icu4x::capi::GeneralCategoryGroup icu4x_GeneralCategoryNameToGroupMapper_get_strict_mv1(const icu4x::capi::GeneralCategoryNameToGroupMapper* self, icu4x::diplomat::capi::DiplomatStringView name); - icu4x::capi::GeneralCategoryGroup icu4x_GeneralCategoryNameToGroupMapper_get_loose_mv1(const icu4x::capi::GeneralCategoryNameToGroupMapper* self, diplomat::capi::DiplomatStringView name); + icu4x::capi::GeneralCategoryGroup icu4x_GeneralCategoryNameToGroupMapper_get_loose_mv1(const icu4x::capi::GeneralCategoryNameToGroupMapper* self, icu4x::diplomat::capi::DiplomatStringView name); icu4x::capi::GeneralCategoryNameToGroupMapper* icu4x_GeneralCategoryNameToGroupMapper_create_mv1(void); @@ -53,9 +53,9 @@ inline std::unique_ptr icu4x::GeneralCa return std::unique_ptr(icu4x::GeneralCategoryNameToGroupMapper::FromFFI(result)); } -inline diplomat::result, icu4x::DataError> icu4x::GeneralCategoryNameToGroupMapper::create_with_provider(const icu4x::DataProvider& provider) { +inline icu4x::diplomat::result, icu4x::DataError> icu4x::GeneralCategoryNameToGroupMapper::create_with_provider(const icu4x::DataProvider& provider) { auto result = icu4x::capi::icu4x_GeneralCategoryNameToGroupMapper_create_with_provider_mv1(provider.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DataError>(diplomat::Ok>(std::unique_ptr(icu4x::GeneralCategoryNameToGroupMapper::FromFFI(result.ok)))) : diplomat::result, icu4x::DataError>(diplomat::Err(icu4x::DataError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::GeneralCategoryNameToGroupMapper::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Err(icu4x::DataError::FromFFI(result.err))); } inline const icu4x::capi::GeneralCategoryNameToGroupMapper* icu4x::GeneralCategoryNameToGroupMapper::AsFFI() const { @@ -79,4 +79,4 @@ inline void icu4x::GeneralCategoryNameToGroupMapper::operator delete(void* ptr) } -#endif // icu4x_GeneralCategoryNameToGroupMapper_HPP +#endif // ICU4X_GeneralCategoryNameToGroupMapper_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/GraphemeClusterBreak.d.hpp b/ffi/capi/bindings/cpp/icu4x/GraphemeClusterBreak.d.hpp index f88cd590f63..370ff1ed597 100644 --- a/ffi/capi/bindings/cpp/icu4x/GraphemeClusterBreak.d.hpp +++ b/ffi/capi/bindings/cpp/icu4x/GraphemeClusterBreak.d.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_GraphemeClusterBreak_D_HPP -#define icu4x_GraphemeClusterBreak_D_HPP +#ifndef ICU4X_GraphemeClusterBreak_D_HPP +#define ICU4X_GraphemeClusterBreak_D_HPP #include #include @@ -9,11 +9,11 @@ #include #include #include -#include "../diplomat_runtime.hpp" - +#include "diplomat_runtime.hpp" namespace icu4x { class GraphemeClusterBreak; -} +} // namespace icu4x + namespace icu4x { @@ -79,21 +79,21 @@ class GraphemeClusterBreak { explicit operator bool() const = delete; /** - * See the [Rust documentation for `for_char`](https://docs.rs/icu/2.0.0/icu/properties/props/trait.EnumeratedProperty.html#tymethod.for_char) for more information. + * See the [Rust documentation for `for_char`](https://docs.rs/icu/2.0.0/icu/properties/props/trait.EnumeratedProperty.html#tymethod.for_char) for more information. */ inline static icu4x::GraphemeClusterBreak for_char(char32_t ch); /** - * Convert to an integer value usable with ICU4C and CodePointMapData - * - * See the [Rust documentation for `to_icu4c_value`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.GraphemeClusterBreak.html#method.to_icu4c_value) for more information. + * Convert to an integer value usable with ICU4C and CodePointMapData + * + * See the [Rust documentation for `to_icu4c_value`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.GraphemeClusterBreak.html#method.to_icu4c_value) for more information. */ inline uint8_t to_integer_value() const; /** - * Convert from an integer value from ICU4C or CodePointMapData - * - * See the [Rust documentation for `from_icu4c_value`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.GraphemeClusterBreak.html#method.from_icu4c_value) for more information. + * Convert from an integer value from ICU4C or CodePointMapData + * + * See the [Rust documentation for `from_icu4c_value`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.GraphemeClusterBreak.html#method.from_icu4c_value) for more information. */ inline static std::optional from_integer_value(uint8_t other); @@ -104,4 +104,4 @@ class GraphemeClusterBreak { }; } // namespace -#endif // icu4x_GraphemeClusterBreak_D_HPP +#endif // ICU4X_GraphemeClusterBreak_D_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/GraphemeClusterBreak.hpp b/ffi/capi/bindings/cpp/icu4x/GraphemeClusterBreak.hpp index 07a422ff443..8d3ab00940e 100644 --- a/ffi/capi/bindings/cpp/icu4x/GraphemeClusterBreak.hpp +++ b/ffi/capi/bindings/cpp/icu4x/GraphemeClusterBreak.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_GraphemeClusterBreak_HPP -#define icu4x_GraphemeClusterBreak_HPP +#ifndef ICU4X_GraphemeClusterBreak_HPP +#define ICU4X_GraphemeClusterBreak_HPP #include "GraphemeClusterBreak.d.hpp" @@ -11,7 +11,7 @@ #include #include #include -#include "../diplomat_runtime.hpp" +#include "diplomat_runtime.hpp" namespace icu4x { @@ -73,4 +73,4 @@ inline std::optional icu4x::GraphemeClusterBreak::f auto result = icu4x::capi::icu4x_GraphemeClusterBreak_from_integer_value_mv1(other); return result.is_ok ? std::optional(icu4x::GraphemeClusterBreak::FromFFI(result.ok)) : std::nullopt; } -#endif // icu4x_GraphemeClusterBreak_HPP +#endif // ICU4X_GraphemeClusterBreak_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/GraphemeClusterBreakIteratorLatin1.d.hpp b/ffi/capi/bindings/cpp/icu4x/GraphemeClusterBreakIteratorLatin1.d.hpp index 6e3c9792b9e..457091fb0b0 100644 --- a/ffi/capi/bindings/cpp/icu4x/GraphemeClusterBreakIteratorLatin1.d.hpp +++ b/ffi/capi/bindings/cpp/icu4x/GraphemeClusterBreakIteratorLatin1.d.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_GraphemeClusterBreakIteratorLatin1_D_HPP -#define icu4x_GraphemeClusterBreakIteratorLatin1_D_HPP +#ifndef ICU4X_GraphemeClusterBreakIteratorLatin1_D_HPP +#define ICU4X_GraphemeClusterBreakIteratorLatin1_D_HPP #include #include @@ -9,7 +9,7 @@ #include #include #include -#include "../diplomat_runtime.hpp" +#include "diplomat_runtime.hpp" namespace icu4x { @@ -26,10 +26,10 @@ class GraphemeClusterBreakIteratorLatin1 { public: /** - * Finds the next breakpoint. Returns -1 if at the end of the string or if the index is - * out of range of a 32-bit signed integer. - * - * See the [Rust documentation for `next`](https://docs.rs/icu/2.0.0/icu/segmenter/iterators/struct.GraphemeClusterBreakIterator.html#method.next) for more information. + * Finds the next breakpoint. Returns -1 if at the end of the string or if the index is + * out of range of a 32-bit signed integer. + * + * See the [Rust documentation for `next`](https://docs.rs/icu/2.0.0/icu/segmenter/iterators/struct.GraphemeClusterBreakIterator.html#method.next) for more information. */ inline int32_t next(); @@ -48,4 +48,4 @@ class GraphemeClusterBreakIteratorLatin1 { }; } // namespace -#endif // icu4x_GraphemeClusterBreakIteratorLatin1_D_HPP +#endif // ICU4X_GraphemeClusterBreakIteratorLatin1_D_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/GraphemeClusterBreakIteratorLatin1.hpp b/ffi/capi/bindings/cpp/icu4x/GraphemeClusterBreakIteratorLatin1.hpp index df2f482f1ce..521df9b9330 100644 --- a/ffi/capi/bindings/cpp/icu4x/GraphemeClusterBreakIteratorLatin1.hpp +++ b/ffi/capi/bindings/cpp/icu4x/GraphemeClusterBreakIteratorLatin1.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_GraphemeClusterBreakIteratorLatin1_HPP -#define icu4x_GraphemeClusterBreakIteratorLatin1_HPP +#ifndef ICU4X_GraphemeClusterBreakIteratorLatin1_HPP +#define ICU4X_GraphemeClusterBreakIteratorLatin1_HPP #include "GraphemeClusterBreakIteratorLatin1.d.hpp" @@ -11,7 +11,7 @@ #include #include #include -#include "../diplomat_runtime.hpp" +#include "diplomat_runtime.hpp" namespace icu4x { @@ -52,4 +52,4 @@ inline void icu4x::GraphemeClusterBreakIteratorLatin1::operator delete(void* ptr } -#endif // icu4x_GraphemeClusterBreakIteratorLatin1_HPP +#endif // ICU4X_GraphemeClusterBreakIteratorLatin1_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/GraphemeClusterBreakIteratorUtf16.d.hpp b/ffi/capi/bindings/cpp/icu4x/GraphemeClusterBreakIteratorUtf16.d.hpp index d6dbe8e2066..db527c7af3e 100644 --- a/ffi/capi/bindings/cpp/icu4x/GraphemeClusterBreakIteratorUtf16.d.hpp +++ b/ffi/capi/bindings/cpp/icu4x/GraphemeClusterBreakIteratorUtf16.d.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_GraphemeClusterBreakIteratorUtf16_D_HPP -#define icu4x_GraphemeClusterBreakIteratorUtf16_D_HPP +#ifndef ICU4X_GraphemeClusterBreakIteratorUtf16_D_HPP +#define ICU4X_GraphemeClusterBreakIteratorUtf16_D_HPP #include #include @@ -9,7 +9,7 @@ #include #include #include -#include "../diplomat_runtime.hpp" +#include "diplomat_runtime.hpp" namespace icu4x { @@ -26,10 +26,10 @@ class GraphemeClusterBreakIteratorUtf16 { public: /** - * Finds the next breakpoint. Returns -1 if at the end of the string or if the index is - * out of range of a 32-bit signed integer. - * - * See the [Rust documentation for `next`](https://docs.rs/icu/2.0.0/icu/segmenter/iterators/struct.GraphemeClusterBreakIterator.html#method.next) for more information. + * Finds the next breakpoint. Returns -1 if at the end of the string or if the index is + * out of range of a 32-bit signed integer. + * + * See the [Rust documentation for `next`](https://docs.rs/icu/2.0.0/icu/segmenter/iterators/struct.GraphemeClusterBreakIterator.html#method.next) for more information. */ inline int32_t next(); @@ -48,4 +48,4 @@ class GraphemeClusterBreakIteratorUtf16 { }; } // namespace -#endif // icu4x_GraphemeClusterBreakIteratorUtf16_D_HPP +#endif // ICU4X_GraphemeClusterBreakIteratorUtf16_D_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/GraphemeClusterBreakIteratorUtf16.hpp b/ffi/capi/bindings/cpp/icu4x/GraphemeClusterBreakIteratorUtf16.hpp index a5d5bb586d9..77faa44ec61 100644 --- a/ffi/capi/bindings/cpp/icu4x/GraphemeClusterBreakIteratorUtf16.hpp +++ b/ffi/capi/bindings/cpp/icu4x/GraphemeClusterBreakIteratorUtf16.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_GraphemeClusterBreakIteratorUtf16_HPP -#define icu4x_GraphemeClusterBreakIteratorUtf16_HPP +#ifndef ICU4X_GraphemeClusterBreakIteratorUtf16_HPP +#define ICU4X_GraphemeClusterBreakIteratorUtf16_HPP #include "GraphemeClusterBreakIteratorUtf16.d.hpp" @@ -11,7 +11,7 @@ #include #include #include -#include "../diplomat_runtime.hpp" +#include "diplomat_runtime.hpp" namespace icu4x { @@ -52,4 +52,4 @@ inline void icu4x::GraphemeClusterBreakIteratorUtf16::operator delete(void* ptr) } -#endif // icu4x_GraphemeClusterBreakIteratorUtf16_HPP +#endif // ICU4X_GraphemeClusterBreakIteratorUtf16_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/GraphemeClusterBreakIteratorUtf8.d.hpp b/ffi/capi/bindings/cpp/icu4x/GraphemeClusterBreakIteratorUtf8.d.hpp index 6f7e0fdf8d1..504d5570c0b 100644 --- a/ffi/capi/bindings/cpp/icu4x/GraphemeClusterBreakIteratorUtf8.d.hpp +++ b/ffi/capi/bindings/cpp/icu4x/GraphemeClusterBreakIteratorUtf8.d.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_GraphemeClusterBreakIteratorUtf8_D_HPP -#define icu4x_GraphemeClusterBreakIteratorUtf8_D_HPP +#ifndef ICU4X_GraphemeClusterBreakIteratorUtf8_D_HPP +#define ICU4X_GraphemeClusterBreakIteratorUtf8_D_HPP #include #include @@ -9,7 +9,7 @@ #include #include #include -#include "../diplomat_runtime.hpp" +#include "diplomat_runtime.hpp" namespace icu4x { @@ -26,10 +26,10 @@ class GraphemeClusterBreakIteratorUtf8 { public: /** - * Finds the next breakpoint. Returns -1 if at the end of the string or if the index is - * out of range of a 32-bit signed integer. - * - * See the [Rust documentation for `next`](https://docs.rs/icu/2.0.0/icu/segmenter/iterators/struct.GraphemeClusterBreakIterator.html#method.next) for more information. + * Finds the next breakpoint. Returns -1 if at the end of the string or if the index is + * out of range of a 32-bit signed integer. + * + * See the [Rust documentation for `next`](https://docs.rs/icu/2.0.0/icu/segmenter/iterators/struct.GraphemeClusterBreakIterator.html#method.next) for more information. */ inline int32_t next(); @@ -48,4 +48,4 @@ class GraphemeClusterBreakIteratorUtf8 { }; } // namespace -#endif // icu4x_GraphemeClusterBreakIteratorUtf8_D_HPP +#endif // ICU4X_GraphemeClusterBreakIteratorUtf8_D_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/GraphemeClusterBreakIteratorUtf8.hpp b/ffi/capi/bindings/cpp/icu4x/GraphemeClusterBreakIteratorUtf8.hpp index f686eb3401c..68f4152b0c7 100644 --- a/ffi/capi/bindings/cpp/icu4x/GraphemeClusterBreakIteratorUtf8.hpp +++ b/ffi/capi/bindings/cpp/icu4x/GraphemeClusterBreakIteratorUtf8.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_GraphemeClusterBreakIteratorUtf8_HPP -#define icu4x_GraphemeClusterBreakIteratorUtf8_HPP +#ifndef ICU4X_GraphemeClusterBreakIteratorUtf8_HPP +#define ICU4X_GraphemeClusterBreakIteratorUtf8_HPP #include "GraphemeClusterBreakIteratorUtf8.d.hpp" @@ -11,7 +11,7 @@ #include #include #include -#include "../diplomat_runtime.hpp" +#include "diplomat_runtime.hpp" namespace icu4x { @@ -52,4 +52,4 @@ inline void icu4x::GraphemeClusterBreakIteratorUtf8::operator delete(void* ptr) } -#endif // icu4x_GraphemeClusterBreakIteratorUtf8_HPP +#endif // ICU4X_GraphemeClusterBreakIteratorUtf8_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/GraphemeClusterSegmenter.d.hpp b/ffi/capi/bindings/cpp/icu4x/GraphemeClusterSegmenter.d.hpp index f5be042e02f..674697744d6 100644 --- a/ffi/capi/bindings/cpp/icu4x/GraphemeClusterSegmenter.d.hpp +++ b/ffi/capi/bindings/cpp/icu4x/GraphemeClusterSegmenter.d.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_GraphemeClusterSegmenter_D_HPP -#define icu4x_GraphemeClusterSegmenter_D_HPP +#ifndef ICU4X_GraphemeClusterSegmenter_D_HPP +#define ICU4X_GraphemeClusterSegmenter_D_HPP #include #include @@ -9,8 +9,7 @@ #include #include #include -#include "../diplomat_runtime.hpp" - +#include "diplomat_runtime.hpp" namespace icu4x { namespace capi { struct DataProvider; } class DataProvider; @@ -23,7 +22,8 @@ class GraphemeClusterBreakIteratorUtf8; namespace capi { struct GraphemeClusterSegmenter; } class GraphemeClusterSegmenter; class DataError; -} +} // namespace icu4x + namespace icu4x { @@ -43,45 +43,45 @@ class GraphemeClusterSegmenter { public: /** - * Construct an {@link GraphemeClusterSegmenter} using compiled data. - * - * See the [Rust documentation for `new`](https://docs.rs/icu/2.0.0/icu/segmenter/struct.GraphemeClusterSegmenter.html#method.new) for more information. + * Construct an {@link GraphemeClusterSegmenter} using compiled data. + * + * See the [Rust documentation for `new`](https://docs.rs/icu/2.0.0/icu/segmenter/struct.GraphemeClusterSegmenter.html#method.new) for more information. */ inline static std::unique_ptr create(); /** - * Construct an {@link GraphemeClusterSegmenter}. - * - * See the [Rust documentation for `new`](https://docs.rs/icu/2.0.0/icu/segmenter/struct.GraphemeClusterSegmenter.html#method.new) for more information. + * Construct an {@link GraphemeClusterSegmenter}. + * + * See the [Rust documentation for `new`](https://docs.rs/icu/2.0.0/icu/segmenter/struct.GraphemeClusterSegmenter.html#method.new) for more information. */ - inline static diplomat::result, icu4x::DataError> create_with_provider(const icu4x::DataProvider& provider); + inline static icu4x::diplomat::result, icu4x::DataError> create_with_provider(const icu4x::DataProvider& provider); /** - * Segments a string. - * - * Ill-formed input is treated as if errors had been replaced with REPLACEMENT CHARACTERs according - * to the WHATWG Encoding Standard. - * - * See the [Rust documentation for `segment_utf8`](https://docs.rs/icu/2.0.0/icu/segmenter/struct.GraphemeClusterSegmenterBorrowed.html#method.segment_utf8) for more information. + * Segments a string. + * + * Ill-formed input is treated as if errors had been replaced with REPLACEMENT CHARACTERs according + * to the WHATWG Encoding Standard. + * + * See the [Rust documentation for `segment_utf8`](https://docs.rs/icu/2.0.0/icu/segmenter/struct.GraphemeClusterSegmenterBorrowed.html#method.segment_utf8) for more information. */ inline std::unique_ptr segment(std::string_view input) const; /** - * Segments a string. - * - * Ill-formed input is treated as if errors had been replaced with REPLACEMENT CHARACTERs according - * to the WHATWG Encoding Standard. - * - * See the [Rust documentation for `segment_utf16`](https://docs.rs/icu/2.0.0/icu/segmenter/struct.GraphemeClusterSegmenterBorrowed.html#method.segment_utf16) for more information. + * Segments a string. + * + * Ill-formed input is treated as if errors had been replaced with REPLACEMENT CHARACTERs according + * to the WHATWG Encoding Standard. + * + * See the [Rust documentation for `segment_utf16`](https://docs.rs/icu/2.0.0/icu/segmenter/struct.GraphemeClusterSegmenterBorrowed.html#method.segment_utf16) for more information. */ inline std::unique_ptr segment16(std::u16string_view input) const; /** - * Segments a Latin-1 string. - * - * See the [Rust documentation for `segment_latin1`](https://docs.rs/icu/2.0.0/icu/segmenter/struct.GraphemeClusterSegmenterBorrowed.html#method.segment_latin1) for more information. + * Segments a Latin-1 string. + * + * See the [Rust documentation for `segment_latin1`](https://docs.rs/icu/2.0.0/icu/segmenter/struct.GraphemeClusterSegmenterBorrowed.html#method.segment_latin1) for more information. */ - inline std::unique_ptr segment_latin1(diplomat::span input) const; + inline std::unique_ptr segment_latin1(icu4x::diplomat::span input) const; inline const icu4x::capi::GraphemeClusterSegmenter* AsFFI() const; inline icu4x::capi::GraphemeClusterSegmenter* AsFFI(); @@ -98,4 +98,4 @@ class GraphemeClusterSegmenter { }; } // namespace -#endif // icu4x_GraphemeClusterSegmenter_D_HPP +#endif // ICU4X_GraphemeClusterSegmenter_D_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/GraphemeClusterSegmenter.hpp b/ffi/capi/bindings/cpp/icu4x/GraphemeClusterSegmenter.hpp index 106525d7640..8ba11481e56 100644 --- a/ffi/capi/bindings/cpp/icu4x/GraphemeClusterSegmenter.hpp +++ b/ffi/capi/bindings/cpp/icu4x/GraphemeClusterSegmenter.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_GraphemeClusterSegmenter_HPP -#define icu4x_GraphemeClusterSegmenter_HPP +#ifndef ICU4X_GraphemeClusterSegmenter_HPP +#define ICU4X_GraphemeClusterSegmenter_HPP #include "GraphemeClusterSegmenter.d.hpp" @@ -11,12 +11,12 @@ #include #include #include -#include "../diplomat_runtime.hpp" #include "DataError.hpp" #include "DataProvider.hpp" #include "GraphemeClusterBreakIteratorLatin1.hpp" #include "GraphemeClusterBreakIteratorUtf16.hpp" #include "GraphemeClusterBreakIteratorUtf8.hpp" +#include "diplomat_runtime.hpp" namespace icu4x { @@ -28,11 +28,11 @@ namespace capi { typedef struct icu4x_GraphemeClusterSegmenter_create_with_provider_mv1_result {union {icu4x::capi::GraphemeClusterSegmenter* ok; icu4x::capi::DataError err;}; bool is_ok;} icu4x_GraphemeClusterSegmenter_create_with_provider_mv1_result; icu4x_GraphemeClusterSegmenter_create_with_provider_mv1_result icu4x_GraphemeClusterSegmenter_create_with_provider_mv1(const icu4x::capi::DataProvider* provider); - icu4x::capi::GraphemeClusterBreakIteratorUtf8* icu4x_GraphemeClusterSegmenter_segment_utf8_mv1(const icu4x::capi::GraphemeClusterSegmenter* self, diplomat::capi::DiplomatStringView input); + icu4x::capi::GraphemeClusterBreakIteratorUtf8* icu4x_GraphemeClusterSegmenter_segment_utf8_mv1(const icu4x::capi::GraphemeClusterSegmenter* self, icu4x::diplomat::capi::DiplomatStringView input); - icu4x::capi::GraphemeClusterBreakIteratorUtf16* icu4x_GraphemeClusterSegmenter_segment_utf16_mv1(const icu4x::capi::GraphemeClusterSegmenter* self, diplomat::capi::DiplomatString16View input); + icu4x::capi::GraphemeClusterBreakIteratorUtf16* icu4x_GraphemeClusterSegmenter_segment_utf16_mv1(const icu4x::capi::GraphemeClusterSegmenter* self, icu4x::diplomat::capi::DiplomatString16View input); - icu4x::capi::GraphemeClusterBreakIteratorLatin1* icu4x_GraphemeClusterSegmenter_segment_latin1_mv1(const icu4x::capi::GraphemeClusterSegmenter* self, diplomat::capi::DiplomatU8View input); + icu4x::capi::GraphemeClusterBreakIteratorLatin1* icu4x_GraphemeClusterSegmenter_segment_latin1_mv1(const icu4x::capi::GraphemeClusterSegmenter* self, icu4x::diplomat::capi::DiplomatU8View input); void icu4x_GraphemeClusterSegmenter_destroy_mv1(GraphemeClusterSegmenter* self); @@ -45,9 +45,9 @@ inline std::unique_ptr icu4x::GraphemeClusterSe return std::unique_ptr(icu4x::GraphemeClusterSegmenter::FromFFI(result)); } -inline diplomat::result, icu4x::DataError> icu4x::GraphemeClusterSegmenter::create_with_provider(const icu4x::DataProvider& provider) { +inline icu4x::diplomat::result, icu4x::DataError> icu4x::GraphemeClusterSegmenter::create_with_provider(const icu4x::DataProvider& provider) { auto result = icu4x::capi::icu4x_GraphemeClusterSegmenter_create_with_provider_mv1(provider.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DataError>(diplomat::Ok>(std::unique_ptr(icu4x::GraphemeClusterSegmenter::FromFFI(result.ok)))) : diplomat::result, icu4x::DataError>(diplomat::Err(icu4x::DataError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::GraphemeClusterSegmenter::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Err(icu4x::DataError::FromFFI(result.err))); } inline std::unique_ptr icu4x::GraphemeClusterSegmenter::segment(std::string_view input) const { @@ -62,7 +62,7 @@ inline std::unique_ptr icu4x::Grapheme return std::unique_ptr(icu4x::GraphemeClusterBreakIteratorUtf16::FromFFI(result)); } -inline std::unique_ptr icu4x::GraphemeClusterSegmenter::segment_latin1(diplomat::span input) const { +inline std::unique_ptr icu4x::GraphemeClusterSegmenter::segment_latin1(icu4x::diplomat::span input) const { auto result = icu4x::capi::icu4x_GraphemeClusterSegmenter_segment_latin1_mv1(this->AsFFI(), {input.data(), input.size()}); return std::unique_ptr(icu4x::GraphemeClusterBreakIteratorLatin1::FromFFI(result)); @@ -89,4 +89,4 @@ inline void icu4x::GraphemeClusterSegmenter::operator delete(void* ptr) { } -#endif // icu4x_GraphemeClusterSegmenter_HPP +#endif // ICU4X_GraphemeClusterSegmenter_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/HangulSyllableType.d.hpp b/ffi/capi/bindings/cpp/icu4x/HangulSyllableType.d.hpp index bd43c5bdad9..fda002b5c97 100644 --- a/ffi/capi/bindings/cpp/icu4x/HangulSyllableType.d.hpp +++ b/ffi/capi/bindings/cpp/icu4x/HangulSyllableType.d.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_HangulSyllableType_D_HPP -#define icu4x_HangulSyllableType_D_HPP +#ifndef ICU4X_HangulSyllableType_D_HPP +#define ICU4X_HangulSyllableType_D_HPP #include #include @@ -9,11 +9,11 @@ #include #include #include -#include "../diplomat_runtime.hpp" - +#include "diplomat_runtime.hpp" namespace icu4x { class HangulSyllableType; -} +} // namespace icu4x + namespace icu4x { @@ -55,21 +55,21 @@ class HangulSyllableType { explicit operator bool() const = delete; /** - * See the [Rust documentation for `for_char`](https://docs.rs/icu/2.0.0/icu/properties/props/trait.EnumeratedProperty.html#tymethod.for_char) for more information. + * See the [Rust documentation for `for_char`](https://docs.rs/icu/2.0.0/icu/properties/props/trait.EnumeratedProperty.html#tymethod.for_char) for more information. */ inline static icu4x::HangulSyllableType for_char(char32_t ch); /** - * Convert to an integer value usable with ICU4C and CodePointMapData - * - * See the [Rust documentation for `to_icu4c_value`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.HangulSyllableType.html#method.to_icu4c_value) for more information. + * Convert to an integer value usable with ICU4C and CodePointMapData + * + * See the [Rust documentation for `to_icu4c_value`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.HangulSyllableType.html#method.to_icu4c_value) for more information. */ inline uint8_t to_integer_value() const; /** - * Convert from an integer value from ICU4C or CodePointMapData - * - * See the [Rust documentation for `from_icu4c_value`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.HangulSyllableType.html#method.from_icu4c_value) for more information. + * Convert from an integer value from ICU4C or CodePointMapData + * + * See the [Rust documentation for `from_icu4c_value`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.HangulSyllableType.html#method.from_icu4c_value) for more information. */ inline static std::optional from_integer_value(uint8_t other); @@ -80,4 +80,4 @@ class HangulSyllableType { }; } // namespace -#endif // icu4x_HangulSyllableType_D_HPP +#endif // ICU4X_HangulSyllableType_D_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/HangulSyllableType.hpp b/ffi/capi/bindings/cpp/icu4x/HangulSyllableType.hpp index d5472a4239a..0e4a5b5cdd7 100644 --- a/ffi/capi/bindings/cpp/icu4x/HangulSyllableType.hpp +++ b/ffi/capi/bindings/cpp/icu4x/HangulSyllableType.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_HangulSyllableType_HPP -#define icu4x_HangulSyllableType_HPP +#ifndef ICU4X_HangulSyllableType_HPP +#define ICU4X_HangulSyllableType_HPP #include "HangulSyllableType.d.hpp" @@ -11,7 +11,7 @@ #include #include #include -#include "../diplomat_runtime.hpp" +#include "diplomat_runtime.hpp" namespace icu4x { @@ -61,4 +61,4 @@ inline std::optional icu4x::HangulSyllableType::from_ auto result = icu4x::capi::icu4x_HangulSyllableType_from_integer_value_mv1(other); return result.is_ok ? std::optional(icu4x::HangulSyllableType::FromFFI(result.ok)) : std::nullopt; } -#endif // icu4x_HangulSyllableType_HPP +#endif // ICU4X_HangulSyllableType_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/IanaParser.d.hpp b/ffi/capi/bindings/cpp/icu4x/IanaParser.d.hpp index 8e87add70fe..c8711b75a54 100644 --- a/ffi/capi/bindings/cpp/icu4x/IanaParser.d.hpp +++ b/ffi/capi/bindings/cpp/icu4x/IanaParser.d.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_IanaParser_D_HPP -#define icu4x_IanaParser_D_HPP +#ifndef ICU4X_IanaParser_D_HPP +#define ICU4X_IanaParser_D_HPP #include #include @@ -9,8 +9,7 @@ #include #include #include -#include "../diplomat_runtime.hpp" - +#include "diplomat_runtime.hpp" namespace icu4x { namespace capi { struct DataProvider; } class DataProvider; @@ -21,7 +20,8 @@ class TimeZone; namespace capi { struct TimeZoneIterator; } class TimeZoneIterator; class DataError; -} +} // namespace icu4x + namespace icu4x { @@ -43,26 +43,26 @@ class IanaParser { public: /** - * Create a new {@link IanaParser} using compiled data - * - * See the [Rust documentation for `new`](https://docs.rs/icu/2.0.0/icu/time/zone/iana/struct.IanaParser.html#method.new) for more information. + * Create a new {@link IanaParser} using compiled data + * + * See the [Rust documentation for `new`](https://docs.rs/icu/2.0.0/icu/time/zone/iana/struct.IanaParser.html#method.new) for more information. */ inline static std::unique_ptr create(); /** - * Create a new {@link IanaParser} using a particular data source - * - * See the [Rust documentation for `new`](https://docs.rs/icu/2.0.0/icu/time/zone/iana/struct.IanaParser.html#method.new) for more information. + * Create a new {@link IanaParser} using a particular data source + * + * See the [Rust documentation for `new`](https://docs.rs/icu/2.0.0/icu/time/zone/iana/struct.IanaParser.html#method.new) for more information. */ - inline static diplomat::result, icu4x::DataError> create_with_provider(const icu4x::DataProvider& provider); + inline static icu4x::diplomat::result, icu4x::DataError> create_with_provider(const icu4x::DataProvider& provider); /** - * See the [Rust documentation for `parse`](https://docs.rs/icu/2.0.0/icu/time/zone/iana/struct.IanaParserBorrowed.html#method.parse) for more information. + * See the [Rust documentation for `parse`](https://docs.rs/icu/2.0.0/icu/time/zone/iana/struct.IanaParserBorrowed.html#method.parse) for more information. */ inline std::unique_ptr parse(std::string_view value) const; /** - * See the [Rust documentation for `iter`](https://docs.rs/icu/2.0.0/icu/time/zone/iana/struct.IanaParserBorrowed.html#method.iter) for more information. + * See the [Rust documentation for `iter`](https://docs.rs/icu/2.0.0/icu/time/zone/iana/struct.IanaParserBorrowed.html#method.iter) for more information. */ inline std::unique_ptr iter() const; @@ -81,4 +81,4 @@ class IanaParser { }; } // namespace -#endif // icu4x_IanaParser_D_HPP +#endif // ICU4X_IanaParser_D_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/IanaParser.hpp b/ffi/capi/bindings/cpp/icu4x/IanaParser.hpp index 367e90d6d1f..9fb4d0ba524 100644 --- a/ffi/capi/bindings/cpp/icu4x/IanaParser.hpp +++ b/ffi/capi/bindings/cpp/icu4x/IanaParser.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_IanaParser_HPP -#define icu4x_IanaParser_HPP +#ifndef ICU4X_IanaParser_HPP +#define ICU4X_IanaParser_HPP #include "IanaParser.d.hpp" @@ -11,11 +11,11 @@ #include #include #include -#include "../diplomat_runtime.hpp" #include "DataError.hpp" #include "DataProvider.hpp" #include "TimeZone.hpp" #include "TimeZoneIterator.hpp" +#include "diplomat_runtime.hpp" namespace icu4x { @@ -27,7 +27,7 @@ namespace capi { typedef struct icu4x_IanaParser_create_with_provider_mv1_result {union {icu4x::capi::IanaParser* ok; icu4x::capi::DataError err;}; bool is_ok;} icu4x_IanaParser_create_with_provider_mv1_result; icu4x_IanaParser_create_with_provider_mv1_result icu4x_IanaParser_create_with_provider_mv1(const icu4x::capi::DataProvider* provider); - icu4x::capi::TimeZone* icu4x_IanaParser_parse_mv1(const icu4x::capi::IanaParser* self, diplomat::capi::DiplomatStringView value); + icu4x::capi::TimeZone* icu4x_IanaParser_parse_mv1(const icu4x::capi::IanaParser* self, icu4x::diplomat::capi::DiplomatStringView value); icu4x::capi::TimeZoneIterator* icu4x_IanaParser_iter_mv1(const icu4x::capi::IanaParser* self); @@ -42,9 +42,9 @@ inline std::unique_ptr icu4x::IanaParser::create() { return std::unique_ptr(icu4x::IanaParser::FromFFI(result)); } -inline diplomat::result, icu4x::DataError> icu4x::IanaParser::create_with_provider(const icu4x::DataProvider& provider) { +inline icu4x::diplomat::result, icu4x::DataError> icu4x::IanaParser::create_with_provider(const icu4x::DataProvider& provider) { auto result = icu4x::capi::icu4x_IanaParser_create_with_provider_mv1(provider.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DataError>(diplomat::Ok>(std::unique_ptr(icu4x::IanaParser::FromFFI(result.ok)))) : diplomat::result, icu4x::DataError>(diplomat::Err(icu4x::DataError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::IanaParser::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Err(icu4x::DataError::FromFFI(result.err))); } inline std::unique_ptr icu4x::IanaParser::parse(std::string_view value) const { @@ -79,4 +79,4 @@ inline void icu4x::IanaParser::operator delete(void* ptr) { } -#endif // icu4x_IanaParser_HPP +#endif // ICU4X_IanaParser_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/IanaParserExtended.d.hpp b/ffi/capi/bindings/cpp/icu4x/IanaParserExtended.d.hpp index c856e4faeaa..aec6740c6f5 100644 --- a/ffi/capi/bindings/cpp/icu4x/IanaParserExtended.d.hpp +++ b/ffi/capi/bindings/cpp/icu4x/IanaParserExtended.d.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_IanaParserExtended_D_HPP -#define icu4x_IanaParserExtended_D_HPP +#ifndef ICU4X_IanaParserExtended_D_HPP +#define ICU4X_IanaParserExtended_D_HPP #include #include @@ -9,8 +9,7 @@ #include #include #include -#include "../diplomat_runtime.hpp" - +#include "diplomat_runtime.hpp" namespace icu4x { namespace capi { struct DataProvider; } class DataProvider; @@ -22,7 +21,8 @@ namespace capi { struct TimeZoneAndCanonicalIterator; } class TimeZoneAndCanonicalIterator; struct TimeZoneAndCanonicalAndNormalized; class DataError; -} +} // namespace icu4x + namespace icu4x { @@ -44,31 +44,31 @@ class IanaParserExtended { public: /** - * Create a new {@link IanaParserExtended} using compiled data - * - * See the [Rust documentation for `new`](https://docs.rs/icu/2.0.0/icu/time/zone/iana/struct.IanaParserExtended.html#method.new) for more information. + * Create a new {@link IanaParserExtended} using compiled data + * + * See the [Rust documentation for `new`](https://docs.rs/icu/2.0.0/icu/time/zone/iana/struct.IanaParserExtended.html#method.new) for more information. */ inline static std::unique_ptr create(); /** - * Create a new {@link IanaParserExtended} using a particular data source - * - * See the [Rust documentation for `new`](https://docs.rs/icu/2.0.0/icu/time/zone/iana/struct.IanaParserExtended.html#method.new) for more information. + * Create a new {@link IanaParserExtended} using a particular data source + * + * See the [Rust documentation for `new`](https://docs.rs/icu/2.0.0/icu/time/zone/iana/struct.IanaParserExtended.html#method.new) for more information. */ - inline static diplomat::result, icu4x::DataError> create_with_provider(const icu4x::DataProvider& provider); + inline static icu4x::diplomat::result, icu4x::DataError> create_with_provider(const icu4x::DataProvider& provider); /** - * See the [Rust documentation for `parse`](https://docs.rs/icu/2.0.0/icu/time/zone/iana/struct.IanaParserExtendedBorrowed.html#method.parse) for more information. + * See the [Rust documentation for `parse`](https://docs.rs/icu/2.0.0/icu/time/zone/iana/struct.IanaParserExtendedBorrowed.html#method.parse) for more information. */ inline icu4x::TimeZoneAndCanonicalAndNormalized parse(std::string_view value) const; /** - * See the [Rust documentation for `iter`](https://docs.rs/icu/2.0.0/icu/time/zone/iana/struct.IanaParserExtendedBorrowed.html#method.iter) for more information. + * See the [Rust documentation for `iter`](https://docs.rs/icu/2.0.0/icu/time/zone/iana/struct.IanaParserExtendedBorrowed.html#method.iter) for more information. */ inline std::unique_ptr iter() const; /** - * See the [Rust documentation for `iter_all`](https://docs.rs/icu/2.0.0/icu/time/zone/iana/struct.IanaParserExtendedBorrowed.html#method.iter_all) for more information. + * See the [Rust documentation for `iter_all`](https://docs.rs/icu/2.0.0/icu/time/zone/iana/struct.IanaParserExtendedBorrowed.html#method.iter_all) for more information. */ inline std::unique_ptr iter_all() const; @@ -87,4 +87,4 @@ class IanaParserExtended { }; } // namespace -#endif // icu4x_IanaParserExtended_D_HPP +#endif // ICU4X_IanaParserExtended_D_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/IanaParserExtended.hpp b/ffi/capi/bindings/cpp/icu4x/IanaParserExtended.hpp index 15303e77401..1fce8974b64 100644 --- a/ffi/capi/bindings/cpp/icu4x/IanaParserExtended.hpp +++ b/ffi/capi/bindings/cpp/icu4x/IanaParserExtended.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_IanaParserExtended_HPP -#define icu4x_IanaParserExtended_HPP +#ifndef ICU4X_IanaParserExtended_HPP +#define ICU4X_IanaParserExtended_HPP #include "IanaParserExtended.d.hpp" @@ -11,12 +11,12 @@ #include #include #include -#include "../diplomat_runtime.hpp" #include "DataError.hpp" #include "DataProvider.hpp" #include "TimeZoneAndCanonicalAndNormalized.hpp" #include "TimeZoneAndCanonicalAndNormalizedIterator.hpp" #include "TimeZoneAndCanonicalIterator.hpp" +#include "diplomat_runtime.hpp" namespace icu4x { @@ -28,7 +28,7 @@ namespace capi { typedef struct icu4x_IanaParserExtended_create_with_provider_mv1_result {union {icu4x::capi::IanaParserExtended* ok; icu4x::capi::DataError err;}; bool is_ok;} icu4x_IanaParserExtended_create_with_provider_mv1_result; icu4x_IanaParserExtended_create_with_provider_mv1_result icu4x_IanaParserExtended_create_with_provider_mv1(const icu4x::capi::DataProvider* provider); - icu4x::capi::TimeZoneAndCanonicalAndNormalized icu4x_IanaParserExtended_parse_mv1(const icu4x::capi::IanaParserExtended* self, diplomat::capi::DiplomatStringView value); + icu4x::capi::TimeZoneAndCanonicalAndNormalized icu4x_IanaParserExtended_parse_mv1(const icu4x::capi::IanaParserExtended* self, icu4x::diplomat::capi::DiplomatStringView value); icu4x::capi::TimeZoneAndCanonicalIterator* icu4x_IanaParserExtended_iter_mv1(const icu4x::capi::IanaParserExtended* self); @@ -45,9 +45,9 @@ inline std::unique_ptr icu4x::IanaParserExtended::cre return std::unique_ptr(icu4x::IanaParserExtended::FromFFI(result)); } -inline diplomat::result, icu4x::DataError> icu4x::IanaParserExtended::create_with_provider(const icu4x::DataProvider& provider) { +inline icu4x::diplomat::result, icu4x::DataError> icu4x::IanaParserExtended::create_with_provider(const icu4x::DataProvider& provider) { auto result = icu4x::capi::icu4x_IanaParserExtended_create_with_provider_mv1(provider.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DataError>(diplomat::Ok>(std::unique_ptr(icu4x::IanaParserExtended::FromFFI(result.ok)))) : diplomat::result, icu4x::DataError>(diplomat::Err(icu4x::DataError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::IanaParserExtended::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Err(icu4x::DataError::FromFFI(result.err))); } inline icu4x::TimeZoneAndCanonicalAndNormalized icu4x::IanaParserExtended::parse(std::string_view value) const { @@ -87,4 +87,4 @@ inline void icu4x::IanaParserExtended::operator delete(void* ptr) { } -#endif // icu4x_IanaParserExtended_HPP +#endif // ICU4X_IanaParserExtended_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/IndicSyllabicCategory.d.hpp b/ffi/capi/bindings/cpp/icu4x/IndicSyllabicCategory.d.hpp index 2cb6294a49f..1c507a5fec7 100644 --- a/ffi/capi/bindings/cpp/icu4x/IndicSyllabicCategory.d.hpp +++ b/ffi/capi/bindings/cpp/icu4x/IndicSyllabicCategory.d.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_IndicSyllabicCategory_D_HPP -#define icu4x_IndicSyllabicCategory_D_HPP +#ifndef ICU4X_IndicSyllabicCategory_D_HPP +#define ICU4X_IndicSyllabicCategory_D_HPP #include #include @@ -9,11 +9,11 @@ #include #include #include -#include "../diplomat_runtime.hpp" - +#include "diplomat_runtime.hpp" namespace icu4x { class IndicSyllabicCategory; -} +} // namespace icu4x + namespace icu4x { @@ -117,21 +117,21 @@ class IndicSyllabicCategory { explicit operator bool() const = delete; /** - * See the [Rust documentation for `for_char`](https://docs.rs/icu/2.0.0/icu/properties/props/trait.EnumeratedProperty.html#tymethod.for_char) for more information. + * See the [Rust documentation for `for_char`](https://docs.rs/icu/2.0.0/icu/properties/props/trait.EnumeratedProperty.html#tymethod.for_char) for more information. */ inline static icu4x::IndicSyllabicCategory for_char(char32_t ch); /** - * Convert to an integer value usable with ICU4C and CodePointMapData - * - * See the [Rust documentation for `to_icu4c_value`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.IndicSyllabicCategory.html#method.to_icu4c_value) for more information. + * Convert to an integer value usable with ICU4C and CodePointMapData + * + * See the [Rust documentation for `to_icu4c_value`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.IndicSyllabicCategory.html#method.to_icu4c_value) for more information. */ inline uint8_t to_integer_value() const; /** - * Convert from an integer value from ICU4C or CodePointMapData - * - * See the [Rust documentation for `from_icu4c_value`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.IndicSyllabicCategory.html#method.from_icu4c_value) for more information. + * Convert from an integer value from ICU4C or CodePointMapData + * + * See the [Rust documentation for `from_icu4c_value`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.IndicSyllabicCategory.html#method.from_icu4c_value) for more information. */ inline static std::optional from_integer_value(uint8_t other); @@ -142,4 +142,4 @@ class IndicSyllabicCategory { }; } // namespace -#endif // icu4x_IndicSyllabicCategory_D_HPP +#endif // ICU4X_IndicSyllabicCategory_D_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/IndicSyllabicCategory.hpp b/ffi/capi/bindings/cpp/icu4x/IndicSyllabicCategory.hpp index dab50881e25..74bd1d99341 100644 --- a/ffi/capi/bindings/cpp/icu4x/IndicSyllabicCategory.hpp +++ b/ffi/capi/bindings/cpp/icu4x/IndicSyllabicCategory.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_IndicSyllabicCategory_HPP -#define icu4x_IndicSyllabicCategory_HPP +#ifndef ICU4X_IndicSyllabicCategory_HPP +#define ICU4X_IndicSyllabicCategory_HPP #include "IndicSyllabicCategory.d.hpp" @@ -11,7 +11,7 @@ #include #include #include -#include "../diplomat_runtime.hpp" +#include "diplomat_runtime.hpp" namespace icu4x { @@ -92,4 +92,4 @@ inline std::optional icu4x::IndicSyllabicCategory: auto result = icu4x::capi::icu4x_IndicSyllabicCategory_from_integer_value_mv1(other); return result.is_ok ? std::optional(icu4x::IndicSyllabicCategory::FromFFI(result.ok)) : std::nullopt; } -#endif // icu4x_IndicSyllabicCategory_HPP +#endif // ICU4X_IndicSyllabicCategory_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/IsoDate.d.hpp b/ffi/capi/bindings/cpp/icu4x/IsoDate.d.hpp index 3e39747938a..2b737ff65d9 100644 --- a/ffi/capi/bindings/cpp/icu4x/IsoDate.d.hpp +++ b/ffi/capi/bindings/cpp/icu4x/IsoDate.d.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_IsoDate_D_HPP -#define icu4x_IsoDate_D_HPP +#ifndef ICU4X_IsoDate_D_HPP +#define ICU4X_IsoDate_D_HPP #include #include @@ -9,8 +9,7 @@ #include #include #include -#include "../diplomat_runtime.hpp" - +#include "diplomat_runtime.hpp" namespace icu4x { namespace capi { struct Calendar; } class Calendar; @@ -22,7 +21,8 @@ struct IsoWeekOfYear; class CalendarError; class Rfc9557ParseError; class Weekday; -} +} // namespace icu4x + namespace icu4x { @@ -41,116 +41,116 @@ class IsoDate { public: /** - * Creates a new {@link IsoDate} from the specified date. - * - * See the [Rust documentation for `try_new_iso`](https://docs.rs/icu/2.0.0/icu/calendar/struct.Date.html#method.try_new_iso) for more information. + * Creates a new {@link IsoDate} from the specified date. + * + * See the [Rust documentation for `try_new_iso`](https://docs.rs/icu/2.0.0/icu/calendar/struct.Date.html#method.try_new_iso) for more information. */ - inline static diplomat::result, icu4x::CalendarError> create(int32_t year, uint8_t month, uint8_t day); + inline static icu4x::diplomat::result, icu4x::CalendarError> create(int32_t year, uint8_t month, uint8_t day); /** - * Creates a new {@link IsoDate} from the given Rata Die - * - * See the [Rust documentation for `from_rata_die`](https://docs.rs/icu/2.0.0/icu/calendar/struct.Date.html#method.from_rata_die) for more information. + * Creates a new {@link IsoDate} from the given Rata Die + * + * See the [Rust documentation for `from_rata_die`](https://docs.rs/icu/2.0.0/icu/calendar/struct.Date.html#method.from_rata_die) for more information. */ inline static std::unique_ptr from_rata_die(int64_t rd); /** - * Creates a new {@link IsoDate} from an IXDTF string. - * - * See the [Rust documentation for `try_from_str`](https://docs.rs/icu/2.0.0/icu/calendar/struct.Date.html#method.try_from_str) for more information. + * Creates a new {@link IsoDate} from an IXDTF string. + * + * See the [Rust documentation for `try_from_str`](https://docs.rs/icu/2.0.0/icu/calendar/struct.Date.html#method.try_from_str) for more information. */ - inline static diplomat::result, icu4x::Rfc9557ParseError> from_string(std::string_view v); + inline static icu4x::diplomat::result, icu4x::Rfc9557ParseError> from_string(std::string_view v); /** - * Convert this date to one in a different calendar - * - * See the [Rust documentation for `to_calendar`](https://docs.rs/icu/2.0.0/icu/calendar/struct.Date.html#method.to_calendar) for more information. + * Convert this date to one in a different calendar + * + * See the [Rust documentation for `to_calendar`](https://docs.rs/icu/2.0.0/icu/calendar/struct.Date.html#method.to_calendar) for more information. */ inline std::unique_ptr to_calendar(const icu4x::Calendar& calendar) const; /** - * See the [Rust documentation for `to_any`](https://docs.rs/icu/2.0.0/icu/calendar/struct.Date.html#method.to_any) for more information. + * See the [Rust documentation for `to_any`](https://docs.rs/icu/2.0.0/icu/calendar/struct.Date.html#method.to_any) for more information. */ inline std::unique_ptr to_any() const; /** - * Returns this date's Rata Die - * - * See the [Rust documentation for `to_rata_die`](https://docs.rs/icu/2.0.0/icu/calendar/struct.Date.html#method.to_rata_die) for more information. + * Returns this date's Rata Die + * + * See the [Rust documentation for `to_rata_die`](https://docs.rs/icu/2.0.0/icu/calendar/struct.Date.html#method.to_rata_die) for more information. */ inline int64_t to_rata_die() const; /** - * Returns the 1-indexed day in the year for this date - * - * See the [Rust documentation for `day_of_year`](https://docs.rs/icu/2.0.0/icu/calendar/struct.Date.html#method.day_of_year) for more information. + * Returns the 1-indexed day in the year for this date + * + * See the [Rust documentation for `day_of_year`](https://docs.rs/icu/2.0.0/icu/calendar/struct.Date.html#method.day_of_year) for more information. */ inline uint16_t day_of_year() const; /** - * Returns the 1-indexed day in the month for this date - * - * See the [Rust documentation for `day_of_month`](https://docs.rs/icu/2.0.0/icu/calendar/struct.Date.html#method.day_of_month) for more information. + * Returns the 1-indexed day in the month for this date + * + * See the [Rust documentation for `day_of_month`](https://docs.rs/icu/2.0.0/icu/calendar/struct.Date.html#method.day_of_month) for more information. */ inline uint8_t day_of_month() const; /** - * Returns the day in the week for this day - * - * See the [Rust documentation for `day_of_week`](https://docs.rs/icu/2.0.0/icu/calendar/struct.Date.html#method.day_of_week) for more information. + * Returns the day in the week for this day + * + * See the [Rust documentation for `day_of_week`](https://docs.rs/icu/2.0.0/icu/calendar/struct.Date.html#method.day_of_week) for more information. */ inline icu4x::Weekday day_of_week() const; /** - * Returns the week number in this year, using week data - * - * See the [Rust documentation for `week_of_year`](https://docs.rs/icu/2.0.0/icu/calendar/struct.Date.html#method.week_of_year) for more information. + * Returns the week number in this year, using week data + * + * See the [Rust documentation for `week_of_year`](https://docs.rs/icu/2.0.0/icu/calendar/struct.Date.html#method.week_of_year) for more information. */ inline icu4x::IsoWeekOfYear week_of_year() const; /** - * Returns 1-indexed number of the month of this date in its year - * - * See the [Rust documentation for `ordinal`](https://docs.rs/icu/2.0.0/icu/calendar/types/struct.MonthInfo.html#structfield.ordinal) for more information. - * - * Additional information: [1](https://docs.rs/icu/2.0.0/icu/calendar/struct.Date.html#method.month) + * Returns 1-indexed number of the month of this date in its year + * + * See the [Rust documentation for `ordinal`](https://docs.rs/icu/2.0.0/icu/calendar/types/struct.MonthInfo.html#structfield.ordinal) for more information. + * + * Additional information: [1](https://docs.rs/icu/2.0.0/icu/calendar/struct.Date.html#method.month) */ inline uint8_t month() const; /** - * Returns the year number in the current era for this date - * - * For calendars without an era, returns the extended year - * - * See the [Rust documentation for `year`](https://docs.rs/icu/2.0.0/icu/calendar/struct.Date.html#method.year) for more information. + * Returns the year number in the current era for this date + * + * For calendars without an era, returns the extended year + * + * See the [Rust documentation for `year`](https://docs.rs/icu/2.0.0/icu/calendar/struct.Date.html#method.year) for more information. */ inline int32_t year() const; /** - * Returns if the year is a leap year for this date - * - * See the [Rust documentation for `is_in_leap_year`](https://docs.rs/icu/2.0.0/icu/calendar/struct.Date.html#method.is_in_leap_year) for more information. + * Returns if the year is a leap year for this date + * + * See the [Rust documentation for `is_in_leap_year`](https://docs.rs/icu/2.0.0/icu/calendar/struct.Date.html#method.is_in_leap_year) for more information. */ inline bool is_in_leap_year() const; /** - * Returns the number of months in the year represented by this date - * - * See the [Rust documentation for `months_in_year`](https://docs.rs/icu/2.0.0/icu/calendar/struct.Date.html#method.months_in_year) for more information. + * Returns the number of months in the year represented by this date + * + * See the [Rust documentation for `months_in_year`](https://docs.rs/icu/2.0.0/icu/calendar/struct.Date.html#method.months_in_year) for more information. */ inline uint8_t months_in_year() const; /** - * Returns the number of days in the month represented by this date - * - * See the [Rust documentation for `days_in_month`](https://docs.rs/icu/2.0.0/icu/calendar/struct.Date.html#method.days_in_month) for more information. + * Returns the number of days in the month represented by this date + * + * See the [Rust documentation for `days_in_month`](https://docs.rs/icu/2.0.0/icu/calendar/struct.Date.html#method.days_in_month) for more information. */ inline uint8_t days_in_month() const; /** - * Returns the number of days in the year represented by this date - * - * See the [Rust documentation for `days_in_year`](https://docs.rs/icu/2.0.0/icu/calendar/struct.Date.html#method.days_in_year) for more information. + * Returns the number of days in the year represented by this date + * + * See the [Rust documentation for `days_in_year`](https://docs.rs/icu/2.0.0/icu/calendar/struct.Date.html#method.days_in_year) for more information. */ inline uint16_t days_in_year() const; @@ -169,4 +169,4 @@ class IsoDate { }; } // namespace -#endif // icu4x_IsoDate_D_HPP +#endif // ICU4X_IsoDate_D_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/IsoDate.hpp b/ffi/capi/bindings/cpp/icu4x/IsoDate.hpp index f64ddd537fe..25786719b9b 100644 --- a/ffi/capi/bindings/cpp/icu4x/IsoDate.hpp +++ b/ffi/capi/bindings/cpp/icu4x/IsoDate.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_IsoDate_HPP -#define icu4x_IsoDate_HPP +#ifndef ICU4X_IsoDate_HPP +#define ICU4X_IsoDate_HPP #include "IsoDate.d.hpp" @@ -11,13 +11,13 @@ #include #include #include -#include "../diplomat_runtime.hpp" #include "Calendar.hpp" #include "CalendarError.hpp" #include "Date.hpp" #include "IsoWeekOfYear.hpp" #include "Rfc9557ParseError.hpp" #include "Weekday.hpp" +#include "diplomat_runtime.hpp" namespace icu4x { @@ -30,7 +30,7 @@ namespace capi { icu4x::capi::IsoDate* icu4x_IsoDate_from_rata_die_mv1(int64_t rd); typedef struct icu4x_IsoDate_from_string_mv1_result {union {icu4x::capi::IsoDate* ok; icu4x::capi::Rfc9557ParseError err;}; bool is_ok;} icu4x_IsoDate_from_string_mv1_result; - icu4x_IsoDate_from_string_mv1_result icu4x_IsoDate_from_string_mv1(diplomat::capi::DiplomatStringView v); + icu4x_IsoDate_from_string_mv1_result icu4x_IsoDate_from_string_mv1(icu4x::diplomat::capi::DiplomatStringView v); icu4x::capi::Date* icu4x_IsoDate_to_calendar_mv1(const icu4x::capi::IsoDate* self, const icu4x::capi::Calendar* calendar); @@ -64,11 +64,11 @@ namespace capi { } // namespace capi } // namespace -inline diplomat::result, icu4x::CalendarError> icu4x::IsoDate::create(int32_t year, uint8_t month, uint8_t day) { +inline icu4x::diplomat::result, icu4x::CalendarError> icu4x::IsoDate::create(int32_t year, uint8_t month, uint8_t day) { auto result = icu4x::capi::icu4x_IsoDate_create_mv1(year, month, day); - return result.is_ok ? diplomat::result, icu4x::CalendarError>(diplomat::Ok>(std::unique_ptr(icu4x::IsoDate::FromFFI(result.ok)))) : diplomat::result, icu4x::CalendarError>(diplomat::Err(icu4x::CalendarError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::CalendarError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::IsoDate::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::CalendarError>(icu4x::diplomat::Err(icu4x::CalendarError::FromFFI(result.err))); } inline std::unique_ptr icu4x::IsoDate::from_rata_die(int64_t rd) { @@ -76,9 +76,9 @@ inline std::unique_ptr icu4x::IsoDate::from_rata_die(int64_t rd) return std::unique_ptr(icu4x::IsoDate::FromFFI(result)); } -inline diplomat::result, icu4x::Rfc9557ParseError> icu4x::IsoDate::from_string(std::string_view v) { +inline icu4x::diplomat::result, icu4x::Rfc9557ParseError> icu4x::IsoDate::from_string(std::string_view v) { auto result = icu4x::capi::icu4x_IsoDate_from_string_mv1({v.data(), v.size()}); - return result.is_ok ? diplomat::result, icu4x::Rfc9557ParseError>(diplomat::Ok>(std::unique_ptr(icu4x::IsoDate::FromFFI(result.ok)))) : diplomat::result, icu4x::Rfc9557ParseError>(diplomat::Err(icu4x::Rfc9557ParseError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::Rfc9557ParseError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::IsoDate::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::Rfc9557ParseError>(icu4x::diplomat::Err(icu4x::Rfc9557ParseError::FromFFI(result.err))); } inline std::unique_ptr icu4x::IsoDate::to_calendar(const icu4x::Calendar& calendar) const { @@ -168,4 +168,4 @@ inline void icu4x::IsoDate::operator delete(void* ptr) { } -#endif // icu4x_IsoDate_HPP +#endif // ICU4X_IsoDate_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/IsoDateTime.d.hpp b/ffi/capi/bindings/cpp/icu4x/IsoDateTime.d.hpp index ec21d40007e..a4e2bc3a744 100644 --- a/ffi/capi/bindings/cpp/icu4x/IsoDateTime.d.hpp +++ b/ffi/capi/bindings/cpp/icu4x/IsoDateTime.d.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_IsoDateTime_D_HPP -#define icu4x_IsoDateTime_D_HPP +#ifndef ICU4X_IsoDateTime_D_HPP +#define ICU4X_IsoDateTime_D_HPP #include #include @@ -9,8 +9,7 @@ #include #include #include -#include "../diplomat_runtime.hpp" - +#include "diplomat_runtime.hpp" namespace icu4x { namespace capi { struct IsoDate; } class IsoDate; @@ -18,7 +17,8 @@ namespace capi { struct Time; } class Time; struct IsoDateTime; class Rfc9557ParseError; -} +} // namespace icu4x + namespace icu4x { @@ -44,15 +44,15 @@ struct IsoDateTime { std::unique_ptr time; /** - * Creates a new {@link IsoDateTime} from an IXDTF string. - * - * See the [Rust documentation for `try_from_str`](https://docs.rs/icu/2.0.0/icu/time/struct.DateTime.html#method.try_from_str) for more information. + * Creates a new {@link IsoDateTime} from an IXDTF string. + * + * See the [Rust documentation for `try_from_str`](https://docs.rs/icu/2.0.0/icu/time/struct.DateTime.html#method.try_from_str) for more information. */ - inline static diplomat::result from_string(std::string_view v); + inline static icu4x::diplomat::result from_string(std::string_view v); inline icu4x::capi::IsoDateTime AsFFI() const; inline static icu4x::IsoDateTime FromFFI(icu4x::capi::IsoDateTime c_struct); }; } // namespace -#endif // icu4x_IsoDateTime_D_HPP +#endif // ICU4X_IsoDateTime_D_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/IsoDateTime.hpp b/ffi/capi/bindings/cpp/icu4x/IsoDateTime.hpp index 8fa2afe584f..bba6aab3bff 100644 --- a/ffi/capi/bindings/cpp/icu4x/IsoDateTime.hpp +++ b/ffi/capi/bindings/cpp/icu4x/IsoDateTime.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_IsoDateTime_HPP -#define icu4x_IsoDateTime_HPP +#ifndef ICU4X_IsoDateTime_HPP +#define ICU4X_IsoDateTime_HPP #include "IsoDateTime.d.hpp" @@ -11,10 +11,10 @@ #include #include #include -#include "../diplomat_runtime.hpp" #include "IsoDate.hpp" #include "Rfc9557ParseError.hpp" #include "Time.hpp" +#include "diplomat_runtime.hpp" namespace icu4x { @@ -22,15 +22,15 @@ namespace capi { extern "C" { typedef struct icu4x_IsoDateTime_from_string_mv1_result {union {icu4x::capi::IsoDateTime ok; icu4x::capi::Rfc9557ParseError err;}; bool is_ok;} icu4x_IsoDateTime_from_string_mv1_result; - icu4x_IsoDateTime_from_string_mv1_result icu4x_IsoDateTime_from_string_mv1(diplomat::capi::DiplomatStringView v); + icu4x_IsoDateTime_from_string_mv1_result icu4x_IsoDateTime_from_string_mv1(icu4x::diplomat::capi::DiplomatStringView v); } // extern "C" } // namespace capi } // namespace -inline diplomat::result icu4x::IsoDateTime::from_string(std::string_view v) { +inline icu4x::diplomat::result icu4x::IsoDateTime::from_string(std::string_view v) { auto result = icu4x::capi::icu4x_IsoDateTime_from_string_mv1({v.data(), v.size()}); - return result.is_ok ? diplomat::result(diplomat::Ok(icu4x::IsoDateTime::FromFFI(result.ok))) : diplomat::result(diplomat::Err(icu4x::Rfc9557ParseError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result(icu4x::diplomat::Ok(icu4x::IsoDateTime::FromFFI(result.ok))) : icu4x::diplomat::result(icu4x::diplomat::Err(icu4x::Rfc9557ParseError::FromFFI(result.err))); } @@ -49,4 +49,4 @@ inline icu4x::IsoDateTime icu4x::IsoDateTime::FromFFI(icu4x::capi::IsoDateTime c } -#endif // icu4x_IsoDateTime_HPP +#endif // ICU4X_IsoDateTime_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/IsoWeekOfYear.d.hpp b/ffi/capi/bindings/cpp/icu4x/IsoWeekOfYear.d.hpp index 49865b3b294..646d76f3dee 100644 --- a/ffi/capi/bindings/cpp/icu4x/IsoWeekOfYear.d.hpp +++ b/ffi/capi/bindings/cpp/icu4x/IsoWeekOfYear.d.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_IsoWeekOfYear_D_HPP -#define icu4x_IsoWeekOfYear_D_HPP +#ifndef ICU4X_IsoWeekOfYear_D_HPP +#define ICU4X_IsoWeekOfYear_D_HPP #include #include @@ -9,7 +9,7 @@ #include #include #include -#include "../diplomat_runtime.hpp" +#include "diplomat_runtime.hpp" namespace icu4x { @@ -34,4 +34,4 @@ struct IsoWeekOfYear { }; } // namespace -#endif // icu4x_IsoWeekOfYear_D_HPP +#endif // ICU4X_IsoWeekOfYear_D_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/IsoWeekOfYear.hpp b/ffi/capi/bindings/cpp/icu4x/IsoWeekOfYear.hpp index 79ce4938f4b..e9007c13c9e 100644 --- a/ffi/capi/bindings/cpp/icu4x/IsoWeekOfYear.hpp +++ b/ffi/capi/bindings/cpp/icu4x/IsoWeekOfYear.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_IsoWeekOfYear_HPP -#define icu4x_IsoWeekOfYear_HPP +#ifndef ICU4X_IsoWeekOfYear_HPP +#define ICU4X_IsoWeekOfYear_HPP #include "IsoWeekOfYear.d.hpp" @@ -11,7 +11,7 @@ #include #include #include -#include "../diplomat_runtime.hpp" +#include "diplomat_runtime.hpp" namespace icu4x { @@ -38,4 +38,4 @@ inline icu4x::IsoWeekOfYear icu4x::IsoWeekOfYear::FromFFI(icu4x::capi::IsoWeekOf } -#endif // icu4x_IsoWeekOfYear_HPP +#endif // ICU4X_IsoWeekOfYear_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/JoiningType.d.hpp b/ffi/capi/bindings/cpp/icu4x/JoiningType.d.hpp index 92d5f069ccc..0637e951b3b 100644 --- a/ffi/capi/bindings/cpp/icu4x/JoiningType.d.hpp +++ b/ffi/capi/bindings/cpp/icu4x/JoiningType.d.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_JoiningType_D_HPP -#define icu4x_JoiningType_D_HPP +#ifndef ICU4X_JoiningType_D_HPP +#define ICU4X_JoiningType_D_HPP #include #include @@ -9,11 +9,11 @@ #include #include #include -#include "../diplomat_runtime.hpp" - +#include "diplomat_runtime.hpp" namespace icu4x { class JoiningType; -} +} // namespace icu4x + namespace icu4x { @@ -55,35 +55,35 @@ class JoiningType { explicit operator bool() const = delete; /** - * See the [Rust documentation for `for_char`](https://docs.rs/icu/2.0.0/icu/properties/props/trait.EnumeratedProperty.html#tymethod.for_char) for more information. + * See the [Rust documentation for `for_char`](https://docs.rs/icu/2.0.0/icu/properties/props/trait.EnumeratedProperty.html#tymethod.for_char) for more information. */ inline static icu4x::JoiningType for_char(char32_t ch); /** - * Get the "long" name of this property value (returns empty if property value is unknown) - * - * See the [Rust documentation for `get`](https://docs.rs/icu/2.0.0/icu/properties/struct.PropertyNamesLongBorrowed.html#method.get) for more information. + * Get the "long" name of this property value (returns empty if property value is unknown) + * + * See the [Rust documentation for `get`](https://docs.rs/icu/2.0.0/icu/properties/struct.PropertyNamesLongBorrowed.html#method.get) for more information. */ inline std::optional long_name() const; /** - * Get the "short" name of this property value (returns empty if property value is unknown) - * - * See the [Rust documentation for `get`](https://docs.rs/icu/2.0.0/icu/properties/struct.PropertyNamesShortBorrowed.html#method.get) for more information. + * Get the "short" name of this property value (returns empty if property value is unknown) + * + * See the [Rust documentation for `get`](https://docs.rs/icu/2.0.0/icu/properties/struct.PropertyNamesShortBorrowed.html#method.get) for more information. */ inline std::optional short_name() const; /** - * Convert to an integer value usable with ICU4C and CodePointMapData - * - * See the [Rust documentation for `to_icu4c_value`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.JoiningType.html#method.to_icu4c_value) for more information. + * Convert to an integer value usable with ICU4C and CodePointMapData + * + * See the [Rust documentation for `to_icu4c_value`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.JoiningType.html#method.to_icu4c_value) for more information. */ inline uint8_t to_integer_value() const; /** - * Convert from an integer value from ICU4C or CodePointMapData - * - * See the [Rust documentation for `from_icu4c_value`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.JoiningType.html#method.from_icu4c_value) for more information. + * Convert from an integer value from ICU4C or CodePointMapData + * + * See the [Rust documentation for `from_icu4c_value`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.JoiningType.html#method.from_icu4c_value) for more information. */ inline static std::optional from_integer_value(uint8_t other); @@ -94,4 +94,4 @@ class JoiningType { }; } // namespace -#endif // icu4x_JoiningType_D_HPP +#endif // ICU4X_JoiningType_D_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/JoiningType.hpp b/ffi/capi/bindings/cpp/icu4x/JoiningType.hpp index 3742422d3a8..3441efc0310 100644 --- a/ffi/capi/bindings/cpp/icu4x/JoiningType.hpp +++ b/ffi/capi/bindings/cpp/icu4x/JoiningType.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_JoiningType_HPP -#define icu4x_JoiningType_HPP +#ifndef ICU4X_JoiningType_HPP +#define ICU4X_JoiningType_HPP #include "JoiningType.d.hpp" @@ -11,7 +11,7 @@ #include #include #include -#include "../diplomat_runtime.hpp" +#include "diplomat_runtime.hpp" namespace icu4x { @@ -20,10 +20,10 @@ namespace capi { icu4x::capi::JoiningType icu4x_JoiningType_for_char_mv1(char32_t ch); - typedef struct icu4x_JoiningType_long_name_mv1_result {union {diplomat::capi::DiplomatStringView ok; }; bool is_ok;} icu4x_JoiningType_long_name_mv1_result; + typedef struct icu4x_JoiningType_long_name_mv1_result {union {icu4x::diplomat::capi::DiplomatStringView ok; }; bool is_ok;} icu4x_JoiningType_long_name_mv1_result; icu4x_JoiningType_long_name_mv1_result icu4x_JoiningType_long_name_mv1(icu4x::capi::JoiningType self); - typedef struct icu4x_JoiningType_short_name_mv1_result {union {diplomat::capi::DiplomatStringView ok; }; bool is_ok;} icu4x_JoiningType_short_name_mv1_result; + typedef struct icu4x_JoiningType_short_name_mv1_result {union {icu4x::diplomat::capi::DiplomatStringView ok; }; bool is_ok;} icu4x_JoiningType_short_name_mv1_result; icu4x_JoiningType_short_name_mv1_result icu4x_JoiningType_short_name_mv1(icu4x::capi::JoiningType self); uint8_t icu4x_JoiningType_to_integer_value_mv1(icu4x::capi::JoiningType self); @@ -77,4 +77,4 @@ inline std::optional icu4x::JoiningType::from_integer_value( auto result = icu4x::capi::icu4x_JoiningType_from_integer_value_mv1(other); return result.is_ok ? std::optional(icu4x::JoiningType::FromFFI(result.ok)) : std::nullopt; } -#endif // icu4x_JoiningType_HPP +#endif // ICU4X_JoiningType_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/LanguageDisplay.d.hpp b/ffi/capi/bindings/cpp/icu4x/LanguageDisplay.d.hpp index e890b01035b..2e70ee51d83 100644 --- a/ffi/capi/bindings/cpp/icu4x/LanguageDisplay.d.hpp +++ b/ffi/capi/bindings/cpp/icu4x/LanguageDisplay.d.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_LanguageDisplay_D_HPP -#define icu4x_LanguageDisplay_D_HPP +#ifndef ICU4X_LanguageDisplay_D_HPP +#define ICU4X_LanguageDisplay_D_HPP #include #include @@ -9,7 +9,7 @@ #include #include #include -#include "../diplomat_runtime.hpp" +#include "diplomat_runtime.hpp" namespace icu4x { @@ -51,4 +51,4 @@ class LanguageDisplay { }; } // namespace -#endif // icu4x_LanguageDisplay_D_HPP +#endif // ICU4X_LanguageDisplay_D_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/LanguageDisplay.hpp b/ffi/capi/bindings/cpp/icu4x/LanguageDisplay.hpp index 35ea6882048..3891b65e62b 100644 --- a/ffi/capi/bindings/cpp/icu4x/LanguageDisplay.hpp +++ b/ffi/capi/bindings/cpp/icu4x/LanguageDisplay.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_LanguageDisplay_HPP -#define icu4x_LanguageDisplay_HPP +#ifndef ICU4X_LanguageDisplay_HPP +#define ICU4X_LanguageDisplay_HPP #include "LanguageDisplay.d.hpp" @@ -11,7 +11,7 @@ #include #include #include -#include "../diplomat_runtime.hpp" +#include "diplomat_runtime.hpp" namespace icu4x { @@ -35,4 +35,4 @@ inline icu4x::LanguageDisplay icu4x::LanguageDisplay::FromFFI(icu4x::capi::Langu std::abort(); } } -#endif // icu4x_LanguageDisplay_HPP +#endif // ICU4X_LanguageDisplay_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/LeadingAdjustment.d.hpp b/ffi/capi/bindings/cpp/icu4x/LeadingAdjustment.d.hpp index 4bcec168b86..04547aad1c3 100644 --- a/ffi/capi/bindings/cpp/icu4x/LeadingAdjustment.d.hpp +++ b/ffi/capi/bindings/cpp/icu4x/LeadingAdjustment.d.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_LeadingAdjustment_D_HPP -#define icu4x_LeadingAdjustment_D_HPP +#ifndef ICU4X_LeadingAdjustment_D_HPP +#define ICU4X_LeadingAdjustment_D_HPP #include #include @@ -9,7 +9,7 @@ #include #include #include -#include "../diplomat_runtime.hpp" +#include "diplomat_runtime.hpp" namespace icu4x { @@ -51,4 +51,4 @@ class LeadingAdjustment { }; } // namespace -#endif // icu4x_LeadingAdjustment_D_HPP +#endif // ICU4X_LeadingAdjustment_D_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/LeadingAdjustment.hpp b/ffi/capi/bindings/cpp/icu4x/LeadingAdjustment.hpp index 2904711c7a0..a8e61d980cb 100644 --- a/ffi/capi/bindings/cpp/icu4x/LeadingAdjustment.hpp +++ b/ffi/capi/bindings/cpp/icu4x/LeadingAdjustment.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_LeadingAdjustment_HPP -#define icu4x_LeadingAdjustment_HPP +#ifndef ICU4X_LeadingAdjustment_HPP +#define ICU4X_LeadingAdjustment_HPP #include "LeadingAdjustment.d.hpp" @@ -11,7 +11,7 @@ #include #include #include -#include "../diplomat_runtime.hpp" +#include "diplomat_runtime.hpp" namespace icu4x { @@ -36,4 +36,4 @@ inline icu4x::LeadingAdjustment icu4x::LeadingAdjustment::FromFFI(icu4x::capi::L std::abort(); } } -#endif // icu4x_LeadingAdjustment_HPP +#endif // ICU4X_LeadingAdjustment_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/LineBreak.d.hpp b/ffi/capi/bindings/cpp/icu4x/LineBreak.d.hpp index 29fe695e745..72c6dc230ed 100644 --- a/ffi/capi/bindings/cpp/icu4x/LineBreak.d.hpp +++ b/ffi/capi/bindings/cpp/icu4x/LineBreak.d.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_LineBreak_D_HPP -#define icu4x_LineBreak_D_HPP +#ifndef ICU4X_LineBreak_D_HPP +#define ICU4X_LineBreak_D_HPP #include #include @@ -9,11 +9,11 @@ #include #include #include -#include "../diplomat_runtime.hpp" - +#include "diplomat_runtime.hpp" namespace icu4x { class LineBreak; -} +} // namespace icu4x + namespace icu4x { @@ -139,35 +139,35 @@ class LineBreak { explicit operator bool() const = delete; /** - * See the [Rust documentation for `for_char`](https://docs.rs/icu/2.0.0/icu/properties/props/trait.EnumeratedProperty.html#tymethod.for_char) for more information. + * See the [Rust documentation for `for_char`](https://docs.rs/icu/2.0.0/icu/properties/props/trait.EnumeratedProperty.html#tymethod.for_char) for more information. */ inline static icu4x::LineBreak for_char(char32_t ch); /** - * Get the "long" name of this property value (returns empty if property value is unknown) - * - * See the [Rust documentation for `get`](https://docs.rs/icu/2.0.0/icu/properties/struct.PropertyNamesLongBorrowed.html#method.get) for more information. + * Get the "long" name of this property value (returns empty if property value is unknown) + * + * See the [Rust documentation for `get`](https://docs.rs/icu/2.0.0/icu/properties/struct.PropertyNamesLongBorrowed.html#method.get) for more information. */ inline std::optional long_name() const; /** - * Get the "short" name of this property value (returns empty if property value is unknown) - * - * See the [Rust documentation for `get`](https://docs.rs/icu/2.0.0/icu/properties/struct.PropertyNamesShortBorrowed.html#method.get) for more information. + * Get the "short" name of this property value (returns empty if property value is unknown) + * + * See the [Rust documentation for `get`](https://docs.rs/icu/2.0.0/icu/properties/struct.PropertyNamesShortBorrowed.html#method.get) for more information. */ inline std::optional short_name() const; /** - * Convert to an integer value usable with ICU4C and CodePointMapData - * - * See the [Rust documentation for `to_icu4c_value`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.LineBreak.html#method.to_icu4c_value) for more information. + * Convert to an integer value usable with ICU4C and CodePointMapData + * + * See the [Rust documentation for `to_icu4c_value`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.LineBreak.html#method.to_icu4c_value) for more information. */ inline uint8_t to_integer_value() const; /** - * Convert from an integer value from ICU4C or CodePointMapData - * - * See the [Rust documentation for `from_icu4c_value`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.LineBreak.html#method.from_icu4c_value) for more information. + * Convert from an integer value from ICU4C or CodePointMapData + * + * See the [Rust documentation for `from_icu4c_value`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.LineBreak.html#method.from_icu4c_value) for more information. */ inline static std::optional from_integer_value(uint8_t other); @@ -178,4 +178,4 @@ class LineBreak { }; } // namespace -#endif // icu4x_LineBreak_D_HPP +#endif // ICU4X_LineBreak_D_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/LineBreak.hpp b/ffi/capi/bindings/cpp/icu4x/LineBreak.hpp index a7834d56d0f..193408a8f84 100644 --- a/ffi/capi/bindings/cpp/icu4x/LineBreak.hpp +++ b/ffi/capi/bindings/cpp/icu4x/LineBreak.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_LineBreak_HPP -#define icu4x_LineBreak_HPP +#ifndef ICU4X_LineBreak_HPP +#define ICU4X_LineBreak_HPP #include "LineBreak.d.hpp" @@ -11,7 +11,7 @@ #include #include #include -#include "../diplomat_runtime.hpp" +#include "diplomat_runtime.hpp" namespace icu4x { @@ -20,10 +20,10 @@ namespace capi { icu4x::capi::LineBreak icu4x_LineBreak_for_char_mv1(char32_t ch); - typedef struct icu4x_LineBreak_long_name_mv1_result {union {diplomat::capi::DiplomatStringView ok; }; bool is_ok;} icu4x_LineBreak_long_name_mv1_result; + typedef struct icu4x_LineBreak_long_name_mv1_result {union {icu4x::diplomat::capi::DiplomatStringView ok; }; bool is_ok;} icu4x_LineBreak_long_name_mv1_result; icu4x_LineBreak_long_name_mv1_result icu4x_LineBreak_long_name_mv1(icu4x::capi::LineBreak self); - typedef struct icu4x_LineBreak_short_name_mv1_result {union {diplomat::capi::DiplomatStringView ok; }; bool is_ok;} icu4x_LineBreak_short_name_mv1_result; + typedef struct icu4x_LineBreak_short_name_mv1_result {union {icu4x::diplomat::capi::DiplomatStringView ok; }; bool is_ok;} icu4x_LineBreak_short_name_mv1_result; icu4x_LineBreak_short_name_mv1_result icu4x_LineBreak_short_name_mv1(icu4x::capi::LineBreak self); uint8_t icu4x_LineBreak_to_integer_value_mv1(icu4x::capi::LineBreak self); @@ -119,4 +119,4 @@ inline std::optional icu4x::LineBreak::from_integer_value(uint auto result = icu4x::capi::icu4x_LineBreak_from_integer_value_mv1(other); return result.is_ok ? std::optional(icu4x::LineBreak::FromFFI(result.ok)) : std::nullopt; } -#endif // icu4x_LineBreak_HPP +#endif // ICU4X_LineBreak_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/LineBreakIteratorLatin1.d.hpp b/ffi/capi/bindings/cpp/icu4x/LineBreakIteratorLatin1.d.hpp index 4499df2717f..b9fa1accded 100644 --- a/ffi/capi/bindings/cpp/icu4x/LineBreakIteratorLatin1.d.hpp +++ b/ffi/capi/bindings/cpp/icu4x/LineBreakIteratorLatin1.d.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_LineBreakIteratorLatin1_D_HPP -#define icu4x_LineBreakIteratorLatin1_D_HPP +#ifndef ICU4X_LineBreakIteratorLatin1_D_HPP +#define ICU4X_LineBreakIteratorLatin1_D_HPP #include #include @@ -9,7 +9,7 @@ #include #include #include -#include "../diplomat_runtime.hpp" +#include "diplomat_runtime.hpp" namespace icu4x { @@ -26,10 +26,10 @@ class LineBreakIteratorLatin1 { public: /** - * Finds the next breakpoint. Returns -1 if at the end of the string or if the index is - * out of range of a 32-bit signed integer. - * - * See the [Rust documentation for `next`](https://docs.rs/icu/2.0.0/icu/segmenter/iterators/struct.LineBreakIterator.html#method.next) for more information. + * Finds the next breakpoint. Returns -1 if at the end of the string or if the index is + * out of range of a 32-bit signed integer. + * + * See the [Rust documentation for `next`](https://docs.rs/icu/2.0.0/icu/segmenter/iterators/struct.LineBreakIterator.html#method.next) for more information. */ inline int32_t next(); @@ -48,4 +48,4 @@ class LineBreakIteratorLatin1 { }; } // namespace -#endif // icu4x_LineBreakIteratorLatin1_D_HPP +#endif // ICU4X_LineBreakIteratorLatin1_D_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/LineBreakIteratorLatin1.hpp b/ffi/capi/bindings/cpp/icu4x/LineBreakIteratorLatin1.hpp index 3bb44b56028..0c3d8c20fc5 100644 --- a/ffi/capi/bindings/cpp/icu4x/LineBreakIteratorLatin1.hpp +++ b/ffi/capi/bindings/cpp/icu4x/LineBreakIteratorLatin1.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_LineBreakIteratorLatin1_HPP -#define icu4x_LineBreakIteratorLatin1_HPP +#ifndef ICU4X_LineBreakIteratorLatin1_HPP +#define ICU4X_LineBreakIteratorLatin1_HPP #include "LineBreakIteratorLatin1.d.hpp" @@ -11,7 +11,7 @@ #include #include #include -#include "../diplomat_runtime.hpp" +#include "diplomat_runtime.hpp" namespace icu4x { @@ -52,4 +52,4 @@ inline void icu4x::LineBreakIteratorLatin1::operator delete(void* ptr) { } -#endif // icu4x_LineBreakIteratorLatin1_HPP +#endif // ICU4X_LineBreakIteratorLatin1_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/LineBreakIteratorUtf16.d.hpp b/ffi/capi/bindings/cpp/icu4x/LineBreakIteratorUtf16.d.hpp index 0a2cd5bb8ff..f05a9428102 100644 --- a/ffi/capi/bindings/cpp/icu4x/LineBreakIteratorUtf16.d.hpp +++ b/ffi/capi/bindings/cpp/icu4x/LineBreakIteratorUtf16.d.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_LineBreakIteratorUtf16_D_HPP -#define icu4x_LineBreakIteratorUtf16_D_HPP +#ifndef ICU4X_LineBreakIteratorUtf16_D_HPP +#define ICU4X_LineBreakIteratorUtf16_D_HPP #include #include @@ -9,7 +9,7 @@ #include #include #include -#include "../diplomat_runtime.hpp" +#include "diplomat_runtime.hpp" namespace icu4x { @@ -26,10 +26,10 @@ class LineBreakIteratorUtf16 { public: /** - * Finds the next breakpoint. Returns -1 if at the end of the string or if the index is - * out of range of a 32-bit signed integer. - * - * See the [Rust documentation for `next`](https://docs.rs/icu/2.0.0/icu/segmenter/iterators/struct.LineBreakIterator.html#method.next) for more information. + * Finds the next breakpoint. Returns -1 if at the end of the string or if the index is + * out of range of a 32-bit signed integer. + * + * See the [Rust documentation for `next`](https://docs.rs/icu/2.0.0/icu/segmenter/iterators/struct.LineBreakIterator.html#method.next) for more information. */ inline int32_t next(); @@ -48,4 +48,4 @@ class LineBreakIteratorUtf16 { }; } // namespace -#endif // icu4x_LineBreakIteratorUtf16_D_HPP +#endif // ICU4X_LineBreakIteratorUtf16_D_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/LineBreakIteratorUtf16.hpp b/ffi/capi/bindings/cpp/icu4x/LineBreakIteratorUtf16.hpp index c6959db79b7..3cc6f0e62a1 100644 --- a/ffi/capi/bindings/cpp/icu4x/LineBreakIteratorUtf16.hpp +++ b/ffi/capi/bindings/cpp/icu4x/LineBreakIteratorUtf16.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_LineBreakIteratorUtf16_HPP -#define icu4x_LineBreakIteratorUtf16_HPP +#ifndef ICU4X_LineBreakIteratorUtf16_HPP +#define ICU4X_LineBreakIteratorUtf16_HPP #include "LineBreakIteratorUtf16.d.hpp" @@ -11,7 +11,7 @@ #include #include #include -#include "../diplomat_runtime.hpp" +#include "diplomat_runtime.hpp" namespace icu4x { @@ -52,4 +52,4 @@ inline void icu4x::LineBreakIteratorUtf16::operator delete(void* ptr) { } -#endif // icu4x_LineBreakIteratorUtf16_HPP +#endif // ICU4X_LineBreakIteratorUtf16_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/LineBreakIteratorUtf8.d.hpp b/ffi/capi/bindings/cpp/icu4x/LineBreakIteratorUtf8.d.hpp index 60fc40b02f0..9b331fc8dbc 100644 --- a/ffi/capi/bindings/cpp/icu4x/LineBreakIteratorUtf8.d.hpp +++ b/ffi/capi/bindings/cpp/icu4x/LineBreakIteratorUtf8.d.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_LineBreakIteratorUtf8_D_HPP -#define icu4x_LineBreakIteratorUtf8_D_HPP +#ifndef ICU4X_LineBreakIteratorUtf8_D_HPP +#define ICU4X_LineBreakIteratorUtf8_D_HPP #include #include @@ -9,7 +9,7 @@ #include #include #include -#include "../diplomat_runtime.hpp" +#include "diplomat_runtime.hpp" namespace icu4x { @@ -26,10 +26,10 @@ class LineBreakIteratorUtf8 { public: /** - * Finds the next breakpoint. Returns -1 if at the end of the string or if the index is - * out of range of a 32-bit signed integer. - * - * See the [Rust documentation for `next`](https://docs.rs/icu/2.0.0/icu/segmenter/iterators/struct.LineBreakIterator.html#method.next) for more information. + * Finds the next breakpoint. Returns -1 if at the end of the string or if the index is + * out of range of a 32-bit signed integer. + * + * See the [Rust documentation for `next`](https://docs.rs/icu/2.0.0/icu/segmenter/iterators/struct.LineBreakIterator.html#method.next) for more information. */ inline int32_t next(); @@ -48,4 +48,4 @@ class LineBreakIteratorUtf8 { }; } // namespace -#endif // icu4x_LineBreakIteratorUtf8_D_HPP +#endif // ICU4X_LineBreakIteratorUtf8_D_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/LineBreakIteratorUtf8.hpp b/ffi/capi/bindings/cpp/icu4x/LineBreakIteratorUtf8.hpp index c64c242eb7d..b80c63f0c63 100644 --- a/ffi/capi/bindings/cpp/icu4x/LineBreakIteratorUtf8.hpp +++ b/ffi/capi/bindings/cpp/icu4x/LineBreakIteratorUtf8.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_LineBreakIteratorUtf8_HPP -#define icu4x_LineBreakIteratorUtf8_HPP +#ifndef ICU4X_LineBreakIteratorUtf8_HPP +#define ICU4X_LineBreakIteratorUtf8_HPP #include "LineBreakIteratorUtf8.d.hpp" @@ -11,7 +11,7 @@ #include #include #include -#include "../diplomat_runtime.hpp" +#include "diplomat_runtime.hpp" namespace icu4x { @@ -52,4 +52,4 @@ inline void icu4x::LineBreakIteratorUtf8::operator delete(void* ptr) { } -#endif // icu4x_LineBreakIteratorUtf8_HPP +#endif // ICU4X_LineBreakIteratorUtf8_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/LineBreakOptionsV2.d.hpp b/ffi/capi/bindings/cpp/icu4x/LineBreakOptionsV2.d.hpp index c7c12ac6c0b..7c835832265 100644 --- a/ffi/capi/bindings/cpp/icu4x/LineBreakOptionsV2.d.hpp +++ b/ffi/capi/bindings/cpp/icu4x/LineBreakOptionsV2.d.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_LineBreakOptionsV2_D_HPP -#define icu4x_LineBreakOptionsV2_D_HPP +#ifndef ICU4X_LineBreakOptionsV2_D_HPP +#define ICU4X_LineBreakOptionsV2_D_HPP #include #include @@ -9,14 +9,14 @@ #include #include #include -#include "../diplomat_runtime.hpp" #include "LineBreakStrictness.d.hpp" #include "LineBreakWordOption.d.hpp" - +#include "diplomat_runtime.hpp" namespace icu4x { class LineBreakStrictness; class LineBreakWordOption; -} +} // namespace icu4x + namespace icu4x { @@ -44,4 +44,4 @@ struct LineBreakOptionsV2 { }; } // namespace -#endif // icu4x_LineBreakOptionsV2_D_HPP +#endif // ICU4X_LineBreakOptionsV2_D_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/LineBreakOptionsV2.hpp b/ffi/capi/bindings/cpp/icu4x/LineBreakOptionsV2.hpp index 2457dc5a36a..c2a34885785 100644 --- a/ffi/capi/bindings/cpp/icu4x/LineBreakOptionsV2.hpp +++ b/ffi/capi/bindings/cpp/icu4x/LineBreakOptionsV2.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_LineBreakOptionsV2_HPP -#define icu4x_LineBreakOptionsV2_HPP +#ifndef ICU4X_LineBreakOptionsV2_HPP +#define ICU4X_LineBreakOptionsV2_HPP #include "LineBreakOptionsV2.d.hpp" @@ -11,9 +11,9 @@ #include #include #include -#include "../diplomat_runtime.hpp" #include "LineBreakStrictness.hpp" #include "LineBreakWordOption.hpp" +#include "diplomat_runtime.hpp" namespace icu4x { @@ -40,4 +40,4 @@ inline icu4x::LineBreakOptionsV2 icu4x::LineBreakOptionsV2::FromFFI(icu4x::capi: } -#endif // icu4x_LineBreakOptionsV2_HPP +#endif // ICU4X_LineBreakOptionsV2_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/LineBreakStrictness.d.hpp b/ffi/capi/bindings/cpp/icu4x/LineBreakStrictness.d.hpp index 1ecc344b2f2..7bc50bc2a51 100644 --- a/ffi/capi/bindings/cpp/icu4x/LineBreakStrictness.d.hpp +++ b/ffi/capi/bindings/cpp/icu4x/LineBreakStrictness.d.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_LineBreakStrictness_D_HPP -#define icu4x_LineBreakStrictness_D_HPP +#ifndef ICU4X_LineBreakStrictness_D_HPP +#define ICU4X_LineBreakStrictness_D_HPP #include #include @@ -9,7 +9,7 @@ #include #include #include -#include "../diplomat_runtime.hpp" +#include "diplomat_runtime.hpp" namespace icu4x { @@ -53,4 +53,4 @@ class LineBreakStrictness { }; } // namespace -#endif // icu4x_LineBreakStrictness_D_HPP +#endif // ICU4X_LineBreakStrictness_D_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/LineBreakStrictness.hpp b/ffi/capi/bindings/cpp/icu4x/LineBreakStrictness.hpp index f22c52eabe4..82002d73a8f 100644 --- a/ffi/capi/bindings/cpp/icu4x/LineBreakStrictness.hpp +++ b/ffi/capi/bindings/cpp/icu4x/LineBreakStrictness.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_LineBreakStrictness_HPP -#define icu4x_LineBreakStrictness_HPP +#ifndef ICU4X_LineBreakStrictness_HPP +#define ICU4X_LineBreakStrictness_HPP #include "LineBreakStrictness.d.hpp" @@ -11,7 +11,7 @@ #include #include #include -#include "../diplomat_runtime.hpp" +#include "diplomat_runtime.hpp" namespace icu4x { @@ -37,4 +37,4 @@ inline icu4x::LineBreakStrictness icu4x::LineBreakStrictness::FromFFI(icu4x::cap std::abort(); } } -#endif // icu4x_LineBreakStrictness_HPP +#endif // ICU4X_LineBreakStrictness_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/LineBreakWordOption.d.hpp b/ffi/capi/bindings/cpp/icu4x/LineBreakWordOption.d.hpp index f1f351a66b1..9585bc412b7 100644 --- a/ffi/capi/bindings/cpp/icu4x/LineBreakWordOption.d.hpp +++ b/ffi/capi/bindings/cpp/icu4x/LineBreakWordOption.d.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_LineBreakWordOption_D_HPP -#define icu4x_LineBreakWordOption_D_HPP +#ifndef ICU4X_LineBreakWordOption_D_HPP +#define ICU4X_LineBreakWordOption_D_HPP #include #include @@ -9,7 +9,7 @@ #include #include #include -#include "../diplomat_runtime.hpp" +#include "diplomat_runtime.hpp" namespace icu4x { @@ -51,4 +51,4 @@ class LineBreakWordOption { }; } // namespace -#endif // icu4x_LineBreakWordOption_D_HPP +#endif // ICU4X_LineBreakWordOption_D_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/LineBreakWordOption.hpp b/ffi/capi/bindings/cpp/icu4x/LineBreakWordOption.hpp index 8fe2f703a37..7e7923951ac 100644 --- a/ffi/capi/bindings/cpp/icu4x/LineBreakWordOption.hpp +++ b/ffi/capi/bindings/cpp/icu4x/LineBreakWordOption.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_LineBreakWordOption_HPP -#define icu4x_LineBreakWordOption_HPP +#ifndef ICU4X_LineBreakWordOption_HPP +#define ICU4X_LineBreakWordOption_HPP #include "LineBreakWordOption.d.hpp" @@ -11,7 +11,7 @@ #include #include #include -#include "../diplomat_runtime.hpp" +#include "diplomat_runtime.hpp" namespace icu4x { @@ -36,4 +36,4 @@ inline icu4x::LineBreakWordOption icu4x::LineBreakWordOption::FromFFI(icu4x::cap std::abort(); } } -#endif // icu4x_LineBreakWordOption_HPP +#endif // ICU4X_LineBreakWordOption_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/LineSegmenter.d.hpp b/ffi/capi/bindings/cpp/icu4x/LineSegmenter.d.hpp index a4223bb724f..0f56cd81603 100644 --- a/ffi/capi/bindings/cpp/icu4x/LineSegmenter.d.hpp +++ b/ffi/capi/bindings/cpp/icu4x/LineSegmenter.d.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_LineSegmenter_D_HPP -#define icu4x_LineSegmenter_D_HPP +#ifndef ICU4X_LineSegmenter_D_HPP +#define ICU4X_LineSegmenter_D_HPP #include #include @@ -9,8 +9,7 @@ #include #include #include -#include "../diplomat_runtime.hpp" - +#include "diplomat_runtime.hpp" namespace icu4x { namespace capi { struct DataProvider; } class DataProvider; @@ -26,7 +25,8 @@ namespace capi { struct Locale; } class Locale; struct LineBreakOptionsV2; class DataError; -} +} // namespace icu4x + namespace icu4x { @@ -45,103 +45,103 @@ class LineSegmenter { public: /** - * Construct a {@link LineSegmenter} with default options (no locale-based tailoring) using compiled data. It automatically loads the best - * available payload data for Burmese, Khmer, Lao, and Thai. - * - * See the [Rust documentation for `new_auto`](https://docs.rs/icu/2.0.0/icu/segmenter/struct.LineSegmenter.html#method.new_auto) for more information. + * Construct a {@link LineSegmenter} with default options (no locale-based tailoring) using compiled data. It automatically loads the best + * available payload data for Burmese, Khmer, Lao, and Thai. + * + * See the [Rust documentation for `new_auto`](https://docs.rs/icu/2.0.0/icu/segmenter/struct.LineSegmenter.html#method.new_auto) for more information. */ inline static std::unique_ptr create_auto(); /** - * Construct a {@link LineSegmenter} with default options (no locale-based tailoring) and LSTM payload data for - * Burmese, Khmer, Lao, and Thai, using compiled data. - * - * See the [Rust documentation for `new_lstm`](https://docs.rs/icu/2.0.0/icu/segmenter/struct.LineSegmenter.html#method.new_lstm) for more information. + * Construct a {@link LineSegmenter} with default options (no locale-based tailoring) and LSTM payload data for + * Burmese, Khmer, Lao, and Thai, using compiled data. + * + * See the [Rust documentation for `new_lstm`](https://docs.rs/icu/2.0.0/icu/segmenter/struct.LineSegmenter.html#method.new_lstm) for more information. */ inline static std::unique_ptr create_lstm(); /** - * Construct a {@link LineSegmenter} with default options (no locale-based tailoring) and dictionary payload data for - * Burmese, Khmer, Lao, and Thai, using compiled data - * - * See the [Rust documentation for `new_dictionary`](https://docs.rs/icu/2.0.0/icu/segmenter/struct.LineSegmenter.html#method.new_dictionary) for more information. + * Construct a {@link LineSegmenter} with default options (no locale-based tailoring) and dictionary payload data for + * Burmese, Khmer, Lao, and Thai, using compiled data + * + * See the [Rust documentation for `new_dictionary`](https://docs.rs/icu/2.0.0/icu/segmenter/struct.LineSegmenter.html#method.new_dictionary) for more information. */ inline static std::unique_ptr create_dictionary(); /** - * Construct a {@link LineSegmenter} with custom options using compiled data. It automatically loads the best - * available payload data for Burmese, Khmer, Lao, and Thai. - * - * See the [Rust documentation for `new_auto`](https://docs.rs/icu/2.0.0/icu/segmenter/struct.LineSegmenter.html#method.new_auto) for more information. + * Construct a {@link LineSegmenter} with custom options using compiled data. It automatically loads the best + * available payload data for Burmese, Khmer, Lao, and Thai. + * + * See the [Rust documentation for `new_auto`](https://docs.rs/icu/2.0.0/icu/segmenter/struct.LineSegmenter.html#method.new_auto) for more information. */ inline static std::unique_ptr create_auto_with_options_v2(const icu4x::Locale* content_locale, icu4x::LineBreakOptionsV2 options); /** - * Construct a {@link LineSegmenter} with custom options. It automatically loads the best - * available payload data for Burmese, Khmer, Lao, and Thai, using a particular data source. - * - * See the [Rust documentation for `new_auto`](https://docs.rs/icu/2.0.0/icu/segmenter/struct.LineSegmenter.html#method.new_auto) for more information. + * Construct a {@link LineSegmenter} with custom options. It automatically loads the best + * available payload data for Burmese, Khmer, Lao, and Thai, using a particular data source. + * + * See the [Rust documentation for `new_auto`](https://docs.rs/icu/2.0.0/icu/segmenter/struct.LineSegmenter.html#method.new_auto) for more information. */ - inline static diplomat::result, icu4x::DataError> create_auto_with_options_v2_and_provider(const icu4x::DataProvider& provider, const icu4x::Locale* content_locale, icu4x::LineBreakOptionsV2 options); + inline static icu4x::diplomat::result, icu4x::DataError> create_auto_with_options_v2_and_provider(const icu4x::DataProvider& provider, const icu4x::Locale* content_locale, icu4x::LineBreakOptionsV2 options); /** - * Construct a {@link LineSegmenter} with custom options and LSTM payload data for - * Burmese, Khmer, Lao, and Thai, using compiled data. - * - * See the [Rust documentation for `new_lstm`](https://docs.rs/icu/2.0.0/icu/segmenter/struct.LineSegmenter.html#method.new_lstm) for more information. + * Construct a {@link LineSegmenter} with custom options and LSTM payload data for + * Burmese, Khmer, Lao, and Thai, using compiled data. + * + * See the [Rust documentation for `new_lstm`](https://docs.rs/icu/2.0.0/icu/segmenter/struct.LineSegmenter.html#method.new_lstm) for more information. */ inline static std::unique_ptr create_lstm_with_options_v2(const icu4x::Locale* content_locale, icu4x::LineBreakOptionsV2 options); /** - * Construct a {@link LineSegmenter} with custom options and LSTM payload data for - * Burmese, Khmer, Lao, and Thai, using a particular data source. - * - * See the [Rust documentation for `new_lstm`](https://docs.rs/icu/2.0.0/icu/segmenter/struct.LineSegmenter.html#method.new_lstm) for more information. + * Construct a {@link LineSegmenter} with custom options and LSTM payload data for + * Burmese, Khmer, Lao, and Thai, using a particular data source. + * + * See the [Rust documentation for `new_lstm`](https://docs.rs/icu/2.0.0/icu/segmenter/struct.LineSegmenter.html#method.new_lstm) for more information. */ - inline static diplomat::result, icu4x::DataError> create_lstm_with_options_v2_and_provider(const icu4x::DataProvider& provider, const icu4x::Locale* content_locale, icu4x::LineBreakOptionsV2 options); + inline static icu4x::diplomat::result, icu4x::DataError> create_lstm_with_options_v2_and_provider(const icu4x::DataProvider& provider, const icu4x::Locale* content_locale, icu4x::LineBreakOptionsV2 options); /** - * Construct a {@link LineSegmenter} with custom options and dictionary payload data for - * Burmese, Khmer, Lao, and Thai, using compiled data. - * - * See the [Rust documentation for `new_dictionary`](https://docs.rs/icu/2.0.0/icu/segmenter/struct.LineSegmenter.html#method.new_dictionary) for more information. + * Construct a {@link LineSegmenter} with custom options and dictionary payload data for + * Burmese, Khmer, Lao, and Thai, using compiled data. + * + * See the [Rust documentation for `new_dictionary`](https://docs.rs/icu/2.0.0/icu/segmenter/struct.LineSegmenter.html#method.new_dictionary) for more information. */ inline static std::unique_ptr create_dictionary_with_options_v2(const icu4x::Locale* content_locale, icu4x::LineBreakOptionsV2 options); /** - * Construct a {@link LineSegmenter} with custom options and dictionary payload data for - * Burmese, Khmer, Lao, and Thai, using a particular data source. - * - * See the [Rust documentation for `new_dictionary`](https://docs.rs/icu/2.0.0/icu/segmenter/struct.LineSegmenter.html#method.new_dictionary) for more information. + * Construct a {@link LineSegmenter} with custom options and dictionary payload data for + * Burmese, Khmer, Lao, and Thai, using a particular data source. + * + * See the [Rust documentation for `new_dictionary`](https://docs.rs/icu/2.0.0/icu/segmenter/struct.LineSegmenter.html#method.new_dictionary) for more information. */ - inline static diplomat::result, icu4x::DataError> create_dictionary_with_options_v2_and_provider(const icu4x::DataProvider& provider, const icu4x::Locale* content_locale, icu4x::LineBreakOptionsV2 options); + inline static icu4x::diplomat::result, icu4x::DataError> create_dictionary_with_options_v2_and_provider(const icu4x::DataProvider& provider, const icu4x::Locale* content_locale, icu4x::LineBreakOptionsV2 options); /** - * Segments a string. - * - * Ill-formed input is treated as if errors had been replaced with REPLACEMENT CHARACTERs according - * to the WHATWG Encoding Standard. - * - * See the [Rust documentation for `segment_utf8`](https://docs.rs/icu/2.0.0/icu/segmenter/struct.LineSegmenterBorrowed.html#method.segment_utf8) for more information. + * Segments a string. + * + * Ill-formed input is treated as if errors had been replaced with REPLACEMENT CHARACTERs according + * to the WHATWG Encoding Standard. + * + * See the [Rust documentation for `segment_utf8`](https://docs.rs/icu/2.0.0/icu/segmenter/struct.LineSegmenterBorrowed.html#method.segment_utf8) for more information. */ inline std::unique_ptr segment(std::string_view input) const; /** - * Segments a string. - * - * Ill-formed input is treated as if errors had been replaced with REPLACEMENT CHARACTERs according - * to the WHATWG Encoding Standard. - * - * See the [Rust documentation for `segment_utf16`](https://docs.rs/icu/2.0.0/icu/segmenter/struct.LineSegmenterBorrowed.html#method.segment_utf16) for more information. + * Segments a string. + * + * Ill-formed input is treated as if errors had been replaced with REPLACEMENT CHARACTERs according + * to the WHATWG Encoding Standard. + * + * See the [Rust documentation for `segment_utf16`](https://docs.rs/icu/2.0.0/icu/segmenter/struct.LineSegmenterBorrowed.html#method.segment_utf16) for more information. */ inline std::unique_ptr segment16(std::u16string_view input) const; /** - * Segments a Latin-1 string. - * - * See the [Rust documentation for `segment_latin1`](https://docs.rs/icu/2.0.0/icu/segmenter/struct.LineSegmenterBorrowed.html#method.segment_latin1) for more information. + * Segments a Latin-1 string. + * + * See the [Rust documentation for `segment_latin1`](https://docs.rs/icu/2.0.0/icu/segmenter/struct.LineSegmenterBorrowed.html#method.segment_latin1) for more information. */ - inline std::unique_ptr segment_latin1(diplomat::span input) const; + inline std::unique_ptr segment_latin1(icu4x::diplomat::span input) const; inline const icu4x::capi::LineSegmenter* AsFFI() const; inline icu4x::capi::LineSegmenter* AsFFI(); @@ -158,4 +158,4 @@ class LineSegmenter { }; } // namespace -#endif // icu4x_LineSegmenter_D_HPP +#endif // ICU4X_LineSegmenter_D_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/LineSegmenter.hpp b/ffi/capi/bindings/cpp/icu4x/LineSegmenter.hpp index 144d6be159f..8a2207ac0dd 100644 --- a/ffi/capi/bindings/cpp/icu4x/LineSegmenter.hpp +++ b/ffi/capi/bindings/cpp/icu4x/LineSegmenter.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_LineSegmenter_HPP -#define icu4x_LineSegmenter_HPP +#ifndef ICU4X_LineSegmenter_HPP +#define ICU4X_LineSegmenter_HPP #include "LineSegmenter.d.hpp" @@ -11,7 +11,6 @@ #include #include #include -#include "../diplomat_runtime.hpp" #include "DataError.hpp" #include "DataProvider.hpp" #include "LineBreakIteratorLatin1.hpp" @@ -19,6 +18,7 @@ #include "LineBreakIteratorUtf8.hpp" #include "LineBreakOptionsV2.hpp" #include "Locale.hpp" +#include "diplomat_runtime.hpp" namespace icu4x { @@ -46,11 +46,11 @@ namespace capi { typedef struct icu4x_LineSegmenter_create_dictionary_with_options_v2_and_provider_mv1_result {union {icu4x::capi::LineSegmenter* ok; icu4x::capi::DataError err;}; bool is_ok;} icu4x_LineSegmenter_create_dictionary_with_options_v2_and_provider_mv1_result; icu4x_LineSegmenter_create_dictionary_with_options_v2_and_provider_mv1_result icu4x_LineSegmenter_create_dictionary_with_options_v2_and_provider_mv1(const icu4x::capi::DataProvider* provider, const icu4x::capi::Locale* content_locale, icu4x::capi::LineBreakOptionsV2 options); - icu4x::capi::LineBreakIteratorUtf8* icu4x_LineSegmenter_segment_utf8_mv1(const icu4x::capi::LineSegmenter* self, diplomat::capi::DiplomatStringView input); + icu4x::capi::LineBreakIteratorUtf8* icu4x_LineSegmenter_segment_utf8_mv1(const icu4x::capi::LineSegmenter* self, icu4x::diplomat::capi::DiplomatStringView input); - icu4x::capi::LineBreakIteratorUtf16* icu4x_LineSegmenter_segment_utf16_mv1(const icu4x::capi::LineSegmenter* self, diplomat::capi::DiplomatString16View input); + icu4x::capi::LineBreakIteratorUtf16* icu4x_LineSegmenter_segment_utf16_mv1(const icu4x::capi::LineSegmenter* self, icu4x::diplomat::capi::DiplomatString16View input); - icu4x::capi::LineBreakIteratorLatin1* icu4x_LineSegmenter_segment_latin1_mv1(const icu4x::capi::LineSegmenter* self, diplomat::capi::DiplomatU8View input); + icu4x::capi::LineBreakIteratorLatin1* icu4x_LineSegmenter_segment_latin1_mv1(const icu4x::capi::LineSegmenter* self, icu4x::diplomat::capi::DiplomatU8View input); void icu4x_LineSegmenter_destroy_mv1(LineSegmenter* self); @@ -79,11 +79,11 @@ inline std::unique_ptr icu4x::LineSegmenter::create_auto_w return std::unique_ptr(icu4x::LineSegmenter::FromFFI(result)); } -inline diplomat::result, icu4x::DataError> icu4x::LineSegmenter::create_auto_with_options_v2_and_provider(const icu4x::DataProvider& provider, const icu4x::Locale* content_locale, icu4x::LineBreakOptionsV2 options) { +inline icu4x::diplomat::result, icu4x::DataError> icu4x::LineSegmenter::create_auto_with_options_v2_and_provider(const icu4x::DataProvider& provider, const icu4x::Locale* content_locale, icu4x::LineBreakOptionsV2 options) { auto result = icu4x::capi::icu4x_LineSegmenter_create_auto_with_options_v2_and_provider_mv1(provider.AsFFI(), content_locale ? content_locale->AsFFI() : nullptr, options.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DataError>(diplomat::Ok>(std::unique_ptr(icu4x::LineSegmenter::FromFFI(result.ok)))) : diplomat::result, icu4x::DataError>(diplomat::Err(icu4x::DataError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::LineSegmenter::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Err(icu4x::DataError::FromFFI(result.err))); } inline std::unique_ptr icu4x::LineSegmenter::create_lstm_with_options_v2(const icu4x::Locale* content_locale, icu4x::LineBreakOptionsV2 options) { @@ -92,11 +92,11 @@ inline std::unique_ptr icu4x::LineSegmenter::create_lstm_w return std::unique_ptr(icu4x::LineSegmenter::FromFFI(result)); } -inline diplomat::result, icu4x::DataError> icu4x::LineSegmenter::create_lstm_with_options_v2_and_provider(const icu4x::DataProvider& provider, const icu4x::Locale* content_locale, icu4x::LineBreakOptionsV2 options) { +inline icu4x::diplomat::result, icu4x::DataError> icu4x::LineSegmenter::create_lstm_with_options_v2_and_provider(const icu4x::DataProvider& provider, const icu4x::Locale* content_locale, icu4x::LineBreakOptionsV2 options) { auto result = icu4x::capi::icu4x_LineSegmenter_create_lstm_with_options_v2_and_provider_mv1(provider.AsFFI(), content_locale ? content_locale->AsFFI() : nullptr, options.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DataError>(diplomat::Ok>(std::unique_ptr(icu4x::LineSegmenter::FromFFI(result.ok)))) : diplomat::result, icu4x::DataError>(diplomat::Err(icu4x::DataError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::LineSegmenter::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Err(icu4x::DataError::FromFFI(result.err))); } inline std::unique_ptr icu4x::LineSegmenter::create_dictionary_with_options_v2(const icu4x::Locale* content_locale, icu4x::LineBreakOptionsV2 options) { @@ -105,11 +105,11 @@ inline std::unique_ptr icu4x::LineSegmenter::create_dictio return std::unique_ptr(icu4x::LineSegmenter::FromFFI(result)); } -inline diplomat::result, icu4x::DataError> icu4x::LineSegmenter::create_dictionary_with_options_v2_and_provider(const icu4x::DataProvider& provider, const icu4x::Locale* content_locale, icu4x::LineBreakOptionsV2 options) { +inline icu4x::diplomat::result, icu4x::DataError> icu4x::LineSegmenter::create_dictionary_with_options_v2_and_provider(const icu4x::DataProvider& provider, const icu4x::Locale* content_locale, icu4x::LineBreakOptionsV2 options) { auto result = icu4x::capi::icu4x_LineSegmenter_create_dictionary_with_options_v2_and_provider_mv1(provider.AsFFI(), content_locale ? content_locale->AsFFI() : nullptr, options.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DataError>(diplomat::Ok>(std::unique_ptr(icu4x::LineSegmenter::FromFFI(result.ok)))) : diplomat::result, icu4x::DataError>(diplomat::Err(icu4x::DataError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::LineSegmenter::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Err(icu4x::DataError::FromFFI(result.err))); } inline std::unique_ptr icu4x::LineSegmenter::segment(std::string_view input) const { @@ -124,7 +124,7 @@ inline std::unique_ptr icu4x::LineSegmenter::segm return std::unique_ptr(icu4x::LineBreakIteratorUtf16::FromFFI(result)); } -inline std::unique_ptr icu4x::LineSegmenter::segment_latin1(diplomat::span input) const { +inline std::unique_ptr icu4x::LineSegmenter::segment_latin1(icu4x::diplomat::span input) const { auto result = icu4x::capi::icu4x_LineSegmenter_segment_latin1_mv1(this->AsFFI(), {input.data(), input.size()}); return std::unique_ptr(icu4x::LineBreakIteratorLatin1::FromFFI(result)); @@ -151,4 +151,4 @@ inline void icu4x::LineSegmenter::operator delete(void* ptr) { } -#endif // icu4x_LineSegmenter_HPP +#endif // ICU4X_LineSegmenter_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/ListFormatter.d.hpp b/ffi/capi/bindings/cpp/icu4x/ListFormatter.d.hpp index 99e861ac327..1e139a8b425 100644 --- a/ffi/capi/bindings/cpp/icu4x/ListFormatter.d.hpp +++ b/ffi/capi/bindings/cpp/icu4x/ListFormatter.d.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_ListFormatter_D_HPP -#define icu4x_ListFormatter_D_HPP +#ifndef ICU4X_ListFormatter_D_HPP +#define ICU4X_ListFormatter_D_HPP #include #include @@ -9,8 +9,7 @@ #include #include #include -#include "../diplomat_runtime.hpp" - +#include "diplomat_runtime.hpp" namespace icu4x { namespace capi { struct DataProvider; } class DataProvider; @@ -20,7 +19,8 @@ namespace capi { struct Locale; } class Locale; class DataError; class ListLength; -} +} // namespace icu4x + namespace icu4x { @@ -37,60 +37,60 @@ class ListFormatter { public: /** - * Construct a new ListFormatter instance for And patterns from compiled data. - * - * See the [Rust documentation for `try_new_and`](https://docs.rs/icu/2.0.0/icu/list/struct.ListFormatter.html#method.try_new_and) for more information. + * Construct a new ListFormatter instance for And patterns from compiled data. + * + * See the [Rust documentation for `try_new_and`](https://docs.rs/icu/2.0.0/icu/list/struct.ListFormatter.html#method.try_new_and) for more information. */ - inline static diplomat::result, icu4x::DataError> create_and_with_length(const icu4x::Locale& locale, icu4x::ListLength length); + inline static icu4x::diplomat::result, icu4x::DataError> create_and_with_length(const icu4x::Locale& locale, icu4x::ListLength length); /** - * Construct a new ListFormatter instance for And patterns - * - * See the [Rust documentation for `try_new_and`](https://docs.rs/icu/2.0.0/icu/list/struct.ListFormatter.html#method.try_new_and) for more information. + * Construct a new ListFormatter instance for And patterns + * + * See the [Rust documentation for `try_new_and`](https://docs.rs/icu/2.0.0/icu/list/struct.ListFormatter.html#method.try_new_and) for more information. */ - inline static diplomat::result, icu4x::DataError> create_and_with_length_and_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, icu4x::ListLength length); + inline static icu4x::diplomat::result, icu4x::DataError> create_and_with_length_and_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, icu4x::ListLength length); /** - * Construct a new ListFormatter instance for And patterns from compiled data. - * - * See the [Rust documentation for `try_new_or`](https://docs.rs/icu/2.0.0/icu/list/struct.ListFormatter.html#method.try_new_or) for more information. + * Construct a new ListFormatter instance for And patterns from compiled data. + * + * See the [Rust documentation for `try_new_or`](https://docs.rs/icu/2.0.0/icu/list/struct.ListFormatter.html#method.try_new_or) for more information. */ - inline static diplomat::result, icu4x::DataError> create_or_with_length(const icu4x::Locale& locale, icu4x::ListLength length); + inline static icu4x::diplomat::result, icu4x::DataError> create_or_with_length(const icu4x::Locale& locale, icu4x::ListLength length); /** - * Construct a new ListFormatter instance for And patterns - * - * See the [Rust documentation for `try_new_or`](https://docs.rs/icu/2.0.0/icu/list/struct.ListFormatter.html#method.try_new_or) for more information. + * Construct a new ListFormatter instance for And patterns + * + * See the [Rust documentation for `try_new_or`](https://docs.rs/icu/2.0.0/icu/list/struct.ListFormatter.html#method.try_new_or) for more information. */ - inline static diplomat::result, icu4x::DataError> create_or_with_length_and_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, icu4x::ListLength length); + inline static icu4x::diplomat::result, icu4x::DataError> create_or_with_length_and_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, icu4x::ListLength length); /** - * Construct a new ListFormatter instance for And patterns from compiled data. - * - * See the [Rust documentation for `try_new_unit`](https://docs.rs/icu/2.0.0/icu/list/struct.ListFormatter.html#method.try_new_unit) for more information. + * Construct a new ListFormatter instance for And patterns from compiled data. + * + * See the [Rust documentation for `try_new_unit`](https://docs.rs/icu/2.0.0/icu/list/struct.ListFormatter.html#method.try_new_unit) for more information. */ - inline static diplomat::result, icu4x::DataError> create_unit_with_length(const icu4x::Locale& locale, icu4x::ListLength length); + inline static icu4x::diplomat::result, icu4x::DataError> create_unit_with_length(const icu4x::Locale& locale, icu4x::ListLength length); /** - * Construct a new ListFormatter instance for And patterns - * - * See the [Rust documentation for `try_new_unit`](https://docs.rs/icu/2.0.0/icu/list/struct.ListFormatter.html#method.try_new_unit) for more information. + * Construct a new ListFormatter instance for And patterns + * + * See the [Rust documentation for `try_new_unit`](https://docs.rs/icu/2.0.0/icu/list/struct.ListFormatter.html#method.try_new_unit) for more information. */ - inline static diplomat::result, icu4x::DataError> create_unit_with_length_and_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, icu4x::ListLength length); + inline static icu4x::diplomat::result, icu4x::DataError> create_unit_with_length_and_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, icu4x::ListLength length); /** - * See the [Rust documentation for `format`](https://docs.rs/icu/2.0.0/icu/list/struct.ListFormatter.html#method.format) for more information. + * See the [Rust documentation for `format`](https://docs.rs/icu/2.0.0/icu/list/struct.ListFormatter.html#method.format) for more information. */ - inline std::string format(diplomat::span list) const; + inline std::string format(icu4x::diplomat::span list) const; template - inline void format_write(diplomat::span list, W& writeable_output) const; + inline void format_write(icu4x::diplomat::span list, W& writeable_output) const; /** - * See the [Rust documentation for `format`](https://docs.rs/icu/2.0.0/icu/list/struct.ListFormatter.html#method.format) for more information. + * See the [Rust documentation for `format`](https://docs.rs/icu/2.0.0/icu/list/struct.ListFormatter.html#method.format) for more information. */ - inline std::string format16(diplomat::span list) const; + inline std::string format16(icu4x::diplomat::span list) const; template - inline void format16_write(diplomat::span list, W& writeable_output) const; + inline void format16_write(icu4x::diplomat::span list, W& writeable_output) const; inline const icu4x::capi::ListFormatter* AsFFI() const; inline icu4x::capi::ListFormatter* AsFFI(); @@ -107,4 +107,4 @@ class ListFormatter { }; } // namespace -#endif // icu4x_ListFormatter_D_HPP +#endif // ICU4X_ListFormatter_D_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/ListFormatter.hpp b/ffi/capi/bindings/cpp/icu4x/ListFormatter.hpp index 44df717c975..158084d35e5 100644 --- a/ffi/capi/bindings/cpp/icu4x/ListFormatter.hpp +++ b/ffi/capi/bindings/cpp/icu4x/ListFormatter.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_ListFormatter_HPP -#define icu4x_ListFormatter_HPP +#ifndef ICU4X_ListFormatter_HPP +#define ICU4X_ListFormatter_HPP #include "ListFormatter.d.hpp" @@ -11,11 +11,11 @@ #include #include #include -#include "../diplomat_runtime.hpp" #include "DataError.hpp" #include "DataProvider.hpp" #include "ListLength.hpp" #include "Locale.hpp" +#include "diplomat_runtime.hpp" namespace icu4x { @@ -40,9 +40,9 @@ namespace capi { typedef struct icu4x_ListFormatter_create_unit_with_length_and_provider_mv1_result {union {icu4x::capi::ListFormatter* ok; icu4x::capi::DataError err;}; bool is_ok;} icu4x_ListFormatter_create_unit_with_length_and_provider_mv1_result; icu4x_ListFormatter_create_unit_with_length_and_provider_mv1_result icu4x_ListFormatter_create_unit_with_length_and_provider_mv1(const icu4x::capi::DataProvider* provider, const icu4x::capi::Locale* locale, icu4x::capi::ListLength length); - void icu4x_ListFormatter_format_utf8_mv1(const icu4x::capi::ListFormatter* self, diplomat::capi::DiplomatStringsView list, diplomat::capi::DiplomatWrite* write); + void icu4x_ListFormatter_format_utf8_mv1(const icu4x::capi::ListFormatter* self, icu4x::diplomat::capi::DiplomatStringsView list, icu4x::diplomat::capi::DiplomatWrite* write); - void icu4x_ListFormatter_format_utf16_mv1(const icu4x::capi::ListFormatter* self, diplomat::capi::DiplomatStrings16View list, diplomat::capi::DiplomatWrite* write); + void icu4x_ListFormatter_format_utf16_mv1(const icu4x::capi::ListFormatter* self, icu4x::diplomat::capi::DiplomatStrings16View list, icu4x::diplomat::capi::DiplomatWrite* write); void icu4x_ListFormatter_destroy_mv1(ListFormatter* self); @@ -50,74 +50,74 @@ namespace capi { } // namespace capi } // namespace -inline diplomat::result, icu4x::DataError> icu4x::ListFormatter::create_and_with_length(const icu4x::Locale& locale, icu4x::ListLength length) { +inline icu4x::diplomat::result, icu4x::DataError> icu4x::ListFormatter::create_and_with_length(const icu4x::Locale& locale, icu4x::ListLength length) { auto result = icu4x::capi::icu4x_ListFormatter_create_and_with_length_mv1(locale.AsFFI(), length.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DataError>(diplomat::Ok>(std::unique_ptr(icu4x::ListFormatter::FromFFI(result.ok)))) : diplomat::result, icu4x::DataError>(diplomat::Err(icu4x::DataError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::ListFormatter::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Err(icu4x::DataError::FromFFI(result.err))); } -inline diplomat::result, icu4x::DataError> icu4x::ListFormatter::create_and_with_length_and_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, icu4x::ListLength length) { +inline icu4x::diplomat::result, icu4x::DataError> icu4x::ListFormatter::create_and_with_length_and_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, icu4x::ListLength length) { auto result = icu4x::capi::icu4x_ListFormatter_create_and_with_length_and_provider_mv1(provider.AsFFI(), locale.AsFFI(), length.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DataError>(diplomat::Ok>(std::unique_ptr(icu4x::ListFormatter::FromFFI(result.ok)))) : diplomat::result, icu4x::DataError>(diplomat::Err(icu4x::DataError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::ListFormatter::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Err(icu4x::DataError::FromFFI(result.err))); } -inline diplomat::result, icu4x::DataError> icu4x::ListFormatter::create_or_with_length(const icu4x::Locale& locale, icu4x::ListLength length) { +inline icu4x::diplomat::result, icu4x::DataError> icu4x::ListFormatter::create_or_with_length(const icu4x::Locale& locale, icu4x::ListLength length) { auto result = icu4x::capi::icu4x_ListFormatter_create_or_with_length_mv1(locale.AsFFI(), length.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DataError>(diplomat::Ok>(std::unique_ptr(icu4x::ListFormatter::FromFFI(result.ok)))) : diplomat::result, icu4x::DataError>(diplomat::Err(icu4x::DataError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::ListFormatter::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Err(icu4x::DataError::FromFFI(result.err))); } -inline diplomat::result, icu4x::DataError> icu4x::ListFormatter::create_or_with_length_and_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, icu4x::ListLength length) { +inline icu4x::diplomat::result, icu4x::DataError> icu4x::ListFormatter::create_or_with_length_and_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, icu4x::ListLength length) { auto result = icu4x::capi::icu4x_ListFormatter_create_or_with_length_and_provider_mv1(provider.AsFFI(), locale.AsFFI(), length.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DataError>(diplomat::Ok>(std::unique_ptr(icu4x::ListFormatter::FromFFI(result.ok)))) : diplomat::result, icu4x::DataError>(diplomat::Err(icu4x::DataError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::ListFormatter::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Err(icu4x::DataError::FromFFI(result.err))); } -inline diplomat::result, icu4x::DataError> icu4x::ListFormatter::create_unit_with_length(const icu4x::Locale& locale, icu4x::ListLength length) { +inline icu4x::diplomat::result, icu4x::DataError> icu4x::ListFormatter::create_unit_with_length(const icu4x::Locale& locale, icu4x::ListLength length) { auto result = icu4x::capi::icu4x_ListFormatter_create_unit_with_length_mv1(locale.AsFFI(), length.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DataError>(diplomat::Ok>(std::unique_ptr(icu4x::ListFormatter::FromFFI(result.ok)))) : diplomat::result, icu4x::DataError>(diplomat::Err(icu4x::DataError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::ListFormatter::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Err(icu4x::DataError::FromFFI(result.err))); } -inline diplomat::result, icu4x::DataError> icu4x::ListFormatter::create_unit_with_length_and_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, icu4x::ListLength length) { +inline icu4x::diplomat::result, icu4x::DataError> icu4x::ListFormatter::create_unit_with_length_and_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, icu4x::ListLength length) { auto result = icu4x::capi::icu4x_ListFormatter_create_unit_with_length_and_provider_mv1(provider.AsFFI(), locale.AsFFI(), length.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DataError>(diplomat::Ok>(std::unique_ptr(icu4x::ListFormatter::FromFFI(result.ok)))) : diplomat::result, icu4x::DataError>(diplomat::Err(icu4x::DataError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::ListFormatter::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Err(icu4x::DataError::FromFFI(result.err))); } -inline std::string icu4x::ListFormatter::format(diplomat::span list) const { +inline std::string icu4x::ListFormatter::format(icu4x::diplomat::span list) const { std::string output; - diplomat::capi::DiplomatWrite write = diplomat::WriteFromString(output); + icu4x::diplomat::capi::DiplomatWrite write = icu4x::diplomat::WriteFromString(output); icu4x::capi::icu4x_ListFormatter_format_utf8_mv1(this->AsFFI(), - {reinterpret_cast(list.data()), list.size()}, + {reinterpret_cast(list.data()), list.size()}, &write); return output; } template -inline void icu4x::ListFormatter::format_write(diplomat::span list, W& writeable) const { - diplomat::capi::DiplomatWrite write = diplomat::WriteTrait::Construct(writeable); +inline void icu4x::ListFormatter::format_write(icu4x::diplomat::span list, W& writeable) const { + icu4x::diplomat::capi::DiplomatWrite write = icu4x::diplomat::WriteTrait::Construct(writeable); icu4x::capi::icu4x_ListFormatter_format_utf8_mv1(this->AsFFI(), - {reinterpret_cast(list.data()), list.size()}, + {reinterpret_cast(list.data()), list.size()}, &write); } -inline std::string icu4x::ListFormatter::format16(diplomat::span list) const { +inline std::string icu4x::ListFormatter::format16(icu4x::diplomat::span list) const { std::string output; - diplomat::capi::DiplomatWrite write = diplomat::WriteFromString(output); + icu4x::diplomat::capi::DiplomatWrite write = icu4x::diplomat::WriteFromString(output); icu4x::capi::icu4x_ListFormatter_format_utf16_mv1(this->AsFFI(), - {reinterpret_cast(list.data()), list.size()}, + {reinterpret_cast(list.data()), list.size()}, &write); return output; } template -inline void icu4x::ListFormatter::format16_write(diplomat::span list, W& writeable) const { - diplomat::capi::DiplomatWrite write = diplomat::WriteTrait::Construct(writeable); +inline void icu4x::ListFormatter::format16_write(icu4x::diplomat::span list, W& writeable) const { + icu4x::diplomat::capi::DiplomatWrite write = icu4x::diplomat::WriteTrait::Construct(writeable); icu4x::capi::icu4x_ListFormatter_format_utf16_mv1(this->AsFFI(), - {reinterpret_cast(list.data()), list.size()}, + {reinterpret_cast(list.data()), list.size()}, &write); } @@ -142,4 +142,4 @@ inline void icu4x::ListFormatter::operator delete(void* ptr) { } -#endif // icu4x_ListFormatter_HPP +#endif // ICU4X_ListFormatter_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/ListLength.d.hpp b/ffi/capi/bindings/cpp/icu4x/ListLength.d.hpp index 845106ad7fa..089c06d867b 100644 --- a/ffi/capi/bindings/cpp/icu4x/ListLength.d.hpp +++ b/ffi/capi/bindings/cpp/icu4x/ListLength.d.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_ListLength_D_HPP -#define icu4x_ListLength_D_HPP +#ifndef ICU4X_ListLength_D_HPP +#define ICU4X_ListLength_D_HPP #include #include @@ -9,7 +9,7 @@ #include #include #include -#include "../diplomat_runtime.hpp" +#include "diplomat_runtime.hpp" namespace icu4x { @@ -51,4 +51,4 @@ class ListLength { }; } // namespace -#endif // icu4x_ListLength_D_HPP +#endif // ICU4X_ListLength_D_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/ListLength.hpp b/ffi/capi/bindings/cpp/icu4x/ListLength.hpp index f23f352ca57..3104d20fd3a 100644 --- a/ffi/capi/bindings/cpp/icu4x/ListLength.hpp +++ b/ffi/capi/bindings/cpp/icu4x/ListLength.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_ListLength_HPP -#define icu4x_ListLength_HPP +#ifndef ICU4X_ListLength_HPP +#define ICU4X_ListLength_HPP #include "ListLength.d.hpp" @@ -11,7 +11,7 @@ #include #include #include -#include "../diplomat_runtime.hpp" +#include "diplomat_runtime.hpp" namespace icu4x { @@ -36,4 +36,4 @@ inline icu4x::ListLength icu4x::ListLength::FromFFI(icu4x::capi::ListLength c_en std::abort(); } } -#endif // icu4x_ListLength_HPP +#endif // ICU4X_ListLength_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/Locale.d.hpp b/ffi/capi/bindings/cpp/icu4x/Locale.d.hpp index 08c1c0e990d..9b04b10e2f4 100644 --- a/ffi/capi/bindings/cpp/icu4x/Locale.d.hpp +++ b/ffi/capi/bindings/cpp/icu4x/Locale.d.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_Locale_D_HPP -#define icu4x_Locale_D_HPP +#ifndef ICU4X_Locale_D_HPP +#define ICU4X_Locale_D_HPP #include #include @@ -9,13 +9,13 @@ #include #include #include -#include "../diplomat_runtime.hpp" - +#include "diplomat_runtime.hpp" namespace icu4x { namespace capi { struct Locale; } class Locale; class LocaleParseError; -} +} // namespace icu4x + namespace icu4x { @@ -34,134 +34,134 @@ class Locale { public: /** - * Construct an {@link Locale} from an locale identifier. - * - * This will run the complete locale parsing algorithm. If code size and - * performance are critical and the locale is of a known shape (such as - * `aa-BB`) use `create_und`, `set_language`, `set_script`, and `set_region`. - * - * See the [Rust documentation for `try_from_str`](https://docs.rs/icu/2.0.0/icu/locale/struct.Locale.html#method.try_from_str) for more information. + * Construct an {@link Locale} from an locale identifier. + * + * This will run the complete locale parsing algorithm. If code size and + * performance are critical and the locale is of a known shape (such as + * `aa-BB`) use `create_und`, `set_language`, `set_script`, and `set_region`. + * + * See the [Rust documentation for `try_from_str`](https://docs.rs/icu/2.0.0/icu/locale/struct.Locale.html#method.try_from_str) for more information. */ - inline static diplomat::result, icu4x::LocaleParseError> from_string(std::string_view name); + inline static icu4x::diplomat::result, icu4x::LocaleParseError> from_string(std::string_view name); /** - * Construct a unknown {@link Locale} "und". - * - * See the [Rust documentation for `UNKNOWN`](https://docs.rs/icu/2.0.0/icu/locale/struct.Locale.html#associatedconstant.UNKNOWN) for more information. + * Construct a unknown {@link Locale} "und". + * + * See the [Rust documentation for `UNKNOWN`](https://docs.rs/icu/2.0.0/icu/locale/struct.Locale.html#associatedconstant.UNKNOWN) for more information. */ inline static std::unique_ptr unknown(); /** - * Clones the {@link Locale}. - * - * See the [Rust documentation for `Locale`](https://docs.rs/icu/2.0.0/icu/locale/struct.Locale.html) for more information. + * Clones the {@link Locale}. + * + * See the [Rust documentation for `Locale`](https://docs.rs/icu/2.0.0/icu/locale/struct.Locale.html) for more information. */ inline std::unique_ptr clone() const; /** - * Returns a string representation of the `LanguageIdentifier` part of - * {@link Locale}. - * - * See the [Rust documentation for `id`](https://docs.rs/icu/2.0.0/icu/locale/struct.Locale.html#structfield.id) for more information. + * Returns a string representation of the `LanguageIdentifier` part of + * {@link Locale}. + * + * See the [Rust documentation for `id`](https://docs.rs/icu/2.0.0/icu/locale/struct.Locale.html#structfield.id) for more information. */ inline std::string basename() const; template inline void basename_write(W& writeable_output) const; /** - * Returns a string representation of the unicode extension. - * - * See the [Rust documentation for `extensions`](https://docs.rs/icu/2.0.0/icu/locale/struct.Locale.html#structfield.extensions) for more information. + * Returns a string representation of the unicode extension. + * + * See the [Rust documentation for `extensions`](https://docs.rs/icu/2.0.0/icu/locale/struct.Locale.html#structfield.extensions) for more information. */ inline std::optional get_unicode_extension(std::string_view s) const; template inline std::optional get_unicode_extension_write(std::string_view s, W& writeable_output) const; /** - * Set a Unicode extension. - * - * See the [Rust documentation for `extensions`](https://docs.rs/icu/2.0.0/icu/locale/struct.Locale.html#structfield.extensions) for more information. + * Set a Unicode extension. + * + * See the [Rust documentation for `extensions`](https://docs.rs/icu/2.0.0/icu/locale/struct.Locale.html#structfield.extensions) for more information. */ inline std::optional set_unicode_extension(std::string_view k, std::string_view v); /** - * Returns a string representation of {@link Locale} language. - * - * See the [Rust documentation for `id`](https://docs.rs/icu/2.0.0/icu/locale/struct.Locale.html#structfield.id) for more information. + * Returns a string representation of {@link Locale} language. + * + * See the [Rust documentation for `id`](https://docs.rs/icu/2.0.0/icu/locale/struct.Locale.html#structfield.id) for more information. */ inline std::string language() const; template inline void language_write(W& writeable_output) const; /** - * Set the language part of the {@link Locale}. - * - * See the [Rust documentation for `try_from_str`](https://docs.rs/icu/2.0.0/icu/locale/struct.Locale.html#method.try_from_str) for more information. + * Set the language part of the {@link Locale}. + * + * See the [Rust documentation for `try_from_str`](https://docs.rs/icu/2.0.0/icu/locale/struct.Locale.html#method.try_from_str) for more information. */ - inline diplomat::result set_language(std::string_view s); + inline icu4x::diplomat::result set_language(std::string_view s); /** - * Returns a string representation of {@link Locale} region. - * - * See the [Rust documentation for `id`](https://docs.rs/icu/2.0.0/icu/locale/struct.Locale.html#structfield.id) for more information. + * Returns a string representation of {@link Locale} region. + * + * See the [Rust documentation for `id`](https://docs.rs/icu/2.0.0/icu/locale/struct.Locale.html#structfield.id) for more information. */ inline std::optional region() const; template inline std::optional region_write(W& writeable_output) const; /** - * Set the region part of the {@link Locale}. - * - * See the [Rust documentation for `try_from_str`](https://docs.rs/icu/2.0.0/icu/locale/struct.Locale.html#method.try_from_str) for more information. + * Set the region part of the {@link Locale}. + * + * See the [Rust documentation for `try_from_str`](https://docs.rs/icu/2.0.0/icu/locale/struct.Locale.html#method.try_from_str) for more information. */ - inline diplomat::result set_region(std::string_view s); + inline icu4x::diplomat::result set_region(std::string_view s); /** - * Returns a string representation of {@link Locale} script. - * - * See the [Rust documentation for `id`](https://docs.rs/icu/2.0.0/icu/locale/struct.Locale.html#structfield.id) for more information. + * Returns a string representation of {@link Locale} script. + * + * See the [Rust documentation for `id`](https://docs.rs/icu/2.0.0/icu/locale/struct.Locale.html#structfield.id) for more information. */ inline std::optional script() const; template inline std::optional script_write(W& writeable_output) const; /** - * Set the script part of the {@link Locale}. Pass an empty string to remove the script. - * - * See the [Rust documentation for `try_from_str`](https://docs.rs/icu/2.0.0/icu/locale/struct.Locale.html#method.try_from_str) for more information. + * Set the script part of the {@link Locale}. Pass an empty string to remove the script. + * + * See the [Rust documentation for `try_from_str`](https://docs.rs/icu/2.0.0/icu/locale/struct.Locale.html#method.try_from_str) for more information. */ - inline diplomat::result set_script(std::string_view s); + inline icu4x::diplomat::result set_script(std::string_view s); /** - * Normalizes a locale string. - * - * See the [Rust documentation for `normalize`](https://docs.rs/icu/2.0.0/icu/locale/struct.Locale.html#method.normalize) for more information. + * Normalizes a locale string. + * + * See the [Rust documentation for `normalize`](https://docs.rs/icu/2.0.0/icu/locale/struct.Locale.html#method.normalize) for more information. */ - inline static diplomat::result normalize(std::string_view s); + inline static icu4x::diplomat::result normalize(std::string_view s); template - inline static diplomat::result normalize_write(std::string_view s, W& writeable_output); + inline static icu4x::diplomat::result normalize_write(std::string_view s, W& writeable_output); /** - * Returns a string representation of {@link Locale}. - * - * See the [Rust documentation for `write_to`](https://docs.rs/icu/2.0.0/icu/locale/struct.Locale.html#method.write_to) for more information. + * Returns a string representation of {@link Locale}. + * + * See the [Rust documentation for `write_to`](https://docs.rs/icu/2.0.0/icu/locale/struct.Locale.html#method.write_to) for more information. */ inline std::string to_string() const; template inline void to_string_write(W& writeable_output) const; /** - * See the [Rust documentation for `normalizing_eq`](https://docs.rs/icu/2.0.0/icu/locale/struct.Locale.html#method.normalizing_eq) for more information. + * See the [Rust documentation for `normalizing_eq`](https://docs.rs/icu/2.0.0/icu/locale/struct.Locale.html#method.normalizing_eq) for more information. */ inline bool normalizing_eq(std::string_view other) const; /** - * See the [Rust documentation for `strict_cmp`](https://docs.rs/icu/2.0.0/icu/locale/struct.Locale.html#method.strict_cmp) for more information. + * See the [Rust documentation for `strict_cmp`](https://docs.rs/icu/2.0.0/icu/locale/struct.Locale.html#method.strict_cmp) for more information. */ inline int8_t compare_to_string(std::string_view other) const; /** - * See the [Rust documentation for `total_cmp`](https://docs.rs/icu/2.0.0/icu/locale/struct.Locale.html#method.total_cmp) for more information. + * See the [Rust documentation for `total_cmp`](https://docs.rs/icu/2.0.0/icu/locale/struct.Locale.html#method.total_cmp) for more information. */ inline int8_t compare_to(const icu4x::Locale& other) const; inline bool operator==(const icu4x::Locale& other) const; @@ -186,4 +186,4 @@ class Locale { }; } // namespace -#endif // icu4x_Locale_D_HPP +#endif // ICU4X_Locale_D_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/Locale.hpp b/ffi/capi/bindings/cpp/icu4x/Locale.hpp index 07e0b258f50..b8dc56ef424 100644 --- a/ffi/capi/bindings/cpp/icu4x/Locale.hpp +++ b/ffi/capi/bindings/cpp/icu4x/Locale.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_Locale_HPP -#define icu4x_Locale_HPP +#ifndef ICU4X_Locale_HPP +#define ICU4X_Locale_HPP #include "Locale.d.hpp" @@ -11,8 +11,8 @@ #include #include #include -#include "../diplomat_runtime.hpp" #include "LocaleParseError.hpp" +#include "diplomat_runtime.hpp" namespace icu4x { @@ -20,45 +20,45 @@ namespace capi { extern "C" { typedef struct icu4x_Locale_from_string_mv1_result {union {icu4x::capi::Locale* ok; icu4x::capi::LocaleParseError err;}; bool is_ok;} icu4x_Locale_from_string_mv1_result; - icu4x_Locale_from_string_mv1_result icu4x_Locale_from_string_mv1(diplomat::capi::DiplomatStringView name); + icu4x_Locale_from_string_mv1_result icu4x_Locale_from_string_mv1(icu4x::diplomat::capi::DiplomatStringView name); icu4x::capi::Locale* icu4x_Locale_unknown_mv1(void); icu4x::capi::Locale* icu4x_Locale_clone_mv1(const icu4x::capi::Locale* self); - void icu4x_Locale_basename_mv1(const icu4x::capi::Locale* self, diplomat::capi::DiplomatWrite* write); + void icu4x_Locale_basename_mv1(const icu4x::capi::Locale* self, icu4x::diplomat::capi::DiplomatWrite* write); typedef struct icu4x_Locale_get_unicode_extension_mv1_result { bool is_ok;} icu4x_Locale_get_unicode_extension_mv1_result; - icu4x_Locale_get_unicode_extension_mv1_result icu4x_Locale_get_unicode_extension_mv1(const icu4x::capi::Locale* self, diplomat::capi::DiplomatStringView s, diplomat::capi::DiplomatWrite* write); + icu4x_Locale_get_unicode_extension_mv1_result icu4x_Locale_get_unicode_extension_mv1(const icu4x::capi::Locale* self, icu4x::diplomat::capi::DiplomatStringView s, icu4x::diplomat::capi::DiplomatWrite* write); typedef struct icu4x_Locale_set_unicode_extension_mv1_result { bool is_ok;} icu4x_Locale_set_unicode_extension_mv1_result; - icu4x_Locale_set_unicode_extension_mv1_result icu4x_Locale_set_unicode_extension_mv1(icu4x::capi::Locale* self, diplomat::capi::DiplomatStringView k, diplomat::capi::DiplomatStringView v); + icu4x_Locale_set_unicode_extension_mv1_result icu4x_Locale_set_unicode_extension_mv1(icu4x::capi::Locale* self, icu4x::diplomat::capi::DiplomatStringView k, icu4x::diplomat::capi::DiplomatStringView v); - void icu4x_Locale_language_mv1(const icu4x::capi::Locale* self, diplomat::capi::DiplomatWrite* write); + void icu4x_Locale_language_mv1(const icu4x::capi::Locale* self, icu4x::diplomat::capi::DiplomatWrite* write); typedef struct icu4x_Locale_set_language_mv1_result {union { icu4x::capi::LocaleParseError err;}; bool is_ok;} icu4x_Locale_set_language_mv1_result; - icu4x_Locale_set_language_mv1_result icu4x_Locale_set_language_mv1(icu4x::capi::Locale* self, diplomat::capi::DiplomatStringView s); + icu4x_Locale_set_language_mv1_result icu4x_Locale_set_language_mv1(icu4x::capi::Locale* self, icu4x::diplomat::capi::DiplomatStringView s); typedef struct icu4x_Locale_region_mv1_result { bool is_ok;} icu4x_Locale_region_mv1_result; - icu4x_Locale_region_mv1_result icu4x_Locale_region_mv1(const icu4x::capi::Locale* self, diplomat::capi::DiplomatWrite* write); + icu4x_Locale_region_mv1_result icu4x_Locale_region_mv1(const icu4x::capi::Locale* self, icu4x::diplomat::capi::DiplomatWrite* write); typedef struct icu4x_Locale_set_region_mv1_result {union { icu4x::capi::LocaleParseError err;}; bool is_ok;} icu4x_Locale_set_region_mv1_result; - icu4x_Locale_set_region_mv1_result icu4x_Locale_set_region_mv1(icu4x::capi::Locale* self, diplomat::capi::DiplomatStringView s); + icu4x_Locale_set_region_mv1_result icu4x_Locale_set_region_mv1(icu4x::capi::Locale* self, icu4x::diplomat::capi::DiplomatStringView s); typedef struct icu4x_Locale_script_mv1_result { bool is_ok;} icu4x_Locale_script_mv1_result; - icu4x_Locale_script_mv1_result icu4x_Locale_script_mv1(const icu4x::capi::Locale* self, diplomat::capi::DiplomatWrite* write); + icu4x_Locale_script_mv1_result icu4x_Locale_script_mv1(const icu4x::capi::Locale* self, icu4x::diplomat::capi::DiplomatWrite* write); typedef struct icu4x_Locale_set_script_mv1_result {union { icu4x::capi::LocaleParseError err;}; bool is_ok;} icu4x_Locale_set_script_mv1_result; - icu4x_Locale_set_script_mv1_result icu4x_Locale_set_script_mv1(icu4x::capi::Locale* self, diplomat::capi::DiplomatStringView s); + icu4x_Locale_set_script_mv1_result icu4x_Locale_set_script_mv1(icu4x::capi::Locale* self, icu4x::diplomat::capi::DiplomatStringView s); typedef struct icu4x_Locale_normalize_mv1_result {union { icu4x::capi::LocaleParseError err;}; bool is_ok;} icu4x_Locale_normalize_mv1_result; - icu4x_Locale_normalize_mv1_result icu4x_Locale_normalize_mv1(diplomat::capi::DiplomatStringView s, diplomat::capi::DiplomatWrite* write); + icu4x_Locale_normalize_mv1_result icu4x_Locale_normalize_mv1(icu4x::diplomat::capi::DiplomatStringView s, icu4x::diplomat::capi::DiplomatWrite* write); - void icu4x_Locale_to_string_mv1(const icu4x::capi::Locale* self, diplomat::capi::DiplomatWrite* write); + void icu4x_Locale_to_string_mv1(const icu4x::capi::Locale* self, icu4x::diplomat::capi::DiplomatWrite* write); - bool icu4x_Locale_normalizing_eq_mv1(const icu4x::capi::Locale* self, diplomat::capi::DiplomatStringView other); + bool icu4x_Locale_normalizing_eq_mv1(const icu4x::capi::Locale* self, icu4x::diplomat::capi::DiplomatStringView other); - int8_t icu4x_Locale_compare_to_string_mv1(const icu4x::capi::Locale* self, diplomat::capi::DiplomatStringView other); + int8_t icu4x_Locale_compare_to_string_mv1(const icu4x::capi::Locale* self, icu4x::diplomat::capi::DiplomatStringView other); int8_t icu4x_Locale_compare_to_mv1(const icu4x::capi::Locale* self, const icu4x::capi::Locale* other); @@ -68,9 +68,9 @@ namespace capi { } // namespace capi } // namespace -inline diplomat::result, icu4x::LocaleParseError> icu4x::Locale::from_string(std::string_view name) { +inline icu4x::diplomat::result, icu4x::LocaleParseError> icu4x::Locale::from_string(std::string_view name) { auto result = icu4x::capi::icu4x_Locale_from_string_mv1({name.data(), name.size()}); - return result.is_ok ? diplomat::result, icu4x::LocaleParseError>(diplomat::Ok>(std::unique_ptr(icu4x::Locale::FromFFI(result.ok)))) : diplomat::result, icu4x::LocaleParseError>(diplomat::Err(icu4x::LocaleParseError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::LocaleParseError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::Locale::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::LocaleParseError>(icu4x::diplomat::Err(icu4x::LocaleParseError::FromFFI(result.err))); } inline std::unique_ptr icu4x::Locale::unknown() { @@ -85,21 +85,21 @@ inline std::unique_ptr icu4x::Locale::clone() const { inline std::string icu4x::Locale::basename() const { std::string output; - diplomat::capi::DiplomatWrite write = diplomat::WriteFromString(output); + icu4x::diplomat::capi::DiplomatWrite write = icu4x::diplomat::WriteFromString(output); icu4x::capi::icu4x_Locale_basename_mv1(this->AsFFI(), &write); return output; } template inline void icu4x::Locale::basename_write(W& writeable) const { - diplomat::capi::DiplomatWrite write = diplomat::WriteTrait::Construct(writeable); + icu4x::diplomat::capi::DiplomatWrite write = icu4x::diplomat::WriteTrait::Construct(writeable); icu4x::capi::icu4x_Locale_basename_mv1(this->AsFFI(), &write); } inline std::optional icu4x::Locale::get_unicode_extension(std::string_view s) const { std::string output; - diplomat::capi::DiplomatWrite write = diplomat::WriteFromString(output); + icu4x::diplomat::capi::DiplomatWrite write = icu4x::diplomat::WriteFromString(output); auto result = icu4x::capi::icu4x_Locale_get_unicode_extension_mv1(this->AsFFI(), {s.data(), s.size()}, &write); @@ -107,7 +107,7 @@ inline std::optional icu4x::Locale::get_unicode_extension(std::stri } template inline std::optional icu4x::Locale::get_unicode_extension_write(std::string_view s, W& writeable) const { - diplomat::capi::DiplomatWrite write = diplomat::WriteTrait::Construct(writeable); + icu4x::diplomat::capi::DiplomatWrite write = icu4x::diplomat::WriteTrait::Construct(writeable); auto result = icu4x::capi::icu4x_Locale_get_unicode_extension_mv1(this->AsFFI(), {s.data(), s.size()}, &write); @@ -123,91 +123,91 @@ inline std::optional icu4x::Locale::set_unicode_extension(std::s inline std::string icu4x::Locale::language() const { std::string output; - diplomat::capi::DiplomatWrite write = diplomat::WriteFromString(output); + icu4x::diplomat::capi::DiplomatWrite write = icu4x::diplomat::WriteFromString(output); icu4x::capi::icu4x_Locale_language_mv1(this->AsFFI(), &write); return output; } template inline void icu4x::Locale::language_write(W& writeable) const { - diplomat::capi::DiplomatWrite write = diplomat::WriteTrait::Construct(writeable); + icu4x::diplomat::capi::DiplomatWrite write = icu4x::diplomat::WriteTrait::Construct(writeable); icu4x::capi::icu4x_Locale_language_mv1(this->AsFFI(), &write); } -inline diplomat::result icu4x::Locale::set_language(std::string_view s) { +inline icu4x::diplomat::result icu4x::Locale::set_language(std::string_view s) { auto result = icu4x::capi::icu4x_Locale_set_language_mv1(this->AsFFI(), {s.data(), s.size()}); - return result.is_ok ? diplomat::result(diplomat::Ok()) : diplomat::result(diplomat::Err(icu4x::LocaleParseError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result(icu4x::diplomat::Ok()) : icu4x::diplomat::result(icu4x::diplomat::Err(icu4x::LocaleParseError::FromFFI(result.err))); } inline std::optional icu4x::Locale::region() const { std::string output; - diplomat::capi::DiplomatWrite write = diplomat::WriteFromString(output); + icu4x::diplomat::capi::DiplomatWrite write = icu4x::diplomat::WriteFromString(output); auto result = icu4x::capi::icu4x_Locale_region_mv1(this->AsFFI(), &write); return result.is_ok ? std::optional(std::move(output)) : std::nullopt; } template inline std::optional icu4x::Locale::region_write(W& writeable) const { - diplomat::capi::DiplomatWrite write = diplomat::WriteTrait::Construct(writeable); + icu4x::diplomat::capi::DiplomatWrite write = icu4x::diplomat::WriteTrait::Construct(writeable); auto result = icu4x::capi::icu4x_Locale_region_mv1(this->AsFFI(), &write); return result.is_ok ? std::optional() : std::nullopt; } -inline diplomat::result icu4x::Locale::set_region(std::string_view s) { +inline icu4x::diplomat::result icu4x::Locale::set_region(std::string_view s) { auto result = icu4x::capi::icu4x_Locale_set_region_mv1(this->AsFFI(), {s.data(), s.size()}); - return result.is_ok ? diplomat::result(diplomat::Ok()) : diplomat::result(diplomat::Err(icu4x::LocaleParseError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result(icu4x::diplomat::Ok()) : icu4x::diplomat::result(icu4x::diplomat::Err(icu4x::LocaleParseError::FromFFI(result.err))); } inline std::optional icu4x::Locale::script() const { std::string output; - diplomat::capi::DiplomatWrite write = diplomat::WriteFromString(output); + icu4x::diplomat::capi::DiplomatWrite write = icu4x::diplomat::WriteFromString(output); auto result = icu4x::capi::icu4x_Locale_script_mv1(this->AsFFI(), &write); return result.is_ok ? std::optional(std::move(output)) : std::nullopt; } template inline std::optional icu4x::Locale::script_write(W& writeable) const { - diplomat::capi::DiplomatWrite write = diplomat::WriteTrait::Construct(writeable); + icu4x::diplomat::capi::DiplomatWrite write = icu4x::diplomat::WriteTrait::Construct(writeable); auto result = icu4x::capi::icu4x_Locale_script_mv1(this->AsFFI(), &write); return result.is_ok ? std::optional() : std::nullopt; } -inline diplomat::result icu4x::Locale::set_script(std::string_view s) { +inline icu4x::diplomat::result icu4x::Locale::set_script(std::string_view s) { auto result = icu4x::capi::icu4x_Locale_set_script_mv1(this->AsFFI(), {s.data(), s.size()}); - return result.is_ok ? diplomat::result(diplomat::Ok()) : diplomat::result(diplomat::Err(icu4x::LocaleParseError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result(icu4x::diplomat::Ok()) : icu4x::diplomat::result(icu4x::diplomat::Err(icu4x::LocaleParseError::FromFFI(result.err))); } -inline diplomat::result icu4x::Locale::normalize(std::string_view s) { +inline icu4x::diplomat::result icu4x::Locale::normalize(std::string_view s) { std::string output; - diplomat::capi::DiplomatWrite write = diplomat::WriteFromString(output); + icu4x::diplomat::capi::DiplomatWrite write = icu4x::diplomat::WriteFromString(output); auto result = icu4x::capi::icu4x_Locale_normalize_mv1({s.data(), s.size()}, &write); - return result.is_ok ? diplomat::result(diplomat::Ok(std::move(output))) : diplomat::result(diplomat::Err(icu4x::LocaleParseError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result(icu4x::diplomat::Ok(std::move(output))) : icu4x::diplomat::result(icu4x::diplomat::Err(icu4x::LocaleParseError::FromFFI(result.err))); } template -inline diplomat::result icu4x::Locale::normalize_write(std::string_view s, W& writeable) { - diplomat::capi::DiplomatWrite write = diplomat::WriteTrait::Construct(writeable); +inline icu4x::diplomat::result icu4x::Locale::normalize_write(std::string_view s, W& writeable) { + icu4x::diplomat::capi::DiplomatWrite write = icu4x::diplomat::WriteTrait::Construct(writeable); auto result = icu4x::capi::icu4x_Locale_normalize_mv1({s.data(), s.size()}, &write); - return result.is_ok ? diplomat::result(diplomat::Ok()) : diplomat::result(diplomat::Err(icu4x::LocaleParseError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result(icu4x::diplomat::Ok()) : icu4x::diplomat::result(icu4x::diplomat::Err(icu4x::LocaleParseError::FromFFI(result.err))); } inline std::string icu4x::Locale::to_string() const { std::string output; - diplomat::capi::DiplomatWrite write = diplomat::WriteFromString(output); + icu4x::diplomat::capi::DiplomatWrite write = icu4x::diplomat::WriteFromString(output); icu4x::capi::icu4x_Locale_to_string_mv1(this->AsFFI(), &write); return output; } template inline void icu4x::Locale::to_string_write(W& writeable) const { - diplomat::capi::DiplomatWrite write = diplomat::WriteTrait::Construct(writeable); + icu4x::diplomat::capi::DiplomatWrite write = icu4x::diplomat::WriteTrait::Construct(writeable); icu4x::capi::icu4x_Locale_to_string_mv1(this->AsFFI(), &write); } @@ -274,4 +274,4 @@ inline void icu4x::Locale::operator delete(void* ptr) { } -#endif // icu4x_Locale_HPP +#endif // ICU4X_Locale_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/LocaleCanonicalizer.d.hpp b/ffi/capi/bindings/cpp/icu4x/LocaleCanonicalizer.d.hpp index 34d46b83a11..35af0ebdde1 100644 --- a/ffi/capi/bindings/cpp/icu4x/LocaleCanonicalizer.d.hpp +++ b/ffi/capi/bindings/cpp/icu4x/LocaleCanonicalizer.d.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_LocaleCanonicalizer_D_HPP -#define icu4x_LocaleCanonicalizer_D_HPP +#ifndef ICU4X_LocaleCanonicalizer_D_HPP +#define ICU4X_LocaleCanonicalizer_D_HPP #include #include @@ -9,8 +9,7 @@ #include #include #include -#include "../diplomat_runtime.hpp" - +#include "diplomat_runtime.hpp" namespace icu4x { namespace capi { struct DataProvider; } class DataProvider; @@ -20,7 +19,8 @@ namespace capi { struct LocaleCanonicalizer; } class LocaleCanonicalizer; class DataError; class TransformResult; -} +} // namespace icu4x + namespace icu4x { @@ -39,35 +39,35 @@ class LocaleCanonicalizer { public: /** - * Create a new {@link LocaleCanonicalizer} using compiled data. - * - * See the [Rust documentation for `new_common`](https://docs.rs/icu/2.0.0/icu/locale/struct.LocaleCanonicalizer.html#method.new_common) for more information. + * Create a new {@link LocaleCanonicalizer} using compiled data. + * + * See the [Rust documentation for `new_common`](https://docs.rs/icu/2.0.0/icu/locale/struct.LocaleCanonicalizer.html#method.new_common) for more information. */ inline static std::unique_ptr create_common(); /** - * Create a new {@link LocaleCanonicalizer}. - * - * See the [Rust documentation for `new_common`](https://docs.rs/icu/2.0.0/icu/locale/struct.LocaleCanonicalizer.html#method.new_common) for more information. + * Create a new {@link LocaleCanonicalizer}. + * + * See the [Rust documentation for `new_common`](https://docs.rs/icu/2.0.0/icu/locale/struct.LocaleCanonicalizer.html#method.new_common) for more information. */ - inline static diplomat::result, icu4x::DataError> create_common_with_provider(const icu4x::DataProvider& provider); + inline static icu4x::diplomat::result, icu4x::DataError> create_common_with_provider(const icu4x::DataProvider& provider); /** - * Create a new {@link LocaleCanonicalizer} with extended data using compiled data. - * - * See the [Rust documentation for `new_extended`](https://docs.rs/icu/2.0.0/icu/locale/struct.LocaleCanonicalizer.html#method.new_extended) for more information. + * Create a new {@link LocaleCanonicalizer} with extended data using compiled data. + * + * See the [Rust documentation for `new_extended`](https://docs.rs/icu/2.0.0/icu/locale/struct.LocaleCanonicalizer.html#method.new_extended) for more information. */ inline static std::unique_ptr create_extended(); /** - * Create a new {@link LocaleCanonicalizer} with extended data. - * - * See the [Rust documentation for `new_extended`](https://docs.rs/icu/2.0.0/icu/locale/struct.LocaleCanonicalizer.html#method.new_extended) for more information. + * Create a new {@link LocaleCanonicalizer} with extended data. + * + * See the [Rust documentation for `new_extended`](https://docs.rs/icu/2.0.0/icu/locale/struct.LocaleCanonicalizer.html#method.new_extended) for more information. */ - inline static diplomat::result, icu4x::DataError> create_extended_with_provider(const icu4x::DataProvider& provider); + inline static icu4x::diplomat::result, icu4x::DataError> create_extended_with_provider(const icu4x::DataProvider& provider); /** - * See the [Rust documentation for `canonicalize`](https://docs.rs/icu/2.0.0/icu/locale/struct.LocaleCanonicalizer.html#method.canonicalize) for more information. + * See the [Rust documentation for `canonicalize`](https://docs.rs/icu/2.0.0/icu/locale/struct.LocaleCanonicalizer.html#method.canonicalize) for more information. */ inline icu4x::TransformResult canonicalize(icu4x::Locale& locale) const; @@ -86,4 +86,4 @@ class LocaleCanonicalizer { }; } // namespace -#endif // icu4x_LocaleCanonicalizer_D_HPP +#endif // ICU4X_LocaleCanonicalizer_D_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/LocaleCanonicalizer.hpp b/ffi/capi/bindings/cpp/icu4x/LocaleCanonicalizer.hpp index d009a3abdc5..e645f2b29f0 100644 --- a/ffi/capi/bindings/cpp/icu4x/LocaleCanonicalizer.hpp +++ b/ffi/capi/bindings/cpp/icu4x/LocaleCanonicalizer.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_LocaleCanonicalizer_HPP -#define icu4x_LocaleCanonicalizer_HPP +#ifndef ICU4X_LocaleCanonicalizer_HPP +#define ICU4X_LocaleCanonicalizer_HPP #include "LocaleCanonicalizer.d.hpp" @@ -11,11 +11,11 @@ #include #include #include -#include "../diplomat_runtime.hpp" #include "DataError.hpp" #include "DataProvider.hpp" #include "Locale.hpp" #include "TransformResult.hpp" +#include "diplomat_runtime.hpp" namespace icu4x { @@ -45,9 +45,9 @@ inline std::unique_ptr icu4x::LocaleCanonicalizer::c return std::unique_ptr(icu4x::LocaleCanonicalizer::FromFFI(result)); } -inline diplomat::result, icu4x::DataError> icu4x::LocaleCanonicalizer::create_common_with_provider(const icu4x::DataProvider& provider) { +inline icu4x::diplomat::result, icu4x::DataError> icu4x::LocaleCanonicalizer::create_common_with_provider(const icu4x::DataProvider& provider) { auto result = icu4x::capi::icu4x_LocaleCanonicalizer_create_common_with_provider_mv1(provider.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DataError>(diplomat::Ok>(std::unique_ptr(icu4x::LocaleCanonicalizer::FromFFI(result.ok)))) : diplomat::result, icu4x::DataError>(diplomat::Err(icu4x::DataError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::LocaleCanonicalizer::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Err(icu4x::DataError::FromFFI(result.err))); } inline std::unique_ptr icu4x::LocaleCanonicalizer::create_extended() { @@ -55,9 +55,9 @@ inline std::unique_ptr icu4x::LocaleCanonicalizer::c return std::unique_ptr(icu4x::LocaleCanonicalizer::FromFFI(result)); } -inline diplomat::result, icu4x::DataError> icu4x::LocaleCanonicalizer::create_extended_with_provider(const icu4x::DataProvider& provider) { +inline icu4x::diplomat::result, icu4x::DataError> icu4x::LocaleCanonicalizer::create_extended_with_provider(const icu4x::DataProvider& provider) { auto result = icu4x::capi::icu4x_LocaleCanonicalizer_create_extended_with_provider_mv1(provider.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DataError>(diplomat::Ok>(std::unique_ptr(icu4x::LocaleCanonicalizer::FromFFI(result.ok)))) : diplomat::result, icu4x::DataError>(diplomat::Err(icu4x::DataError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::LocaleCanonicalizer::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Err(icu4x::DataError::FromFFI(result.err))); } inline icu4x::TransformResult icu4x::LocaleCanonicalizer::canonicalize(icu4x::Locale& locale) const { @@ -87,4 +87,4 @@ inline void icu4x::LocaleCanonicalizer::operator delete(void* ptr) { } -#endif // icu4x_LocaleCanonicalizer_HPP +#endif // ICU4X_LocaleCanonicalizer_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/LocaleDirection.d.hpp b/ffi/capi/bindings/cpp/icu4x/LocaleDirection.d.hpp index 468b6f868bb..83b6e7e5d05 100644 --- a/ffi/capi/bindings/cpp/icu4x/LocaleDirection.d.hpp +++ b/ffi/capi/bindings/cpp/icu4x/LocaleDirection.d.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_LocaleDirection_D_HPP -#define icu4x_LocaleDirection_D_HPP +#ifndef ICU4X_LocaleDirection_D_HPP +#define ICU4X_LocaleDirection_D_HPP #include #include @@ -9,7 +9,7 @@ #include #include #include -#include "../diplomat_runtime.hpp" +#include "diplomat_runtime.hpp" namespace icu4x { @@ -51,4 +51,4 @@ class LocaleDirection { }; } // namespace -#endif // icu4x_LocaleDirection_D_HPP +#endif // ICU4X_LocaleDirection_D_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/LocaleDirection.hpp b/ffi/capi/bindings/cpp/icu4x/LocaleDirection.hpp index 9aacc10be13..aca75393797 100644 --- a/ffi/capi/bindings/cpp/icu4x/LocaleDirection.hpp +++ b/ffi/capi/bindings/cpp/icu4x/LocaleDirection.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_LocaleDirection_HPP -#define icu4x_LocaleDirection_HPP +#ifndef ICU4X_LocaleDirection_HPP +#define ICU4X_LocaleDirection_HPP #include "LocaleDirection.d.hpp" @@ -11,7 +11,7 @@ #include #include #include -#include "../diplomat_runtime.hpp" +#include "diplomat_runtime.hpp" namespace icu4x { @@ -36,4 +36,4 @@ inline icu4x::LocaleDirection icu4x::LocaleDirection::FromFFI(icu4x::capi::Local std::abort(); } } -#endif // icu4x_LocaleDirection_HPP +#endif // ICU4X_LocaleDirection_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/LocaleDirectionality.d.hpp b/ffi/capi/bindings/cpp/icu4x/LocaleDirectionality.d.hpp index b6d0d352a76..851c680706a 100644 --- a/ffi/capi/bindings/cpp/icu4x/LocaleDirectionality.d.hpp +++ b/ffi/capi/bindings/cpp/icu4x/LocaleDirectionality.d.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_LocaleDirectionality_D_HPP -#define icu4x_LocaleDirectionality_D_HPP +#ifndef ICU4X_LocaleDirectionality_D_HPP +#define ICU4X_LocaleDirectionality_D_HPP #include #include @@ -9,8 +9,7 @@ #include #include #include -#include "../diplomat_runtime.hpp" - +#include "diplomat_runtime.hpp" namespace icu4x { namespace capi { struct DataProvider; } class DataProvider; @@ -20,7 +19,8 @@ namespace capi { struct LocaleDirectionality; } class LocaleDirectionality; class DataError; class LocaleDirection; -} +} // namespace icu4x + namespace icu4x { @@ -37,45 +37,45 @@ class LocaleDirectionality { public: /** - * Construct a new LocaleDirectionality instance using compiled data. - * - * See the [Rust documentation for `new_common`](https://docs.rs/icu/2.0.0/icu/locale/struct.LocaleDirectionality.html#method.new_common) for more information. + * Construct a new LocaleDirectionality instance using compiled data. + * + * See the [Rust documentation for `new_common`](https://docs.rs/icu/2.0.0/icu/locale/struct.LocaleDirectionality.html#method.new_common) for more information. */ inline static std::unique_ptr create_common(); /** - * Construct a new LocaleDirectionality instance using a particular data source. - * - * See the [Rust documentation for `new_common`](https://docs.rs/icu/2.0.0/icu/locale/struct.LocaleDirectionality.html#method.new_common) for more information. + * Construct a new LocaleDirectionality instance using a particular data source. + * + * See the [Rust documentation for `new_common`](https://docs.rs/icu/2.0.0/icu/locale/struct.LocaleDirectionality.html#method.new_common) for more information. */ - inline static diplomat::result, icu4x::DataError> create_common_with_provider(const icu4x::DataProvider& provider); + inline static icu4x::diplomat::result, icu4x::DataError> create_common_with_provider(const icu4x::DataProvider& provider); /** - * Construct a new LocaleDirectionality instance using compiled data. - * - * See the [Rust documentation for `new_extended`](https://docs.rs/icu/2.0.0/icu/locale/struct.LocaleDirectionality.html#method.new_extended) for more information. + * Construct a new LocaleDirectionality instance using compiled data. + * + * See the [Rust documentation for `new_extended`](https://docs.rs/icu/2.0.0/icu/locale/struct.LocaleDirectionality.html#method.new_extended) for more information. */ inline static std::unique_ptr create_extended(); /** - * Construct a new LocaleDirectionality instance using a particular data source. - * - * See the [Rust documentation for `new_extended`](https://docs.rs/icu/2.0.0/icu/locale/struct.LocaleDirectionality.html#method.new_extended) for more information. + * Construct a new LocaleDirectionality instance using a particular data source. + * + * See the [Rust documentation for `new_extended`](https://docs.rs/icu/2.0.0/icu/locale/struct.LocaleDirectionality.html#method.new_extended) for more information. */ - inline static diplomat::result, icu4x::DataError> create_extended_with_provider(const icu4x::DataProvider& provider); + inline static icu4x::diplomat::result, icu4x::DataError> create_extended_with_provider(const icu4x::DataProvider& provider); /** - * See the [Rust documentation for `get`](https://docs.rs/icu/2.0.0/icu/locale/struct.LocaleDirectionality.html#method.get) for more information. + * See the [Rust documentation for `get`](https://docs.rs/icu/2.0.0/icu/locale/struct.LocaleDirectionality.html#method.get) for more information. */ inline icu4x::LocaleDirection operator[](const icu4x::Locale& locale) const; /** - * See the [Rust documentation for `is_left_to_right`](https://docs.rs/icu/2.0.0/icu/locale/struct.LocaleDirectionality.html#method.is_left_to_right) for more information. + * See the [Rust documentation for `is_left_to_right`](https://docs.rs/icu/2.0.0/icu/locale/struct.LocaleDirectionality.html#method.is_left_to_right) for more information. */ inline bool is_left_to_right(const icu4x::Locale& locale) const; /** - * See the [Rust documentation for `is_right_to_left`](https://docs.rs/icu/2.0.0/icu/locale/struct.LocaleDirectionality.html#method.is_right_to_left) for more information. + * See the [Rust documentation for `is_right_to_left`](https://docs.rs/icu/2.0.0/icu/locale/struct.LocaleDirectionality.html#method.is_right_to_left) for more information. */ inline bool is_right_to_left(const icu4x::Locale& locale) const; @@ -94,4 +94,4 @@ class LocaleDirectionality { }; } // namespace -#endif // icu4x_LocaleDirectionality_D_HPP +#endif // ICU4X_LocaleDirectionality_D_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/LocaleDirectionality.hpp b/ffi/capi/bindings/cpp/icu4x/LocaleDirectionality.hpp index 8f432164e68..5c31e7385f2 100644 --- a/ffi/capi/bindings/cpp/icu4x/LocaleDirectionality.hpp +++ b/ffi/capi/bindings/cpp/icu4x/LocaleDirectionality.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_LocaleDirectionality_HPP -#define icu4x_LocaleDirectionality_HPP +#ifndef ICU4X_LocaleDirectionality_HPP +#define ICU4X_LocaleDirectionality_HPP #include "LocaleDirectionality.d.hpp" @@ -11,11 +11,11 @@ #include #include #include -#include "../diplomat_runtime.hpp" #include "DataError.hpp" #include "DataProvider.hpp" #include "Locale.hpp" #include "LocaleDirection.hpp" +#include "diplomat_runtime.hpp" namespace icu4x { @@ -49,9 +49,9 @@ inline std::unique_ptr icu4x::LocaleDirectionality: return std::unique_ptr(icu4x::LocaleDirectionality::FromFFI(result)); } -inline diplomat::result, icu4x::DataError> icu4x::LocaleDirectionality::create_common_with_provider(const icu4x::DataProvider& provider) { +inline icu4x::diplomat::result, icu4x::DataError> icu4x::LocaleDirectionality::create_common_with_provider(const icu4x::DataProvider& provider) { auto result = icu4x::capi::icu4x_LocaleDirectionality_create_common_with_provider_mv1(provider.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DataError>(diplomat::Ok>(std::unique_ptr(icu4x::LocaleDirectionality::FromFFI(result.ok)))) : diplomat::result, icu4x::DataError>(diplomat::Err(icu4x::DataError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::LocaleDirectionality::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Err(icu4x::DataError::FromFFI(result.err))); } inline std::unique_ptr icu4x::LocaleDirectionality::create_extended() { @@ -59,9 +59,9 @@ inline std::unique_ptr icu4x::LocaleDirectionality: return std::unique_ptr(icu4x::LocaleDirectionality::FromFFI(result)); } -inline diplomat::result, icu4x::DataError> icu4x::LocaleDirectionality::create_extended_with_provider(const icu4x::DataProvider& provider) { +inline icu4x::diplomat::result, icu4x::DataError> icu4x::LocaleDirectionality::create_extended_with_provider(const icu4x::DataProvider& provider) { auto result = icu4x::capi::icu4x_LocaleDirectionality_create_extended_with_provider_mv1(provider.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DataError>(diplomat::Ok>(std::unique_ptr(icu4x::LocaleDirectionality::FromFFI(result.ok)))) : diplomat::result, icu4x::DataError>(diplomat::Err(icu4x::DataError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::LocaleDirectionality::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Err(icu4x::DataError::FromFFI(result.err))); } inline icu4x::LocaleDirection icu4x::LocaleDirectionality::operator[](const icu4x::Locale& locale) const { @@ -103,4 +103,4 @@ inline void icu4x::LocaleDirectionality::operator delete(void* ptr) { } -#endif // icu4x_LocaleDirectionality_HPP +#endif // ICU4X_LocaleDirectionality_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/LocaleDisplayNamesFormatter.d.hpp b/ffi/capi/bindings/cpp/icu4x/LocaleDisplayNamesFormatter.d.hpp index 0dfefc97d8d..511eeddb5b6 100644 --- a/ffi/capi/bindings/cpp/icu4x/LocaleDisplayNamesFormatter.d.hpp +++ b/ffi/capi/bindings/cpp/icu4x/LocaleDisplayNamesFormatter.d.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_LocaleDisplayNamesFormatter_D_HPP -#define icu4x_LocaleDisplayNamesFormatter_D_HPP +#ifndef ICU4X_LocaleDisplayNamesFormatter_D_HPP +#define ICU4X_LocaleDisplayNamesFormatter_D_HPP #include #include @@ -9,8 +9,7 @@ #include #include #include -#include "../diplomat_runtime.hpp" - +#include "diplomat_runtime.hpp" namespace icu4x { namespace capi { struct DataProvider; } class DataProvider; @@ -20,7 +19,8 @@ namespace capi { struct LocaleDisplayNamesFormatter; } class LocaleDisplayNamesFormatter; struct DisplayNamesOptionsV1; class DataError; -} +} // namespace icu4x + namespace icu4x { @@ -39,31 +39,31 @@ class LocaleDisplayNamesFormatter { public: /** - * 🚧 This API is experimental and may experience breaking changes outside major releases. - * - * Creates a new `LocaleDisplayNamesFormatter` from locale data and an options bag using compiled data. - * - * See the [Rust documentation for `try_new`](https://docs.rs/icu/2.0.0/icu/experimental/displaynames/struct.LocaleDisplayNamesFormatter.html#method.try_new) for more information. + * 🚧 This API is experimental and may experience breaking changes outside major releases. + * + * Creates a new `LocaleDisplayNamesFormatter` from locale data and an options bag using compiled data. + * + * See the [Rust documentation for `try_new`](https://docs.rs/icu/2.0.0/icu/experimental/displaynames/struct.LocaleDisplayNamesFormatter.html#method.try_new) for more information. */ - inline static diplomat::result, icu4x::DataError> create_v1(const icu4x::Locale& locale, icu4x::DisplayNamesOptionsV1 options); + inline static icu4x::diplomat::result, icu4x::DataError> create_v1(const icu4x::Locale& locale, icu4x::DisplayNamesOptionsV1 options); /** - * 🚧 This API is experimental and may experience breaking changes outside major releases. - * - * Creates a new `LocaleDisplayNamesFormatter` from locale data and an options bag using a particular data source. - * - * See the [Rust documentation for `try_new`](https://docs.rs/icu/2.0.0/icu/experimental/displaynames/struct.LocaleDisplayNamesFormatter.html#method.try_new) for more information. + * 🚧 This API is experimental and may experience breaking changes outside major releases. + * + * Creates a new `LocaleDisplayNamesFormatter` from locale data and an options bag using a particular data source. + * + * See the [Rust documentation for `try_new`](https://docs.rs/icu/2.0.0/icu/experimental/displaynames/struct.LocaleDisplayNamesFormatter.html#method.try_new) for more information. */ - inline static diplomat::result, icu4x::DataError> create_v1_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, icu4x::DisplayNamesOptionsV1 options); + inline static icu4x::diplomat::result, icu4x::DataError> create_v1_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, icu4x::DisplayNamesOptionsV1 options); /** - * 🚧 This API is experimental and may experience breaking changes outside major releases. - * - * Returns the locale-specific display name of a locale. - * 🚧 This API is experimental and may experience breaking changes outside major releases. - * - * - * See the [Rust documentation for `of`](https://docs.rs/icu/2.0.0/icu/experimental/displaynames/struct.LocaleDisplayNamesFormatter.html#method.of) for more information. + * 🚧 This API is experimental and may experience breaking changes outside major releases. + * + * Returns the locale-specific display name of a locale. + * 🚧 This API is experimental and may experience breaking changes outside major releases. + * + * + * See the [Rust documentation for `of`](https://docs.rs/icu/2.0.0/icu/experimental/displaynames/struct.LocaleDisplayNamesFormatter.html#method.of) for more information. */ inline std::string of(const icu4x::Locale& locale) const; template @@ -84,4 +84,4 @@ class LocaleDisplayNamesFormatter { }; } // namespace -#endif // icu4x_LocaleDisplayNamesFormatter_D_HPP +#endif // ICU4X_LocaleDisplayNamesFormatter_D_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/LocaleDisplayNamesFormatter.hpp b/ffi/capi/bindings/cpp/icu4x/LocaleDisplayNamesFormatter.hpp index 7749c20a2cc..5f80f37fd1e 100644 --- a/ffi/capi/bindings/cpp/icu4x/LocaleDisplayNamesFormatter.hpp +++ b/ffi/capi/bindings/cpp/icu4x/LocaleDisplayNamesFormatter.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_LocaleDisplayNamesFormatter_HPP -#define icu4x_LocaleDisplayNamesFormatter_HPP +#ifndef ICU4X_LocaleDisplayNamesFormatter_HPP +#define ICU4X_LocaleDisplayNamesFormatter_HPP #include "LocaleDisplayNamesFormatter.d.hpp" @@ -11,11 +11,11 @@ #include #include #include -#include "../diplomat_runtime.hpp" #include "DataError.hpp" #include "DataProvider.hpp" #include "DisplayNamesOptionsV1.hpp" #include "Locale.hpp" +#include "diplomat_runtime.hpp" namespace icu4x { @@ -28,7 +28,7 @@ namespace capi { typedef struct icu4x_LocaleDisplayNamesFormatter_create_v1_with_provider_mv1_result {union {icu4x::capi::LocaleDisplayNamesFormatter* ok; icu4x::capi::DataError err;}; bool is_ok;} icu4x_LocaleDisplayNamesFormatter_create_v1_with_provider_mv1_result; icu4x_LocaleDisplayNamesFormatter_create_v1_with_provider_mv1_result icu4x_LocaleDisplayNamesFormatter_create_v1_with_provider_mv1(const icu4x::capi::DataProvider* provider, const icu4x::capi::Locale* locale, icu4x::capi::DisplayNamesOptionsV1 options); - void icu4x_LocaleDisplayNamesFormatter_of_mv1(const icu4x::capi::LocaleDisplayNamesFormatter* self, const icu4x::capi::Locale* locale, diplomat::capi::DiplomatWrite* write); + void icu4x_LocaleDisplayNamesFormatter_of_mv1(const icu4x::capi::LocaleDisplayNamesFormatter* self, const icu4x::capi::Locale* locale, icu4x::diplomat::capi::DiplomatWrite* write); void icu4x_LocaleDisplayNamesFormatter_destroy_mv1(LocaleDisplayNamesFormatter* self); @@ -36,22 +36,22 @@ namespace capi { } // namespace capi } // namespace -inline diplomat::result, icu4x::DataError> icu4x::LocaleDisplayNamesFormatter::create_v1(const icu4x::Locale& locale, icu4x::DisplayNamesOptionsV1 options) { +inline icu4x::diplomat::result, icu4x::DataError> icu4x::LocaleDisplayNamesFormatter::create_v1(const icu4x::Locale& locale, icu4x::DisplayNamesOptionsV1 options) { auto result = icu4x::capi::icu4x_LocaleDisplayNamesFormatter_create_v1_mv1(locale.AsFFI(), options.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DataError>(diplomat::Ok>(std::unique_ptr(icu4x::LocaleDisplayNamesFormatter::FromFFI(result.ok)))) : diplomat::result, icu4x::DataError>(diplomat::Err(icu4x::DataError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::LocaleDisplayNamesFormatter::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Err(icu4x::DataError::FromFFI(result.err))); } -inline diplomat::result, icu4x::DataError> icu4x::LocaleDisplayNamesFormatter::create_v1_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, icu4x::DisplayNamesOptionsV1 options) { +inline icu4x::diplomat::result, icu4x::DataError> icu4x::LocaleDisplayNamesFormatter::create_v1_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, icu4x::DisplayNamesOptionsV1 options) { auto result = icu4x::capi::icu4x_LocaleDisplayNamesFormatter_create_v1_with_provider_mv1(provider.AsFFI(), locale.AsFFI(), options.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DataError>(diplomat::Ok>(std::unique_ptr(icu4x::LocaleDisplayNamesFormatter::FromFFI(result.ok)))) : diplomat::result, icu4x::DataError>(diplomat::Err(icu4x::DataError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::LocaleDisplayNamesFormatter::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Err(icu4x::DataError::FromFFI(result.err))); } inline std::string icu4x::LocaleDisplayNamesFormatter::of(const icu4x::Locale& locale) const { std::string output; - diplomat::capi::DiplomatWrite write = diplomat::WriteFromString(output); + icu4x::diplomat::capi::DiplomatWrite write = icu4x::diplomat::WriteFromString(output); icu4x::capi::icu4x_LocaleDisplayNamesFormatter_of_mv1(this->AsFFI(), locale.AsFFI(), &write); @@ -59,7 +59,7 @@ inline std::string icu4x::LocaleDisplayNamesFormatter::of(const icu4x::Locale& l } template inline void icu4x::LocaleDisplayNamesFormatter::of_write(const icu4x::Locale& locale, W& writeable) const { - diplomat::capi::DiplomatWrite write = diplomat::WriteTrait::Construct(writeable); + icu4x::diplomat::capi::DiplomatWrite write = icu4x::diplomat::WriteTrait::Construct(writeable); icu4x::capi::icu4x_LocaleDisplayNamesFormatter_of_mv1(this->AsFFI(), locale.AsFFI(), &write); @@ -86,4 +86,4 @@ inline void icu4x::LocaleDisplayNamesFormatter::operator delete(void* ptr) { } -#endif // icu4x_LocaleDisplayNamesFormatter_HPP +#endif // ICU4X_LocaleDisplayNamesFormatter_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/LocaleExpander.d.hpp b/ffi/capi/bindings/cpp/icu4x/LocaleExpander.d.hpp index 2e59881414d..99fe3b5cd0f 100644 --- a/ffi/capi/bindings/cpp/icu4x/LocaleExpander.d.hpp +++ b/ffi/capi/bindings/cpp/icu4x/LocaleExpander.d.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_LocaleExpander_D_HPP -#define icu4x_LocaleExpander_D_HPP +#ifndef ICU4X_LocaleExpander_D_HPP +#define ICU4X_LocaleExpander_D_HPP #include #include @@ -9,8 +9,7 @@ #include #include #include -#include "../diplomat_runtime.hpp" - +#include "diplomat_runtime.hpp" namespace icu4x { namespace capi { struct DataProvider; } class DataProvider; @@ -20,7 +19,8 @@ namespace capi { struct LocaleExpander; } class LocaleExpander; class DataError; class TransformResult; -} +} // namespace icu4x + namespace icu4x { @@ -39,45 +39,45 @@ class LocaleExpander { public: /** - * Create a new {@link LocaleExpander} using compiled data. - * - * See the [Rust documentation for `new_common`](https://docs.rs/icu/2.0.0/icu/locale/struct.LocaleExpander.html#method.new_common) for more information. + * Create a new {@link LocaleExpander} using compiled data. + * + * See the [Rust documentation for `new_common`](https://docs.rs/icu/2.0.0/icu/locale/struct.LocaleExpander.html#method.new_common) for more information. */ inline static std::unique_ptr create_common(); /** - * Create a new {@link LocaleExpander} using a new_common data source. - * - * See the [Rust documentation for `new_common`](https://docs.rs/icu/2.0.0/icu/locale/struct.LocaleExpander.html#method.new_common) for more information. + * Create a new {@link LocaleExpander} using a new_common data source. + * + * See the [Rust documentation for `new_common`](https://docs.rs/icu/2.0.0/icu/locale/struct.LocaleExpander.html#method.new_common) for more information. */ - inline static diplomat::result, icu4x::DataError> create_common_with_provider(const icu4x::DataProvider& provider); + inline static icu4x::diplomat::result, icu4x::DataError> create_common_with_provider(const icu4x::DataProvider& provider); /** - * Create a new {@link LocaleExpander} with extended data using compiled data. - * - * See the [Rust documentation for `new_extended`](https://docs.rs/icu/2.0.0/icu/locale/struct.LocaleExpander.html#method.new_extended) for more information. + * Create a new {@link LocaleExpander} with extended data using compiled data. + * + * See the [Rust documentation for `new_extended`](https://docs.rs/icu/2.0.0/icu/locale/struct.LocaleExpander.html#method.new_extended) for more information. */ inline static std::unique_ptr create_extended(); /** - * Create a new {@link LocaleExpander} with extended data using a particular data source. - * - * See the [Rust documentation for `new_extended`](https://docs.rs/icu/2.0.0/icu/locale/struct.LocaleExpander.html#method.new_extended) for more information. + * Create a new {@link LocaleExpander} with extended data using a particular data source. + * + * See the [Rust documentation for `new_extended`](https://docs.rs/icu/2.0.0/icu/locale/struct.LocaleExpander.html#method.new_extended) for more information. */ - inline static diplomat::result, icu4x::DataError> create_extended_with_provider(const icu4x::DataProvider& provider); + inline static icu4x::diplomat::result, icu4x::DataError> create_extended_with_provider(const icu4x::DataProvider& provider); /** - * See the [Rust documentation for `maximize`](https://docs.rs/icu/2.0.0/icu/locale/struct.LocaleExpander.html#method.maximize) for more information. + * See the [Rust documentation for `maximize`](https://docs.rs/icu/2.0.0/icu/locale/struct.LocaleExpander.html#method.maximize) for more information. */ inline icu4x::TransformResult maximize(icu4x::Locale& locale) const; /** - * See the [Rust documentation for `minimize`](https://docs.rs/icu/2.0.0/icu/locale/struct.LocaleExpander.html#method.minimize) for more information. + * See the [Rust documentation for `minimize`](https://docs.rs/icu/2.0.0/icu/locale/struct.LocaleExpander.html#method.minimize) for more information. */ inline icu4x::TransformResult minimize(icu4x::Locale& locale) const; /** - * See the [Rust documentation for `minimize_favor_script`](https://docs.rs/icu/2.0.0/icu/locale/struct.LocaleExpander.html#method.minimize_favor_script) for more information. + * See the [Rust documentation for `minimize_favor_script`](https://docs.rs/icu/2.0.0/icu/locale/struct.LocaleExpander.html#method.minimize_favor_script) for more information. */ inline icu4x::TransformResult minimize_favor_script(icu4x::Locale& locale) const; @@ -96,4 +96,4 @@ class LocaleExpander { }; } // namespace -#endif // icu4x_LocaleExpander_D_HPP +#endif // ICU4X_LocaleExpander_D_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/LocaleExpander.hpp b/ffi/capi/bindings/cpp/icu4x/LocaleExpander.hpp index a8495aaa0da..a36b872d3b0 100644 --- a/ffi/capi/bindings/cpp/icu4x/LocaleExpander.hpp +++ b/ffi/capi/bindings/cpp/icu4x/LocaleExpander.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_LocaleExpander_HPP -#define icu4x_LocaleExpander_HPP +#ifndef ICU4X_LocaleExpander_HPP +#define ICU4X_LocaleExpander_HPP #include "LocaleExpander.d.hpp" @@ -11,11 +11,11 @@ #include #include #include -#include "../diplomat_runtime.hpp" #include "DataError.hpp" #include "DataProvider.hpp" #include "Locale.hpp" #include "TransformResult.hpp" +#include "diplomat_runtime.hpp" namespace icu4x { @@ -49,9 +49,9 @@ inline std::unique_ptr icu4x::LocaleExpander::create_comm return std::unique_ptr(icu4x::LocaleExpander::FromFFI(result)); } -inline diplomat::result, icu4x::DataError> icu4x::LocaleExpander::create_common_with_provider(const icu4x::DataProvider& provider) { +inline icu4x::diplomat::result, icu4x::DataError> icu4x::LocaleExpander::create_common_with_provider(const icu4x::DataProvider& provider) { auto result = icu4x::capi::icu4x_LocaleExpander_create_common_with_provider_mv1(provider.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DataError>(diplomat::Ok>(std::unique_ptr(icu4x::LocaleExpander::FromFFI(result.ok)))) : diplomat::result, icu4x::DataError>(diplomat::Err(icu4x::DataError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::LocaleExpander::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Err(icu4x::DataError::FromFFI(result.err))); } inline std::unique_ptr icu4x::LocaleExpander::create_extended() { @@ -59,9 +59,9 @@ inline std::unique_ptr icu4x::LocaleExpander::create_exte return std::unique_ptr(icu4x::LocaleExpander::FromFFI(result)); } -inline diplomat::result, icu4x::DataError> icu4x::LocaleExpander::create_extended_with_provider(const icu4x::DataProvider& provider) { +inline icu4x::diplomat::result, icu4x::DataError> icu4x::LocaleExpander::create_extended_with_provider(const icu4x::DataProvider& provider) { auto result = icu4x::capi::icu4x_LocaleExpander_create_extended_with_provider_mv1(provider.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DataError>(diplomat::Ok>(std::unique_ptr(icu4x::LocaleExpander::FromFFI(result.ok)))) : diplomat::result, icu4x::DataError>(diplomat::Err(icu4x::DataError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::LocaleExpander::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Err(icu4x::DataError::FromFFI(result.err))); } inline icu4x::TransformResult icu4x::LocaleExpander::maximize(icu4x::Locale& locale) const { @@ -103,4 +103,4 @@ inline void icu4x::LocaleExpander::operator delete(void* ptr) { } -#endif // icu4x_LocaleExpander_HPP +#endif // ICU4X_LocaleExpander_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/LocaleFallbackConfig.d.hpp b/ffi/capi/bindings/cpp/icu4x/LocaleFallbackConfig.d.hpp index 64e82422db3..f80c9a95e70 100644 --- a/ffi/capi/bindings/cpp/icu4x/LocaleFallbackConfig.d.hpp +++ b/ffi/capi/bindings/cpp/icu4x/LocaleFallbackConfig.d.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_LocaleFallbackConfig_D_HPP -#define icu4x_LocaleFallbackConfig_D_HPP +#ifndef ICU4X_LocaleFallbackConfig_D_HPP +#define ICU4X_LocaleFallbackConfig_D_HPP #include #include @@ -9,12 +9,12 @@ #include #include #include -#include "../diplomat_runtime.hpp" #include "LocaleFallbackPriority.d.hpp" - +#include "diplomat_runtime.hpp" namespace icu4x { class LocaleFallbackPriority; -} +} // namespace icu4x + namespace icu4x { @@ -42,4 +42,4 @@ struct LocaleFallbackConfig { }; } // namespace -#endif // icu4x_LocaleFallbackConfig_D_HPP +#endif // ICU4X_LocaleFallbackConfig_D_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/LocaleFallbackConfig.hpp b/ffi/capi/bindings/cpp/icu4x/LocaleFallbackConfig.hpp index c0de97324f5..100a1586fd6 100644 --- a/ffi/capi/bindings/cpp/icu4x/LocaleFallbackConfig.hpp +++ b/ffi/capi/bindings/cpp/icu4x/LocaleFallbackConfig.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_LocaleFallbackConfig_HPP -#define icu4x_LocaleFallbackConfig_HPP +#ifndef ICU4X_LocaleFallbackConfig_HPP +#define ICU4X_LocaleFallbackConfig_HPP #include "LocaleFallbackConfig.d.hpp" @@ -11,8 +11,8 @@ #include #include #include -#include "../diplomat_runtime.hpp" #include "LocaleFallbackPriority.hpp" +#include "diplomat_runtime.hpp" namespace icu4x { @@ -37,4 +37,4 @@ inline icu4x::LocaleFallbackConfig icu4x::LocaleFallbackConfig::FromFFI(icu4x::c } -#endif // icu4x_LocaleFallbackConfig_HPP +#endif // ICU4X_LocaleFallbackConfig_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/LocaleFallbackIterator.d.hpp b/ffi/capi/bindings/cpp/icu4x/LocaleFallbackIterator.d.hpp index 81c7d9d9293..7cc4bb43472 100644 --- a/ffi/capi/bindings/cpp/icu4x/LocaleFallbackIterator.d.hpp +++ b/ffi/capi/bindings/cpp/icu4x/LocaleFallbackIterator.d.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_LocaleFallbackIterator_D_HPP -#define icu4x_LocaleFallbackIterator_D_HPP +#ifndef ICU4X_LocaleFallbackIterator_D_HPP +#define ICU4X_LocaleFallbackIterator_D_HPP #include #include @@ -9,12 +9,12 @@ #include #include #include -#include "../diplomat_runtime.hpp" - +#include "diplomat_runtime.hpp" namespace icu4x { namespace capi { struct Locale; } class Locale; -} +} // namespace icu4x + namespace icu4x { @@ -49,4 +49,4 @@ class LocaleFallbackIterator { }; } // namespace -#endif // icu4x_LocaleFallbackIterator_D_HPP +#endif // ICU4X_LocaleFallbackIterator_D_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/LocaleFallbackIterator.hpp b/ffi/capi/bindings/cpp/icu4x/LocaleFallbackIterator.hpp index 66444565dd1..35ef10555e6 100644 --- a/ffi/capi/bindings/cpp/icu4x/LocaleFallbackIterator.hpp +++ b/ffi/capi/bindings/cpp/icu4x/LocaleFallbackIterator.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_LocaleFallbackIterator_HPP -#define icu4x_LocaleFallbackIterator_HPP +#ifndef ICU4X_LocaleFallbackIterator_HPP +#define ICU4X_LocaleFallbackIterator_HPP #include "LocaleFallbackIterator.d.hpp" @@ -11,8 +11,8 @@ #include #include #include -#include "../diplomat_runtime.hpp" #include "Locale.hpp" +#include "diplomat_runtime.hpp" namespace icu4x { @@ -53,4 +53,4 @@ inline void icu4x::LocaleFallbackIterator::operator delete(void* ptr) { } -#endif // icu4x_LocaleFallbackIterator_HPP +#endif // ICU4X_LocaleFallbackIterator_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/LocaleFallbackPriority.d.hpp b/ffi/capi/bindings/cpp/icu4x/LocaleFallbackPriority.d.hpp index c46b372025d..19cd328d3e1 100644 --- a/ffi/capi/bindings/cpp/icu4x/LocaleFallbackPriority.d.hpp +++ b/ffi/capi/bindings/cpp/icu4x/LocaleFallbackPriority.d.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_LocaleFallbackPriority_D_HPP -#define icu4x_LocaleFallbackPriority_D_HPP +#ifndef ICU4X_LocaleFallbackPriority_D_HPP +#define ICU4X_LocaleFallbackPriority_D_HPP #include #include @@ -9,7 +9,7 @@ #include #include #include -#include "../diplomat_runtime.hpp" +#include "diplomat_runtime.hpp" namespace icu4x { @@ -51,4 +51,4 @@ class LocaleFallbackPriority { }; } // namespace -#endif // icu4x_LocaleFallbackPriority_D_HPP +#endif // ICU4X_LocaleFallbackPriority_D_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/LocaleFallbackPriority.hpp b/ffi/capi/bindings/cpp/icu4x/LocaleFallbackPriority.hpp index 54511cd8d21..2c89cf46eaa 100644 --- a/ffi/capi/bindings/cpp/icu4x/LocaleFallbackPriority.hpp +++ b/ffi/capi/bindings/cpp/icu4x/LocaleFallbackPriority.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_LocaleFallbackPriority_HPP -#define icu4x_LocaleFallbackPriority_HPP +#ifndef ICU4X_LocaleFallbackPriority_HPP +#define ICU4X_LocaleFallbackPriority_HPP #include "LocaleFallbackPriority.d.hpp" @@ -11,7 +11,7 @@ #include #include #include -#include "../diplomat_runtime.hpp" +#include "diplomat_runtime.hpp" namespace icu4x { @@ -35,4 +35,4 @@ inline icu4x::LocaleFallbackPriority icu4x::LocaleFallbackPriority::FromFFI(icu4 std::abort(); } } -#endif // icu4x_LocaleFallbackPriority_HPP +#endif // ICU4X_LocaleFallbackPriority_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/LocaleFallbacker.d.hpp b/ffi/capi/bindings/cpp/icu4x/LocaleFallbacker.d.hpp index c0b90407896..acd380f303f 100644 --- a/ffi/capi/bindings/cpp/icu4x/LocaleFallbacker.d.hpp +++ b/ffi/capi/bindings/cpp/icu4x/LocaleFallbacker.d.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_LocaleFallbacker_D_HPP -#define icu4x_LocaleFallbacker_D_HPP +#ifndef ICU4X_LocaleFallbacker_D_HPP +#define ICU4X_LocaleFallbacker_D_HPP #include #include @@ -9,8 +9,7 @@ #include #include #include -#include "../diplomat_runtime.hpp" - +#include "diplomat_runtime.hpp" namespace icu4x { namespace capi { struct DataProvider; } class DataProvider; @@ -20,7 +19,8 @@ namespace capi { struct LocaleFallbackerWithConfig; } class LocaleFallbackerWithConfig; struct LocaleFallbackConfig; class DataError; -} +} // namespace icu4x + namespace icu4x { @@ -39,30 +39,30 @@ class LocaleFallbacker { public: /** - * Creates a new `LocaleFallbacker` from compiled data. - * - * See the [Rust documentation for `new`](https://docs.rs/icu_locale/2.0.0/icu_locale/struct.LocaleFallbacker.html#method.new) for more information. + * Creates a new `LocaleFallbacker` from compiled data. + * + * See the [Rust documentation for `new`](https://docs.rs/icu_locale/2.0.0/icu_locale/struct.LocaleFallbacker.html#method.new) for more information. */ inline static std::unique_ptr create(); /** - * Creates a new `LocaleFallbacker` from a data provider. - * - * See the [Rust documentation for `new`](https://docs.rs/icu_locale/2.0.0/icu_locale/struct.LocaleFallbacker.html#method.new) for more information. + * Creates a new `LocaleFallbacker` from a data provider. + * + * See the [Rust documentation for `new`](https://docs.rs/icu_locale/2.0.0/icu_locale/struct.LocaleFallbacker.html#method.new) for more information. */ - inline static diplomat::result, icu4x::DataError> create_with_provider(const icu4x::DataProvider& provider); + inline static icu4x::diplomat::result, icu4x::DataError> create_with_provider(const icu4x::DataProvider& provider); /** - * Creates a new `LocaleFallbacker` without data for limited functionality. - * - * See the [Rust documentation for `new_without_data`](https://docs.rs/icu_locale/2.0.0/icu_locale/struct.LocaleFallbacker.html#method.new_without_data) for more information. + * Creates a new `LocaleFallbacker` without data for limited functionality. + * + * See the [Rust documentation for `new_without_data`](https://docs.rs/icu_locale/2.0.0/icu_locale/struct.LocaleFallbacker.html#method.new_without_data) for more information. */ inline static std::unique_ptr without_data(); /** - * Associates this `LocaleFallbacker` with configuration options. - * - * See the [Rust documentation for `for_config`](https://docs.rs/icu_locale/2.0.0/icu_locale/struct.LocaleFallbacker.html#method.for_config) for more information. + * Associates this `LocaleFallbacker` with configuration options. + * + * See the [Rust documentation for `for_config`](https://docs.rs/icu_locale/2.0.0/icu_locale/struct.LocaleFallbacker.html#method.for_config) for more information. */ inline std::unique_ptr for_config(icu4x::LocaleFallbackConfig config) const; @@ -81,4 +81,4 @@ class LocaleFallbacker { }; } // namespace -#endif // icu4x_LocaleFallbacker_D_HPP +#endif // ICU4X_LocaleFallbacker_D_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/LocaleFallbacker.hpp b/ffi/capi/bindings/cpp/icu4x/LocaleFallbacker.hpp index 379d228d242..efd554fdfb1 100644 --- a/ffi/capi/bindings/cpp/icu4x/LocaleFallbacker.hpp +++ b/ffi/capi/bindings/cpp/icu4x/LocaleFallbacker.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_LocaleFallbacker_HPP -#define icu4x_LocaleFallbacker_HPP +#ifndef ICU4X_LocaleFallbacker_HPP +#define ICU4X_LocaleFallbacker_HPP #include "LocaleFallbacker.d.hpp" @@ -11,11 +11,11 @@ #include #include #include -#include "../diplomat_runtime.hpp" #include "DataError.hpp" #include "DataProvider.hpp" #include "LocaleFallbackConfig.hpp" #include "LocaleFallbackerWithConfig.hpp" +#include "diplomat_runtime.hpp" namespace icu4x { @@ -42,9 +42,9 @@ inline std::unique_ptr icu4x::LocaleFallbacker::create( return std::unique_ptr(icu4x::LocaleFallbacker::FromFFI(result)); } -inline diplomat::result, icu4x::DataError> icu4x::LocaleFallbacker::create_with_provider(const icu4x::DataProvider& provider) { +inline icu4x::diplomat::result, icu4x::DataError> icu4x::LocaleFallbacker::create_with_provider(const icu4x::DataProvider& provider) { auto result = icu4x::capi::icu4x_LocaleFallbacker_create_with_provider_mv1(provider.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DataError>(diplomat::Ok>(std::unique_ptr(icu4x::LocaleFallbacker::FromFFI(result.ok)))) : diplomat::result, icu4x::DataError>(diplomat::Err(icu4x::DataError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::LocaleFallbacker::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Err(icu4x::DataError::FromFFI(result.err))); } inline std::unique_ptr icu4x::LocaleFallbacker::without_data() { @@ -79,4 +79,4 @@ inline void icu4x::LocaleFallbacker::operator delete(void* ptr) { } -#endif // icu4x_LocaleFallbacker_HPP +#endif // ICU4X_LocaleFallbacker_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/LocaleFallbackerWithConfig.d.hpp b/ffi/capi/bindings/cpp/icu4x/LocaleFallbackerWithConfig.d.hpp index 34b7f0e3f2a..ba47783f620 100644 --- a/ffi/capi/bindings/cpp/icu4x/LocaleFallbackerWithConfig.d.hpp +++ b/ffi/capi/bindings/cpp/icu4x/LocaleFallbackerWithConfig.d.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_LocaleFallbackerWithConfig_D_HPP -#define icu4x_LocaleFallbackerWithConfig_D_HPP +#ifndef ICU4X_LocaleFallbackerWithConfig_D_HPP +#define ICU4X_LocaleFallbackerWithConfig_D_HPP #include #include @@ -9,14 +9,14 @@ #include #include #include -#include "../diplomat_runtime.hpp" - +#include "diplomat_runtime.hpp" namespace icu4x { namespace capi { struct Locale; } class Locale; namespace capi { struct LocaleFallbackIterator; } class LocaleFallbackIterator; -} +} // namespace icu4x + namespace icu4x { @@ -37,9 +37,9 @@ class LocaleFallbackerWithConfig { public: /** - * Creates an iterator from a locale with each step of fallback. - * - * See the [Rust documentation for `fallback_for`](https://docs.rs/icu_locale/2.0.0/icu_locale/struct.LocaleFallbacker.html#method.fallback_for) for more information. + * Creates an iterator from a locale with each step of fallback. + * + * See the [Rust documentation for `fallback_for`](https://docs.rs/icu_locale/2.0.0/icu_locale/struct.LocaleFallbacker.html#method.fallback_for) for more information. */ inline std::unique_ptr fallback_for_locale(const icu4x::Locale& locale) const; @@ -58,4 +58,4 @@ class LocaleFallbackerWithConfig { }; } // namespace -#endif // icu4x_LocaleFallbackerWithConfig_D_HPP +#endif // ICU4X_LocaleFallbackerWithConfig_D_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/LocaleFallbackerWithConfig.hpp b/ffi/capi/bindings/cpp/icu4x/LocaleFallbackerWithConfig.hpp index c7ba80e6556..d38a949142a 100644 --- a/ffi/capi/bindings/cpp/icu4x/LocaleFallbackerWithConfig.hpp +++ b/ffi/capi/bindings/cpp/icu4x/LocaleFallbackerWithConfig.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_LocaleFallbackerWithConfig_HPP -#define icu4x_LocaleFallbackerWithConfig_HPP +#ifndef ICU4X_LocaleFallbackerWithConfig_HPP +#define ICU4X_LocaleFallbackerWithConfig_HPP #include "LocaleFallbackerWithConfig.d.hpp" @@ -11,9 +11,9 @@ #include #include #include -#include "../diplomat_runtime.hpp" #include "Locale.hpp" #include "LocaleFallbackIterator.hpp" +#include "diplomat_runtime.hpp" namespace icu4x { @@ -55,4 +55,4 @@ inline void icu4x::LocaleFallbackerWithConfig::operator delete(void* ptr) { } -#endif // icu4x_LocaleFallbackerWithConfig_HPP +#endif // ICU4X_LocaleFallbackerWithConfig_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/LocaleParseError.d.hpp b/ffi/capi/bindings/cpp/icu4x/LocaleParseError.d.hpp index 5333af49aca..9e46588f59b 100644 --- a/ffi/capi/bindings/cpp/icu4x/LocaleParseError.d.hpp +++ b/ffi/capi/bindings/cpp/icu4x/LocaleParseError.d.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_LocaleParseError_D_HPP -#define icu4x_LocaleParseError_D_HPP +#ifndef ICU4X_LocaleParseError_D_HPP +#define ICU4X_LocaleParseError_D_HPP #include #include @@ -9,7 +9,7 @@ #include #include #include -#include "../diplomat_runtime.hpp" +#include "diplomat_runtime.hpp" namespace icu4x { @@ -53,4 +53,4 @@ class LocaleParseError { }; } // namespace -#endif // icu4x_LocaleParseError_D_HPP +#endif // ICU4X_LocaleParseError_D_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/LocaleParseError.hpp b/ffi/capi/bindings/cpp/icu4x/LocaleParseError.hpp index 28ceca0d7f1..4906c7f882f 100644 --- a/ffi/capi/bindings/cpp/icu4x/LocaleParseError.hpp +++ b/ffi/capi/bindings/cpp/icu4x/LocaleParseError.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_LocaleParseError_HPP -#define icu4x_LocaleParseError_HPP +#ifndef ICU4X_LocaleParseError_HPP +#define ICU4X_LocaleParseError_HPP #include "LocaleParseError.d.hpp" @@ -11,7 +11,7 @@ #include #include #include -#include "../diplomat_runtime.hpp" +#include "diplomat_runtime.hpp" namespace icu4x { @@ -37,4 +37,4 @@ inline icu4x::LocaleParseError icu4x::LocaleParseError::FromFFI(icu4x::capi::Loc std::abort(); } } -#endif // icu4x_LocaleParseError_HPP +#endif // ICU4X_LocaleParseError_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/Logger.d.hpp b/ffi/capi/bindings/cpp/icu4x/Logger.d.hpp index 6c452723ed6..7f76bd28234 100644 --- a/ffi/capi/bindings/cpp/icu4x/Logger.d.hpp +++ b/ffi/capi/bindings/cpp/icu4x/Logger.d.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_Logger_D_HPP -#define icu4x_Logger_D_HPP +#ifndef ICU4X_Logger_D_HPP +#define ICU4X_Logger_D_HPP #include #include @@ -9,7 +9,7 @@ #include #include #include -#include "../diplomat_runtime.hpp" +#include "diplomat_runtime.hpp" namespace icu4x { @@ -26,11 +26,11 @@ class Logger { public: /** - * Initialize the logger using `simple_logger` - * - * Requires the `simple_logger` Cargo feature. - * - * Returns `false` if there was already a logger set. + * Initialize the logger using `simple_logger` + * + * Requires the `simple_logger` Cargo feature. + * + * Returns `false` if there was already a logger set. */ inline static bool init_simple_logger(); @@ -49,4 +49,4 @@ class Logger { }; } // namespace -#endif // icu4x_Logger_D_HPP +#endif // ICU4X_Logger_D_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/Logger.hpp b/ffi/capi/bindings/cpp/icu4x/Logger.hpp index 9bdb27143ae..3b76137fed4 100644 --- a/ffi/capi/bindings/cpp/icu4x/Logger.hpp +++ b/ffi/capi/bindings/cpp/icu4x/Logger.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_Logger_HPP -#define icu4x_Logger_HPP +#ifndef ICU4X_Logger_HPP +#define ICU4X_Logger_HPP #include "Logger.d.hpp" @@ -11,7 +11,7 @@ #include #include #include -#include "../diplomat_runtime.hpp" +#include "diplomat_runtime.hpp" namespace icu4x { @@ -52,4 +52,4 @@ inline void icu4x::Logger::operator delete(void* ptr) { } -#endif // icu4x_Logger_HPP +#endif // ICU4X_Logger_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/PluralCategories.d.hpp b/ffi/capi/bindings/cpp/icu4x/PluralCategories.d.hpp index d5d6616bde2..0f4b7bc0e22 100644 --- a/ffi/capi/bindings/cpp/icu4x/PluralCategories.d.hpp +++ b/ffi/capi/bindings/cpp/icu4x/PluralCategories.d.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_PluralCategories_D_HPP -#define icu4x_PluralCategories_D_HPP +#ifndef ICU4X_PluralCategories_D_HPP +#define ICU4X_PluralCategories_D_HPP #include #include @@ -9,7 +9,7 @@ #include #include #include -#include "../diplomat_runtime.hpp" +#include "diplomat_runtime.hpp" namespace icu4x { @@ -42,4 +42,4 @@ struct PluralCategories { }; } // namespace -#endif // icu4x_PluralCategories_D_HPP +#endif // ICU4X_PluralCategories_D_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/PluralCategories.hpp b/ffi/capi/bindings/cpp/icu4x/PluralCategories.hpp index 5c32d3a1690..2c7d6582e7f 100644 --- a/ffi/capi/bindings/cpp/icu4x/PluralCategories.hpp +++ b/ffi/capi/bindings/cpp/icu4x/PluralCategories.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_PluralCategories_HPP -#define icu4x_PluralCategories_HPP +#ifndef ICU4X_PluralCategories_HPP +#define ICU4X_PluralCategories_HPP #include "PluralCategories.d.hpp" @@ -11,7 +11,7 @@ #include #include #include -#include "../diplomat_runtime.hpp" +#include "diplomat_runtime.hpp" namespace icu4x { @@ -46,4 +46,4 @@ inline icu4x::PluralCategories icu4x::PluralCategories::FromFFI(icu4x::capi::Plu } -#endif // icu4x_PluralCategories_HPP +#endif // ICU4X_PluralCategories_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/PluralCategory.d.hpp b/ffi/capi/bindings/cpp/icu4x/PluralCategory.d.hpp index 4fc9210e1de..30fc08f45e9 100644 --- a/ffi/capi/bindings/cpp/icu4x/PluralCategory.d.hpp +++ b/ffi/capi/bindings/cpp/icu4x/PluralCategory.d.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_PluralCategory_D_HPP -#define icu4x_PluralCategory_D_HPP +#ifndef ICU4X_PluralCategory_D_HPP +#define ICU4X_PluralCategory_D_HPP #include #include @@ -9,11 +9,11 @@ #include #include #include -#include "../diplomat_runtime.hpp" - +#include "diplomat_runtime.hpp" namespace icu4x { class PluralCategory; -} +} // namespace icu4x + namespace icu4x { @@ -55,12 +55,12 @@ class PluralCategory { explicit operator bool() const = delete; /** - * Construct from a string in the format - * [specified in TR35](https://unicode.org/reports/tr35/tr35-numbers.html#Language_Plural_Rules) - * - * See the [Rust documentation for `get_for_cldr_string`](https://docs.rs/icu/2.0.0/icu/plurals/enum.PluralCategory.html#method.get_for_cldr_string) for more information. - * - * See the [Rust documentation for `get_for_cldr_bytes`](https://docs.rs/icu/2.0.0/icu/plurals/enum.PluralCategory.html#method.get_for_cldr_bytes) for more information. + * Construct from a string in the format + * [specified in TR35](https://unicode.org/reports/tr35/tr35-numbers.html#Language_Plural_Rules) + * + * See the [Rust documentation for `get_for_cldr_string`](https://docs.rs/icu/2.0.0/icu/plurals/enum.PluralCategory.html#method.get_for_cldr_string) for more information. + * + * See the [Rust documentation for `get_for_cldr_bytes`](https://docs.rs/icu/2.0.0/icu/plurals/enum.PluralCategory.html#method.get_for_cldr_bytes) for more information. */ inline static std::optional get_for_cldr_string(std::string_view s); @@ -71,4 +71,4 @@ class PluralCategory { }; } // namespace -#endif // icu4x_PluralCategory_D_HPP +#endif // ICU4X_PluralCategory_D_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/PluralCategory.hpp b/ffi/capi/bindings/cpp/icu4x/PluralCategory.hpp index c4a6ff0bfc0..7fc87322474 100644 --- a/ffi/capi/bindings/cpp/icu4x/PluralCategory.hpp +++ b/ffi/capi/bindings/cpp/icu4x/PluralCategory.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_PluralCategory_HPP -#define icu4x_PluralCategory_HPP +#ifndef ICU4X_PluralCategory_HPP +#define ICU4X_PluralCategory_HPP #include "PluralCategory.d.hpp" @@ -11,7 +11,7 @@ #include #include #include -#include "../diplomat_runtime.hpp" +#include "diplomat_runtime.hpp" namespace icu4x { @@ -19,7 +19,7 @@ namespace capi { extern "C" { typedef struct icu4x_PluralCategory_get_for_cldr_string_mv1_result {union {icu4x::capi::PluralCategory ok; }; bool is_ok;} icu4x_PluralCategory_get_for_cldr_string_mv1_result; - icu4x_PluralCategory_get_for_cldr_string_mv1_result icu4x_PluralCategory_get_for_cldr_string_mv1(diplomat::capi::DiplomatStringView s); + icu4x_PluralCategory_get_for_cldr_string_mv1_result icu4x_PluralCategory_get_for_cldr_string_mv1(icu4x::diplomat::capi::DiplomatStringView s); } // extern "C" } // namespace capi @@ -47,4 +47,4 @@ inline std::optional icu4x::PluralCategory::get_for_cldr_ auto result = icu4x::capi::icu4x_PluralCategory_get_for_cldr_string_mv1({s.data(), s.size()}); return result.is_ok ? std::optional(icu4x::PluralCategory::FromFFI(result.ok)) : std::nullopt; } -#endif // icu4x_PluralCategory_HPP +#endif // ICU4X_PluralCategory_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/PluralOperands.d.hpp b/ffi/capi/bindings/cpp/icu4x/PluralOperands.d.hpp index e356cfbcfa3..fd2f78df74b 100644 --- a/ffi/capi/bindings/cpp/icu4x/PluralOperands.d.hpp +++ b/ffi/capi/bindings/cpp/icu4x/PluralOperands.d.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_PluralOperands_D_HPP -#define icu4x_PluralOperands_D_HPP +#ifndef ICU4X_PluralOperands_D_HPP +#define ICU4X_PluralOperands_D_HPP #include #include @@ -9,15 +9,15 @@ #include #include #include -#include "../diplomat_runtime.hpp" - +#include "diplomat_runtime.hpp" namespace icu4x { namespace capi { struct Decimal; } class Decimal; namespace capi { struct PluralOperands; } class PluralOperands; class DecimalParseError; -} +} // namespace icu4x + namespace icu4x { @@ -34,21 +34,21 @@ class PluralOperands { public: /** - * Construct for a given string representing a number - * - * See the [Rust documentation for `from_str`](https://docs.rs/icu/2.0.0/icu/plurals/struct.PluralOperands.html#method.from_str) for more information. + * Construct for a given string representing a number + * + * See the [Rust documentation for `from_str`](https://docs.rs/icu/2.0.0/icu/plurals/struct.PluralOperands.html#method.from_str) for more information. */ - inline static diplomat::result, icu4x::DecimalParseError> from_string(std::string_view s); + inline static icu4x::diplomat::result, icu4x::DecimalParseError> from_string(std::string_view s); /** - * Construct for a given integer + * Construct for a given integer */ inline static std::unique_ptr from(int64_t i); /** - * Construct from a FixedDecimal - * - * Retains at most 18 digits each from the integer and fraction parts. + * Construct from a FixedDecimal + * + * Retains at most 18 digits each from the integer and fraction parts. */ inline static std::unique_ptr from_fixed_decimal(const icu4x::Decimal& x); @@ -67,4 +67,4 @@ class PluralOperands { }; } // namespace -#endif // icu4x_PluralOperands_D_HPP +#endif // ICU4X_PluralOperands_D_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/PluralOperands.hpp b/ffi/capi/bindings/cpp/icu4x/PluralOperands.hpp index b82e49489c9..610acb9ae04 100644 --- a/ffi/capi/bindings/cpp/icu4x/PluralOperands.hpp +++ b/ffi/capi/bindings/cpp/icu4x/PluralOperands.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_PluralOperands_HPP -#define icu4x_PluralOperands_HPP +#ifndef ICU4X_PluralOperands_HPP +#define ICU4X_PluralOperands_HPP #include "PluralOperands.d.hpp" @@ -11,9 +11,9 @@ #include #include #include -#include "../diplomat_runtime.hpp" #include "Decimal.hpp" #include "DecimalParseError.hpp" +#include "diplomat_runtime.hpp" namespace icu4x { @@ -21,7 +21,7 @@ namespace capi { extern "C" { typedef struct icu4x_PluralOperands_from_string_mv1_result {union {icu4x::capi::PluralOperands* ok; icu4x::capi::DecimalParseError err;}; bool is_ok;} icu4x_PluralOperands_from_string_mv1_result; - icu4x_PluralOperands_from_string_mv1_result icu4x_PluralOperands_from_string_mv1(diplomat::capi::DiplomatStringView s); + icu4x_PluralOperands_from_string_mv1_result icu4x_PluralOperands_from_string_mv1(icu4x::diplomat::capi::DiplomatStringView s); icu4x::capi::PluralOperands* icu4x_PluralOperands_from_int64_mv1(int64_t i); @@ -33,9 +33,9 @@ namespace capi { } // namespace capi } // namespace -inline diplomat::result, icu4x::DecimalParseError> icu4x::PluralOperands::from_string(std::string_view s) { +inline icu4x::diplomat::result, icu4x::DecimalParseError> icu4x::PluralOperands::from_string(std::string_view s) { auto result = icu4x::capi::icu4x_PluralOperands_from_string_mv1({s.data(), s.size()}); - return result.is_ok ? diplomat::result, icu4x::DecimalParseError>(diplomat::Ok>(std::unique_ptr(icu4x::PluralOperands::FromFFI(result.ok)))) : diplomat::result, icu4x::DecimalParseError>(diplomat::Err(icu4x::DecimalParseError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DecimalParseError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::PluralOperands::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DecimalParseError>(icu4x::diplomat::Err(icu4x::DecimalParseError::FromFFI(result.err))); } inline std::unique_ptr icu4x::PluralOperands::from(int64_t i) { @@ -69,4 +69,4 @@ inline void icu4x::PluralOperands::operator delete(void* ptr) { } -#endif // icu4x_PluralOperands_HPP +#endif // ICU4X_PluralOperands_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/PluralRules.d.hpp b/ffi/capi/bindings/cpp/icu4x/PluralRules.d.hpp index c2a82e73a6c..c2e80094b05 100644 --- a/ffi/capi/bindings/cpp/icu4x/PluralRules.d.hpp +++ b/ffi/capi/bindings/cpp/icu4x/PluralRules.d.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_PluralRules_D_HPP -#define icu4x_PluralRules_D_HPP +#ifndef ICU4X_PluralRules_D_HPP +#define ICU4X_PluralRules_D_HPP #include #include @@ -9,8 +9,7 @@ #include #include #include -#include "../diplomat_runtime.hpp" - +#include "diplomat_runtime.hpp" namespace icu4x { namespace capi { struct DataProvider; } class DataProvider; @@ -23,7 +22,8 @@ class PluralRules; struct PluralCategories; class DataError; class PluralCategory; -} +} // namespace icu4x + namespace icu4x { @@ -40,44 +40,44 @@ class PluralRules { public: /** - * Construct an {@link PluralRules} for the given locale, for cardinal numbers, using compiled data. - * - * See the [Rust documentation for `try_new_cardinal`](https://docs.rs/icu/2.0.0/icu/plurals/struct.PluralRules.html#method.try_new_cardinal) for more information. + * Construct an {@link PluralRules} for the given locale, for cardinal numbers, using compiled data. + * + * See the [Rust documentation for `try_new_cardinal`](https://docs.rs/icu/2.0.0/icu/plurals/struct.PluralRules.html#method.try_new_cardinal) for more information. */ - inline static diplomat::result, icu4x::DataError> create_cardinal(const icu4x::Locale& locale); + inline static icu4x::diplomat::result, icu4x::DataError> create_cardinal(const icu4x::Locale& locale); /** - * Construct an {@link PluralRules} for the given locale, for cardinal numbers, using a particular data source. - * - * See the [Rust documentation for `try_new_cardinal`](https://docs.rs/icu/2.0.0/icu/plurals/struct.PluralRules.html#method.try_new_cardinal) for more information. + * Construct an {@link PluralRules} for the given locale, for cardinal numbers, using a particular data source. + * + * See the [Rust documentation for `try_new_cardinal`](https://docs.rs/icu/2.0.0/icu/plurals/struct.PluralRules.html#method.try_new_cardinal) for more information. */ - inline static diplomat::result, icu4x::DataError> create_cardinal_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale); + inline static icu4x::diplomat::result, icu4x::DataError> create_cardinal_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale); /** - * Construct an {@link PluralRules} for the given locale, for ordinal numbers, using compiled data. - * - * See the [Rust documentation for `try_new_ordinal`](https://docs.rs/icu/2.0.0/icu/plurals/struct.PluralRules.html#method.try_new_ordinal) for more information. + * Construct an {@link PluralRules} for the given locale, for ordinal numbers, using compiled data. + * + * See the [Rust documentation for `try_new_ordinal`](https://docs.rs/icu/2.0.0/icu/plurals/struct.PluralRules.html#method.try_new_ordinal) for more information. */ - inline static diplomat::result, icu4x::DataError> create_ordinal(const icu4x::Locale& locale); + inline static icu4x::diplomat::result, icu4x::DataError> create_ordinal(const icu4x::Locale& locale); /** - * Construct an {@link PluralRules} for the given locale, for ordinal numbers, using a particular data source. - * - * See the [Rust documentation for `try_new_ordinal`](https://docs.rs/icu/2.0.0/icu/plurals/struct.PluralRules.html#method.try_new_ordinal) for more information. + * Construct an {@link PluralRules} for the given locale, for ordinal numbers, using a particular data source. + * + * See the [Rust documentation for `try_new_ordinal`](https://docs.rs/icu/2.0.0/icu/plurals/struct.PluralRules.html#method.try_new_ordinal) for more information. */ - inline static diplomat::result, icu4x::DataError> create_ordinal_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale); + inline static icu4x::diplomat::result, icu4x::DataError> create_ordinal_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale); /** - * Get the category for a given number represented as operands - * - * See the [Rust documentation for `category_for`](https://docs.rs/icu/2.0.0/icu/plurals/struct.PluralRules.html#method.category_for) for more information. + * Get the category for a given number represented as operands + * + * See the [Rust documentation for `category_for`](https://docs.rs/icu/2.0.0/icu/plurals/struct.PluralRules.html#method.category_for) for more information. */ inline icu4x::PluralCategory category_for(const icu4x::PluralOperands& op) const; /** - * Get all of the categories needed in the current locale - * - * See the [Rust documentation for `categories`](https://docs.rs/icu/2.0.0/icu/plurals/struct.PluralRules.html#method.categories) for more information. + * Get all of the categories needed in the current locale + * + * See the [Rust documentation for `categories`](https://docs.rs/icu/2.0.0/icu/plurals/struct.PluralRules.html#method.categories) for more information. */ inline icu4x::PluralCategories categories() const; @@ -96,4 +96,4 @@ class PluralRules { }; } // namespace -#endif // icu4x_PluralRules_D_HPP +#endif // ICU4X_PluralRules_D_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/PluralRules.hpp b/ffi/capi/bindings/cpp/icu4x/PluralRules.hpp index c9f1ed41eb7..e7854302235 100644 --- a/ffi/capi/bindings/cpp/icu4x/PluralRules.hpp +++ b/ffi/capi/bindings/cpp/icu4x/PluralRules.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_PluralRules_HPP -#define icu4x_PluralRules_HPP +#ifndef ICU4X_PluralRules_HPP +#define ICU4X_PluralRules_HPP #include "PluralRules.d.hpp" @@ -11,13 +11,13 @@ #include #include #include -#include "../diplomat_runtime.hpp" #include "DataError.hpp" #include "DataProvider.hpp" #include "Locale.hpp" #include "PluralCategories.hpp" #include "PluralCategory.hpp" #include "PluralOperands.hpp" +#include "diplomat_runtime.hpp" namespace icu4x { @@ -46,26 +46,26 @@ namespace capi { } // namespace capi } // namespace -inline diplomat::result, icu4x::DataError> icu4x::PluralRules::create_cardinal(const icu4x::Locale& locale) { +inline icu4x::diplomat::result, icu4x::DataError> icu4x::PluralRules::create_cardinal(const icu4x::Locale& locale) { auto result = icu4x::capi::icu4x_PluralRules_create_cardinal_mv1(locale.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DataError>(diplomat::Ok>(std::unique_ptr(icu4x::PluralRules::FromFFI(result.ok)))) : diplomat::result, icu4x::DataError>(diplomat::Err(icu4x::DataError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::PluralRules::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Err(icu4x::DataError::FromFFI(result.err))); } -inline diplomat::result, icu4x::DataError> icu4x::PluralRules::create_cardinal_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale) { +inline icu4x::diplomat::result, icu4x::DataError> icu4x::PluralRules::create_cardinal_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale) { auto result = icu4x::capi::icu4x_PluralRules_create_cardinal_with_provider_mv1(provider.AsFFI(), locale.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DataError>(diplomat::Ok>(std::unique_ptr(icu4x::PluralRules::FromFFI(result.ok)))) : diplomat::result, icu4x::DataError>(diplomat::Err(icu4x::DataError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::PluralRules::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Err(icu4x::DataError::FromFFI(result.err))); } -inline diplomat::result, icu4x::DataError> icu4x::PluralRules::create_ordinal(const icu4x::Locale& locale) { +inline icu4x::diplomat::result, icu4x::DataError> icu4x::PluralRules::create_ordinal(const icu4x::Locale& locale) { auto result = icu4x::capi::icu4x_PluralRules_create_ordinal_mv1(locale.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DataError>(diplomat::Ok>(std::unique_ptr(icu4x::PluralRules::FromFFI(result.ok)))) : diplomat::result, icu4x::DataError>(diplomat::Err(icu4x::DataError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::PluralRules::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Err(icu4x::DataError::FromFFI(result.err))); } -inline diplomat::result, icu4x::DataError> icu4x::PluralRules::create_ordinal_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale) { +inline icu4x::diplomat::result, icu4x::DataError> icu4x::PluralRules::create_ordinal_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale) { auto result = icu4x::capi::icu4x_PluralRules_create_ordinal_with_provider_mv1(provider.AsFFI(), locale.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DataError>(diplomat::Ok>(std::unique_ptr(icu4x::PluralRules::FromFFI(result.ok)))) : diplomat::result, icu4x::DataError>(diplomat::Err(icu4x::DataError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::PluralRules::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Err(icu4x::DataError::FromFFI(result.err))); } inline icu4x::PluralCategory icu4x::PluralRules::category_for(const icu4x::PluralOperands& op) const { @@ -100,4 +100,4 @@ inline void icu4x::PluralRules::operator delete(void* ptr) { } -#endif // icu4x_PluralRules_HPP +#endif // ICU4X_PluralRules_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/PropertyValueNameToEnumMapper.d.hpp b/ffi/capi/bindings/cpp/icu4x/PropertyValueNameToEnumMapper.d.hpp index b63d55fd7e1..4c90890e0da 100644 --- a/ffi/capi/bindings/cpp/icu4x/PropertyValueNameToEnumMapper.d.hpp +++ b/ffi/capi/bindings/cpp/icu4x/PropertyValueNameToEnumMapper.d.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_PropertyValueNameToEnumMapper_D_HPP -#define icu4x_PropertyValueNameToEnumMapper_D_HPP +#ifndef ICU4X_PropertyValueNameToEnumMapper_D_HPP +#define ICU4X_PropertyValueNameToEnumMapper_D_HPP #include #include @@ -9,15 +9,15 @@ #include #include #include -#include "../diplomat_runtime.hpp" - +#include "diplomat_runtime.hpp" namespace icu4x { namespace capi { struct DataProvider; } class DataProvider; namespace capi { struct PropertyValueNameToEnumMapper; } class PropertyValueNameToEnumMapper; class DataError; -} +} // namespace icu4x + namespace icu4x { @@ -40,176 +40,176 @@ class PropertyValueNameToEnumMapper { public: /** - * Get the property value matching the given name, using strict matching - * - * Returns -1 if the name is unknown for this property - * - * See the [Rust documentation for `get_strict`](https://docs.rs/icu/2.0.0/icu/properties/struct.PropertyParserBorrowed.html#method.get_strict) for more information. + * Get the property value matching the given name, using strict matching + * + * Returns -1 if the name is unknown for this property + * + * See the [Rust documentation for `get_strict`](https://docs.rs/icu/2.0.0/icu/properties/struct.PropertyParserBorrowed.html#method.get_strict) for more information. */ inline int16_t get_strict(std::string_view name) const; /** - * Get the property value matching the given name, using loose matching - * - * Returns -1 if the name is unknown for this property - * - * See the [Rust documentation for `get_loose`](https://docs.rs/icu/2.0.0/icu/properties/struct.PropertyParserBorrowed.html#method.get_loose) for more information. + * Get the property value matching the given name, using loose matching + * + * Returns -1 if the name is unknown for this property + * + * See the [Rust documentation for `get_loose`](https://docs.rs/icu/2.0.0/icu/properties/struct.PropertyParserBorrowed.html#method.get_loose) for more information. */ inline int16_t get_loose(std::string_view name) const; /** - * Create a name-to-enum mapper for the `General_Category` property, using compiled data. - * - * See the [Rust documentation for `GeneralCategory`](https://docs.rs/icu/2.0.0/icu/properties/props/enum.GeneralCategory.html) for more information. + * Create a name-to-enum mapper for the `General_Category` property, using compiled data. + * + * See the [Rust documentation for `GeneralCategory`](https://docs.rs/icu/2.0.0/icu/properties/props/enum.GeneralCategory.html) for more information. */ inline static std::unique_ptr create_general_category(); /** - * Create a name-to-enum mapper for the `General_Category` property, using a particular data source. - * - * See the [Rust documentation for `GeneralCategory`](https://docs.rs/icu/2.0.0/icu/properties/props/enum.GeneralCategory.html) for more information. + * Create a name-to-enum mapper for the `General_Category` property, using a particular data source. + * + * See the [Rust documentation for `GeneralCategory`](https://docs.rs/icu/2.0.0/icu/properties/props/enum.GeneralCategory.html) for more information. */ - inline static diplomat::result, icu4x::DataError> create_general_category_with_provider(const icu4x::DataProvider& provider); + inline static icu4x::diplomat::result, icu4x::DataError> create_general_category_with_provider(const icu4x::DataProvider& provider); /** - * Create a name-to-enum mapper for the `Hangul_Syllable_Type` property, using compiled data. - * - * See the [Rust documentation for `HangulSyllableType`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.HangulSyllableType.html) for more information. + * Create a name-to-enum mapper for the `Hangul_Syllable_Type` property, using compiled data. + * + * See the [Rust documentation for `HangulSyllableType`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.HangulSyllableType.html) for more information. */ inline static std::unique_ptr create_hangul_syllable_type(); /** - * Create a name-to-enum mapper for the `Hangul_Syllable_Type` property, using a particular data source. - * - * See the [Rust documentation for `HangulSyllableType`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.HangulSyllableType.html) for more information. + * Create a name-to-enum mapper for the `Hangul_Syllable_Type` property, using a particular data source. + * + * See the [Rust documentation for `HangulSyllableType`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.HangulSyllableType.html) for more information. */ - inline static diplomat::result, icu4x::DataError> create_hangul_syllable_type_with_provider(const icu4x::DataProvider& provider); + inline static icu4x::diplomat::result, icu4x::DataError> create_hangul_syllable_type_with_provider(const icu4x::DataProvider& provider); /** - * Create a name-to-enum mapper for the `East_Asian_Width` property, using compiled data. - * - * See the [Rust documentation for `EastAsianWidth`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.EastAsianWidth.html) for more information. + * Create a name-to-enum mapper for the `East_Asian_Width` property, using compiled data. + * + * See the [Rust documentation for `EastAsianWidth`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.EastAsianWidth.html) for more information. */ inline static std::unique_ptr create_east_asian_width(); /** - * Create a name-to-enum mapper for the `East_Asian_Width` property, using a particular data source. - * - * See the [Rust documentation for `EastAsianWidth`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.EastAsianWidth.html) for more information. + * Create a name-to-enum mapper for the `East_Asian_Width` property, using a particular data source. + * + * See the [Rust documentation for `EastAsianWidth`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.EastAsianWidth.html) for more information. */ - inline static diplomat::result, icu4x::DataError> create_east_asian_width_with_provider(const icu4x::DataProvider& provider); + inline static icu4x::diplomat::result, icu4x::DataError> create_east_asian_width_with_provider(const icu4x::DataProvider& provider); /** - * Create a name-to-enum mapper for the `Bidi_Class` property, using compiled data. - * - * See the [Rust documentation for `BidiClass`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.BidiClass.html) for more information. + * Create a name-to-enum mapper for the `Bidi_Class` property, using compiled data. + * + * See the [Rust documentation for `BidiClass`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.BidiClass.html) for more information. */ inline static std::unique_ptr create_bidi_class(); /** - * Create a name-to-enum mapper for the `Bidi_Class` property, using a particular data source. - * - * See the [Rust documentation for `BidiClass`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.BidiClass.html) for more information. + * Create a name-to-enum mapper for the `Bidi_Class` property, using a particular data source. + * + * See the [Rust documentation for `BidiClass`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.BidiClass.html) for more information. */ - inline static diplomat::result, icu4x::DataError> create_bidi_class_with_provider(const icu4x::DataProvider& provider); + inline static icu4x::diplomat::result, icu4x::DataError> create_bidi_class_with_provider(const icu4x::DataProvider& provider); /** - * Create a name-to-enum mapper for the `Indic_Syllabic_Category` property, using compiled data. - * - * See the [Rust documentation for `IndicSyllabicCategory`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.IndicSyllabicCategory.html) for more information. + * Create a name-to-enum mapper for the `Indic_Syllabic_Category` property, using compiled data. + * + * See the [Rust documentation for `IndicSyllabicCategory`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.IndicSyllabicCategory.html) for more information. */ inline static std::unique_ptr create_indic_syllabic_category(); /** - * Create a name-to-enum mapper for the `Indic_Syllabic_Category` property, using a particular data source. - * - * See the [Rust documentation for `IndicSyllabicCategory`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.IndicSyllabicCategory.html) for more information. + * Create a name-to-enum mapper for the `Indic_Syllabic_Category` property, using a particular data source. + * + * See the [Rust documentation for `IndicSyllabicCategory`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.IndicSyllabicCategory.html) for more information. */ - inline static diplomat::result, icu4x::DataError> create_indic_syllabic_category_with_provider(const icu4x::DataProvider& provider); + inline static icu4x::diplomat::result, icu4x::DataError> create_indic_syllabic_category_with_provider(const icu4x::DataProvider& provider); /** - * Create a name-to-enum mapper for the `Line_Break` property, using compiled data. - * - * See the [Rust documentation for `LineBreak`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.LineBreak.html) for more information. + * Create a name-to-enum mapper for the `Line_Break` property, using compiled data. + * + * See the [Rust documentation for `LineBreak`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.LineBreak.html) for more information. */ inline static std::unique_ptr create_line_break(); /** - * Create a name-to-enum mapper for the `Line_Break` property, using a particular data source. - * - * See the [Rust documentation for `LineBreak`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.LineBreak.html) for more information. + * Create a name-to-enum mapper for the `Line_Break` property, using a particular data source. + * + * See the [Rust documentation for `LineBreak`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.LineBreak.html) for more information. */ - inline static diplomat::result, icu4x::DataError> create_line_break_with_provider(const icu4x::DataProvider& provider); + inline static icu4x::diplomat::result, icu4x::DataError> create_line_break_with_provider(const icu4x::DataProvider& provider); /** - * Create a name-to-enum mapper for the `Grapheme_Cluster_Break` property, using compiled data. - * - * See the [Rust documentation for `GraphemeClusterBreak`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.GraphemeClusterBreak.html) for more information. + * Create a name-to-enum mapper for the `Grapheme_Cluster_Break` property, using compiled data. + * + * See the [Rust documentation for `GraphemeClusterBreak`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.GraphemeClusterBreak.html) for more information. */ inline static std::unique_ptr create_grapheme_cluster_break(); /** - * Create a name-to-enum mapper for the `Grapheme_Cluster_Break` property, using a particular data source. - * - * See the [Rust documentation for `GraphemeClusterBreak`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.GraphemeClusterBreak.html) for more information. + * Create a name-to-enum mapper for the `Grapheme_Cluster_Break` property, using a particular data source. + * + * See the [Rust documentation for `GraphemeClusterBreak`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.GraphemeClusterBreak.html) for more information. */ - inline static diplomat::result, icu4x::DataError> create_grapheme_cluster_break_with_provider(const icu4x::DataProvider& provider); + inline static icu4x::diplomat::result, icu4x::DataError> create_grapheme_cluster_break_with_provider(const icu4x::DataProvider& provider); /** - * Create a name-to-enum mapper for the `Word_Break` property, using compiled data. - * - * See the [Rust documentation for `WordBreak`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.WordBreak.html) for more information. + * Create a name-to-enum mapper for the `Word_Break` property, using compiled data. + * + * See the [Rust documentation for `WordBreak`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.WordBreak.html) for more information. */ inline static std::unique_ptr create_word_break(); /** - * Create a name-to-enum mapper for the `Word_Break` property, using a particular data source. - * - * See the [Rust documentation for `WordBreak`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.WordBreak.html) for more information. + * Create a name-to-enum mapper for the `Word_Break` property, using a particular data source. + * + * See the [Rust documentation for `WordBreak`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.WordBreak.html) for more information. */ - inline static diplomat::result, icu4x::DataError> create_word_break_with_provider(const icu4x::DataProvider& provider); + inline static icu4x::diplomat::result, icu4x::DataError> create_word_break_with_provider(const icu4x::DataProvider& provider); /** - * Create a name-to-enum mapper for the `Sentence_Break` property, using compiled data. - * - * See the [Rust documentation for `SentenceBreak`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.SentenceBreak.html) for more information. + * Create a name-to-enum mapper for the `Sentence_Break` property, using compiled data. + * + * See the [Rust documentation for `SentenceBreak`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.SentenceBreak.html) for more information. */ inline static std::unique_ptr create_sentence_break(); /** - * Create a name-to-enum mapper for the `Sentence_Break` property, using a particular data source. - * - * See the [Rust documentation for `SentenceBreak`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.SentenceBreak.html) for more information. + * Create a name-to-enum mapper for the `Sentence_Break` property, using a particular data source. + * + * See the [Rust documentation for `SentenceBreak`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.SentenceBreak.html) for more information. */ - inline static diplomat::result, icu4x::DataError> create_sentence_break_with_provider(const icu4x::DataProvider& provider); + inline static icu4x::diplomat::result, icu4x::DataError> create_sentence_break_with_provider(const icu4x::DataProvider& provider); /** - * Create a name-to-enum mapper for the `Script` property, using compiled data. - * - * See the [Rust documentation for `Script`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.Script.html) for more information. + * Create a name-to-enum mapper for the `Script` property, using compiled data. + * + * See the [Rust documentation for `Script`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.Script.html) for more information. */ inline static std::unique_ptr create_script(); /** - * Create a name-to-enum mapper for the `Script` property, using a particular data source. - * - * See the [Rust documentation for `Script`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.Script.html) for more information. + * Create a name-to-enum mapper for the `Script` property, using a particular data source. + * + * See the [Rust documentation for `Script`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.Script.html) for more information. */ - inline static diplomat::result, icu4x::DataError> create_script_with_provider(const icu4x::DataProvider& provider); + inline static icu4x::diplomat::result, icu4x::DataError> create_script_with_provider(const icu4x::DataProvider& provider); /** - * Create a name-to-enum mapper for the `Vertical_Orientation` property, using compiled data. - * - * See the [Rust documentation for `VerticalOrientation`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.VerticalOrientation.html) for more information. + * Create a name-to-enum mapper for the `Vertical_Orientation` property, using compiled data. + * + * See the [Rust documentation for `VerticalOrientation`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.VerticalOrientation.html) for more information. */ inline static std::unique_ptr create_vertical_orientation(); /** - * Create a name-to-enum mapper for the `Vertical_Orientation` property, using a particular data source. - * - * See the [Rust documentation for `VerticalOrientation`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.VerticalOrientation.html) for more information. + * Create a name-to-enum mapper for the `Vertical_Orientation` property, using a particular data source. + * + * See the [Rust documentation for `VerticalOrientation`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.VerticalOrientation.html) for more information. */ - inline static diplomat::result, icu4x::DataError> create_vertical_orientation_with_provider(const icu4x::DataProvider& provider); + inline static icu4x::diplomat::result, icu4x::DataError> create_vertical_orientation_with_provider(const icu4x::DataProvider& provider); inline const icu4x::capi::PropertyValueNameToEnumMapper* AsFFI() const; inline icu4x::capi::PropertyValueNameToEnumMapper* AsFFI(); @@ -226,4 +226,4 @@ class PropertyValueNameToEnumMapper { }; } // namespace -#endif // icu4x_PropertyValueNameToEnumMapper_D_HPP +#endif // ICU4X_PropertyValueNameToEnumMapper_D_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/PropertyValueNameToEnumMapper.hpp b/ffi/capi/bindings/cpp/icu4x/PropertyValueNameToEnumMapper.hpp index e1b86b98e0e..d91b51dcc99 100644 --- a/ffi/capi/bindings/cpp/icu4x/PropertyValueNameToEnumMapper.hpp +++ b/ffi/capi/bindings/cpp/icu4x/PropertyValueNameToEnumMapper.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_PropertyValueNameToEnumMapper_HPP -#define icu4x_PropertyValueNameToEnumMapper_HPP +#ifndef ICU4X_PropertyValueNameToEnumMapper_HPP +#define ICU4X_PropertyValueNameToEnumMapper_HPP #include "PropertyValueNameToEnumMapper.d.hpp" @@ -11,18 +11,18 @@ #include #include #include -#include "../diplomat_runtime.hpp" #include "DataError.hpp" #include "DataProvider.hpp" +#include "diplomat_runtime.hpp" namespace icu4x { namespace capi { extern "C" { - int16_t icu4x_PropertyValueNameToEnumMapper_get_strict_mv1(const icu4x::capi::PropertyValueNameToEnumMapper* self, diplomat::capi::DiplomatStringView name); + int16_t icu4x_PropertyValueNameToEnumMapper_get_strict_mv1(const icu4x::capi::PropertyValueNameToEnumMapper* self, icu4x::diplomat::capi::DiplomatStringView name); - int16_t icu4x_PropertyValueNameToEnumMapper_get_loose_mv1(const icu4x::capi::PropertyValueNameToEnumMapper* self, diplomat::capi::DiplomatStringView name); + int16_t icu4x_PropertyValueNameToEnumMapper_get_loose_mv1(const icu4x::capi::PropertyValueNameToEnumMapper* self, icu4x::diplomat::capi::DiplomatStringView name); icu4x::capi::PropertyValueNameToEnumMapper* icu4x_PropertyValueNameToEnumMapper_create_general_category_mv1(void); @@ -102,9 +102,9 @@ inline std::unique_ptr icu4x::PropertyValu return std::unique_ptr(icu4x::PropertyValueNameToEnumMapper::FromFFI(result)); } -inline diplomat::result, icu4x::DataError> icu4x::PropertyValueNameToEnumMapper::create_general_category_with_provider(const icu4x::DataProvider& provider) { +inline icu4x::diplomat::result, icu4x::DataError> icu4x::PropertyValueNameToEnumMapper::create_general_category_with_provider(const icu4x::DataProvider& provider) { auto result = icu4x::capi::icu4x_PropertyValueNameToEnumMapper_create_general_category_with_provider_mv1(provider.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DataError>(diplomat::Ok>(std::unique_ptr(icu4x::PropertyValueNameToEnumMapper::FromFFI(result.ok)))) : diplomat::result, icu4x::DataError>(diplomat::Err(icu4x::DataError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::PropertyValueNameToEnumMapper::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Err(icu4x::DataError::FromFFI(result.err))); } inline std::unique_ptr icu4x::PropertyValueNameToEnumMapper::create_hangul_syllable_type() { @@ -112,9 +112,9 @@ inline std::unique_ptr icu4x::PropertyValu return std::unique_ptr(icu4x::PropertyValueNameToEnumMapper::FromFFI(result)); } -inline diplomat::result, icu4x::DataError> icu4x::PropertyValueNameToEnumMapper::create_hangul_syllable_type_with_provider(const icu4x::DataProvider& provider) { +inline icu4x::diplomat::result, icu4x::DataError> icu4x::PropertyValueNameToEnumMapper::create_hangul_syllable_type_with_provider(const icu4x::DataProvider& provider) { auto result = icu4x::capi::icu4x_PropertyValueNameToEnumMapper_create_hangul_syllable_type_with_provider_mv1(provider.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DataError>(diplomat::Ok>(std::unique_ptr(icu4x::PropertyValueNameToEnumMapper::FromFFI(result.ok)))) : diplomat::result, icu4x::DataError>(diplomat::Err(icu4x::DataError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::PropertyValueNameToEnumMapper::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Err(icu4x::DataError::FromFFI(result.err))); } inline std::unique_ptr icu4x::PropertyValueNameToEnumMapper::create_east_asian_width() { @@ -122,9 +122,9 @@ inline std::unique_ptr icu4x::PropertyValu return std::unique_ptr(icu4x::PropertyValueNameToEnumMapper::FromFFI(result)); } -inline diplomat::result, icu4x::DataError> icu4x::PropertyValueNameToEnumMapper::create_east_asian_width_with_provider(const icu4x::DataProvider& provider) { +inline icu4x::diplomat::result, icu4x::DataError> icu4x::PropertyValueNameToEnumMapper::create_east_asian_width_with_provider(const icu4x::DataProvider& provider) { auto result = icu4x::capi::icu4x_PropertyValueNameToEnumMapper_create_east_asian_width_with_provider_mv1(provider.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DataError>(diplomat::Ok>(std::unique_ptr(icu4x::PropertyValueNameToEnumMapper::FromFFI(result.ok)))) : diplomat::result, icu4x::DataError>(diplomat::Err(icu4x::DataError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::PropertyValueNameToEnumMapper::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Err(icu4x::DataError::FromFFI(result.err))); } inline std::unique_ptr icu4x::PropertyValueNameToEnumMapper::create_bidi_class() { @@ -132,9 +132,9 @@ inline std::unique_ptr icu4x::PropertyValu return std::unique_ptr(icu4x::PropertyValueNameToEnumMapper::FromFFI(result)); } -inline diplomat::result, icu4x::DataError> icu4x::PropertyValueNameToEnumMapper::create_bidi_class_with_provider(const icu4x::DataProvider& provider) { +inline icu4x::diplomat::result, icu4x::DataError> icu4x::PropertyValueNameToEnumMapper::create_bidi_class_with_provider(const icu4x::DataProvider& provider) { auto result = icu4x::capi::icu4x_PropertyValueNameToEnumMapper_create_bidi_class_with_provider_mv1(provider.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DataError>(diplomat::Ok>(std::unique_ptr(icu4x::PropertyValueNameToEnumMapper::FromFFI(result.ok)))) : diplomat::result, icu4x::DataError>(diplomat::Err(icu4x::DataError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::PropertyValueNameToEnumMapper::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Err(icu4x::DataError::FromFFI(result.err))); } inline std::unique_ptr icu4x::PropertyValueNameToEnumMapper::create_indic_syllabic_category() { @@ -142,9 +142,9 @@ inline std::unique_ptr icu4x::PropertyValu return std::unique_ptr(icu4x::PropertyValueNameToEnumMapper::FromFFI(result)); } -inline diplomat::result, icu4x::DataError> icu4x::PropertyValueNameToEnumMapper::create_indic_syllabic_category_with_provider(const icu4x::DataProvider& provider) { +inline icu4x::diplomat::result, icu4x::DataError> icu4x::PropertyValueNameToEnumMapper::create_indic_syllabic_category_with_provider(const icu4x::DataProvider& provider) { auto result = icu4x::capi::icu4x_PropertyValueNameToEnumMapper_create_indic_syllabic_category_with_provider_mv1(provider.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DataError>(diplomat::Ok>(std::unique_ptr(icu4x::PropertyValueNameToEnumMapper::FromFFI(result.ok)))) : diplomat::result, icu4x::DataError>(diplomat::Err(icu4x::DataError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::PropertyValueNameToEnumMapper::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Err(icu4x::DataError::FromFFI(result.err))); } inline std::unique_ptr icu4x::PropertyValueNameToEnumMapper::create_line_break() { @@ -152,9 +152,9 @@ inline std::unique_ptr icu4x::PropertyValu return std::unique_ptr(icu4x::PropertyValueNameToEnumMapper::FromFFI(result)); } -inline diplomat::result, icu4x::DataError> icu4x::PropertyValueNameToEnumMapper::create_line_break_with_provider(const icu4x::DataProvider& provider) { +inline icu4x::diplomat::result, icu4x::DataError> icu4x::PropertyValueNameToEnumMapper::create_line_break_with_provider(const icu4x::DataProvider& provider) { auto result = icu4x::capi::icu4x_PropertyValueNameToEnumMapper_create_line_break_with_provider_mv1(provider.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DataError>(diplomat::Ok>(std::unique_ptr(icu4x::PropertyValueNameToEnumMapper::FromFFI(result.ok)))) : diplomat::result, icu4x::DataError>(diplomat::Err(icu4x::DataError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::PropertyValueNameToEnumMapper::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Err(icu4x::DataError::FromFFI(result.err))); } inline std::unique_ptr icu4x::PropertyValueNameToEnumMapper::create_grapheme_cluster_break() { @@ -162,9 +162,9 @@ inline std::unique_ptr icu4x::PropertyValu return std::unique_ptr(icu4x::PropertyValueNameToEnumMapper::FromFFI(result)); } -inline diplomat::result, icu4x::DataError> icu4x::PropertyValueNameToEnumMapper::create_grapheme_cluster_break_with_provider(const icu4x::DataProvider& provider) { +inline icu4x::diplomat::result, icu4x::DataError> icu4x::PropertyValueNameToEnumMapper::create_grapheme_cluster_break_with_provider(const icu4x::DataProvider& provider) { auto result = icu4x::capi::icu4x_PropertyValueNameToEnumMapper_create_grapheme_cluster_break_with_provider_mv1(provider.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DataError>(diplomat::Ok>(std::unique_ptr(icu4x::PropertyValueNameToEnumMapper::FromFFI(result.ok)))) : diplomat::result, icu4x::DataError>(diplomat::Err(icu4x::DataError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::PropertyValueNameToEnumMapper::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Err(icu4x::DataError::FromFFI(result.err))); } inline std::unique_ptr icu4x::PropertyValueNameToEnumMapper::create_word_break() { @@ -172,9 +172,9 @@ inline std::unique_ptr icu4x::PropertyValu return std::unique_ptr(icu4x::PropertyValueNameToEnumMapper::FromFFI(result)); } -inline diplomat::result, icu4x::DataError> icu4x::PropertyValueNameToEnumMapper::create_word_break_with_provider(const icu4x::DataProvider& provider) { +inline icu4x::diplomat::result, icu4x::DataError> icu4x::PropertyValueNameToEnumMapper::create_word_break_with_provider(const icu4x::DataProvider& provider) { auto result = icu4x::capi::icu4x_PropertyValueNameToEnumMapper_create_word_break_with_provider_mv1(provider.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DataError>(diplomat::Ok>(std::unique_ptr(icu4x::PropertyValueNameToEnumMapper::FromFFI(result.ok)))) : diplomat::result, icu4x::DataError>(diplomat::Err(icu4x::DataError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::PropertyValueNameToEnumMapper::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Err(icu4x::DataError::FromFFI(result.err))); } inline std::unique_ptr icu4x::PropertyValueNameToEnumMapper::create_sentence_break() { @@ -182,9 +182,9 @@ inline std::unique_ptr icu4x::PropertyValu return std::unique_ptr(icu4x::PropertyValueNameToEnumMapper::FromFFI(result)); } -inline diplomat::result, icu4x::DataError> icu4x::PropertyValueNameToEnumMapper::create_sentence_break_with_provider(const icu4x::DataProvider& provider) { +inline icu4x::diplomat::result, icu4x::DataError> icu4x::PropertyValueNameToEnumMapper::create_sentence_break_with_provider(const icu4x::DataProvider& provider) { auto result = icu4x::capi::icu4x_PropertyValueNameToEnumMapper_create_sentence_break_with_provider_mv1(provider.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DataError>(diplomat::Ok>(std::unique_ptr(icu4x::PropertyValueNameToEnumMapper::FromFFI(result.ok)))) : diplomat::result, icu4x::DataError>(diplomat::Err(icu4x::DataError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::PropertyValueNameToEnumMapper::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Err(icu4x::DataError::FromFFI(result.err))); } inline std::unique_ptr icu4x::PropertyValueNameToEnumMapper::create_script() { @@ -192,9 +192,9 @@ inline std::unique_ptr icu4x::PropertyValu return std::unique_ptr(icu4x::PropertyValueNameToEnumMapper::FromFFI(result)); } -inline diplomat::result, icu4x::DataError> icu4x::PropertyValueNameToEnumMapper::create_script_with_provider(const icu4x::DataProvider& provider) { +inline icu4x::diplomat::result, icu4x::DataError> icu4x::PropertyValueNameToEnumMapper::create_script_with_provider(const icu4x::DataProvider& provider) { auto result = icu4x::capi::icu4x_PropertyValueNameToEnumMapper_create_script_with_provider_mv1(provider.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DataError>(diplomat::Ok>(std::unique_ptr(icu4x::PropertyValueNameToEnumMapper::FromFFI(result.ok)))) : diplomat::result, icu4x::DataError>(diplomat::Err(icu4x::DataError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::PropertyValueNameToEnumMapper::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Err(icu4x::DataError::FromFFI(result.err))); } inline std::unique_ptr icu4x::PropertyValueNameToEnumMapper::create_vertical_orientation() { @@ -202,9 +202,9 @@ inline std::unique_ptr icu4x::PropertyValu return std::unique_ptr(icu4x::PropertyValueNameToEnumMapper::FromFFI(result)); } -inline diplomat::result, icu4x::DataError> icu4x::PropertyValueNameToEnumMapper::create_vertical_orientation_with_provider(const icu4x::DataProvider& provider) { +inline icu4x::diplomat::result, icu4x::DataError> icu4x::PropertyValueNameToEnumMapper::create_vertical_orientation_with_provider(const icu4x::DataProvider& provider) { auto result = icu4x::capi::icu4x_PropertyValueNameToEnumMapper_create_vertical_orientation_with_provider_mv1(provider.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DataError>(diplomat::Ok>(std::unique_ptr(icu4x::PropertyValueNameToEnumMapper::FromFFI(result.ok)))) : diplomat::result, icu4x::DataError>(diplomat::Err(icu4x::DataError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::PropertyValueNameToEnumMapper::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Err(icu4x::DataError::FromFFI(result.err))); } inline const icu4x::capi::PropertyValueNameToEnumMapper* icu4x::PropertyValueNameToEnumMapper::AsFFI() const { @@ -228,4 +228,4 @@ inline void icu4x::PropertyValueNameToEnumMapper::operator delete(void* ptr) { } -#endif // icu4x_PropertyValueNameToEnumMapper_HPP +#endif // ICU4X_PropertyValueNameToEnumMapper_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/RegionDisplayNames.d.hpp b/ffi/capi/bindings/cpp/icu4x/RegionDisplayNames.d.hpp index 0a464767b79..0db4e88fafe 100644 --- a/ffi/capi/bindings/cpp/icu4x/RegionDisplayNames.d.hpp +++ b/ffi/capi/bindings/cpp/icu4x/RegionDisplayNames.d.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_RegionDisplayNames_D_HPP -#define icu4x_RegionDisplayNames_D_HPP +#ifndef ICU4X_RegionDisplayNames_D_HPP +#define ICU4X_RegionDisplayNames_D_HPP #include #include @@ -9,8 +9,7 @@ #include #include #include -#include "../diplomat_runtime.hpp" - +#include "diplomat_runtime.hpp" namespace icu4x { namespace capi { struct DataProvider; } class DataProvider; @@ -21,7 +20,8 @@ class RegionDisplayNames; struct DisplayNamesOptionsV1; class DataError; class LocaleParseError; -} +} // namespace icu4x + namespace icu4x { @@ -40,35 +40,35 @@ class RegionDisplayNames { public: /** - * 🚧 This API is experimental and may experience breaking changes outside major releases. - * - * Creates a new `RegionDisplayNames` from locale data and an options bag using compiled data. - * - * See the [Rust documentation for `try_new`](https://docs.rs/icu/2.0.0/icu/experimental/displaynames/struct.RegionDisplayNames.html#method.try_new) for more information. + * 🚧 This API is experimental and may experience breaking changes outside major releases. + * + * Creates a new `RegionDisplayNames` from locale data and an options bag using compiled data. + * + * See the [Rust documentation for `try_new`](https://docs.rs/icu/2.0.0/icu/experimental/displaynames/struct.RegionDisplayNames.html#method.try_new) for more information. */ - inline static diplomat::result, icu4x::DataError> create_v1(const icu4x::Locale& locale, icu4x::DisplayNamesOptionsV1 options); + inline static icu4x::diplomat::result, icu4x::DataError> create_v1(const icu4x::Locale& locale, icu4x::DisplayNamesOptionsV1 options); /** - * 🚧 This API is experimental and may experience breaking changes outside major releases. - * - * Creates a new `RegionDisplayNames` from locale data and an options bag using a particular data source. - * - * See the [Rust documentation for `try_new`](https://docs.rs/icu/2.0.0/icu/experimental/displaynames/struct.RegionDisplayNames.html#method.try_new) for more information. + * 🚧 This API is experimental and may experience breaking changes outside major releases. + * + * Creates a new `RegionDisplayNames` from locale data and an options bag using a particular data source. + * + * See the [Rust documentation for `try_new`](https://docs.rs/icu/2.0.0/icu/experimental/displaynames/struct.RegionDisplayNames.html#method.try_new) for more information. */ - inline static diplomat::result, icu4x::DataError> create_v1_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, icu4x::DisplayNamesOptionsV1 options); + inline static icu4x::diplomat::result, icu4x::DataError> create_v1_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, icu4x::DisplayNamesOptionsV1 options); /** - * 🚧 This API is experimental and may experience breaking changes outside major releases. - * - * Returns the locale specific display name of a region. - * Note that the function returns an empty string in case the display name for a given - * region code is not found. - * - * See the [Rust documentation for `of`](https://docs.rs/icu/2.0.0/icu/experimental/displaynames/struct.RegionDisplayNames.html#method.of) for more information. + * 🚧 This API is experimental and may experience breaking changes outside major releases. + * + * Returns the locale specific display name of a region. + * Note that the function returns an empty string in case the display name for a given + * region code is not found. + * + * See the [Rust documentation for `of`](https://docs.rs/icu/2.0.0/icu/experimental/displaynames/struct.RegionDisplayNames.html#method.of) for more information. */ - inline diplomat::result of(std::string_view region) const; + inline icu4x::diplomat::result of(std::string_view region) const; template - inline diplomat::result of_write(std::string_view region, W& writeable_output) const; + inline icu4x::diplomat::result of_write(std::string_view region, W& writeable_output) const; inline const icu4x::capi::RegionDisplayNames* AsFFI() const; inline icu4x::capi::RegionDisplayNames* AsFFI(); @@ -85,4 +85,4 @@ class RegionDisplayNames { }; } // namespace -#endif // icu4x_RegionDisplayNames_D_HPP +#endif // ICU4X_RegionDisplayNames_D_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/RegionDisplayNames.hpp b/ffi/capi/bindings/cpp/icu4x/RegionDisplayNames.hpp index eb2915f5311..6ea7c4b2836 100644 --- a/ffi/capi/bindings/cpp/icu4x/RegionDisplayNames.hpp +++ b/ffi/capi/bindings/cpp/icu4x/RegionDisplayNames.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_RegionDisplayNames_HPP -#define icu4x_RegionDisplayNames_HPP +#ifndef ICU4X_RegionDisplayNames_HPP +#define ICU4X_RegionDisplayNames_HPP #include "RegionDisplayNames.d.hpp" @@ -11,12 +11,12 @@ #include #include #include -#include "../diplomat_runtime.hpp" #include "DataError.hpp" #include "DataProvider.hpp" #include "DisplayNamesOptionsV1.hpp" #include "Locale.hpp" #include "LocaleParseError.hpp" +#include "diplomat_runtime.hpp" namespace icu4x { @@ -30,7 +30,7 @@ namespace capi { icu4x_RegionDisplayNames_create_v1_with_provider_mv1_result icu4x_RegionDisplayNames_create_v1_with_provider_mv1(const icu4x::capi::DataProvider* provider, const icu4x::capi::Locale* locale, icu4x::capi::DisplayNamesOptionsV1 options); typedef struct icu4x_RegionDisplayNames_of_mv1_result {union { icu4x::capi::LocaleParseError err;}; bool is_ok;} icu4x_RegionDisplayNames_of_mv1_result; - icu4x_RegionDisplayNames_of_mv1_result icu4x_RegionDisplayNames_of_mv1(const icu4x::capi::RegionDisplayNames* self, diplomat::capi::DiplomatStringView region, diplomat::capi::DiplomatWrite* write); + icu4x_RegionDisplayNames_of_mv1_result icu4x_RegionDisplayNames_of_mv1(const icu4x::capi::RegionDisplayNames* self, icu4x::diplomat::capi::DiplomatStringView region, icu4x::diplomat::capi::DiplomatWrite* write); void icu4x_RegionDisplayNames_destroy_mv1(RegionDisplayNames* self); @@ -38,34 +38,34 @@ namespace capi { } // namespace capi } // namespace -inline diplomat::result, icu4x::DataError> icu4x::RegionDisplayNames::create_v1(const icu4x::Locale& locale, icu4x::DisplayNamesOptionsV1 options) { +inline icu4x::diplomat::result, icu4x::DataError> icu4x::RegionDisplayNames::create_v1(const icu4x::Locale& locale, icu4x::DisplayNamesOptionsV1 options) { auto result = icu4x::capi::icu4x_RegionDisplayNames_create_v1_mv1(locale.AsFFI(), options.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DataError>(diplomat::Ok>(std::unique_ptr(icu4x::RegionDisplayNames::FromFFI(result.ok)))) : diplomat::result, icu4x::DataError>(diplomat::Err(icu4x::DataError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::RegionDisplayNames::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Err(icu4x::DataError::FromFFI(result.err))); } -inline diplomat::result, icu4x::DataError> icu4x::RegionDisplayNames::create_v1_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, icu4x::DisplayNamesOptionsV1 options) { +inline icu4x::diplomat::result, icu4x::DataError> icu4x::RegionDisplayNames::create_v1_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, icu4x::DisplayNamesOptionsV1 options) { auto result = icu4x::capi::icu4x_RegionDisplayNames_create_v1_with_provider_mv1(provider.AsFFI(), locale.AsFFI(), options.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DataError>(diplomat::Ok>(std::unique_ptr(icu4x::RegionDisplayNames::FromFFI(result.ok)))) : diplomat::result, icu4x::DataError>(diplomat::Err(icu4x::DataError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::RegionDisplayNames::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Err(icu4x::DataError::FromFFI(result.err))); } -inline diplomat::result icu4x::RegionDisplayNames::of(std::string_view region) const { +inline icu4x::diplomat::result icu4x::RegionDisplayNames::of(std::string_view region) const { std::string output; - diplomat::capi::DiplomatWrite write = diplomat::WriteFromString(output); + icu4x::diplomat::capi::DiplomatWrite write = icu4x::diplomat::WriteFromString(output); auto result = icu4x::capi::icu4x_RegionDisplayNames_of_mv1(this->AsFFI(), {region.data(), region.size()}, &write); - return result.is_ok ? diplomat::result(diplomat::Ok(std::move(output))) : diplomat::result(diplomat::Err(icu4x::LocaleParseError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result(icu4x::diplomat::Ok(std::move(output))) : icu4x::diplomat::result(icu4x::diplomat::Err(icu4x::LocaleParseError::FromFFI(result.err))); } template -inline diplomat::result icu4x::RegionDisplayNames::of_write(std::string_view region, W& writeable) const { - diplomat::capi::DiplomatWrite write = diplomat::WriteTrait::Construct(writeable); +inline icu4x::diplomat::result icu4x::RegionDisplayNames::of_write(std::string_view region, W& writeable) const { + icu4x::diplomat::capi::DiplomatWrite write = icu4x::diplomat::WriteTrait::Construct(writeable); auto result = icu4x::capi::icu4x_RegionDisplayNames_of_mv1(this->AsFFI(), {region.data(), region.size()}, &write); - return result.is_ok ? diplomat::result(diplomat::Ok()) : diplomat::result(diplomat::Err(icu4x::LocaleParseError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result(icu4x::diplomat::Ok()) : icu4x::diplomat::result(icu4x::diplomat::Err(icu4x::LocaleParseError::FromFFI(result.err))); } inline const icu4x::capi::RegionDisplayNames* icu4x::RegionDisplayNames::AsFFI() const { @@ -89,4 +89,4 @@ inline void icu4x::RegionDisplayNames::operator delete(void* ptr) { } -#endif // icu4x_RegionDisplayNames_HPP +#endif // ICU4X_RegionDisplayNames_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/ReorderedIndexMap.d.hpp b/ffi/capi/bindings/cpp/icu4x/ReorderedIndexMap.d.hpp index 1a55f19f08c..3792a2e864c 100644 --- a/ffi/capi/bindings/cpp/icu4x/ReorderedIndexMap.d.hpp +++ b/ffi/capi/bindings/cpp/icu4x/ReorderedIndexMap.d.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_ReorderedIndexMap_D_HPP -#define icu4x_ReorderedIndexMap_D_HPP +#ifndef ICU4X_ReorderedIndexMap_D_HPP +#define ICU4X_ReorderedIndexMap_D_HPP #include #include @@ -9,7 +9,7 @@ #include #include #include -#include "../diplomat_runtime.hpp" +#include "diplomat_runtime.hpp" namespace icu4x { @@ -30,24 +30,24 @@ class ReorderedIndexMap { public: /** - * Get this as a slice/array of indices + * Get this as a slice/array of indices */ - inline diplomat::span as_slice() const; + inline icu4x::diplomat::span as_slice() const; /** - * The length of this map + * The length of this map */ inline size_t len() const; /** - * Whether this map is empty + * Whether this map is empty */ inline bool is_empty() const; /** - * Get element at `index`. Returns 0 when out of bounds - * (note that 0 is also a valid in-bounds value, please use `len()` - * to avoid out-of-bounds) + * Get element at `index`. Returns 0 when out of bounds + * (note that 0 is also a valid in-bounds value, please use `len()` + * to avoid out-of-bounds) */ inline size_t operator[](size_t index) const; @@ -66,4 +66,4 @@ class ReorderedIndexMap { }; } // namespace -#endif // icu4x_ReorderedIndexMap_D_HPP +#endif // ICU4X_ReorderedIndexMap_D_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/ReorderedIndexMap.hpp b/ffi/capi/bindings/cpp/icu4x/ReorderedIndexMap.hpp index 9f7ad3e5348..1f5b4ee2ce2 100644 --- a/ffi/capi/bindings/cpp/icu4x/ReorderedIndexMap.hpp +++ b/ffi/capi/bindings/cpp/icu4x/ReorderedIndexMap.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_ReorderedIndexMap_HPP -#define icu4x_ReorderedIndexMap_HPP +#ifndef ICU4X_ReorderedIndexMap_HPP +#define ICU4X_ReorderedIndexMap_HPP #include "ReorderedIndexMap.d.hpp" @@ -11,14 +11,14 @@ #include #include #include -#include "../diplomat_runtime.hpp" +#include "diplomat_runtime.hpp" namespace icu4x { namespace capi { extern "C" { - diplomat::capi::DiplomatUsizeView icu4x_ReorderedIndexMap_as_slice_mv1(const icu4x::capi::ReorderedIndexMap* self); + icu4x::diplomat::capi::DiplomatUsizeView icu4x_ReorderedIndexMap_as_slice_mv1(const icu4x::capi::ReorderedIndexMap* self); size_t icu4x_ReorderedIndexMap_len_mv1(const icu4x::capi::ReorderedIndexMap* self); @@ -32,9 +32,9 @@ namespace capi { } // namespace capi } // namespace -inline diplomat::span icu4x::ReorderedIndexMap::as_slice() const { +inline icu4x::diplomat::span icu4x::ReorderedIndexMap::as_slice() const { auto result = icu4x::capi::icu4x_ReorderedIndexMap_as_slice_mv1(this->AsFFI()); - return diplomat::span(result.data, result.len); + return icu4x::diplomat::span(result.data, result.len); } inline size_t icu4x::ReorderedIndexMap::len() const { @@ -74,4 +74,4 @@ inline void icu4x::ReorderedIndexMap::operator delete(void* ptr) { } -#endif // icu4x_ReorderedIndexMap_HPP +#endif // ICU4X_ReorderedIndexMap_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/Rfc9557ParseError.d.hpp b/ffi/capi/bindings/cpp/icu4x/Rfc9557ParseError.d.hpp index 02b883bc002..9e2ee35157e 100644 --- a/ffi/capi/bindings/cpp/icu4x/Rfc9557ParseError.d.hpp +++ b/ffi/capi/bindings/cpp/icu4x/Rfc9557ParseError.d.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_Rfc9557ParseError_D_HPP -#define icu4x_Rfc9557ParseError_D_HPP +#ifndef ICU4X_Rfc9557ParseError_D_HPP +#define ICU4X_Rfc9557ParseError_D_HPP #include #include @@ -9,7 +9,7 @@ #include #include #include -#include "../diplomat_runtime.hpp" +#include "diplomat_runtime.hpp" namespace icu4x { @@ -55,4 +55,4 @@ class Rfc9557ParseError { }; } // namespace -#endif // icu4x_Rfc9557ParseError_D_HPP +#endif // ICU4X_Rfc9557ParseError_D_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/Rfc9557ParseError.hpp b/ffi/capi/bindings/cpp/icu4x/Rfc9557ParseError.hpp index 2a29152174e..11e8ec9fac4 100644 --- a/ffi/capi/bindings/cpp/icu4x/Rfc9557ParseError.hpp +++ b/ffi/capi/bindings/cpp/icu4x/Rfc9557ParseError.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_Rfc9557ParseError_HPP -#define icu4x_Rfc9557ParseError_HPP +#ifndef ICU4X_Rfc9557ParseError_HPP +#define ICU4X_Rfc9557ParseError_HPP #include "Rfc9557ParseError.d.hpp" @@ -11,7 +11,7 @@ #include #include #include -#include "../diplomat_runtime.hpp" +#include "diplomat_runtime.hpp" namespace icu4x { @@ -38,4 +38,4 @@ inline icu4x::Rfc9557ParseError icu4x::Rfc9557ParseError::FromFFI(icu4x::capi::R std::abort(); } } -#endif // icu4x_Rfc9557ParseError_HPP +#endif // ICU4X_Rfc9557ParseError_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/Script.d.hpp b/ffi/capi/bindings/cpp/icu4x/Script.d.hpp index 9c990b397b4..331026a9b9c 100644 --- a/ffi/capi/bindings/cpp/icu4x/Script.d.hpp +++ b/ffi/capi/bindings/cpp/icu4x/Script.d.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_Script_D_HPP -#define icu4x_Script_D_HPP +#ifndef ICU4X_Script_D_HPP +#define ICU4X_Script_D_HPP #include #include @@ -9,11 +9,11 @@ #include #include #include -#include "../diplomat_runtime.hpp" - +#include "diplomat_runtime.hpp" namespace icu4x { class Script; -} +} // namespace icu4x + namespace icu4x { @@ -373,35 +373,35 @@ class Script { explicit operator bool() const = delete; /** - * See the [Rust documentation for `for_char`](https://docs.rs/icu/2.0.0/icu/properties/props/trait.EnumeratedProperty.html#tymethod.for_char) for more information. + * See the [Rust documentation for `for_char`](https://docs.rs/icu/2.0.0/icu/properties/props/trait.EnumeratedProperty.html#tymethod.for_char) for more information. */ inline static icu4x::Script for_char(char32_t ch); /** - * Get the "long" name of this property value (returns empty if property value is unknown) - * - * See the [Rust documentation for `get`](https://docs.rs/icu/2.0.0/icu/properties/struct.PropertyNamesLongBorrowed.html#method.get) for more information. + * Get the "long" name of this property value (returns empty if property value is unknown) + * + * See the [Rust documentation for `get`](https://docs.rs/icu/2.0.0/icu/properties/struct.PropertyNamesLongBorrowed.html#method.get) for more information. */ inline std::optional long_name() const; /** - * Get the "short" name of this property value (returns empty if property value is unknown) - * - * See the [Rust documentation for `get`](https://docs.rs/icu/2.0.0/icu/properties/struct.PropertyNamesShortBorrowed.html#method.get) for more information. + * Get the "short" name of this property value (returns empty if property value is unknown) + * + * See the [Rust documentation for `get`](https://docs.rs/icu/2.0.0/icu/properties/struct.PropertyNamesShortBorrowed.html#method.get) for more information. */ inline std::optional short_name() const; /** - * Convert to an integer value usable with ICU4C and CodePointMapData - * - * See the [Rust documentation for `to_icu4c_value`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.Script.html#method.to_icu4c_value) for more information. + * Convert to an integer value usable with ICU4C and CodePointMapData + * + * See the [Rust documentation for `to_icu4c_value`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.Script.html#method.to_icu4c_value) for more information. */ inline uint16_t to_integer_value() const; /** - * Convert from an integer value from ICU4C or CodePointMapData - * - * See the [Rust documentation for `from_icu4c_value`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.Script.html#method.from_icu4c_value) for more information. + * Convert from an integer value from ICU4C or CodePointMapData + * + * See the [Rust documentation for `from_icu4c_value`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.Script.html#method.from_icu4c_value) for more information. */ inline static std::optional from_integer_value(uint16_t other); @@ -412,4 +412,4 @@ class Script { }; } // namespace -#endif // icu4x_Script_D_HPP +#endif // ICU4X_Script_D_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/Script.hpp b/ffi/capi/bindings/cpp/icu4x/Script.hpp index 00bcbddf28c..3355327374b 100644 --- a/ffi/capi/bindings/cpp/icu4x/Script.hpp +++ b/ffi/capi/bindings/cpp/icu4x/Script.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_Script_HPP -#define icu4x_Script_HPP +#ifndef ICU4X_Script_HPP +#define ICU4X_Script_HPP #include "Script.d.hpp" @@ -11,7 +11,7 @@ #include #include #include -#include "../diplomat_runtime.hpp" +#include "diplomat_runtime.hpp" namespace icu4x { @@ -20,10 +20,10 @@ namespace capi { icu4x::capi::Script icu4x_Script_for_char_mv1(char32_t ch); - typedef struct icu4x_Script_long_name_mv1_result {union {diplomat::capi::DiplomatStringView ok; }; bool is_ok;} icu4x_Script_long_name_mv1_result; + typedef struct icu4x_Script_long_name_mv1_result {union {icu4x::diplomat::capi::DiplomatStringView ok; }; bool is_ok;} icu4x_Script_long_name_mv1_result; icu4x_Script_long_name_mv1_result icu4x_Script_long_name_mv1(icu4x::capi::Script self); - typedef struct icu4x_Script_short_name_mv1_result {union {diplomat::capi::DiplomatStringView ok; }; bool is_ok;} icu4x_Script_short_name_mv1_result; + typedef struct icu4x_Script_short_name_mv1_result {union {icu4x::diplomat::capi::DiplomatStringView ok; }; bool is_ok;} icu4x_Script_short_name_mv1_result; icu4x_Script_short_name_mv1_result icu4x_Script_short_name_mv1(icu4x::capi::Script self); uint16_t icu4x_Script_to_integer_value_mv1(icu4x::capi::Script self); @@ -236,4 +236,4 @@ inline std::optional icu4x::Script::from_integer_value(uint16_t o auto result = icu4x::capi::icu4x_Script_from_integer_value_mv1(other); return result.is_ok ? std::optional(icu4x::Script::FromFFI(result.ok)) : std::nullopt; } -#endif // icu4x_Script_HPP +#endif // ICU4X_Script_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/ScriptExtensionsSet.d.hpp b/ffi/capi/bindings/cpp/icu4x/ScriptExtensionsSet.d.hpp index fd38e93cbae..126bf50f8cd 100644 --- a/ffi/capi/bindings/cpp/icu4x/ScriptExtensionsSet.d.hpp +++ b/ffi/capi/bindings/cpp/icu4x/ScriptExtensionsSet.d.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_ScriptExtensionsSet_D_HPP -#define icu4x_ScriptExtensionsSet_D_HPP +#ifndef ICU4X_ScriptExtensionsSet_D_HPP +#define ICU4X_ScriptExtensionsSet_D_HPP #include #include @@ -9,7 +9,7 @@ #include #include #include -#include "../diplomat_runtime.hpp" +#include "diplomat_runtime.hpp" namespace icu4x { @@ -28,23 +28,23 @@ class ScriptExtensionsSet { public: /** - * Check if the Script_Extensions property of the given code point covers the given script - * - * See the [Rust documentation for `contains`](https://docs.rs/icu/2.0.0/icu/properties/script/struct.ScriptExtensionsSet.html#method.contains) for more information. + * Check if the Script_Extensions property of the given code point covers the given script + * + * See the [Rust documentation for `contains`](https://docs.rs/icu/2.0.0/icu/properties/script/struct.ScriptExtensionsSet.html#method.contains) for more information. */ inline bool contains(uint16_t script) const; /** - * Get the number of scripts contained in here - * - * See the [Rust documentation for `iter`](https://docs.rs/icu/2.0.0/icu/properties/script/struct.ScriptExtensionsSet.html#method.iter) for more information. + * Get the number of scripts contained in here + * + * See the [Rust documentation for `iter`](https://docs.rs/icu/2.0.0/icu/properties/script/struct.ScriptExtensionsSet.html#method.iter) for more information. */ inline size_t count() const; /** - * Get script at index - * - * See the [Rust documentation for `iter`](https://docs.rs/icu/2.0.0/icu/properties/script/struct.ScriptExtensionsSet.html#method.iter) for more information. + * Get script at index + * + * See the [Rust documentation for `iter`](https://docs.rs/icu/2.0.0/icu/properties/script/struct.ScriptExtensionsSet.html#method.iter) for more information. */ inline std::optional script_at(size_t index) const; @@ -63,4 +63,4 @@ class ScriptExtensionsSet { }; } // namespace -#endif // icu4x_ScriptExtensionsSet_D_HPP +#endif // ICU4X_ScriptExtensionsSet_D_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/ScriptExtensionsSet.hpp b/ffi/capi/bindings/cpp/icu4x/ScriptExtensionsSet.hpp index 6849299eb87..eebd664ab37 100644 --- a/ffi/capi/bindings/cpp/icu4x/ScriptExtensionsSet.hpp +++ b/ffi/capi/bindings/cpp/icu4x/ScriptExtensionsSet.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_ScriptExtensionsSet_HPP -#define icu4x_ScriptExtensionsSet_HPP +#ifndef ICU4X_ScriptExtensionsSet_HPP +#define ICU4X_ScriptExtensionsSet_HPP #include "ScriptExtensionsSet.d.hpp" @@ -11,7 +11,7 @@ #include #include #include -#include "../diplomat_runtime.hpp" +#include "diplomat_runtime.hpp" namespace icu4x { @@ -69,4 +69,4 @@ inline void icu4x::ScriptExtensionsSet::operator delete(void* ptr) { } -#endif // icu4x_ScriptExtensionsSet_HPP +#endif // ICU4X_ScriptExtensionsSet_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/ScriptWithExtensions.d.hpp b/ffi/capi/bindings/cpp/icu4x/ScriptWithExtensions.d.hpp index 72816434c56..7d8e16cc014 100644 --- a/ffi/capi/bindings/cpp/icu4x/ScriptWithExtensions.d.hpp +++ b/ffi/capi/bindings/cpp/icu4x/ScriptWithExtensions.d.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_ScriptWithExtensions_D_HPP -#define icu4x_ScriptWithExtensions_D_HPP +#ifndef ICU4X_ScriptWithExtensions_D_HPP +#define ICU4X_ScriptWithExtensions_D_HPP #include #include @@ -9,8 +9,7 @@ #include #include #include -#include "../diplomat_runtime.hpp" - +#include "diplomat_runtime.hpp" namespace icu4x { namespace capi { struct CodePointRangeIterator; } class CodePointRangeIterator; @@ -21,7 +20,8 @@ class ScriptWithExtensions; namespace capi { struct ScriptWithExtensionsBorrowed; } class ScriptWithExtensionsBorrowed; class DataError; -} +} // namespace icu4x + namespace icu4x { @@ -40,44 +40,44 @@ class ScriptWithExtensions { public: /** - * Create a map for the `Script`/`Script_Extensions` properties, using compiled data. - * - * See the [Rust documentation for `new`](https://docs.rs/icu/2.0.0/icu/properties/script/struct.ScriptWithExtensions.html#method.new) for more information. + * Create a map for the `Script`/`Script_Extensions` properties, using compiled data. + * + * See the [Rust documentation for `new`](https://docs.rs/icu/2.0.0/icu/properties/script/struct.ScriptWithExtensions.html#method.new) for more information. */ inline static std::unique_ptr create(); /** - * Create a map for the `Script`/`Script_Extensions` properties, using compiled data. - * - * See the [Rust documentation for `new`](https://docs.rs/icu/2.0.0/icu/properties/script/struct.ScriptWithExtensions.html#method.new) for more information. + * Create a map for the `Script`/`Script_Extensions` properties, using compiled data. + * + * See the [Rust documentation for `new`](https://docs.rs/icu/2.0.0/icu/properties/script/struct.ScriptWithExtensions.html#method.new) for more information. */ - inline static diplomat::result, icu4x::DataError> create_with_provider(const icu4x::DataProvider& provider); + inline static icu4x::diplomat::result, icu4x::DataError> create_with_provider(const icu4x::DataProvider& provider); /** - * Get the Script property value for a code point - * - * See the [Rust documentation for `get_script_val`](https://docs.rs/icu/2.0.0/icu/properties/script/struct.ScriptWithExtensionsBorrowed.html#method.get_script_val) for more information. + * Get the Script property value for a code point + * + * See the [Rust documentation for `get_script_val`](https://docs.rs/icu/2.0.0/icu/properties/script/struct.ScriptWithExtensionsBorrowed.html#method.get_script_val) for more information. */ inline uint16_t get_script_val(char32_t ch) const; /** - * Check if the Script_Extensions property of the given code point covers the given script - * - * See the [Rust documentation for `has_script`](https://docs.rs/icu/2.0.0/icu/properties/script/struct.ScriptWithExtensionsBorrowed.html#method.has_script) for more information. + * Check if the Script_Extensions property of the given code point covers the given script + * + * See the [Rust documentation for `has_script`](https://docs.rs/icu/2.0.0/icu/properties/script/struct.ScriptWithExtensionsBorrowed.html#method.has_script) for more information. */ inline bool has_script(char32_t ch, uint16_t script) const; /** - * Borrow this object for a slightly faster variant with more operations - * - * See the [Rust documentation for `as_borrowed`](https://docs.rs/icu/2.0.0/icu/properties/script/struct.ScriptWithExtensions.html#method.as_borrowed) for more information. + * Borrow this object for a slightly faster variant with more operations + * + * See the [Rust documentation for `as_borrowed`](https://docs.rs/icu/2.0.0/icu/properties/script/struct.ScriptWithExtensions.html#method.as_borrowed) for more information. */ inline std::unique_ptr as_borrowed() const; /** - * Get a list of ranges of code points that contain this script in their Script_Extensions values - * - * See the [Rust documentation for `get_script_extensions_ranges`](https://docs.rs/icu/2.0.0/icu/properties/script/struct.ScriptWithExtensionsBorrowed.html#method.get_script_extensions_ranges) for more information. + * Get a list of ranges of code points that contain this script in their Script_Extensions values + * + * See the [Rust documentation for `get_script_extensions_ranges`](https://docs.rs/icu/2.0.0/icu/properties/script/struct.ScriptWithExtensionsBorrowed.html#method.get_script_extensions_ranges) for more information. */ inline std::unique_ptr iter_ranges_for_script(uint16_t script) const; @@ -96,4 +96,4 @@ class ScriptWithExtensions { }; } // namespace -#endif // icu4x_ScriptWithExtensions_D_HPP +#endif // ICU4X_ScriptWithExtensions_D_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/ScriptWithExtensions.hpp b/ffi/capi/bindings/cpp/icu4x/ScriptWithExtensions.hpp index 4f69adb5d34..67177765527 100644 --- a/ffi/capi/bindings/cpp/icu4x/ScriptWithExtensions.hpp +++ b/ffi/capi/bindings/cpp/icu4x/ScriptWithExtensions.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_ScriptWithExtensions_HPP -#define icu4x_ScriptWithExtensions_HPP +#ifndef ICU4X_ScriptWithExtensions_HPP +#define ICU4X_ScriptWithExtensions_HPP #include "ScriptWithExtensions.d.hpp" @@ -11,11 +11,11 @@ #include #include #include -#include "../diplomat_runtime.hpp" #include "CodePointRangeIterator.hpp" #include "DataError.hpp" #include "DataProvider.hpp" #include "ScriptWithExtensionsBorrowed.hpp" +#include "diplomat_runtime.hpp" namespace icu4x { @@ -46,9 +46,9 @@ inline std::unique_ptr icu4x::ScriptWithExtensions: return std::unique_ptr(icu4x::ScriptWithExtensions::FromFFI(result)); } -inline diplomat::result, icu4x::DataError> icu4x::ScriptWithExtensions::create_with_provider(const icu4x::DataProvider& provider) { +inline icu4x::diplomat::result, icu4x::DataError> icu4x::ScriptWithExtensions::create_with_provider(const icu4x::DataProvider& provider) { auto result = icu4x::capi::icu4x_ScriptWithExtensions_create_with_provider_mv1(provider.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DataError>(diplomat::Ok>(std::unique_ptr(icu4x::ScriptWithExtensions::FromFFI(result.ok)))) : diplomat::result, icu4x::DataError>(diplomat::Err(icu4x::DataError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::ScriptWithExtensions::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Err(icu4x::DataError::FromFFI(result.err))); } inline uint16_t icu4x::ScriptWithExtensions::get_script_val(char32_t ch) const { @@ -96,4 +96,4 @@ inline void icu4x::ScriptWithExtensions::operator delete(void* ptr) { } -#endif // icu4x_ScriptWithExtensions_HPP +#endif // ICU4X_ScriptWithExtensions_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/ScriptWithExtensionsBorrowed.d.hpp b/ffi/capi/bindings/cpp/icu4x/ScriptWithExtensionsBorrowed.d.hpp index 79530ad57a1..86d3b07e12f 100644 --- a/ffi/capi/bindings/cpp/icu4x/ScriptWithExtensionsBorrowed.d.hpp +++ b/ffi/capi/bindings/cpp/icu4x/ScriptWithExtensionsBorrowed.d.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_ScriptWithExtensionsBorrowed_D_HPP -#define icu4x_ScriptWithExtensionsBorrowed_D_HPP +#ifndef ICU4X_ScriptWithExtensionsBorrowed_D_HPP +#define ICU4X_ScriptWithExtensionsBorrowed_D_HPP #include #include @@ -9,14 +9,14 @@ #include #include #include -#include "../diplomat_runtime.hpp" - +#include "diplomat_runtime.hpp" namespace icu4x { namespace capi { struct CodePointSetData; } class CodePointSetData; namespace capi { struct ScriptExtensionsSet; } class ScriptExtensionsSet; -} +} // namespace icu4x + namespace icu4x { @@ -35,32 +35,32 @@ class ScriptWithExtensionsBorrowed { public: /** - * Get the Script property value for a code point - * Get the Script property value for a code point - * - * See the [Rust documentation for `get_script_val`](https://docs.rs/icu/2.0.0/icu/properties/script/struct.ScriptWithExtensionsBorrowed.html#method.get_script_val) for more information. + * Get the Script property value for a code point + * Get the Script property value for a code point + * + * See the [Rust documentation for `get_script_val`](https://docs.rs/icu/2.0.0/icu/properties/script/struct.ScriptWithExtensionsBorrowed.html#method.get_script_val) for more information. */ inline uint16_t get_script_val(char32_t ch) const; /** - * Get the Script property value for a code point - * - * See the [Rust documentation for `get_script_extensions_val`](https://docs.rs/icu/2.0.0/icu/properties/script/struct.ScriptWithExtensionsBorrowed.html#method.get_script_extensions_val) for more information. + * Get the Script property value for a code point + * + * See the [Rust documentation for `get_script_extensions_val`](https://docs.rs/icu/2.0.0/icu/properties/script/struct.ScriptWithExtensionsBorrowed.html#method.get_script_extensions_val) for more information. */ inline std::unique_ptr get_script_extensions_val(char32_t ch) const; /** - * Check if the Script_Extensions property of the given code point covers the given script - * - * See the [Rust documentation for `has_script`](https://docs.rs/icu/2.0.0/icu/properties/script/struct.ScriptWithExtensionsBorrowed.html#method.has_script) for more information. + * Check if the Script_Extensions property of the given code point covers the given script + * + * See the [Rust documentation for `has_script`](https://docs.rs/icu/2.0.0/icu/properties/script/struct.ScriptWithExtensionsBorrowed.html#method.has_script) for more information. */ inline bool has_script(char32_t ch, uint16_t script) const; /** - * Build the CodePointSetData corresponding to a codepoints matching a particular script - * in their Script_Extensions - * - * See the [Rust documentation for `get_script_extensions_set`](https://docs.rs/icu/2.0.0/icu/properties/script/struct.ScriptWithExtensionsBorrowed.html#method.get_script_extensions_set) for more information. + * Build the CodePointSetData corresponding to a codepoints matching a particular script + * in their Script_Extensions + * + * See the [Rust documentation for `get_script_extensions_set`](https://docs.rs/icu/2.0.0/icu/properties/script/struct.ScriptWithExtensionsBorrowed.html#method.get_script_extensions_set) for more information. */ inline std::unique_ptr get_script_extensions_set(uint16_t script) const; @@ -79,4 +79,4 @@ class ScriptWithExtensionsBorrowed { }; } // namespace -#endif // icu4x_ScriptWithExtensionsBorrowed_D_HPP +#endif // ICU4X_ScriptWithExtensionsBorrowed_D_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/ScriptWithExtensionsBorrowed.hpp b/ffi/capi/bindings/cpp/icu4x/ScriptWithExtensionsBorrowed.hpp index 90d8b5f633e..3d4536b8db0 100644 --- a/ffi/capi/bindings/cpp/icu4x/ScriptWithExtensionsBorrowed.hpp +++ b/ffi/capi/bindings/cpp/icu4x/ScriptWithExtensionsBorrowed.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_ScriptWithExtensionsBorrowed_HPP -#define icu4x_ScriptWithExtensionsBorrowed_HPP +#ifndef ICU4X_ScriptWithExtensionsBorrowed_HPP +#define ICU4X_ScriptWithExtensionsBorrowed_HPP #include "ScriptWithExtensionsBorrowed.d.hpp" @@ -11,9 +11,9 @@ #include #include #include -#include "../diplomat_runtime.hpp" #include "CodePointSetData.hpp" #include "ScriptExtensionsSet.hpp" +#include "diplomat_runtime.hpp" namespace icu4x { @@ -80,4 +80,4 @@ inline void icu4x::ScriptWithExtensionsBorrowed::operator delete(void* ptr) { } -#endif // icu4x_ScriptWithExtensionsBorrowed_HPP +#endif // ICU4X_ScriptWithExtensionsBorrowed_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/SegmenterWordType.d.hpp b/ffi/capi/bindings/cpp/icu4x/SegmenterWordType.d.hpp index 5db6eb53763..10230994e6d 100644 --- a/ffi/capi/bindings/cpp/icu4x/SegmenterWordType.d.hpp +++ b/ffi/capi/bindings/cpp/icu4x/SegmenterWordType.d.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_SegmenterWordType_D_HPP -#define icu4x_SegmenterWordType_D_HPP +#ifndef ICU4X_SegmenterWordType_D_HPP +#define ICU4X_SegmenterWordType_D_HPP #include #include @@ -9,7 +9,7 @@ #include #include #include -#include "../diplomat_runtime.hpp" +#include "diplomat_runtime.hpp" namespace icu4x { @@ -45,7 +45,7 @@ class SegmenterWordType { explicit operator bool() const = delete; /** - * See the [Rust documentation for `is_word_like`](https://docs.rs/icu/2.0.0/icu/segmenter/options/enum.WordType.html#method.is_word_like) for more information. + * See the [Rust documentation for `is_word_like`](https://docs.rs/icu/2.0.0/icu/segmenter/options/enum.WordType.html#method.is_word_like) for more information. */ inline bool is_word_like() const; @@ -56,4 +56,4 @@ class SegmenterWordType { }; } // namespace -#endif // icu4x_SegmenterWordType_D_HPP +#endif // ICU4X_SegmenterWordType_D_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/SegmenterWordType.hpp b/ffi/capi/bindings/cpp/icu4x/SegmenterWordType.hpp index 4d31ac363ef..b8d6e0b5123 100644 --- a/ffi/capi/bindings/cpp/icu4x/SegmenterWordType.hpp +++ b/ffi/capi/bindings/cpp/icu4x/SegmenterWordType.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_SegmenterWordType_HPP -#define icu4x_SegmenterWordType_HPP +#ifndef ICU4X_SegmenterWordType_HPP +#define ICU4X_SegmenterWordType_HPP #include "SegmenterWordType.d.hpp" @@ -11,7 +11,7 @@ #include #include #include -#include "../diplomat_runtime.hpp" +#include "diplomat_runtime.hpp" namespace icu4x { @@ -43,4 +43,4 @@ inline bool icu4x::SegmenterWordType::is_word_like() const { auto result = icu4x::capi::icu4x_SegmenterWordType_is_word_like_mv1(this->AsFFI()); return result; } -#endif // icu4x_SegmenterWordType_HPP +#endif // ICU4X_SegmenterWordType_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/SentenceBreak.d.hpp b/ffi/capi/bindings/cpp/icu4x/SentenceBreak.d.hpp index e82991e964e..7f62575b2d8 100644 --- a/ffi/capi/bindings/cpp/icu4x/SentenceBreak.d.hpp +++ b/ffi/capi/bindings/cpp/icu4x/SentenceBreak.d.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_SentenceBreak_D_HPP -#define icu4x_SentenceBreak_D_HPP +#ifndef ICU4X_SentenceBreak_D_HPP +#define ICU4X_SentenceBreak_D_HPP #include #include @@ -9,11 +9,11 @@ #include #include #include -#include "../diplomat_runtime.hpp" - +#include "diplomat_runtime.hpp" namespace icu4x { class SentenceBreak; -} +} // namespace icu4x + namespace icu4x { @@ -73,35 +73,35 @@ class SentenceBreak { explicit operator bool() const = delete; /** - * See the [Rust documentation for `for_char`](https://docs.rs/icu/2.0.0/icu/properties/props/trait.EnumeratedProperty.html#tymethod.for_char) for more information. + * See the [Rust documentation for `for_char`](https://docs.rs/icu/2.0.0/icu/properties/props/trait.EnumeratedProperty.html#tymethod.for_char) for more information. */ inline static icu4x::SentenceBreak for_char(char32_t ch); /** - * Get the "long" name of this property value (returns empty if property value is unknown) - * - * See the [Rust documentation for `get`](https://docs.rs/icu/2.0.0/icu/properties/struct.PropertyNamesLongBorrowed.html#method.get) for more information. + * Get the "long" name of this property value (returns empty if property value is unknown) + * + * See the [Rust documentation for `get`](https://docs.rs/icu/2.0.0/icu/properties/struct.PropertyNamesLongBorrowed.html#method.get) for more information. */ inline std::optional long_name() const; /** - * Get the "short" name of this property value (returns empty if property value is unknown) - * - * See the [Rust documentation for `get`](https://docs.rs/icu/2.0.0/icu/properties/struct.PropertyNamesShortBorrowed.html#method.get) for more information. + * Get the "short" name of this property value (returns empty if property value is unknown) + * + * See the [Rust documentation for `get`](https://docs.rs/icu/2.0.0/icu/properties/struct.PropertyNamesShortBorrowed.html#method.get) for more information. */ inline std::optional short_name() const; /** - * Convert to an integer value usable with ICU4C and CodePointMapData - * - * See the [Rust documentation for `to_icu4c_value`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.SentenceBreak.html#method.to_icu4c_value) for more information. + * Convert to an integer value usable with ICU4C and CodePointMapData + * + * See the [Rust documentation for `to_icu4c_value`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.SentenceBreak.html#method.to_icu4c_value) for more information. */ inline uint8_t to_integer_value() const; /** - * Convert from an integer value from ICU4C or CodePointMapData - * - * See the [Rust documentation for `from_icu4c_value`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.SentenceBreak.html#method.from_icu4c_value) for more information. + * Convert from an integer value from ICU4C or CodePointMapData + * + * See the [Rust documentation for `from_icu4c_value`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.SentenceBreak.html#method.from_icu4c_value) for more information. */ inline static std::optional from_integer_value(uint8_t other); @@ -112,4 +112,4 @@ class SentenceBreak { }; } // namespace -#endif // icu4x_SentenceBreak_D_HPP +#endif // ICU4X_SentenceBreak_D_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/SentenceBreak.hpp b/ffi/capi/bindings/cpp/icu4x/SentenceBreak.hpp index 4467e7ab0af..48359a285a5 100644 --- a/ffi/capi/bindings/cpp/icu4x/SentenceBreak.hpp +++ b/ffi/capi/bindings/cpp/icu4x/SentenceBreak.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_SentenceBreak_HPP -#define icu4x_SentenceBreak_HPP +#ifndef ICU4X_SentenceBreak_HPP +#define ICU4X_SentenceBreak_HPP #include "SentenceBreak.d.hpp" @@ -11,7 +11,7 @@ #include #include #include -#include "../diplomat_runtime.hpp" +#include "diplomat_runtime.hpp" namespace icu4x { @@ -20,10 +20,10 @@ namespace capi { icu4x::capi::SentenceBreak icu4x_SentenceBreak_for_char_mv1(char32_t ch); - typedef struct icu4x_SentenceBreak_long_name_mv1_result {union {diplomat::capi::DiplomatStringView ok; }; bool is_ok;} icu4x_SentenceBreak_long_name_mv1_result; + typedef struct icu4x_SentenceBreak_long_name_mv1_result {union {icu4x::diplomat::capi::DiplomatStringView ok; }; bool is_ok;} icu4x_SentenceBreak_long_name_mv1_result; icu4x_SentenceBreak_long_name_mv1_result icu4x_SentenceBreak_long_name_mv1(icu4x::capi::SentenceBreak self); - typedef struct icu4x_SentenceBreak_short_name_mv1_result {union {diplomat::capi::DiplomatStringView ok; }; bool is_ok;} icu4x_SentenceBreak_short_name_mv1_result; + typedef struct icu4x_SentenceBreak_short_name_mv1_result {union {icu4x::diplomat::capi::DiplomatStringView ok; }; bool is_ok;} icu4x_SentenceBreak_short_name_mv1_result; icu4x_SentenceBreak_short_name_mv1_result icu4x_SentenceBreak_short_name_mv1(icu4x::capi::SentenceBreak self); uint8_t icu4x_SentenceBreak_to_integer_value_mv1(icu4x::capi::SentenceBreak self); @@ -86,4 +86,4 @@ inline std::optional icu4x::SentenceBreak::from_integer_va auto result = icu4x::capi::icu4x_SentenceBreak_from_integer_value_mv1(other); return result.is_ok ? std::optional(icu4x::SentenceBreak::FromFFI(result.ok)) : std::nullopt; } -#endif // icu4x_SentenceBreak_HPP +#endif // ICU4X_SentenceBreak_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/SentenceBreakIteratorLatin1.d.hpp b/ffi/capi/bindings/cpp/icu4x/SentenceBreakIteratorLatin1.d.hpp index 85aa7166e5a..5e52c5d5f32 100644 --- a/ffi/capi/bindings/cpp/icu4x/SentenceBreakIteratorLatin1.d.hpp +++ b/ffi/capi/bindings/cpp/icu4x/SentenceBreakIteratorLatin1.d.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_SentenceBreakIteratorLatin1_D_HPP -#define icu4x_SentenceBreakIteratorLatin1_D_HPP +#ifndef ICU4X_SentenceBreakIteratorLatin1_D_HPP +#define ICU4X_SentenceBreakIteratorLatin1_D_HPP #include #include @@ -9,7 +9,7 @@ #include #include #include -#include "../diplomat_runtime.hpp" +#include "diplomat_runtime.hpp" namespace icu4x { @@ -26,10 +26,10 @@ class SentenceBreakIteratorLatin1 { public: /** - * Finds the next breakpoint. Returns -1 if at the end of the string or if the index is - * out of range of a 32-bit signed integer. - * - * See the [Rust documentation for `next`](https://docs.rs/icu/2.0.0/icu/segmenter/iterators/struct.SentenceBreakIterator.html#method.next) for more information. + * Finds the next breakpoint. Returns -1 if at the end of the string or if the index is + * out of range of a 32-bit signed integer. + * + * See the [Rust documentation for `next`](https://docs.rs/icu/2.0.0/icu/segmenter/iterators/struct.SentenceBreakIterator.html#method.next) for more information. */ inline int32_t next(); @@ -48,4 +48,4 @@ class SentenceBreakIteratorLatin1 { }; } // namespace -#endif // icu4x_SentenceBreakIteratorLatin1_D_HPP +#endif // ICU4X_SentenceBreakIteratorLatin1_D_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/SentenceBreakIteratorLatin1.hpp b/ffi/capi/bindings/cpp/icu4x/SentenceBreakIteratorLatin1.hpp index ac12000ff51..28bfc071c58 100644 --- a/ffi/capi/bindings/cpp/icu4x/SentenceBreakIteratorLatin1.hpp +++ b/ffi/capi/bindings/cpp/icu4x/SentenceBreakIteratorLatin1.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_SentenceBreakIteratorLatin1_HPP -#define icu4x_SentenceBreakIteratorLatin1_HPP +#ifndef ICU4X_SentenceBreakIteratorLatin1_HPP +#define ICU4X_SentenceBreakIteratorLatin1_HPP #include "SentenceBreakIteratorLatin1.d.hpp" @@ -11,7 +11,7 @@ #include #include #include -#include "../diplomat_runtime.hpp" +#include "diplomat_runtime.hpp" namespace icu4x { @@ -52,4 +52,4 @@ inline void icu4x::SentenceBreakIteratorLatin1::operator delete(void* ptr) { } -#endif // icu4x_SentenceBreakIteratorLatin1_HPP +#endif // ICU4X_SentenceBreakIteratorLatin1_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/SentenceBreakIteratorUtf16.d.hpp b/ffi/capi/bindings/cpp/icu4x/SentenceBreakIteratorUtf16.d.hpp index fdfa4cbe247..0676dbbe4f0 100644 --- a/ffi/capi/bindings/cpp/icu4x/SentenceBreakIteratorUtf16.d.hpp +++ b/ffi/capi/bindings/cpp/icu4x/SentenceBreakIteratorUtf16.d.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_SentenceBreakIteratorUtf16_D_HPP -#define icu4x_SentenceBreakIteratorUtf16_D_HPP +#ifndef ICU4X_SentenceBreakIteratorUtf16_D_HPP +#define ICU4X_SentenceBreakIteratorUtf16_D_HPP #include #include @@ -9,7 +9,7 @@ #include #include #include -#include "../diplomat_runtime.hpp" +#include "diplomat_runtime.hpp" namespace icu4x { @@ -26,10 +26,10 @@ class SentenceBreakIteratorUtf16 { public: /** - * Finds the next breakpoint. Returns -1 if at the end of the string or if the index is - * out of range of a 32-bit signed integer. - * - * See the [Rust documentation for `next`](https://docs.rs/icu/2.0.0/icu/segmenter/iterators/struct.SentenceBreakIterator.html#method.next) for more information. + * Finds the next breakpoint. Returns -1 if at the end of the string or if the index is + * out of range of a 32-bit signed integer. + * + * See the [Rust documentation for `next`](https://docs.rs/icu/2.0.0/icu/segmenter/iterators/struct.SentenceBreakIterator.html#method.next) for more information. */ inline int32_t next(); @@ -48,4 +48,4 @@ class SentenceBreakIteratorUtf16 { }; } // namespace -#endif // icu4x_SentenceBreakIteratorUtf16_D_HPP +#endif // ICU4X_SentenceBreakIteratorUtf16_D_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/SentenceBreakIteratorUtf16.hpp b/ffi/capi/bindings/cpp/icu4x/SentenceBreakIteratorUtf16.hpp index 5d61a9e3e25..af5c22adc01 100644 --- a/ffi/capi/bindings/cpp/icu4x/SentenceBreakIteratorUtf16.hpp +++ b/ffi/capi/bindings/cpp/icu4x/SentenceBreakIteratorUtf16.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_SentenceBreakIteratorUtf16_HPP -#define icu4x_SentenceBreakIteratorUtf16_HPP +#ifndef ICU4X_SentenceBreakIteratorUtf16_HPP +#define ICU4X_SentenceBreakIteratorUtf16_HPP #include "SentenceBreakIteratorUtf16.d.hpp" @@ -11,7 +11,7 @@ #include #include #include -#include "../diplomat_runtime.hpp" +#include "diplomat_runtime.hpp" namespace icu4x { @@ -52,4 +52,4 @@ inline void icu4x::SentenceBreakIteratorUtf16::operator delete(void* ptr) { } -#endif // icu4x_SentenceBreakIteratorUtf16_HPP +#endif // ICU4X_SentenceBreakIteratorUtf16_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/SentenceBreakIteratorUtf8.d.hpp b/ffi/capi/bindings/cpp/icu4x/SentenceBreakIteratorUtf8.d.hpp index a2164c40e11..9af52885682 100644 --- a/ffi/capi/bindings/cpp/icu4x/SentenceBreakIteratorUtf8.d.hpp +++ b/ffi/capi/bindings/cpp/icu4x/SentenceBreakIteratorUtf8.d.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_SentenceBreakIteratorUtf8_D_HPP -#define icu4x_SentenceBreakIteratorUtf8_D_HPP +#ifndef ICU4X_SentenceBreakIteratorUtf8_D_HPP +#define ICU4X_SentenceBreakIteratorUtf8_D_HPP #include #include @@ -9,7 +9,7 @@ #include #include #include -#include "../diplomat_runtime.hpp" +#include "diplomat_runtime.hpp" namespace icu4x { @@ -26,10 +26,10 @@ class SentenceBreakIteratorUtf8 { public: /** - * Finds the next breakpoint. Returns -1 if at the end of the string or if the index is - * out of range of a 32-bit signed integer. - * - * See the [Rust documentation for `next`](https://docs.rs/icu/2.0.0/icu/segmenter/iterators/struct.SentenceBreakIterator.html#method.next) for more information. + * Finds the next breakpoint. Returns -1 if at the end of the string or if the index is + * out of range of a 32-bit signed integer. + * + * See the [Rust documentation for `next`](https://docs.rs/icu/2.0.0/icu/segmenter/iterators/struct.SentenceBreakIterator.html#method.next) for more information. */ inline int32_t next(); @@ -48,4 +48,4 @@ class SentenceBreakIteratorUtf8 { }; } // namespace -#endif // icu4x_SentenceBreakIteratorUtf8_D_HPP +#endif // ICU4X_SentenceBreakIteratorUtf8_D_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/SentenceBreakIteratorUtf8.hpp b/ffi/capi/bindings/cpp/icu4x/SentenceBreakIteratorUtf8.hpp index 4fe963df535..2c081467078 100644 --- a/ffi/capi/bindings/cpp/icu4x/SentenceBreakIteratorUtf8.hpp +++ b/ffi/capi/bindings/cpp/icu4x/SentenceBreakIteratorUtf8.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_SentenceBreakIteratorUtf8_HPP -#define icu4x_SentenceBreakIteratorUtf8_HPP +#ifndef ICU4X_SentenceBreakIteratorUtf8_HPP +#define ICU4X_SentenceBreakIteratorUtf8_HPP #include "SentenceBreakIteratorUtf8.d.hpp" @@ -11,7 +11,7 @@ #include #include #include -#include "../diplomat_runtime.hpp" +#include "diplomat_runtime.hpp" namespace icu4x { @@ -52,4 +52,4 @@ inline void icu4x::SentenceBreakIteratorUtf8::operator delete(void* ptr) { } -#endif // icu4x_SentenceBreakIteratorUtf8_HPP +#endif // ICU4X_SentenceBreakIteratorUtf8_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/SentenceSegmenter.d.hpp b/ffi/capi/bindings/cpp/icu4x/SentenceSegmenter.d.hpp index 5da19ec6ed9..b8f98172a76 100644 --- a/ffi/capi/bindings/cpp/icu4x/SentenceSegmenter.d.hpp +++ b/ffi/capi/bindings/cpp/icu4x/SentenceSegmenter.d.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_SentenceSegmenter_D_HPP -#define icu4x_SentenceSegmenter_D_HPP +#ifndef ICU4X_SentenceSegmenter_D_HPP +#define ICU4X_SentenceSegmenter_D_HPP #include #include @@ -9,8 +9,7 @@ #include #include #include -#include "../diplomat_runtime.hpp" - +#include "diplomat_runtime.hpp" namespace icu4x { namespace capi { struct DataProvider; } class DataProvider; @@ -25,7 +24,8 @@ class SentenceBreakIteratorUtf8; namespace capi { struct SentenceSegmenter; } class SentenceSegmenter; class DataError; -} +} // namespace icu4x + namespace icu4x { @@ -44,48 +44,48 @@ class SentenceSegmenter { public: /** - * Construct a {@link SentenceSegmenter} using compiled data. This does not assume any content locale. - * - * See the [Rust documentation for `new`](https://docs.rs/icu/2.0.0/icu/segmenter/struct.SentenceSegmenter.html#method.new) for more information. + * Construct a {@link SentenceSegmenter} using compiled data. This does not assume any content locale. + * + * See the [Rust documentation for `new`](https://docs.rs/icu/2.0.0/icu/segmenter/struct.SentenceSegmenter.html#method.new) for more information. */ inline static std::unique_ptr create(); /** - * Construct a {@link SentenceSegmenter} for content known to be of a given locale, using compiled data. + * Construct a {@link SentenceSegmenter} for content known to be of a given locale, using compiled data. */ - inline static diplomat::result, icu4x::DataError> create_with_content_locale(const icu4x::Locale& locale); + inline static icu4x::diplomat::result, icu4x::DataError> create_with_content_locale(const icu4x::Locale& locale); /** - * Construct a {@link SentenceSegmenter} for content known to be of a given locale, using a particular data source. + * Construct a {@link SentenceSegmenter} for content known to be of a given locale, using a particular data source. */ - inline static diplomat::result, icu4x::DataError> create_with_content_locale_and_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale); + inline static icu4x::diplomat::result, icu4x::DataError> create_with_content_locale_and_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale); /** - * Segments a string. - * - * Ill-formed input is treated as if errors had been replaced with REPLACEMENT CHARACTERs according - * to the WHATWG Encoding Standard. - * - * See the [Rust documentation for `segment_utf8`](https://docs.rs/icu/2.0.0/icu/segmenter/struct.SentenceSegmenterBorrowed.html#method.segment_utf8) for more information. + * Segments a string. + * + * Ill-formed input is treated as if errors had been replaced with REPLACEMENT CHARACTERs according + * to the WHATWG Encoding Standard. + * + * See the [Rust documentation for `segment_utf8`](https://docs.rs/icu/2.0.0/icu/segmenter/struct.SentenceSegmenterBorrowed.html#method.segment_utf8) for more information. */ inline std::unique_ptr segment(std::string_view input) const; /** - * Segments a string. - * - * Ill-formed input is treated as if errors had been replaced with REPLACEMENT CHARACTERs according - * to the WHATWG Encoding Standard. - * - * See the [Rust documentation for `segment_utf16`](https://docs.rs/icu/2.0.0/icu/segmenter/struct.SentenceSegmenterBorrowed.html#method.segment_utf16) for more information. + * Segments a string. + * + * Ill-formed input is treated as if errors had been replaced with REPLACEMENT CHARACTERs according + * to the WHATWG Encoding Standard. + * + * See the [Rust documentation for `segment_utf16`](https://docs.rs/icu/2.0.0/icu/segmenter/struct.SentenceSegmenterBorrowed.html#method.segment_utf16) for more information. */ inline std::unique_ptr segment16(std::u16string_view input) const; /** - * Segments a Latin-1 string. - * - * See the [Rust documentation for `segment_latin1`](https://docs.rs/icu/2.0.0/icu/segmenter/struct.SentenceSegmenterBorrowed.html#method.segment_latin1) for more information. + * Segments a Latin-1 string. + * + * See the [Rust documentation for `segment_latin1`](https://docs.rs/icu/2.0.0/icu/segmenter/struct.SentenceSegmenterBorrowed.html#method.segment_latin1) for more information. */ - inline std::unique_ptr segment_latin1(diplomat::span input) const; + inline std::unique_ptr segment_latin1(icu4x::diplomat::span input) const; inline const icu4x::capi::SentenceSegmenter* AsFFI() const; inline icu4x::capi::SentenceSegmenter* AsFFI(); @@ -102,4 +102,4 @@ class SentenceSegmenter { }; } // namespace -#endif // icu4x_SentenceSegmenter_D_HPP +#endif // ICU4X_SentenceSegmenter_D_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/SentenceSegmenter.hpp b/ffi/capi/bindings/cpp/icu4x/SentenceSegmenter.hpp index aad41459b34..732f67a3db5 100644 --- a/ffi/capi/bindings/cpp/icu4x/SentenceSegmenter.hpp +++ b/ffi/capi/bindings/cpp/icu4x/SentenceSegmenter.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_SentenceSegmenter_HPP -#define icu4x_SentenceSegmenter_HPP +#ifndef ICU4X_SentenceSegmenter_HPP +#define ICU4X_SentenceSegmenter_HPP #include "SentenceSegmenter.d.hpp" @@ -11,13 +11,13 @@ #include #include #include -#include "../diplomat_runtime.hpp" #include "DataError.hpp" #include "DataProvider.hpp" #include "Locale.hpp" #include "SentenceBreakIteratorLatin1.hpp" #include "SentenceBreakIteratorUtf16.hpp" #include "SentenceBreakIteratorUtf8.hpp" +#include "diplomat_runtime.hpp" namespace icu4x { @@ -32,11 +32,11 @@ namespace capi { typedef struct icu4x_SentenceSegmenter_create_with_content_locale_and_provider_mv1_result {union {icu4x::capi::SentenceSegmenter* ok; icu4x::capi::DataError err;}; bool is_ok;} icu4x_SentenceSegmenter_create_with_content_locale_and_provider_mv1_result; icu4x_SentenceSegmenter_create_with_content_locale_and_provider_mv1_result icu4x_SentenceSegmenter_create_with_content_locale_and_provider_mv1(const icu4x::capi::DataProvider* provider, const icu4x::capi::Locale* locale); - icu4x::capi::SentenceBreakIteratorUtf8* icu4x_SentenceSegmenter_segment_utf8_mv1(const icu4x::capi::SentenceSegmenter* self, diplomat::capi::DiplomatStringView input); + icu4x::capi::SentenceBreakIteratorUtf8* icu4x_SentenceSegmenter_segment_utf8_mv1(const icu4x::capi::SentenceSegmenter* self, icu4x::diplomat::capi::DiplomatStringView input); - icu4x::capi::SentenceBreakIteratorUtf16* icu4x_SentenceSegmenter_segment_utf16_mv1(const icu4x::capi::SentenceSegmenter* self, diplomat::capi::DiplomatString16View input); + icu4x::capi::SentenceBreakIteratorUtf16* icu4x_SentenceSegmenter_segment_utf16_mv1(const icu4x::capi::SentenceSegmenter* self, icu4x::diplomat::capi::DiplomatString16View input); - icu4x::capi::SentenceBreakIteratorLatin1* icu4x_SentenceSegmenter_segment_latin1_mv1(const icu4x::capi::SentenceSegmenter* self, diplomat::capi::DiplomatU8View input); + icu4x::capi::SentenceBreakIteratorLatin1* icu4x_SentenceSegmenter_segment_latin1_mv1(const icu4x::capi::SentenceSegmenter* self, icu4x::diplomat::capi::DiplomatU8View input); void icu4x_SentenceSegmenter_destroy_mv1(SentenceSegmenter* self); @@ -49,15 +49,15 @@ inline std::unique_ptr icu4x::SentenceSegmenter::creat return std::unique_ptr(icu4x::SentenceSegmenter::FromFFI(result)); } -inline diplomat::result, icu4x::DataError> icu4x::SentenceSegmenter::create_with_content_locale(const icu4x::Locale& locale) { +inline icu4x::diplomat::result, icu4x::DataError> icu4x::SentenceSegmenter::create_with_content_locale(const icu4x::Locale& locale) { auto result = icu4x::capi::icu4x_SentenceSegmenter_create_with_content_locale_mv1(locale.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DataError>(diplomat::Ok>(std::unique_ptr(icu4x::SentenceSegmenter::FromFFI(result.ok)))) : diplomat::result, icu4x::DataError>(diplomat::Err(icu4x::DataError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::SentenceSegmenter::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Err(icu4x::DataError::FromFFI(result.err))); } -inline diplomat::result, icu4x::DataError> icu4x::SentenceSegmenter::create_with_content_locale_and_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale) { +inline icu4x::diplomat::result, icu4x::DataError> icu4x::SentenceSegmenter::create_with_content_locale_and_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale) { auto result = icu4x::capi::icu4x_SentenceSegmenter_create_with_content_locale_and_provider_mv1(provider.AsFFI(), locale.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DataError>(diplomat::Ok>(std::unique_ptr(icu4x::SentenceSegmenter::FromFFI(result.ok)))) : diplomat::result, icu4x::DataError>(diplomat::Err(icu4x::DataError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::SentenceSegmenter::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Err(icu4x::DataError::FromFFI(result.err))); } inline std::unique_ptr icu4x::SentenceSegmenter::segment(std::string_view input) const { @@ -72,7 +72,7 @@ inline std::unique_ptr icu4x::SentenceSegment return std::unique_ptr(icu4x::SentenceBreakIteratorUtf16::FromFFI(result)); } -inline std::unique_ptr icu4x::SentenceSegmenter::segment_latin1(diplomat::span input) const { +inline std::unique_ptr icu4x::SentenceSegmenter::segment_latin1(icu4x::diplomat::span input) const { auto result = icu4x::capi::icu4x_SentenceSegmenter_segment_latin1_mv1(this->AsFFI(), {input.data(), input.size()}); return std::unique_ptr(icu4x::SentenceBreakIteratorLatin1::FromFFI(result)); @@ -99,4 +99,4 @@ inline void icu4x::SentenceSegmenter::operator delete(void* ptr) { } -#endif // icu4x_SentenceSegmenter_HPP +#endif // ICU4X_SentenceSegmenter_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/Time.d.hpp b/ffi/capi/bindings/cpp/icu4x/Time.d.hpp index ca3f52e7156..4762e719dc3 100644 --- a/ffi/capi/bindings/cpp/icu4x/Time.d.hpp +++ b/ffi/capi/bindings/cpp/icu4x/Time.d.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_Time_D_HPP -#define icu4x_Time_D_HPP +#ifndef ICU4X_Time_D_HPP +#define ICU4X_Time_D_HPP #include #include @@ -9,14 +9,14 @@ #include #include #include -#include "../diplomat_runtime.hpp" - +#include "diplomat_runtime.hpp" namespace icu4x { namespace capi { struct Time; } class Time; class CalendarError; class Rfc9557ParseError; -} +} // namespace icu4x + namespace icu4x { @@ -35,58 +35,58 @@ class Time { public: /** - * Creates a new {@link Time} given field values - * - * See the [Rust documentation for `try_new`](https://docs.rs/icu/2.0.0/icu/time/struct.Time.html#method.try_new) for more information. + * Creates a new {@link Time} given field values + * + * See the [Rust documentation for `try_new`](https://docs.rs/icu/2.0.0/icu/time/struct.Time.html#method.try_new) for more information. */ - inline static diplomat::result, icu4x::CalendarError> create(uint8_t hour, uint8_t minute, uint8_t second, uint32_t subsecond); + inline static icu4x::diplomat::result, icu4x::CalendarError> create(uint8_t hour, uint8_t minute, uint8_t second, uint32_t subsecond); /** - * Creates a new {@link Time} from an IXDTF string. - * - * See the [Rust documentation for `try_from_str`](https://docs.rs/icu/2.0.0/icu/time/struct.Time.html#method.try_from_str) for more information. + * Creates a new {@link Time} from an IXDTF string. + * + * See the [Rust documentation for `try_from_str`](https://docs.rs/icu/2.0.0/icu/time/struct.Time.html#method.try_from_str) for more information. */ - inline static diplomat::result, icu4x::Rfc9557ParseError> from_string(std::string_view v); + inline static icu4x::diplomat::result, icu4x::Rfc9557ParseError> from_string(std::string_view v); /** - * Creates a new {@link Time} representing the start of the day (00:00:00.000). - * - * See the [Rust documentation for `start_of_day`](https://docs.rs/icu/2.0.0/icu/time/struct.Time.html#method.start_of_day) for more information. + * Creates a new {@link Time} representing the start of the day (00:00:00.000). + * + * See the [Rust documentation for `start_of_day`](https://docs.rs/icu/2.0.0/icu/time/struct.Time.html#method.start_of_day) for more information. */ - inline static diplomat::result, icu4x::CalendarError> start_of_day(); + inline static icu4x::diplomat::result, icu4x::CalendarError> start_of_day(); /** - * Creates a new {@link Time} representing noon (12:00:00.000). - * - * See the [Rust documentation for `noon`](https://docs.rs/icu/2.0.0/icu/time/struct.Time.html#method.noon) for more information. + * Creates a new {@link Time} representing noon (12:00:00.000). + * + * See the [Rust documentation for `noon`](https://docs.rs/icu/2.0.0/icu/time/struct.Time.html#method.noon) for more information. */ - inline static diplomat::result, icu4x::CalendarError> noon(); + inline static icu4x::diplomat::result, icu4x::CalendarError> noon(); /** - * Returns the hour in this time - * - * See the [Rust documentation for `hour`](https://docs.rs/icu/2.0.0/icu/time/struct.Time.html#structfield.hour) for more information. + * Returns the hour in this time + * + * See the [Rust documentation for `hour`](https://docs.rs/icu/2.0.0/icu/time/struct.Time.html#structfield.hour) for more information. */ inline uint8_t hour() const; /** - * Returns the minute in this time - * - * See the [Rust documentation for `minute`](https://docs.rs/icu/2.0.0/icu/time/struct.Time.html#structfield.minute) for more information. + * Returns the minute in this time + * + * See the [Rust documentation for `minute`](https://docs.rs/icu/2.0.0/icu/time/struct.Time.html#structfield.minute) for more information. */ inline uint8_t minute() const; /** - * Returns the second in this time - * - * See the [Rust documentation for `second`](https://docs.rs/icu/2.0.0/icu/time/struct.Time.html#structfield.second) for more information. + * Returns the second in this time + * + * See the [Rust documentation for `second`](https://docs.rs/icu/2.0.0/icu/time/struct.Time.html#structfield.second) for more information. */ inline uint8_t second() const; /** - * Returns the subsecond in this time as nanoseconds - * - * See the [Rust documentation for `subsecond`](https://docs.rs/icu/2.0.0/icu/time/struct.Time.html#structfield.subsecond) for more information. + * Returns the subsecond in this time as nanoseconds + * + * See the [Rust documentation for `subsecond`](https://docs.rs/icu/2.0.0/icu/time/struct.Time.html#structfield.subsecond) for more information. */ inline uint32_t subsecond() const; @@ -105,4 +105,4 @@ class Time { }; } // namespace -#endif // icu4x_Time_D_HPP +#endif // ICU4X_Time_D_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/Time.hpp b/ffi/capi/bindings/cpp/icu4x/Time.hpp index 20169fbbb22..fc3372dfdcc 100644 --- a/ffi/capi/bindings/cpp/icu4x/Time.hpp +++ b/ffi/capi/bindings/cpp/icu4x/Time.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_Time_HPP -#define icu4x_Time_HPP +#ifndef ICU4X_Time_HPP +#define ICU4X_Time_HPP #include "Time.d.hpp" @@ -11,9 +11,9 @@ #include #include #include -#include "../diplomat_runtime.hpp" #include "CalendarError.hpp" #include "Rfc9557ParseError.hpp" +#include "diplomat_runtime.hpp" namespace icu4x { @@ -24,7 +24,7 @@ namespace capi { icu4x_Time_create_mv1_result icu4x_Time_create_mv1(uint8_t hour, uint8_t minute, uint8_t second, uint32_t subsecond); typedef struct icu4x_Time_from_string_mv1_result {union {icu4x::capi::Time* ok; icu4x::capi::Rfc9557ParseError err;}; bool is_ok;} icu4x_Time_from_string_mv1_result; - icu4x_Time_from_string_mv1_result icu4x_Time_from_string_mv1(diplomat::capi::DiplomatStringView v); + icu4x_Time_from_string_mv1_result icu4x_Time_from_string_mv1(icu4x::diplomat::capi::DiplomatStringView v); typedef struct icu4x_Time_start_of_day_mv1_result {union {icu4x::capi::Time* ok; icu4x::capi::CalendarError err;}; bool is_ok;} icu4x_Time_start_of_day_mv1_result; icu4x_Time_start_of_day_mv1_result icu4x_Time_start_of_day_mv1(void); @@ -46,27 +46,27 @@ namespace capi { } // namespace capi } // namespace -inline diplomat::result, icu4x::CalendarError> icu4x::Time::create(uint8_t hour, uint8_t minute, uint8_t second, uint32_t subsecond) { +inline icu4x::diplomat::result, icu4x::CalendarError> icu4x::Time::create(uint8_t hour, uint8_t minute, uint8_t second, uint32_t subsecond) { auto result = icu4x::capi::icu4x_Time_create_mv1(hour, minute, second, subsecond); - return result.is_ok ? diplomat::result, icu4x::CalendarError>(diplomat::Ok>(std::unique_ptr(icu4x::Time::FromFFI(result.ok)))) : diplomat::result, icu4x::CalendarError>(diplomat::Err(icu4x::CalendarError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::CalendarError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::Time::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::CalendarError>(icu4x::diplomat::Err(icu4x::CalendarError::FromFFI(result.err))); } -inline diplomat::result, icu4x::Rfc9557ParseError> icu4x::Time::from_string(std::string_view v) { +inline icu4x::diplomat::result, icu4x::Rfc9557ParseError> icu4x::Time::from_string(std::string_view v) { auto result = icu4x::capi::icu4x_Time_from_string_mv1({v.data(), v.size()}); - return result.is_ok ? diplomat::result, icu4x::Rfc9557ParseError>(diplomat::Ok>(std::unique_ptr(icu4x::Time::FromFFI(result.ok)))) : diplomat::result, icu4x::Rfc9557ParseError>(diplomat::Err(icu4x::Rfc9557ParseError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::Rfc9557ParseError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::Time::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::Rfc9557ParseError>(icu4x::diplomat::Err(icu4x::Rfc9557ParseError::FromFFI(result.err))); } -inline diplomat::result, icu4x::CalendarError> icu4x::Time::start_of_day() { +inline icu4x::diplomat::result, icu4x::CalendarError> icu4x::Time::start_of_day() { auto result = icu4x::capi::icu4x_Time_start_of_day_mv1(); - return result.is_ok ? diplomat::result, icu4x::CalendarError>(diplomat::Ok>(std::unique_ptr(icu4x::Time::FromFFI(result.ok)))) : diplomat::result, icu4x::CalendarError>(diplomat::Err(icu4x::CalendarError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::CalendarError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::Time::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::CalendarError>(icu4x::diplomat::Err(icu4x::CalendarError::FromFFI(result.err))); } -inline diplomat::result, icu4x::CalendarError> icu4x::Time::noon() { +inline icu4x::diplomat::result, icu4x::CalendarError> icu4x::Time::noon() { auto result = icu4x::capi::icu4x_Time_noon_mv1(); - return result.is_ok ? diplomat::result, icu4x::CalendarError>(diplomat::Ok>(std::unique_ptr(icu4x::Time::FromFFI(result.ok)))) : diplomat::result, icu4x::CalendarError>(diplomat::Err(icu4x::CalendarError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::CalendarError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::Time::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::CalendarError>(icu4x::diplomat::Err(icu4x::CalendarError::FromFFI(result.err))); } inline uint8_t icu4x::Time::hour() const { @@ -110,4 +110,4 @@ inline void icu4x::Time::operator delete(void* ptr) { } -#endif // icu4x_Time_HPP +#endif // ICU4X_Time_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/TimeFormatter.d.hpp b/ffi/capi/bindings/cpp/icu4x/TimeFormatter.d.hpp index cd48feba70c..f2bce126330 100644 --- a/ffi/capi/bindings/cpp/icu4x/TimeFormatter.d.hpp +++ b/ffi/capi/bindings/cpp/icu4x/TimeFormatter.d.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_TimeFormatter_D_HPP -#define icu4x_TimeFormatter_D_HPP +#ifndef ICU4X_TimeFormatter_D_HPP +#define ICU4X_TimeFormatter_D_HPP #include #include @@ -9,8 +9,7 @@ #include #include #include -#include "../diplomat_runtime.hpp" - +#include "diplomat_runtime.hpp" namespace icu4x { namespace capi { struct DataProvider; } class DataProvider; @@ -24,7 +23,8 @@ class DateTimeAlignment; class DateTimeFormatterLoadError; class DateTimeLength; class TimePrecision; -} +} // namespace icu4x + namespace icu4x { @@ -41,25 +41,25 @@ class TimeFormatter { public: /** - * See the [Rust documentation for `try_new`](https://docs.rs/icu/2.0.0/icu/datetime/type.NoCalendarFormatter.html#method.try_new) for more information. - * - * See the [Rust documentation for `T`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.T.html) for more information. - * - * Additional information: [1](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.T.html#method.with_time_precision), [2](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.T.html#method.with_alignment), [3](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.T.html#method.for_length) + * See the [Rust documentation for `try_new`](https://docs.rs/icu/2.0.0/icu/datetime/type.NoCalendarFormatter.html#method.try_new) for more information. + * + * See the [Rust documentation for `T`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.T.html) for more information. + * + * Additional information: [1](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.T.html#method.with_time_precision), [2](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.T.html#method.with_alignment), [3](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.T.html#method.for_length) */ - inline static diplomat::result, icu4x::DateTimeFormatterLoadError> create(const icu4x::Locale& locale, std::optional length, std::optional time_precision, std::optional alignment); + inline static icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> create(const icu4x::Locale& locale, std::optional length, std::optional time_precision, std::optional alignment); /** - * See the [Rust documentation for `try_new`](https://docs.rs/icu/2.0.0/icu/datetime/type.NoCalendarFormatter.html#method.try_new) for more information. - * - * See the [Rust documentation for `T`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.T.html) for more information. - * - * Additional information: [1](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.T.html#method.with_time_precision), [2](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.T.html#method.with_alignment), [3](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.T.html#method.for_length) + * See the [Rust documentation for `try_new`](https://docs.rs/icu/2.0.0/icu/datetime/type.NoCalendarFormatter.html#method.try_new) for more information. + * + * See the [Rust documentation for `T`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.T.html) for more information. + * + * Additional information: [1](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.T.html#method.with_time_precision), [2](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.T.html#method.with_alignment), [3](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/struct.T.html#method.for_length) */ - inline static diplomat::result, icu4x::DateTimeFormatterLoadError> create_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, std::optional length, std::optional time_precision, std::optional alignment); + inline static icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> create_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, std::optional length, std::optional time_precision, std::optional alignment); /** - * See the [Rust documentation for `format`](https://docs.rs/icu/2.0.0/icu/datetime/type.NoCalendarFormatter.html#method.format) for more information. + * See the [Rust documentation for `format`](https://docs.rs/icu/2.0.0/icu/datetime/type.NoCalendarFormatter.html#method.format) for more information. */ inline std::string format(const icu4x::Time& time) const; template @@ -80,4 +80,4 @@ class TimeFormatter { }; } // namespace -#endif // icu4x_TimeFormatter_D_HPP +#endif // ICU4X_TimeFormatter_D_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/TimeFormatter.hpp b/ffi/capi/bindings/cpp/icu4x/TimeFormatter.hpp index 7c06a205c7f..2ec145ca1f2 100644 --- a/ffi/capi/bindings/cpp/icu4x/TimeFormatter.hpp +++ b/ffi/capi/bindings/cpp/icu4x/TimeFormatter.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_TimeFormatter_HPP -#define icu4x_TimeFormatter_HPP +#ifndef ICU4X_TimeFormatter_HPP +#define ICU4X_TimeFormatter_HPP #include "TimeFormatter.d.hpp" @@ -11,7 +11,6 @@ #include #include #include -#include "../diplomat_runtime.hpp" #include "DataProvider.hpp" #include "DateTimeAlignment.hpp" #include "DateTimeFormatterLoadError.hpp" @@ -19,6 +18,7 @@ #include "Locale.hpp" #include "Time.hpp" #include "TimePrecision.hpp" +#include "diplomat_runtime.hpp" namespace icu4x { @@ -31,7 +31,7 @@ namespace capi { typedef struct icu4x_TimeFormatter_create_with_provider_mv1_result {union {icu4x::capi::TimeFormatter* ok; icu4x::capi::DateTimeFormatterLoadError err;}; bool is_ok;} icu4x_TimeFormatter_create_with_provider_mv1_result; icu4x_TimeFormatter_create_with_provider_mv1_result icu4x_TimeFormatter_create_with_provider_mv1(const icu4x::capi::DataProvider* provider, const icu4x::capi::Locale* locale, icu4x::capi::DateTimeLength_option length, icu4x::capi::TimePrecision_option time_precision, icu4x::capi::DateTimeAlignment_option alignment); - void icu4x_TimeFormatter_format_mv1(const icu4x::capi::TimeFormatter* self, const icu4x::capi::Time* time, diplomat::capi::DiplomatWrite* write); + void icu4x_TimeFormatter_format_mv1(const icu4x::capi::TimeFormatter* self, const icu4x::capi::Time* time, icu4x::diplomat::capi::DiplomatWrite* write); void icu4x_TimeFormatter_destroy_mv1(TimeFormatter* self); @@ -39,26 +39,26 @@ namespace capi { } // namespace capi } // namespace -inline diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::TimeFormatter::create(const icu4x::Locale& locale, std::optional length, std::optional time_precision, std::optional alignment) { +inline icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::TimeFormatter::create(const icu4x::Locale& locale, std::optional length, std::optional time_precision, std::optional alignment) { auto result = icu4x::capi::icu4x_TimeFormatter_create_mv1(locale.AsFFI(), length.has_value() ? (icu4x::capi::DateTimeLength_option{ { length.value().AsFFI() }, true }) : (icu4x::capi::DateTimeLength_option{ {}, false }), time_precision.has_value() ? (icu4x::capi::TimePrecision_option{ { time_precision.value().AsFFI() }, true }) : (icu4x::capi::TimePrecision_option{ {}, false }), alignment.has_value() ? (icu4x::capi::DateTimeAlignment_option{ { alignment.value().AsFFI() }, true }) : (icu4x::capi::DateTimeAlignment_option{ {}, false })); - return result.is_ok ? diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Ok>(std::unique_ptr(icu4x::TimeFormatter::FromFFI(result.ok)))) : diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::TimeFormatter::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); } -inline diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::TimeFormatter::create_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, std::optional length, std::optional time_precision, std::optional alignment) { +inline icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::TimeFormatter::create_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, std::optional length, std::optional time_precision, std::optional alignment) { auto result = icu4x::capi::icu4x_TimeFormatter_create_with_provider_mv1(provider.AsFFI(), locale.AsFFI(), length.has_value() ? (icu4x::capi::DateTimeLength_option{ { length.value().AsFFI() }, true }) : (icu4x::capi::DateTimeLength_option{ {}, false }), time_precision.has_value() ? (icu4x::capi::TimePrecision_option{ { time_precision.value().AsFFI() }, true }) : (icu4x::capi::TimePrecision_option{ {}, false }), alignment.has_value() ? (icu4x::capi::DateTimeAlignment_option{ { alignment.value().AsFFI() }, true }) : (icu4x::capi::DateTimeAlignment_option{ {}, false })); - return result.is_ok ? diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Ok>(std::unique_ptr(icu4x::TimeFormatter::FromFFI(result.ok)))) : diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::TimeFormatter::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); } inline std::string icu4x::TimeFormatter::format(const icu4x::Time& time) const { std::string output; - diplomat::capi::DiplomatWrite write = diplomat::WriteFromString(output); + icu4x::diplomat::capi::DiplomatWrite write = icu4x::diplomat::WriteFromString(output); icu4x::capi::icu4x_TimeFormatter_format_mv1(this->AsFFI(), time.AsFFI(), &write); @@ -66,7 +66,7 @@ inline std::string icu4x::TimeFormatter::format(const icu4x::Time& time) const { } template inline void icu4x::TimeFormatter::format_write(const icu4x::Time& time, W& writeable) const { - diplomat::capi::DiplomatWrite write = diplomat::WriteTrait::Construct(writeable); + icu4x::diplomat::capi::DiplomatWrite write = icu4x::diplomat::WriteTrait::Construct(writeable); icu4x::capi::icu4x_TimeFormatter_format_mv1(this->AsFFI(), time.AsFFI(), &write); @@ -93,4 +93,4 @@ inline void icu4x::TimeFormatter::operator delete(void* ptr) { } -#endif // icu4x_TimeFormatter_HPP +#endif // ICU4X_TimeFormatter_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/TimePrecision.d.hpp b/ffi/capi/bindings/cpp/icu4x/TimePrecision.d.hpp index cd7fac71735..e3ce9c98c9e 100644 --- a/ffi/capi/bindings/cpp/icu4x/TimePrecision.d.hpp +++ b/ffi/capi/bindings/cpp/icu4x/TimePrecision.d.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_TimePrecision_D_HPP -#define icu4x_TimePrecision_D_HPP +#ifndef ICU4X_TimePrecision_D_HPP +#define ICU4X_TimePrecision_D_HPP #include #include @@ -9,11 +9,11 @@ #include #include #include -#include "../diplomat_runtime.hpp" - +#include "diplomat_runtime.hpp" namespace icu4x { class TimePrecision; -} +} // namespace icu4x + namespace icu4x { @@ -71,7 +71,7 @@ class TimePrecision { explicit operator bool() const = delete; /** - * See the [Rust documentation for `try_from_int`](https://docs.rs/icu/2.0.0/icu/datetime/options/enum.SubsecondDigits.html#method.try_from_int) for more information. + * See the [Rust documentation for `try_from_int`](https://docs.rs/icu/2.0.0/icu/datetime/options/enum.SubsecondDigits.html#method.try_from_int) for more information. */ inline static std::optional from_subsecond_digits(uint8_t digits); @@ -82,4 +82,4 @@ class TimePrecision { }; } // namespace -#endif // icu4x_TimePrecision_D_HPP +#endif // ICU4X_TimePrecision_D_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/TimePrecision.hpp b/ffi/capi/bindings/cpp/icu4x/TimePrecision.hpp index a758b79e9d5..533569e7dc3 100644 --- a/ffi/capi/bindings/cpp/icu4x/TimePrecision.hpp +++ b/ffi/capi/bindings/cpp/icu4x/TimePrecision.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_TimePrecision_HPP -#define icu4x_TimePrecision_HPP +#ifndef ICU4X_TimePrecision_HPP +#define ICU4X_TimePrecision_HPP #include "TimePrecision.d.hpp" @@ -11,7 +11,7 @@ #include #include #include -#include "../diplomat_runtime.hpp" +#include "diplomat_runtime.hpp" namespace icu4x { @@ -54,4 +54,4 @@ inline std::optional icu4x::TimePrecision::from_subsecond_ auto result = icu4x::capi::icu4x_TimePrecision_from_subsecond_digits_mv1(digits); return result.is_ok ? std::optional(icu4x::TimePrecision::FromFFI(result.ok)) : std::nullopt; } -#endif // icu4x_TimePrecision_HPP +#endif // ICU4X_TimePrecision_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/TimeZone.d.hpp b/ffi/capi/bindings/cpp/icu4x/TimeZone.d.hpp index 0ccf2f4da7f..361fbd5dad8 100644 --- a/ffi/capi/bindings/cpp/icu4x/TimeZone.d.hpp +++ b/ffi/capi/bindings/cpp/icu4x/TimeZone.d.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_TimeZone_D_HPP -#define icu4x_TimeZone_D_HPP +#ifndef ICU4X_TimeZone_D_HPP +#define ICU4X_TimeZone_D_HPP #include #include @@ -9,8 +9,7 @@ #include #include #include -#include "../diplomat_runtime.hpp" - +#include "diplomat_runtime.hpp" namespace icu4x { namespace capi { struct TimeZone; } class TimeZone; @@ -18,7 +17,8 @@ namespace capi { struct TimeZoneInfo; } class TimeZoneInfo; namespace capi { struct UtcOffset; } class UtcOffset; -} +} // namespace icu4x + namespace icu4x { @@ -35,35 +35,35 @@ class TimeZone { public: /** - * The unknown time zone. - * - * See the [Rust documentation for `unknown`](https://docs.rs/icu/2.0.0/icu/time/struct.TimeZoneInfo.html#method.unknown) for more information. + * The unknown time zone. + * + * See the [Rust documentation for `unknown`](https://docs.rs/icu/2.0.0/icu/time/struct.TimeZoneInfo.html#method.unknown) for more information. */ inline static std::unique_ptr unknown(); /** - * Whether the time zone is the unknown zone. - * - * See the [Rust documentation for `is_unknown`](https://docs.rs/icu/2.0.0/icu/time/struct.TimeZone.html#method.is_unknown) for more information. + * Whether the time zone is the unknown zone. + * + * See the [Rust documentation for `is_unknown`](https://docs.rs/icu/2.0.0/icu/time/struct.TimeZone.html#method.is_unknown) for more information. */ inline bool is_unknown() const; /** - * Creates a time zone from a BCP-47 string. - * - * Returns the unknown time zone if the string is not a valid BCP-47 subtag. - * - * Additional information: [1](https://docs.rs/icu/2.0.0/icu/time/struct.TimeZone.html) + * Creates a time zone from a BCP-47 string. + * + * Returns the unknown time zone if the string is not a valid BCP-47 subtag. + * + * Additional information: [1](https://docs.rs/icu/2.0.0/icu/time/struct.TimeZone.html) */ inline static std::unique_ptr create_from_bcp47(std::string_view id); /** - * See the [Rust documentation for `with_offset`](https://docs.rs/icu/2.0.0/icu/time/struct.TimeZone.html#method.with_offset) for more information. + * See the [Rust documentation for `with_offset`](https://docs.rs/icu/2.0.0/icu/time/struct.TimeZone.html#method.with_offset) for more information. */ inline std::unique_ptr with_offset(const icu4x::UtcOffset& offset) const; /** - * See the [Rust documentation for `without_offset`](https://docs.rs/icu/2.0.0/icu/time/struct.TimeZone.html#method.without_offset) for more information. + * See the [Rust documentation for `without_offset`](https://docs.rs/icu/2.0.0/icu/time/struct.TimeZone.html#method.without_offset) for more information. */ inline std::unique_ptr without_offset() const; @@ -82,4 +82,4 @@ class TimeZone { }; } // namespace -#endif // icu4x_TimeZone_D_HPP +#endif // ICU4X_TimeZone_D_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/TimeZone.hpp b/ffi/capi/bindings/cpp/icu4x/TimeZone.hpp index d4e655c1fca..1f47eb9c150 100644 --- a/ffi/capi/bindings/cpp/icu4x/TimeZone.hpp +++ b/ffi/capi/bindings/cpp/icu4x/TimeZone.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_TimeZone_HPP -#define icu4x_TimeZone_HPP +#ifndef ICU4X_TimeZone_HPP +#define ICU4X_TimeZone_HPP #include "TimeZone.d.hpp" @@ -11,9 +11,9 @@ #include #include #include -#include "../diplomat_runtime.hpp" #include "TimeZoneInfo.hpp" #include "UtcOffset.hpp" +#include "diplomat_runtime.hpp" namespace icu4x { @@ -24,7 +24,7 @@ namespace capi { bool icu4x_TimeZone_is_unknown_mv1(const icu4x::capi::TimeZone* self); - icu4x::capi::TimeZone* icu4x_TimeZone_create_from_bcp47_mv1(diplomat::capi::DiplomatStringView id); + icu4x::capi::TimeZone* icu4x_TimeZone_create_from_bcp47_mv1(icu4x::diplomat::capi::DiplomatStringView id); icu4x::capi::TimeZoneInfo* icu4x_TimeZone_with_offset_mv1(const icu4x::capi::TimeZone* self, const icu4x::capi::UtcOffset* offset); @@ -83,4 +83,4 @@ inline void icu4x::TimeZone::operator delete(void* ptr) { } -#endif // icu4x_TimeZone_HPP +#endif // ICU4X_TimeZone_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/TimeZoneAndCanonical.d.hpp b/ffi/capi/bindings/cpp/icu4x/TimeZoneAndCanonical.d.hpp index 3400690c5ef..f0d4138e406 100644 --- a/ffi/capi/bindings/cpp/icu4x/TimeZoneAndCanonical.d.hpp +++ b/ffi/capi/bindings/cpp/icu4x/TimeZoneAndCanonical.d.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_TimeZoneAndCanonical_D_HPP -#define icu4x_TimeZoneAndCanonical_D_HPP +#ifndef ICU4X_TimeZoneAndCanonical_D_HPP +#define ICU4X_TimeZoneAndCanonical_D_HPP #include #include @@ -9,19 +9,19 @@ #include #include #include -#include "../diplomat_runtime.hpp" - +#include "diplomat_runtime.hpp" namespace icu4x { namespace capi { struct TimeZone; } class TimeZone; -} +} // namespace icu4x + namespace icu4x { namespace capi { struct TimeZoneAndCanonical { icu4x::capi::TimeZone* time_zone; - diplomat::capi::DiplomatStringView canonical; + icu4x::diplomat::capi::DiplomatStringView canonical; }; typedef struct TimeZoneAndCanonical_option {union { TimeZoneAndCanonical ok; }; bool is_ok; } TimeZoneAndCanonical_option; @@ -42,4 +42,4 @@ struct TimeZoneAndCanonical { }; } // namespace -#endif // icu4x_TimeZoneAndCanonical_D_HPP +#endif // ICU4X_TimeZoneAndCanonical_D_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/TimeZoneAndCanonical.hpp b/ffi/capi/bindings/cpp/icu4x/TimeZoneAndCanonical.hpp index a85d0c22fe6..35152703ac2 100644 --- a/ffi/capi/bindings/cpp/icu4x/TimeZoneAndCanonical.hpp +++ b/ffi/capi/bindings/cpp/icu4x/TimeZoneAndCanonical.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_TimeZoneAndCanonical_HPP -#define icu4x_TimeZoneAndCanonical_HPP +#ifndef ICU4X_TimeZoneAndCanonical_HPP +#define ICU4X_TimeZoneAndCanonical_HPP #include "TimeZoneAndCanonical.d.hpp" @@ -11,8 +11,8 @@ #include #include #include -#include "../diplomat_runtime.hpp" #include "TimeZone.hpp" +#include "diplomat_runtime.hpp" namespace icu4x { @@ -39,4 +39,4 @@ inline icu4x::TimeZoneAndCanonical icu4x::TimeZoneAndCanonical::FromFFI(icu4x::c } -#endif // icu4x_TimeZoneAndCanonical_HPP +#endif // ICU4X_TimeZoneAndCanonical_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/TimeZoneAndCanonicalAndNormalized.d.hpp b/ffi/capi/bindings/cpp/icu4x/TimeZoneAndCanonicalAndNormalized.d.hpp index be042257d54..dc46ce302ad 100644 --- a/ffi/capi/bindings/cpp/icu4x/TimeZoneAndCanonicalAndNormalized.d.hpp +++ b/ffi/capi/bindings/cpp/icu4x/TimeZoneAndCanonicalAndNormalized.d.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_TimeZoneAndCanonicalAndNormalized_D_HPP -#define icu4x_TimeZoneAndCanonicalAndNormalized_D_HPP +#ifndef ICU4X_TimeZoneAndCanonicalAndNormalized_D_HPP +#define ICU4X_TimeZoneAndCanonicalAndNormalized_D_HPP #include #include @@ -9,20 +9,20 @@ #include #include #include -#include "../diplomat_runtime.hpp" - +#include "diplomat_runtime.hpp" namespace icu4x { namespace capi { struct TimeZone; } class TimeZone; -} +} // namespace icu4x + namespace icu4x { namespace capi { struct TimeZoneAndCanonicalAndNormalized { icu4x::capi::TimeZone* time_zone; - diplomat::capi::DiplomatStringView canonical; - diplomat::capi::DiplomatStringView normalized; + icu4x::diplomat::capi::DiplomatStringView canonical; + icu4x::diplomat::capi::DiplomatStringView normalized; }; typedef struct TimeZoneAndCanonicalAndNormalized_option {union { TimeZoneAndCanonicalAndNormalized ok; }; bool is_ok; } TimeZoneAndCanonicalAndNormalized_option; @@ -44,4 +44,4 @@ struct TimeZoneAndCanonicalAndNormalized { }; } // namespace -#endif // icu4x_TimeZoneAndCanonicalAndNormalized_D_HPP +#endif // ICU4X_TimeZoneAndCanonicalAndNormalized_D_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/TimeZoneAndCanonicalAndNormalized.hpp b/ffi/capi/bindings/cpp/icu4x/TimeZoneAndCanonicalAndNormalized.hpp index b634db5cd6b..9a052d4be97 100644 --- a/ffi/capi/bindings/cpp/icu4x/TimeZoneAndCanonicalAndNormalized.hpp +++ b/ffi/capi/bindings/cpp/icu4x/TimeZoneAndCanonicalAndNormalized.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_TimeZoneAndCanonicalAndNormalized_HPP -#define icu4x_TimeZoneAndCanonicalAndNormalized_HPP +#ifndef ICU4X_TimeZoneAndCanonicalAndNormalized_HPP +#define ICU4X_TimeZoneAndCanonicalAndNormalized_HPP #include "TimeZoneAndCanonicalAndNormalized.d.hpp" @@ -11,8 +11,8 @@ #include #include #include -#include "../diplomat_runtime.hpp" #include "TimeZone.hpp" +#include "diplomat_runtime.hpp" namespace icu4x { @@ -41,4 +41,4 @@ inline icu4x::TimeZoneAndCanonicalAndNormalized icu4x::TimeZoneAndCanonicalAndNo } -#endif // icu4x_TimeZoneAndCanonicalAndNormalized_HPP +#endif // ICU4X_TimeZoneAndCanonicalAndNormalized_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/TimeZoneAndCanonicalAndNormalizedIterator.d.hpp b/ffi/capi/bindings/cpp/icu4x/TimeZoneAndCanonicalAndNormalizedIterator.d.hpp index 3c49e7d8223..9e2aa60ed39 100644 --- a/ffi/capi/bindings/cpp/icu4x/TimeZoneAndCanonicalAndNormalizedIterator.d.hpp +++ b/ffi/capi/bindings/cpp/icu4x/TimeZoneAndCanonicalAndNormalizedIterator.d.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_TimeZoneAndCanonicalAndNormalizedIterator_D_HPP -#define icu4x_TimeZoneAndCanonicalAndNormalizedIterator_D_HPP +#ifndef ICU4X_TimeZoneAndCanonicalAndNormalizedIterator_D_HPP +#define ICU4X_TimeZoneAndCanonicalAndNormalizedIterator_D_HPP #include #include @@ -9,11 +9,11 @@ #include #include #include -#include "../diplomat_runtime.hpp" - +#include "diplomat_runtime.hpp" namespace icu4x { struct TimeZoneAndCanonicalAndNormalized; -} +} // namespace icu4x + namespace icu4x { @@ -30,7 +30,7 @@ class TimeZoneAndCanonicalAndNormalizedIterator { public: /** - * See the [Rust documentation for `next`](https://docs.rs/icu/2.0.0/icu/time/zone/iana/struct.TimeZoneAndCanonicalAndNormalizedIter.html#method.next) for more information. + * See the [Rust documentation for `next`](https://docs.rs/icu/2.0.0/icu/time/zone/iana/struct.TimeZoneAndCanonicalAndNormalizedIter.html#method.next) for more information. */ inline std::optional next(); @@ -49,4 +49,4 @@ class TimeZoneAndCanonicalAndNormalizedIterator { }; } // namespace -#endif // icu4x_TimeZoneAndCanonicalAndNormalizedIterator_D_HPP +#endif // ICU4X_TimeZoneAndCanonicalAndNormalizedIterator_D_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/TimeZoneAndCanonicalAndNormalizedIterator.hpp b/ffi/capi/bindings/cpp/icu4x/TimeZoneAndCanonicalAndNormalizedIterator.hpp index 491f05f5afd..cf503a2a50f 100644 --- a/ffi/capi/bindings/cpp/icu4x/TimeZoneAndCanonicalAndNormalizedIterator.hpp +++ b/ffi/capi/bindings/cpp/icu4x/TimeZoneAndCanonicalAndNormalizedIterator.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_TimeZoneAndCanonicalAndNormalizedIterator_HPP -#define icu4x_TimeZoneAndCanonicalAndNormalizedIterator_HPP +#ifndef ICU4X_TimeZoneAndCanonicalAndNormalizedIterator_HPP +#define ICU4X_TimeZoneAndCanonicalAndNormalizedIterator_HPP #include "TimeZoneAndCanonicalAndNormalizedIterator.d.hpp" @@ -11,8 +11,8 @@ #include #include #include -#include "../diplomat_runtime.hpp" #include "TimeZoneAndCanonicalAndNormalized.hpp" +#include "diplomat_runtime.hpp" namespace icu4x { @@ -54,4 +54,4 @@ inline void icu4x::TimeZoneAndCanonicalAndNormalizedIterator::operator delete(vo } -#endif // icu4x_TimeZoneAndCanonicalAndNormalizedIterator_HPP +#endif // ICU4X_TimeZoneAndCanonicalAndNormalizedIterator_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/TimeZoneAndCanonicalIterator.d.hpp b/ffi/capi/bindings/cpp/icu4x/TimeZoneAndCanonicalIterator.d.hpp index 61f3911ffcc..cf4b4c40108 100644 --- a/ffi/capi/bindings/cpp/icu4x/TimeZoneAndCanonicalIterator.d.hpp +++ b/ffi/capi/bindings/cpp/icu4x/TimeZoneAndCanonicalIterator.d.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_TimeZoneAndCanonicalIterator_D_HPP -#define icu4x_TimeZoneAndCanonicalIterator_D_HPP +#ifndef ICU4X_TimeZoneAndCanonicalIterator_D_HPP +#define ICU4X_TimeZoneAndCanonicalIterator_D_HPP #include #include @@ -9,11 +9,11 @@ #include #include #include -#include "../diplomat_runtime.hpp" - +#include "diplomat_runtime.hpp" namespace icu4x { struct TimeZoneAndCanonical; -} +} // namespace icu4x + namespace icu4x { @@ -30,7 +30,7 @@ class TimeZoneAndCanonicalIterator { public: /** - * See the [Rust documentation for `next`](https://docs.rs/icu/2.0.0/icu/time/zone/iana/struct.TimeZoneAndCanonicalIter.html#method.next) for more information. + * See the [Rust documentation for `next`](https://docs.rs/icu/2.0.0/icu/time/zone/iana/struct.TimeZoneAndCanonicalIter.html#method.next) for more information. */ inline std::optional next(); @@ -49,4 +49,4 @@ class TimeZoneAndCanonicalIterator { }; } // namespace -#endif // icu4x_TimeZoneAndCanonicalIterator_D_HPP +#endif // ICU4X_TimeZoneAndCanonicalIterator_D_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/TimeZoneAndCanonicalIterator.hpp b/ffi/capi/bindings/cpp/icu4x/TimeZoneAndCanonicalIterator.hpp index 21fe8acc658..d776fe3cc2f 100644 --- a/ffi/capi/bindings/cpp/icu4x/TimeZoneAndCanonicalIterator.hpp +++ b/ffi/capi/bindings/cpp/icu4x/TimeZoneAndCanonicalIterator.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_TimeZoneAndCanonicalIterator_HPP -#define icu4x_TimeZoneAndCanonicalIterator_HPP +#ifndef ICU4X_TimeZoneAndCanonicalIterator_HPP +#define ICU4X_TimeZoneAndCanonicalIterator_HPP #include "TimeZoneAndCanonicalIterator.d.hpp" @@ -11,8 +11,8 @@ #include #include #include -#include "../diplomat_runtime.hpp" #include "TimeZoneAndCanonical.hpp" +#include "diplomat_runtime.hpp" namespace icu4x { @@ -54,4 +54,4 @@ inline void icu4x::TimeZoneAndCanonicalIterator::operator delete(void* ptr) { } -#endif // icu4x_TimeZoneAndCanonicalIterator_HPP +#endif // ICU4X_TimeZoneAndCanonicalIterator_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/TimeZoneFormatter.d.hpp b/ffi/capi/bindings/cpp/icu4x/TimeZoneFormatter.d.hpp index 7e5cc90e067..4145371fdce 100644 --- a/ffi/capi/bindings/cpp/icu4x/TimeZoneFormatter.d.hpp +++ b/ffi/capi/bindings/cpp/icu4x/TimeZoneFormatter.d.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_TimeZoneFormatter_D_HPP -#define icu4x_TimeZoneFormatter_D_HPP +#ifndef ICU4X_TimeZoneFormatter_D_HPP +#define ICU4X_TimeZoneFormatter_D_HPP #include #include @@ -9,8 +9,7 @@ #include #include #include -#include "../diplomat_runtime.hpp" - +#include "diplomat_runtime.hpp" namespace icu4x { namespace capi { struct DataProvider; } class DataProvider; @@ -22,7 +21,8 @@ namespace capi { struct TimeZoneInfo; } class TimeZoneInfo; class DateTimeFormatterLoadError; class DateTimeWriteError; -} +} // namespace icu4x + namespace icu4x { @@ -39,171 +39,171 @@ class TimeZoneFormatter { public: /** - * Creates a zoned formatter based on a non-zoned formatter. - * - * Caution: The locale provided here must match the locale used to construct the non-zoned formatter, - * or else unexpected behavior may occur! - * - * See the [Rust documentation for `SpecificLong`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/zone/struct.SpecificLong.html) for more information. + * Creates a zoned formatter based on a non-zoned formatter. + * + * Caution: The locale provided here must match the locale used to construct the non-zoned formatter, + * or else unexpected behavior may occur! + * + * See the [Rust documentation for `SpecificLong`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/zone/struct.SpecificLong.html) for more information. */ - inline static diplomat::result, icu4x::DateTimeFormatterLoadError> create_specific_long(const icu4x::Locale& locale); + inline static icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> create_specific_long(const icu4x::Locale& locale); /** - * Creates a zoned formatter based on a non-zoned formatter. - * - * Caution: The locale provided here must match the locale used to construct the non-zoned formatter, - * or else unexpected behavior may occur! - * - * See the [Rust documentation for `SpecificLong`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/zone/struct.SpecificLong.html) for more information. + * Creates a zoned formatter based on a non-zoned formatter. + * + * Caution: The locale provided here must match the locale used to construct the non-zoned formatter, + * or else unexpected behavior may occur! + * + * See the [Rust documentation for `SpecificLong`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/zone/struct.SpecificLong.html) for more information. */ - inline static diplomat::result, icu4x::DateTimeFormatterLoadError> create_specific_long_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale); + inline static icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> create_specific_long_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale); /** - * Creates a zoned formatter based on a non-zoned formatter. - * - * Caution: The locale provided here must match the locale used to construct the non-zoned formatter, - * or else unexpected behavior may occur! - * - * See the [Rust documentation for `SpecificShort`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/zone/struct.SpecificShort.html) for more information. + * Creates a zoned formatter based on a non-zoned formatter. + * + * Caution: The locale provided here must match the locale used to construct the non-zoned formatter, + * or else unexpected behavior may occur! + * + * See the [Rust documentation for `SpecificShort`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/zone/struct.SpecificShort.html) for more information. */ - inline static diplomat::result, icu4x::DateTimeFormatterLoadError> create_specific_short(const icu4x::Locale& locale); + inline static icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> create_specific_short(const icu4x::Locale& locale); /** - * Creates a zoned formatter based on a non-zoned formatter. - * - * Caution: The locale provided here must match the locale used to construct the non-zoned formatter, - * or else unexpected behavior may occur! - * - * See the [Rust documentation for `SpecificShort`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/zone/struct.SpecificShort.html) for more information. + * Creates a zoned formatter based on a non-zoned formatter. + * + * Caution: The locale provided here must match the locale used to construct the non-zoned formatter, + * or else unexpected behavior may occur! + * + * See the [Rust documentation for `SpecificShort`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/zone/struct.SpecificShort.html) for more information. */ - inline static diplomat::result, icu4x::DateTimeFormatterLoadError> create_specific_short_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale); + inline static icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> create_specific_short_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale); /** - * Creates a zoned formatter based on a non-zoned formatter. - * - * Caution: The locale provided here must match the locale used to construct the non-zoned formatter, - * or else unexpected behavior may occur! - * - * See the [Rust documentation for `LocalizedOffsetLong`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/zone/struct.LocalizedOffsetLong.html) for more information. + * Creates a zoned formatter based on a non-zoned formatter. + * + * Caution: The locale provided here must match the locale used to construct the non-zoned formatter, + * or else unexpected behavior may occur! + * + * See the [Rust documentation for `LocalizedOffsetLong`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/zone/struct.LocalizedOffsetLong.html) for more information. */ - inline static diplomat::result, icu4x::DateTimeFormatterLoadError> create_localized_offset_long(const icu4x::Locale& locale); + inline static icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> create_localized_offset_long(const icu4x::Locale& locale); /** - * Creates a zoned formatter based on a non-zoned formatter. - * - * Caution: The locale provided here must match the locale used to construct the non-zoned formatter, - * or else unexpected behavior may occur! - * - * See the [Rust documentation for `LocalizedOffsetLong`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/zone/struct.LocalizedOffsetLong.html) for more information. + * Creates a zoned formatter based on a non-zoned formatter. + * + * Caution: The locale provided here must match the locale used to construct the non-zoned formatter, + * or else unexpected behavior may occur! + * + * See the [Rust documentation for `LocalizedOffsetLong`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/zone/struct.LocalizedOffsetLong.html) for more information. */ - inline static diplomat::result, icu4x::DateTimeFormatterLoadError> create_localized_offset_long_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale); + inline static icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> create_localized_offset_long_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale); /** - * Creates a zoned formatter based on a non-zoned formatter. - * - * Caution: The locale provided here must match the locale used to construct the non-zoned formatter, - * or else unexpected behavior may occur! - * - * See the [Rust documentation for `LocalizedOffsetShort`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/zone/struct.LocalizedOffsetShort.html) for more information. + * Creates a zoned formatter based on a non-zoned formatter. + * + * Caution: The locale provided here must match the locale used to construct the non-zoned formatter, + * or else unexpected behavior may occur! + * + * See the [Rust documentation for `LocalizedOffsetShort`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/zone/struct.LocalizedOffsetShort.html) for more information. */ - inline static diplomat::result, icu4x::DateTimeFormatterLoadError> create_localized_offset_short(const icu4x::Locale& locale); + inline static icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> create_localized_offset_short(const icu4x::Locale& locale); /** - * Creates a zoned formatter based on a non-zoned formatter. - * - * Caution: The locale provided here must match the locale used to construct the non-zoned formatter, - * or else unexpected behavior may occur! - * - * See the [Rust documentation for `LocalizedOffsetShort`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/zone/struct.LocalizedOffsetShort.html) for more information. + * Creates a zoned formatter based on a non-zoned formatter. + * + * Caution: The locale provided here must match the locale used to construct the non-zoned formatter, + * or else unexpected behavior may occur! + * + * See the [Rust documentation for `LocalizedOffsetShort`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/zone/struct.LocalizedOffsetShort.html) for more information. */ - inline static diplomat::result, icu4x::DateTimeFormatterLoadError> create_localized_offset_short_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale); + inline static icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> create_localized_offset_short_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale); /** - * Creates a zoned formatter based on a non-zoned formatter. - * - * Caution: The locale provided here must match the locale used to construct the non-zoned formatter, - * or else unexpected behavior may occur! - * - * See the [Rust documentation for `GenericLong`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/zone/struct.GenericLong.html) for more information. + * Creates a zoned formatter based on a non-zoned formatter. + * + * Caution: The locale provided here must match the locale used to construct the non-zoned formatter, + * or else unexpected behavior may occur! + * + * See the [Rust documentation for `GenericLong`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/zone/struct.GenericLong.html) for more information. */ - inline static diplomat::result, icu4x::DateTimeFormatterLoadError> create_generic_long(const icu4x::Locale& locale); + inline static icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> create_generic_long(const icu4x::Locale& locale); /** - * Creates a zoned formatter based on a non-zoned formatter. - * - * Caution: The locale provided here must match the locale used to construct the non-zoned formatter, - * or else unexpected behavior may occur! - * - * See the [Rust documentation for `GenericLong`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/zone/struct.GenericLong.html) for more information. + * Creates a zoned formatter based on a non-zoned formatter. + * + * Caution: The locale provided here must match the locale used to construct the non-zoned formatter, + * or else unexpected behavior may occur! + * + * See the [Rust documentation for `GenericLong`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/zone/struct.GenericLong.html) for more information. */ - inline static diplomat::result, icu4x::DateTimeFormatterLoadError> create_generic_long_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale); + inline static icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> create_generic_long_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale); /** - * Creates a zoned formatter based on a non-zoned formatter. - * - * Caution: The locale provided here must match the locale used to construct the non-zoned formatter, - * or else unexpected behavior may occur! - * - * See the [Rust documentation for `GenericShort`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/zone/struct.GenericShort.html) for more information. + * Creates a zoned formatter based on a non-zoned formatter. + * + * Caution: The locale provided here must match the locale used to construct the non-zoned formatter, + * or else unexpected behavior may occur! + * + * See the [Rust documentation for `GenericShort`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/zone/struct.GenericShort.html) for more information. */ - inline static diplomat::result, icu4x::DateTimeFormatterLoadError> create_generic_short(const icu4x::Locale& locale); + inline static icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> create_generic_short(const icu4x::Locale& locale); /** - * Creates a zoned formatter based on a non-zoned formatter. - * - * Caution: The locale provided here must match the locale used to construct the non-zoned formatter, - * or else unexpected behavior may occur! - * - * See the [Rust documentation for `GenericShort`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/zone/struct.GenericShort.html) for more information. + * Creates a zoned formatter based on a non-zoned formatter. + * + * Caution: The locale provided here must match the locale used to construct the non-zoned formatter, + * or else unexpected behavior may occur! + * + * See the [Rust documentation for `GenericShort`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/zone/struct.GenericShort.html) for more information. */ - inline static diplomat::result, icu4x::DateTimeFormatterLoadError> create_generic_short_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale); + inline static icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> create_generic_short_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale); /** - * Creates a zoned formatter based on a non-zoned formatter. - * - * Caution: The locale provided here must match the locale used to construct the non-zoned formatter, - * or else unexpected behavior may occur! - * - * See the [Rust documentation for `Location`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/zone/struct.Location.html) for more information. + * Creates a zoned formatter based on a non-zoned formatter. + * + * Caution: The locale provided here must match the locale used to construct the non-zoned formatter, + * or else unexpected behavior may occur! + * + * See the [Rust documentation for `Location`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/zone/struct.Location.html) for more information. */ - inline static diplomat::result, icu4x::DateTimeFormatterLoadError> create_location(const icu4x::Locale& locale); + inline static icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> create_location(const icu4x::Locale& locale); /** - * Creates a zoned formatter based on a non-zoned formatter. - * - * Caution: The locale provided here must match the locale used to construct the non-zoned formatter, - * or else unexpected behavior may occur! - * - * See the [Rust documentation for `Location`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/zone/struct.Location.html) for more information. + * Creates a zoned formatter based on a non-zoned formatter. + * + * Caution: The locale provided here must match the locale used to construct the non-zoned formatter, + * or else unexpected behavior may occur! + * + * See the [Rust documentation for `Location`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/zone/struct.Location.html) for more information. */ - inline static diplomat::result, icu4x::DateTimeFormatterLoadError> create_location_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale); + inline static icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> create_location_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale); /** - * Creates a zoned formatter based on a non-zoned formatter. - * - * Caution: The locale provided here must match the locale used to construct the non-zoned formatter, - * or else unexpected behavior may occur! - * - * See the [Rust documentation for `ExemplarCity`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/zone/struct.ExemplarCity.html) for more information. + * Creates a zoned formatter based on a non-zoned formatter. + * + * Caution: The locale provided here must match the locale used to construct the non-zoned formatter, + * or else unexpected behavior may occur! + * + * See the [Rust documentation for `ExemplarCity`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/zone/struct.ExemplarCity.html) for more information. */ - inline static diplomat::result, icu4x::DateTimeFormatterLoadError> create_exemplar_city(const icu4x::Locale& locale); + inline static icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> create_exemplar_city(const icu4x::Locale& locale); /** - * Creates a zoned formatter based on a non-zoned formatter. - * - * Caution: The locale provided here must match the locale used to construct the non-zoned formatter, - * or else unexpected behavior may occur! - * - * See the [Rust documentation for `ExemplarCity`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/zone/struct.ExemplarCity.html) for more information. + * Creates a zoned formatter based on a non-zoned formatter. + * + * Caution: The locale provided here must match the locale used to construct the non-zoned formatter, + * or else unexpected behavior may occur! + * + * See the [Rust documentation for `ExemplarCity`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/zone/struct.ExemplarCity.html) for more information. */ - inline static diplomat::result, icu4x::DateTimeFormatterLoadError> create_exemplar_city_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale); + inline static icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> create_exemplar_city_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale); /** - * See the [Rust documentation for `format`](https://docs.rs/icu/2.0.0/icu/datetime/struct.FixedCalendarDateTimeFormatter.html#method.format) for more information. + * See the [Rust documentation for `format`](https://docs.rs/icu/2.0.0/icu/datetime/struct.FixedCalendarDateTimeFormatter.html#method.format) for more information. */ - inline diplomat::result format(const icu4x::TimeZoneInfo& zone) const; + inline icu4x::diplomat::result format(const icu4x::TimeZoneInfo& zone) const; template - inline diplomat::result format_write(const icu4x::TimeZoneInfo& zone, W& writeable_output) const; + inline icu4x::diplomat::result format_write(const icu4x::TimeZoneInfo& zone, W& writeable_output) const; inline const icu4x::capi::TimeZoneFormatter* AsFFI() const; inline icu4x::capi::TimeZoneFormatter* AsFFI(); @@ -220,4 +220,4 @@ class TimeZoneFormatter { }; } // namespace -#endif // icu4x_TimeZoneFormatter_D_HPP +#endif // ICU4X_TimeZoneFormatter_D_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/TimeZoneFormatter.hpp b/ffi/capi/bindings/cpp/icu4x/TimeZoneFormatter.hpp index 18d67100b7a..90bd957f7ab 100644 --- a/ffi/capi/bindings/cpp/icu4x/TimeZoneFormatter.hpp +++ b/ffi/capi/bindings/cpp/icu4x/TimeZoneFormatter.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_TimeZoneFormatter_HPP -#define icu4x_TimeZoneFormatter_HPP +#ifndef ICU4X_TimeZoneFormatter_HPP +#define ICU4X_TimeZoneFormatter_HPP #include "TimeZoneFormatter.d.hpp" @@ -11,12 +11,12 @@ #include #include #include -#include "../diplomat_runtime.hpp" #include "DataProvider.hpp" #include "DateTimeFormatterLoadError.hpp" #include "DateTimeWriteError.hpp" #include "Locale.hpp" #include "TimeZoneInfo.hpp" +#include "diplomat_runtime.hpp" namespace icu4x { @@ -72,7 +72,7 @@ namespace capi { icu4x_TimeZoneFormatter_create_exemplar_city_with_provider_mv1_result icu4x_TimeZoneFormatter_create_exemplar_city_with_provider_mv1(const icu4x::capi::DataProvider* provider, const icu4x::capi::Locale* locale); typedef struct icu4x_TimeZoneFormatter_format_mv1_result {union { icu4x::capi::DateTimeWriteError err;}; bool is_ok;} icu4x_TimeZoneFormatter_format_mv1_result; - icu4x_TimeZoneFormatter_format_mv1_result icu4x_TimeZoneFormatter_format_mv1(const icu4x::capi::TimeZoneFormatter* self, const icu4x::capi::TimeZoneInfo* zone, diplomat::capi::DiplomatWrite* write); + icu4x_TimeZoneFormatter_format_mv1_result icu4x_TimeZoneFormatter_format_mv1(const icu4x::capi::TimeZoneFormatter* self, const icu4x::capi::TimeZoneInfo* zone, icu4x::diplomat::capi::DiplomatWrite* write); void icu4x_TimeZoneFormatter_destroy_mv1(TimeZoneFormatter* self); @@ -80,109 +80,109 @@ namespace capi { } // namespace capi } // namespace -inline diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::TimeZoneFormatter::create_specific_long(const icu4x::Locale& locale) { +inline icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::TimeZoneFormatter::create_specific_long(const icu4x::Locale& locale) { auto result = icu4x::capi::icu4x_TimeZoneFormatter_create_specific_long_mv1(locale.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Ok>(std::unique_ptr(icu4x::TimeZoneFormatter::FromFFI(result.ok)))) : diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::TimeZoneFormatter::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); } -inline diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::TimeZoneFormatter::create_specific_long_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale) { +inline icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::TimeZoneFormatter::create_specific_long_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale) { auto result = icu4x::capi::icu4x_TimeZoneFormatter_create_specific_long_with_provider_mv1(provider.AsFFI(), locale.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Ok>(std::unique_ptr(icu4x::TimeZoneFormatter::FromFFI(result.ok)))) : diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::TimeZoneFormatter::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); } -inline diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::TimeZoneFormatter::create_specific_short(const icu4x::Locale& locale) { +inline icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::TimeZoneFormatter::create_specific_short(const icu4x::Locale& locale) { auto result = icu4x::capi::icu4x_TimeZoneFormatter_create_specific_short_mv1(locale.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Ok>(std::unique_ptr(icu4x::TimeZoneFormatter::FromFFI(result.ok)))) : diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::TimeZoneFormatter::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); } -inline diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::TimeZoneFormatter::create_specific_short_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale) { +inline icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::TimeZoneFormatter::create_specific_short_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale) { auto result = icu4x::capi::icu4x_TimeZoneFormatter_create_specific_short_with_provider_mv1(provider.AsFFI(), locale.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Ok>(std::unique_ptr(icu4x::TimeZoneFormatter::FromFFI(result.ok)))) : diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::TimeZoneFormatter::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); } -inline diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::TimeZoneFormatter::create_localized_offset_long(const icu4x::Locale& locale) { +inline icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::TimeZoneFormatter::create_localized_offset_long(const icu4x::Locale& locale) { auto result = icu4x::capi::icu4x_TimeZoneFormatter_create_localized_offset_long_mv1(locale.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Ok>(std::unique_ptr(icu4x::TimeZoneFormatter::FromFFI(result.ok)))) : diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::TimeZoneFormatter::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); } -inline diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::TimeZoneFormatter::create_localized_offset_long_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale) { +inline icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::TimeZoneFormatter::create_localized_offset_long_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale) { auto result = icu4x::capi::icu4x_TimeZoneFormatter_create_localized_offset_long_with_provider_mv1(provider.AsFFI(), locale.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Ok>(std::unique_ptr(icu4x::TimeZoneFormatter::FromFFI(result.ok)))) : diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::TimeZoneFormatter::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); } -inline diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::TimeZoneFormatter::create_localized_offset_short(const icu4x::Locale& locale) { +inline icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::TimeZoneFormatter::create_localized_offset_short(const icu4x::Locale& locale) { auto result = icu4x::capi::icu4x_TimeZoneFormatter_create_localized_offset_short_mv1(locale.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Ok>(std::unique_ptr(icu4x::TimeZoneFormatter::FromFFI(result.ok)))) : diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::TimeZoneFormatter::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); } -inline diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::TimeZoneFormatter::create_localized_offset_short_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale) { +inline icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::TimeZoneFormatter::create_localized_offset_short_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale) { auto result = icu4x::capi::icu4x_TimeZoneFormatter_create_localized_offset_short_with_provider_mv1(provider.AsFFI(), locale.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Ok>(std::unique_ptr(icu4x::TimeZoneFormatter::FromFFI(result.ok)))) : diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::TimeZoneFormatter::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); } -inline diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::TimeZoneFormatter::create_generic_long(const icu4x::Locale& locale) { +inline icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::TimeZoneFormatter::create_generic_long(const icu4x::Locale& locale) { auto result = icu4x::capi::icu4x_TimeZoneFormatter_create_generic_long_mv1(locale.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Ok>(std::unique_ptr(icu4x::TimeZoneFormatter::FromFFI(result.ok)))) : diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::TimeZoneFormatter::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); } -inline diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::TimeZoneFormatter::create_generic_long_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale) { +inline icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::TimeZoneFormatter::create_generic_long_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale) { auto result = icu4x::capi::icu4x_TimeZoneFormatter_create_generic_long_with_provider_mv1(provider.AsFFI(), locale.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Ok>(std::unique_ptr(icu4x::TimeZoneFormatter::FromFFI(result.ok)))) : diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::TimeZoneFormatter::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); } -inline diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::TimeZoneFormatter::create_generic_short(const icu4x::Locale& locale) { +inline icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::TimeZoneFormatter::create_generic_short(const icu4x::Locale& locale) { auto result = icu4x::capi::icu4x_TimeZoneFormatter_create_generic_short_mv1(locale.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Ok>(std::unique_ptr(icu4x::TimeZoneFormatter::FromFFI(result.ok)))) : diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::TimeZoneFormatter::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); } -inline diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::TimeZoneFormatter::create_generic_short_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale) { +inline icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::TimeZoneFormatter::create_generic_short_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale) { auto result = icu4x::capi::icu4x_TimeZoneFormatter_create_generic_short_with_provider_mv1(provider.AsFFI(), locale.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Ok>(std::unique_ptr(icu4x::TimeZoneFormatter::FromFFI(result.ok)))) : diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::TimeZoneFormatter::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); } -inline diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::TimeZoneFormatter::create_location(const icu4x::Locale& locale) { +inline icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::TimeZoneFormatter::create_location(const icu4x::Locale& locale) { auto result = icu4x::capi::icu4x_TimeZoneFormatter_create_location_mv1(locale.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Ok>(std::unique_ptr(icu4x::TimeZoneFormatter::FromFFI(result.ok)))) : diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::TimeZoneFormatter::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); } -inline diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::TimeZoneFormatter::create_location_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale) { +inline icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::TimeZoneFormatter::create_location_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale) { auto result = icu4x::capi::icu4x_TimeZoneFormatter_create_location_with_provider_mv1(provider.AsFFI(), locale.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Ok>(std::unique_ptr(icu4x::TimeZoneFormatter::FromFFI(result.ok)))) : diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::TimeZoneFormatter::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); } -inline diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::TimeZoneFormatter::create_exemplar_city(const icu4x::Locale& locale) { +inline icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::TimeZoneFormatter::create_exemplar_city(const icu4x::Locale& locale) { auto result = icu4x::capi::icu4x_TimeZoneFormatter_create_exemplar_city_mv1(locale.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Ok>(std::unique_ptr(icu4x::TimeZoneFormatter::FromFFI(result.ok)))) : diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::TimeZoneFormatter::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); } -inline diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::TimeZoneFormatter::create_exemplar_city_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale) { +inline icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::TimeZoneFormatter::create_exemplar_city_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale) { auto result = icu4x::capi::icu4x_TimeZoneFormatter_create_exemplar_city_with_provider_mv1(provider.AsFFI(), locale.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Ok>(std::unique_ptr(icu4x::TimeZoneFormatter::FromFFI(result.ok)))) : diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::TimeZoneFormatter::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); } -inline diplomat::result icu4x::TimeZoneFormatter::format(const icu4x::TimeZoneInfo& zone) const { +inline icu4x::diplomat::result icu4x::TimeZoneFormatter::format(const icu4x::TimeZoneInfo& zone) const { std::string output; - diplomat::capi::DiplomatWrite write = diplomat::WriteFromString(output); + icu4x::diplomat::capi::DiplomatWrite write = icu4x::diplomat::WriteFromString(output); auto result = icu4x::capi::icu4x_TimeZoneFormatter_format_mv1(this->AsFFI(), zone.AsFFI(), &write); - return result.is_ok ? diplomat::result(diplomat::Ok(std::move(output))) : diplomat::result(diplomat::Err(icu4x::DateTimeWriteError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result(icu4x::diplomat::Ok(std::move(output))) : icu4x::diplomat::result(icu4x::diplomat::Err(icu4x::DateTimeWriteError::FromFFI(result.err))); } template -inline diplomat::result icu4x::TimeZoneFormatter::format_write(const icu4x::TimeZoneInfo& zone, W& writeable) const { - diplomat::capi::DiplomatWrite write = diplomat::WriteTrait::Construct(writeable); +inline icu4x::diplomat::result icu4x::TimeZoneFormatter::format_write(const icu4x::TimeZoneInfo& zone, W& writeable) const { + icu4x::diplomat::capi::DiplomatWrite write = icu4x::diplomat::WriteTrait::Construct(writeable); auto result = icu4x::capi::icu4x_TimeZoneFormatter_format_mv1(this->AsFFI(), zone.AsFFI(), &write); - return result.is_ok ? diplomat::result(diplomat::Ok()) : diplomat::result(diplomat::Err(icu4x::DateTimeWriteError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result(icu4x::diplomat::Ok()) : icu4x::diplomat::result(icu4x::diplomat::Err(icu4x::DateTimeWriteError::FromFFI(result.err))); } inline const icu4x::capi::TimeZoneFormatter* icu4x::TimeZoneFormatter::AsFFI() const { @@ -206,4 +206,4 @@ inline void icu4x::TimeZoneFormatter::operator delete(void* ptr) { } -#endif // icu4x_TimeZoneFormatter_HPP +#endif // ICU4X_TimeZoneFormatter_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/TimeZoneInfo.d.hpp b/ffi/capi/bindings/cpp/icu4x/TimeZoneInfo.d.hpp index 98eded3953b..fc37524e7be 100644 --- a/ffi/capi/bindings/cpp/icu4x/TimeZoneInfo.d.hpp +++ b/ffi/capi/bindings/cpp/icu4x/TimeZoneInfo.d.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_TimeZoneInfo_D_HPP -#define icu4x_TimeZoneInfo_D_HPP +#ifndef ICU4X_TimeZoneInfo_D_HPP +#define ICU4X_TimeZoneInfo_D_HPP #include #include @@ -9,8 +9,7 @@ #include #include #include -#include "../diplomat_runtime.hpp" - +#include "diplomat_runtime.hpp" namespace icu4x { namespace capi { struct IsoDate; } class IsoDate; @@ -26,7 +25,8 @@ namespace capi { struct VariantOffsetsCalculator; } class VariantOffsetsCalculator; struct IsoDateTime; class TimeZoneVariant; -} +} // namespace icu4x + namespace icu4x { @@ -43,67 +43,67 @@ class TimeZoneInfo { public: /** - * Creates a time zone for UTC (Coordinated Universal Time). - * - * See the [Rust documentation for `utc`](https://docs.rs/icu/2.0.0/icu/time/struct.TimeZoneInfo.html#method.utc) for more information. + * Creates a time zone for UTC (Coordinated Universal Time). + * + * See the [Rust documentation for `utc`](https://docs.rs/icu/2.0.0/icu/time/struct.TimeZoneInfo.html#method.utc) for more information. */ inline static std::unique_ptr utc(); /** - * Creates a time zone info from parts. - * - * `variant` is ignored. + * Creates a time zone info from parts. + * + * `variant` is ignored. */ inline static std::unique_ptr from_parts(const icu4x::TimeZone& id, const icu4x::UtcOffset* offset, std::optional _variant); /** - * See the [Rust documentation for `id`](https://docs.rs/icu/2.0.0/icu/time/struct.TimeZoneInfo.html#method.id) for more information. + * See the [Rust documentation for `id`](https://docs.rs/icu/2.0.0/icu/time/struct.TimeZoneInfo.html#method.id) for more information. */ inline std::unique_ptr id() const; /** - * Sets the datetime at which to interpret the time zone - * for display name lookup. - * - * Notes: - * - * - If not set, the formatting datetime is used if possible. - * - If the offset is not set, the datetime is interpreted as UTC. - * - The constraints are the same as with `ZoneNameTimestamp` in Rust. - * - Set to year 1000 or 9999 for a reference far in the past or future. - * - * See the [Rust documentation for `at_date_time_iso`](https://docs.rs/icu/2.0.0/icu/time/struct.TimeZoneInfo.html#method.at_date_time_iso) for more information. - * - * Additional information: [1](https://docs.rs/icu/2.0.0/icu/time/zone/struct.ZoneNameTimestamp.html) + * Sets the datetime at which to interpret the time zone + * for display name lookup. + * + * Notes: + * + * - If not set, the formatting datetime is used if possible. + * - If the offset is not set, the datetime is interpreted as UTC. + * - The constraints are the same as with `ZoneNameTimestamp` in Rust. + * - Set to year 1000 or 9999 for a reference far in the past or future. + * + * See the [Rust documentation for `at_date_time_iso`](https://docs.rs/icu/2.0.0/icu/time/struct.TimeZoneInfo.html#method.at_date_time_iso) for more information. + * + * Additional information: [1](https://docs.rs/icu/2.0.0/icu/time/zone/struct.ZoneNameTimestamp.html) */ inline std::unique_ptr at_date_time_iso(const icu4x::IsoDate& date, const icu4x::Time& time) const; /** - * Sets the timestamp, in milliseconds since Unix epoch, at which to interpret the time zone - * for display name lookup. - * - * Notes: - * - * - If not set, the formatting datetime is used if possible. - * - The constraints are the same as with `ZoneNameTimestamp` in Rust. - * - * See the [Rust documentation for `with_zone_name_timestamp`](https://docs.rs/icu/2.0.0/icu/time/struct.TimeZoneInfo.html#method.with_zone_name_timestamp) for more information. - * - * Additional information: [1](https://docs.rs/icu/2.0.0/icu/time/zone/struct.ZoneNameTimestamp.html#method.from_zoned_date_time_iso), [2](https://docs.rs/icu/2.0.0/icu/time/zone/struct.ZoneNameTimestamp.html) + * Sets the timestamp, in milliseconds since Unix epoch, at which to interpret the time zone + * for display name lookup. + * + * Notes: + * + * - If not set, the formatting datetime is used if possible. + * - The constraints are the same as with `ZoneNameTimestamp` in Rust. + * + * See the [Rust documentation for `with_zone_name_timestamp`](https://docs.rs/icu/2.0.0/icu/time/struct.TimeZoneInfo.html#method.with_zone_name_timestamp) for more information. + * + * Additional information: [1](https://docs.rs/icu/2.0.0/icu/time/zone/struct.ZoneNameTimestamp.html#method.from_zoned_date_time_iso), [2](https://docs.rs/icu/2.0.0/icu/time/zone/struct.ZoneNameTimestamp.html) */ inline std::unique_ptr at_timestamp(int64_t timestamp) const; /** - * Returns the DateTime for the UTC zone name reference time - * - * See the [Rust documentation for `zone_name_timestamp`](https://docs.rs/icu/2.0.0/icu/time/struct.TimeZoneInfo.html#method.zone_name_timestamp) for more information. + * Returns the DateTime for the UTC zone name reference time + * + * See the [Rust documentation for `zone_name_timestamp`](https://docs.rs/icu/2.0.0/icu/time/struct.TimeZoneInfo.html#method.zone_name_timestamp) for more information. */ inline std::optional zone_name_date_time() const; /** - * See the [Rust documentation for `with_variant`](https://docs.rs/icu/2.0.0/icu/time/struct.TimeZoneInfo.html#method.with_variant) for more information. - * - * \deprecated returns unmodified copy + * See the [Rust documentation for `with_variant`](https://docs.rs/icu/2.0.0/icu/time/struct.TimeZoneInfo.html#method.with_variant) for more information. + * + * \deprecated returns unmodified copy */ [[deprecated("returns unmodified copy")]] inline std::unique_ptr with_variant(icu4x::TimeZoneVariant _time_variant) const; @@ -111,19 +111,19 @@ class TimeZoneInfo { inline std::unique_ptr offset() const; /** - * See the [Rust documentation for `infer_variant`](https://docs.rs/icu/2.0.0/icu/time/struct.TimeZoneInfo.html#method.infer_variant) for more information. - * - * Additional information: [1](https://docs.rs/icu/2.0.0/icu/time/zone/enum.TimeZoneVariant.html) - * - * \deprecated does nothing + * See the [Rust documentation for `infer_variant`](https://docs.rs/icu/2.0.0/icu/time/struct.TimeZoneInfo.html#method.infer_variant) for more information. + * + * Additional information: [1](https://docs.rs/icu/2.0.0/icu/time/zone/enum.TimeZoneVariant.html) + * + * \deprecated does nothing */ [[deprecated("does nothing")]] inline std::optional infer_variant(const icu4x::VariantOffsetsCalculator& _offset_calculator); /** - * See the [Rust documentation for `variant`](https://docs.rs/icu/2.0.0/icu/time/struct.TimeZoneInfo.html#method.variant) for more information. - * - * \deprecated always returns null + * See the [Rust documentation for `variant`](https://docs.rs/icu/2.0.0/icu/time/struct.TimeZoneInfo.html#method.variant) for more information. + * + * \deprecated always returns null */ [[deprecated("always returns null")]] inline std::optional variant() const; @@ -143,4 +143,4 @@ class TimeZoneInfo { }; } // namespace -#endif // icu4x_TimeZoneInfo_D_HPP +#endif // ICU4X_TimeZoneInfo_D_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/TimeZoneInfo.hpp b/ffi/capi/bindings/cpp/icu4x/TimeZoneInfo.hpp index 10379d91655..c0e607fea8a 100644 --- a/ffi/capi/bindings/cpp/icu4x/TimeZoneInfo.hpp +++ b/ffi/capi/bindings/cpp/icu4x/TimeZoneInfo.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_TimeZoneInfo_HPP -#define icu4x_TimeZoneInfo_HPP +#ifndef ICU4X_TimeZoneInfo_HPP +#define ICU4X_TimeZoneInfo_HPP #include "TimeZoneInfo.d.hpp" @@ -11,7 +11,6 @@ #include #include #include -#include "../diplomat_runtime.hpp" #include "IsoDate.hpp" #include "IsoDateTime.hpp" #include "Time.hpp" @@ -19,6 +18,7 @@ #include "TimeZoneVariant.hpp" #include "UtcOffset.hpp" #include "VariantOffsetsCalculator.hpp" +#include "diplomat_runtime.hpp" namespace icu4x { @@ -132,4 +132,4 @@ inline void icu4x::TimeZoneInfo::operator delete(void* ptr) { } -#endif // icu4x_TimeZoneInfo_HPP +#endif // ICU4X_TimeZoneInfo_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/TimeZoneInvalidOffsetError.d.hpp b/ffi/capi/bindings/cpp/icu4x/TimeZoneInvalidOffsetError.d.hpp index 9616e0f7357..82a6704821b 100644 --- a/ffi/capi/bindings/cpp/icu4x/TimeZoneInvalidOffsetError.d.hpp +++ b/ffi/capi/bindings/cpp/icu4x/TimeZoneInvalidOffsetError.d.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_TimeZoneInvalidOffsetError_D_HPP -#define icu4x_TimeZoneInvalidOffsetError_D_HPP +#ifndef ICU4X_TimeZoneInvalidOffsetError_D_HPP +#define ICU4X_TimeZoneInvalidOffsetError_D_HPP #include #include @@ -9,7 +9,7 @@ #include #include #include -#include "../diplomat_runtime.hpp" +#include "diplomat_runtime.hpp" namespace icu4x { @@ -28,4 +28,4 @@ struct TimeZoneInvalidOffsetError { }; } // namespace -#endif // icu4x_TimeZoneInvalidOffsetError_D_HPP +#endif // ICU4X_TimeZoneInvalidOffsetError_D_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/TimeZoneInvalidOffsetError.hpp b/ffi/capi/bindings/cpp/icu4x/TimeZoneInvalidOffsetError.hpp index 81d5c18011e..08464e29bcf 100644 --- a/ffi/capi/bindings/cpp/icu4x/TimeZoneInvalidOffsetError.hpp +++ b/ffi/capi/bindings/cpp/icu4x/TimeZoneInvalidOffsetError.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_TimeZoneInvalidOffsetError_HPP -#define icu4x_TimeZoneInvalidOffsetError_HPP +#ifndef ICU4X_TimeZoneInvalidOffsetError_HPP +#define ICU4X_TimeZoneInvalidOffsetError_HPP #include "TimeZoneInvalidOffsetError.d.hpp" @@ -11,7 +11,7 @@ #include #include #include -#include "../diplomat_runtime.hpp" +#include "diplomat_runtime.hpp" namespace icu4x { @@ -25,4 +25,4 @@ namespace capi { -#endif // icu4x_TimeZoneInvalidOffsetError_HPP +#endif // ICU4X_TimeZoneInvalidOffsetError_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/TimeZoneIterator.d.hpp b/ffi/capi/bindings/cpp/icu4x/TimeZoneIterator.d.hpp index c517b6c8767..ee0770b8db9 100644 --- a/ffi/capi/bindings/cpp/icu4x/TimeZoneIterator.d.hpp +++ b/ffi/capi/bindings/cpp/icu4x/TimeZoneIterator.d.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_TimeZoneIterator_D_HPP -#define icu4x_TimeZoneIterator_D_HPP +#ifndef ICU4X_TimeZoneIterator_D_HPP +#define ICU4X_TimeZoneIterator_D_HPP #include #include @@ -9,12 +9,12 @@ #include #include #include -#include "../diplomat_runtime.hpp" - +#include "diplomat_runtime.hpp" namespace icu4x { namespace capi { struct TimeZone; } class TimeZone; -} +} // namespace icu4x + namespace icu4x { @@ -31,7 +31,7 @@ class TimeZoneIterator { public: /** - * See the [Rust documentation for `next`](https://docs.rs/icu/2.0.0/icu/time/zone/iana/struct.TimeZoneIter.html#method.next) for more information. + * See the [Rust documentation for `next`](https://docs.rs/icu/2.0.0/icu/time/zone/iana/struct.TimeZoneIter.html#method.next) for more information. */ inline std::unique_ptr next(); @@ -50,4 +50,4 @@ class TimeZoneIterator { }; } // namespace -#endif // icu4x_TimeZoneIterator_D_HPP +#endif // ICU4X_TimeZoneIterator_D_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/TimeZoneIterator.hpp b/ffi/capi/bindings/cpp/icu4x/TimeZoneIterator.hpp index ccc863a8afa..9b28deb1232 100644 --- a/ffi/capi/bindings/cpp/icu4x/TimeZoneIterator.hpp +++ b/ffi/capi/bindings/cpp/icu4x/TimeZoneIterator.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_TimeZoneIterator_HPP -#define icu4x_TimeZoneIterator_HPP +#ifndef ICU4X_TimeZoneIterator_HPP +#define ICU4X_TimeZoneIterator_HPP #include "TimeZoneIterator.d.hpp" @@ -11,8 +11,8 @@ #include #include #include -#include "../diplomat_runtime.hpp" #include "TimeZone.hpp" +#include "diplomat_runtime.hpp" namespace icu4x { @@ -53,4 +53,4 @@ inline void icu4x::TimeZoneIterator::operator delete(void* ptr) { } -#endif // icu4x_TimeZoneIterator_HPP +#endif // ICU4X_TimeZoneIterator_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/TimeZoneVariant.d.hpp b/ffi/capi/bindings/cpp/icu4x/TimeZoneVariant.d.hpp index 452e15289de..5dc31957a26 100644 --- a/ffi/capi/bindings/cpp/icu4x/TimeZoneVariant.d.hpp +++ b/ffi/capi/bindings/cpp/icu4x/TimeZoneVariant.d.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_TimeZoneVariant_D_HPP -#define icu4x_TimeZoneVariant_D_HPP +#ifndef ICU4X_TimeZoneVariant_D_HPP +#define ICU4X_TimeZoneVariant_D_HPP #include #include @@ -9,11 +9,11 @@ #include #include #include -#include "../diplomat_runtime.hpp" - +#include "diplomat_runtime.hpp" namespace icu4x { class TimeZoneVariant; -} +} // namespace icu4x + namespace icu4x { @@ -47,13 +47,13 @@ class [[deprecated("type not needed anymore")]] TimeZoneVariant { explicit operator bool() const = delete; /** - * See the [Rust documentation for `from_rearguard_isdst`](https://docs.rs/icu/2.0.0/icu/time/zone/enum.TimeZoneVariant.html#method.from_rearguard_isdst) for more information. - * - * See the [Rust documentation for `with_variant`](https://docs.rs/icu/2.0.0/icu/time/struct.TimeZoneInfo.html#method.with_variant) for more information. - * - * Additional information: [1](https://docs.rs/icu/2.0.0/icu/time/zone/enum.TimeZoneVariant.html) - * - * \deprecated type not needed anymore + * See the [Rust documentation for `from_rearguard_isdst`](https://docs.rs/icu/2.0.0/icu/time/zone/enum.TimeZoneVariant.html#method.from_rearguard_isdst) for more information. + * + * See the [Rust documentation for `with_variant`](https://docs.rs/icu/2.0.0/icu/time/struct.TimeZoneInfo.html#method.with_variant) for more information. + * + * Additional information: [1](https://docs.rs/icu/2.0.0/icu/time/zone/enum.TimeZoneVariant.html) + * + * \deprecated type not needed anymore */ [[deprecated("type not needed anymore")]] inline static icu4x::TimeZoneVariant from_rearguard_isdst(bool isdst); @@ -65,4 +65,4 @@ class [[deprecated("type not needed anymore")]] TimeZoneVariant { }; } // namespace -#endif // icu4x_TimeZoneVariant_D_HPP +#endif // ICU4X_TimeZoneVariant_D_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/TimeZoneVariant.hpp b/ffi/capi/bindings/cpp/icu4x/TimeZoneVariant.hpp index ecbc76e28db..d5279fa3f10 100644 --- a/ffi/capi/bindings/cpp/icu4x/TimeZoneVariant.hpp +++ b/ffi/capi/bindings/cpp/icu4x/TimeZoneVariant.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_TimeZoneVariant_HPP -#define icu4x_TimeZoneVariant_HPP +#ifndef ICU4X_TimeZoneVariant_HPP +#define ICU4X_TimeZoneVariant_HPP #include "TimeZoneVariant.d.hpp" @@ -11,7 +11,7 @@ #include #include #include -#include "../diplomat_runtime.hpp" +#include "diplomat_runtime.hpp" namespace icu4x { @@ -42,4 +42,4 @@ inline icu4x::TimeZoneVariant icu4x::TimeZoneVariant::from_rearguard_isdst(bool auto result = icu4x::capi::icu4x_TimeZoneVariant_from_rearguard_isdst_mv1(isdst); return icu4x::TimeZoneVariant::FromFFI(result); } -#endif // icu4x_TimeZoneVariant_HPP +#endif // ICU4X_TimeZoneVariant_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/TitlecaseMapper.d.hpp b/ffi/capi/bindings/cpp/icu4x/TitlecaseMapper.d.hpp index dbd49dfd1a6..8df803e55d9 100644 --- a/ffi/capi/bindings/cpp/icu4x/TitlecaseMapper.d.hpp +++ b/ffi/capi/bindings/cpp/icu4x/TitlecaseMapper.d.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_TitlecaseMapper_D_HPP -#define icu4x_TitlecaseMapper_D_HPP +#ifndef ICU4X_TitlecaseMapper_D_HPP +#define ICU4X_TitlecaseMapper_D_HPP #include #include @@ -9,8 +9,7 @@ #include #include #include -#include "../diplomat_runtime.hpp" - +#include "diplomat_runtime.hpp" namespace icu4x { namespace capi { struct DataProvider; } class DataProvider; @@ -20,7 +19,8 @@ namespace capi { struct TitlecaseMapper; } class TitlecaseMapper; struct TitlecaseOptionsV1; class DataError; -} +} // namespace icu4x + namespace icu4x { @@ -37,40 +37,40 @@ class TitlecaseMapper { public: /** - * Construct a new `TitlecaseMapper` instance using compiled data. - * - * See the [Rust documentation for `new`](https://docs.rs/icu/2.0.0/icu/casemap/struct.TitlecaseMapper.html#method.new) for more information. + * Construct a new `TitlecaseMapper` instance using compiled data. + * + * See the [Rust documentation for `new`](https://docs.rs/icu/2.0.0/icu/casemap/struct.TitlecaseMapper.html#method.new) for more information. */ - inline static diplomat::result, icu4x::DataError> create(); + inline static icu4x::diplomat::result, icu4x::DataError> create(); /** - * Construct a new `TitlecaseMapper` instance using a particular data source. - * - * See the [Rust documentation for `new`](https://docs.rs/icu/2.0.0/icu/casemap/struct.TitlecaseMapper.html#method.new) for more information. + * Construct a new `TitlecaseMapper` instance using a particular data source. + * + * See the [Rust documentation for `new`](https://docs.rs/icu/2.0.0/icu/casemap/struct.TitlecaseMapper.html#method.new) for more information. */ - inline static diplomat::result, icu4x::DataError> create_with_provider(const icu4x::DataProvider& provider); + inline static icu4x::diplomat::result, icu4x::DataError> create_with_provider(const icu4x::DataProvider& provider); /** - * Returns the full titlecase mapping of the given string - * - * The `v1` refers to the version of the options struct, which may change as we add more options - * - * See the [Rust documentation for `titlecase_segment`](https://docs.rs/icu/2.0.0/icu/casemap/struct.TitlecaseMapperBorrowed.html#method.titlecase_segment) for more information. + * Returns the full titlecase mapping of the given string + * + * The `v1` refers to the version of the options struct, which may change as we add more options + * + * See the [Rust documentation for `titlecase_segment`](https://docs.rs/icu/2.0.0/icu/casemap/struct.TitlecaseMapperBorrowed.html#method.titlecase_segment) for more information. */ - inline diplomat::result titlecase_segment_v1(std::string_view s, const icu4x::Locale& locale, icu4x::TitlecaseOptionsV1 options) const; + inline icu4x::diplomat::result titlecase_segment_v1(std::string_view s, const icu4x::Locale& locale, icu4x::TitlecaseOptionsV1 options) const; template - inline diplomat::result titlecase_segment_v1_write(std::string_view s, const icu4x::Locale& locale, icu4x::TitlecaseOptionsV1 options, W& writeable_output) const; + inline icu4x::diplomat::result titlecase_segment_v1_write(std::string_view s, const icu4x::Locale& locale, icu4x::TitlecaseOptionsV1 options, W& writeable_output) const; /** - * Returns the full titlecase mapping of the given string, using compiled data (avoids having to allocate a TitlecaseMapper object) - * - * The `v1` refers to the version of the options struct, which may change as we add more options - * - * See the [Rust documentation for `titlecase_segment`](https://docs.rs/icu/2.0.0/icu/casemap/struct.TitlecaseMapperBorrowed.html#method.titlecase_segment) for more information. + * Returns the full titlecase mapping of the given string, using compiled data (avoids having to allocate a TitlecaseMapper object) + * + * The `v1` refers to the version of the options struct, which may change as we add more options + * + * See the [Rust documentation for `titlecase_segment`](https://docs.rs/icu/2.0.0/icu/casemap/struct.TitlecaseMapperBorrowed.html#method.titlecase_segment) for more information. */ - inline static diplomat::result titlecase_segment_with_compiled_data_v1(std::string_view s, const icu4x::Locale& locale, icu4x::TitlecaseOptionsV1 options); + inline static icu4x::diplomat::result titlecase_segment_with_compiled_data_v1(std::string_view s, const icu4x::Locale& locale, icu4x::TitlecaseOptionsV1 options); template - inline static diplomat::result titlecase_segment_with_compiled_data_v1_write(std::string_view s, const icu4x::Locale& locale, icu4x::TitlecaseOptionsV1 options, W& writeable_output); + inline static icu4x::diplomat::result titlecase_segment_with_compiled_data_v1_write(std::string_view s, const icu4x::Locale& locale, icu4x::TitlecaseOptionsV1 options, W& writeable_output); inline const icu4x::capi::TitlecaseMapper* AsFFI() const; inline icu4x::capi::TitlecaseMapper* AsFFI(); @@ -87,4 +87,4 @@ class TitlecaseMapper { }; } // namespace -#endif // icu4x_TitlecaseMapper_D_HPP +#endif // ICU4X_TitlecaseMapper_D_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/TitlecaseMapper.hpp b/ffi/capi/bindings/cpp/icu4x/TitlecaseMapper.hpp index 9bc05a2b6c5..adbdb05fc33 100644 --- a/ffi/capi/bindings/cpp/icu4x/TitlecaseMapper.hpp +++ b/ffi/capi/bindings/cpp/icu4x/TitlecaseMapper.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_TitlecaseMapper_HPP -#define icu4x_TitlecaseMapper_HPP +#ifndef ICU4X_TitlecaseMapper_HPP +#define ICU4X_TitlecaseMapper_HPP #include "TitlecaseMapper.d.hpp" @@ -11,11 +11,11 @@ #include #include #include -#include "../diplomat_runtime.hpp" #include "DataError.hpp" #include "DataProvider.hpp" #include "Locale.hpp" #include "TitlecaseOptionsV1.hpp" +#include "diplomat_runtime.hpp" namespace icu4x { @@ -28,9 +28,9 @@ namespace capi { typedef struct icu4x_TitlecaseMapper_create_with_provider_mv1_result {union {icu4x::capi::TitlecaseMapper* ok; icu4x::capi::DataError err;}; bool is_ok;} icu4x_TitlecaseMapper_create_with_provider_mv1_result; icu4x_TitlecaseMapper_create_with_provider_mv1_result icu4x_TitlecaseMapper_create_with_provider_mv1(const icu4x::capi::DataProvider* provider); - void icu4x_TitlecaseMapper_titlecase_segment_v1_mv1(const icu4x::capi::TitlecaseMapper* self, diplomat::capi::DiplomatStringView s, const icu4x::capi::Locale* locale, icu4x::capi::TitlecaseOptionsV1 options, diplomat::capi::DiplomatWrite* write); + void icu4x_TitlecaseMapper_titlecase_segment_v1_mv1(const icu4x::capi::TitlecaseMapper* self, icu4x::diplomat::capi::DiplomatStringView s, const icu4x::capi::Locale* locale, icu4x::capi::TitlecaseOptionsV1 options, icu4x::diplomat::capi::DiplomatWrite* write); - void icu4x_TitlecaseMapper_titlecase_segment_with_compiled_data_v1_mv1(diplomat::capi::DiplomatStringView s, const icu4x::capi::Locale* locale, icu4x::capi::TitlecaseOptionsV1 options, diplomat::capi::DiplomatWrite* write); + void icu4x_TitlecaseMapper_titlecase_segment_with_compiled_data_v1_mv1(icu4x::diplomat::capi::DiplomatStringView s, const icu4x::capi::Locale* locale, icu4x::capi::TitlecaseOptionsV1 options, icu4x::diplomat::capi::DiplomatWrite* write); void icu4x_TitlecaseMapper_destroy_mv1(TitlecaseMapper* self); @@ -38,66 +38,66 @@ namespace capi { } // namespace capi } // namespace -inline diplomat::result, icu4x::DataError> icu4x::TitlecaseMapper::create() { +inline icu4x::diplomat::result, icu4x::DataError> icu4x::TitlecaseMapper::create() { auto result = icu4x::capi::icu4x_TitlecaseMapper_create_mv1(); - return result.is_ok ? diplomat::result, icu4x::DataError>(diplomat::Ok>(std::unique_ptr(icu4x::TitlecaseMapper::FromFFI(result.ok)))) : diplomat::result, icu4x::DataError>(diplomat::Err(icu4x::DataError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::TitlecaseMapper::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Err(icu4x::DataError::FromFFI(result.err))); } -inline diplomat::result, icu4x::DataError> icu4x::TitlecaseMapper::create_with_provider(const icu4x::DataProvider& provider) { +inline icu4x::diplomat::result, icu4x::DataError> icu4x::TitlecaseMapper::create_with_provider(const icu4x::DataProvider& provider) { auto result = icu4x::capi::icu4x_TitlecaseMapper_create_with_provider_mv1(provider.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DataError>(diplomat::Ok>(std::unique_ptr(icu4x::TitlecaseMapper::FromFFI(result.ok)))) : diplomat::result, icu4x::DataError>(diplomat::Err(icu4x::DataError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::TitlecaseMapper::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Err(icu4x::DataError::FromFFI(result.err))); } -inline diplomat::result icu4x::TitlecaseMapper::titlecase_segment_v1(std::string_view s, const icu4x::Locale& locale, icu4x::TitlecaseOptionsV1 options) const { - if (!diplomat::capi::diplomat_is_str(s.data(), s.size())) { - return diplomat::Err(); +inline icu4x::diplomat::result icu4x::TitlecaseMapper::titlecase_segment_v1(std::string_view s, const icu4x::Locale& locale, icu4x::TitlecaseOptionsV1 options) const { + if (!icu4x::diplomat::capi::diplomat_is_str(s.data(), s.size())) { + return icu4x::diplomat::Err(); } std::string output; - diplomat::capi::DiplomatWrite write = diplomat::WriteFromString(output); + icu4x::diplomat::capi::DiplomatWrite write = icu4x::diplomat::WriteFromString(output); icu4x::capi::icu4x_TitlecaseMapper_titlecase_segment_v1_mv1(this->AsFFI(), {s.data(), s.size()}, locale.AsFFI(), options.AsFFI(), &write); - return diplomat::Ok(std::move(output)); + return icu4x::diplomat::Ok(std::move(output)); } template -inline diplomat::result icu4x::TitlecaseMapper::titlecase_segment_v1_write(std::string_view s, const icu4x::Locale& locale, icu4x::TitlecaseOptionsV1 options, W& writeable) const { - if (!diplomat::capi::diplomat_is_str(s.data(), s.size())) { - return diplomat::Err(); +inline icu4x::diplomat::result icu4x::TitlecaseMapper::titlecase_segment_v1_write(std::string_view s, const icu4x::Locale& locale, icu4x::TitlecaseOptionsV1 options, W& writeable) const { + if (!icu4x::diplomat::capi::diplomat_is_str(s.data(), s.size())) { + return icu4x::diplomat::Err(); } - diplomat::capi::DiplomatWrite write = diplomat::WriteTrait::Construct(writeable); + icu4x::diplomat::capi::DiplomatWrite write = icu4x::diplomat::WriteTrait::Construct(writeable); icu4x::capi::icu4x_TitlecaseMapper_titlecase_segment_v1_mv1(this->AsFFI(), {s.data(), s.size()}, locale.AsFFI(), options.AsFFI(), &write); - return diplomat::Ok(); + return icu4x::diplomat::Ok(); } -inline diplomat::result icu4x::TitlecaseMapper::titlecase_segment_with_compiled_data_v1(std::string_view s, const icu4x::Locale& locale, icu4x::TitlecaseOptionsV1 options) { - if (!diplomat::capi::diplomat_is_str(s.data(), s.size())) { - return diplomat::Err(); +inline icu4x::diplomat::result icu4x::TitlecaseMapper::titlecase_segment_with_compiled_data_v1(std::string_view s, const icu4x::Locale& locale, icu4x::TitlecaseOptionsV1 options) { + if (!icu4x::diplomat::capi::diplomat_is_str(s.data(), s.size())) { + return icu4x::diplomat::Err(); } std::string output; - diplomat::capi::DiplomatWrite write = diplomat::WriteFromString(output); + icu4x::diplomat::capi::DiplomatWrite write = icu4x::diplomat::WriteFromString(output); icu4x::capi::icu4x_TitlecaseMapper_titlecase_segment_with_compiled_data_v1_mv1({s.data(), s.size()}, locale.AsFFI(), options.AsFFI(), &write); - return diplomat::Ok(std::move(output)); + return icu4x::diplomat::Ok(std::move(output)); } template -inline diplomat::result icu4x::TitlecaseMapper::titlecase_segment_with_compiled_data_v1_write(std::string_view s, const icu4x::Locale& locale, icu4x::TitlecaseOptionsV1 options, W& writeable) { - if (!diplomat::capi::diplomat_is_str(s.data(), s.size())) { - return diplomat::Err(); +inline icu4x::diplomat::result icu4x::TitlecaseMapper::titlecase_segment_with_compiled_data_v1_write(std::string_view s, const icu4x::Locale& locale, icu4x::TitlecaseOptionsV1 options, W& writeable) { + if (!icu4x::diplomat::capi::diplomat_is_str(s.data(), s.size())) { + return icu4x::diplomat::Err(); } - diplomat::capi::DiplomatWrite write = diplomat::WriteTrait::Construct(writeable); + icu4x::diplomat::capi::DiplomatWrite write = icu4x::diplomat::WriteTrait::Construct(writeable); icu4x::capi::icu4x_TitlecaseMapper_titlecase_segment_with_compiled_data_v1_mv1({s.data(), s.size()}, locale.AsFFI(), options.AsFFI(), &write); - return diplomat::Ok(); + return icu4x::diplomat::Ok(); } inline const icu4x::capi::TitlecaseMapper* icu4x::TitlecaseMapper::AsFFI() const { @@ -121,4 +121,4 @@ inline void icu4x::TitlecaseMapper::operator delete(void* ptr) { } -#endif // icu4x_TitlecaseMapper_HPP +#endif // ICU4X_TitlecaseMapper_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/TitlecaseOptionsV1.d.hpp b/ffi/capi/bindings/cpp/icu4x/TitlecaseOptionsV1.d.hpp index b116f328e8f..331541da8a5 100644 --- a/ffi/capi/bindings/cpp/icu4x/TitlecaseOptionsV1.d.hpp +++ b/ffi/capi/bindings/cpp/icu4x/TitlecaseOptionsV1.d.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_TitlecaseOptionsV1_D_HPP -#define icu4x_TitlecaseOptionsV1_D_HPP +#ifndef ICU4X_TitlecaseOptionsV1_D_HPP +#define ICU4X_TitlecaseOptionsV1_D_HPP #include #include @@ -9,15 +9,15 @@ #include #include #include -#include "../diplomat_runtime.hpp" #include "LeadingAdjustment.d.hpp" #include "TrailingCase.d.hpp" - +#include "diplomat_runtime.hpp" namespace icu4x { struct TitlecaseOptionsV1; class LeadingAdjustment; class TrailingCase; -} +} // namespace icu4x + namespace icu4x { @@ -41,7 +41,7 @@ struct TitlecaseOptionsV1 { std::optional trailing_case; /** - * See the [Rust documentation for `default`](https://docs.rs/icu/2.0.0/icu/casemap/options/struct.TitlecaseOptions.html#method.default) for more information. + * See the [Rust documentation for `default`](https://docs.rs/icu/2.0.0/icu/casemap/options/struct.TitlecaseOptions.html#method.default) for more information. */ inline static icu4x::TitlecaseOptionsV1 default_options(); @@ -50,4 +50,4 @@ struct TitlecaseOptionsV1 { }; } // namespace -#endif // icu4x_TitlecaseOptionsV1_D_HPP +#endif // ICU4X_TitlecaseOptionsV1_D_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/TitlecaseOptionsV1.hpp b/ffi/capi/bindings/cpp/icu4x/TitlecaseOptionsV1.hpp index 1c5ba497e1a..afb1de16af2 100644 --- a/ffi/capi/bindings/cpp/icu4x/TitlecaseOptionsV1.hpp +++ b/ffi/capi/bindings/cpp/icu4x/TitlecaseOptionsV1.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_TitlecaseOptionsV1_HPP -#define icu4x_TitlecaseOptionsV1_HPP +#ifndef ICU4X_TitlecaseOptionsV1_HPP +#define ICU4X_TitlecaseOptionsV1_HPP #include "TitlecaseOptionsV1.d.hpp" @@ -11,9 +11,9 @@ #include #include #include -#include "../diplomat_runtime.hpp" #include "LeadingAdjustment.hpp" #include "TrailingCase.hpp" +#include "diplomat_runtime.hpp" namespace icu4x { @@ -47,4 +47,4 @@ inline icu4x::TitlecaseOptionsV1 icu4x::TitlecaseOptionsV1::FromFFI(icu4x::capi: } -#endif // icu4x_TitlecaseOptionsV1_HPP +#endif // ICU4X_TitlecaseOptionsV1_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/TrailingCase.d.hpp b/ffi/capi/bindings/cpp/icu4x/TrailingCase.d.hpp index 96431f418af..24e14398852 100644 --- a/ffi/capi/bindings/cpp/icu4x/TrailingCase.d.hpp +++ b/ffi/capi/bindings/cpp/icu4x/TrailingCase.d.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_TrailingCase_D_HPP -#define icu4x_TrailingCase_D_HPP +#ifndef ICU4X_TrailingCase_D_HPP +#define ICU4X_TrailingCase_D_HPP #include #include @@ -9,7 +9,7 @@ #include #include #include -#include "../diplomat_runtime.hpp" +#include "diplomat_runtime.hpp" namespace icu4x { @@ -49,4 +49,4 @@ class TrailingCase { }; } // namespace -#endif // icu4x_TrailingCase_D_HPP +#endif // ICU4X_TrailingCase_D_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/TrailingCase.hpp b/ffi/capi/bindings/cpp/icu4x/TrailingCase.hpp index b890d1cb15e..0a11f94b6ae 100644 --- a/ffi/capi/bindings/cpp/icu4x/TrailingCase.hpp +++ b/ffi/capi/bindings/cpp/icu4x/TrailingCase.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_TrailingCase_HPP -#define icu4x_TrailingCase_HPP +#ifndef ICU4X_TrailingCase_HPP +#define ICU4X_TrailingCase_HPP #include "TrailingCase.d.hpp" @@ -11,7 +11,7 @@ #include #include #include -#include "../diplomat_runtime.hpp" +#include "diplomat_runtime.hpp" namespace icu4x { @@ -35,4 +35,4 @@ inline icu4x::TrailingCase icu4x::TrailingCase::FromFFI(icu4x::capi::TrailingCas std::abort(); } } -#endif // icu4x_TrailingCase_HPP +#endif // ICU4X_TrailingCase_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/TransformResult.d.hpp b/ffi/capi/bindings/cpp/icu4x/TransformResult.d.hpp index 58021cf15cf..15967f36098 100644 --- a/ffi/capi/bindings/cpp/icu4x/TransformResult.d.hpp +++ b/ffi/capi/bindings/cpp/icu4x/TransformResult.d.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_TransformResult_D_HPP -#define icu4x_TransformResult_D_HPP +#ifndef ICU4X_TransformResult_D_HPP +#define ICU4X_TransformResult_D_HPP #include #include @@ -9,7 +9,7 @@ #include #include #include -#include "../diplomat_runtime.hpp" +#include "diplomat_runtime.hpp" namespace icu4x { @@ -49,4 +49,4 @@ class TransformResult { }; } // namespace -#endif // icu4x_TransformResult_D_HPP +#endif // ICU4X_TransformResult_D_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/TransformResult.hpp b/ffi/capi/bindings/cpp/icu4x/TransformResult.hpp index 310fa5ade79..812ce5058f6 100644 --- a/ffi/capi/bindings/cpp/icu4x/TransformResult.hpp +++ b/ffi/capi/bindings/cpp/icu4x/TransformResult.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_TransformResult_HPP -#define icu4x_TransformResult_HPP +#ifndef ICU4X_TransformResult_HPP +#define ICU4X_TransformResult_HPP #include "TransformResult.d.hpp" @@ -11,7 +11,7 @@ #include #include #include -#include "../diplomat_runtime.hpp" +#include "diplomat_runtime.hpp" namespace icu4x { @@ -35,4 +35,4 @@ inline icu4x::TransformResult icu4x::TransformResult::FromFFI(icu4x::capi::Trans std::abort(); } } -#endif // icu4x_TransformResult_HPP +#endif // ICU4X_TransformResult_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/UtcOffset.d.hpp b/ffi/capi/bindings/cpp/icu4x/UtcOffset.d.hpp index a1b7ba05626..6acf0fe8f39 100644 --- a/ffi/capi/bindings/cpp/icu4x/UtcOffset.d.hpp +++ b/ffi/capi/bindings/cpp/icu4x/UtcOffset.d.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_UtcOffset_D_HPP -#define icu4x_UtcOffset_D_HPP +#ifndef ICU4X_UtcOffset_D_HPP +#define ICU4X_UtcOffset_D_HPP #include #include @@ -9,13 +9,13 @@ #include #include #include -#include "../diplomat_runtime.hpp" - +#include "diplomat_runtime.hpp" namespace icu4x { namespace capi { struct UtcOffset; } class UtcOffset; struct TimeZoneInvalidOffsetError; -} +} // namespace icu4x + namespace icu4x { @@ -32,76 +32,76 @@ class UtcOffset { public: /** - * Creates an offset from seconds. - * - * Errors if the offset seconds are out of range. - * - * See the [Rust documentation for `try_from_seconds`](https://docs.rs/icu/2.0.0/icu/time/zone/struct.UtcOffset.html#method.try_from_seconds) for more information. + * Creates an offset from seconds. + * + * Errors if the offset seconds are out of range. + * + * See the [Rust documentation for `try_from_seconds`](https://docs.rs/icu/2.0.0/icu/time/zone/struct.UtcOffset.html#method.try_from_seconds) for more information. */ - inline static diplomat::result, icu4x::TimeZoneInvalidOffsetError> from_seconds(int32_t seconds); + inline static icu4x::diplomat::result, icu4x::TimeZoneInvalidOffsetError> from_seconds(int32_t seconds); /** - * Creates an offset from a string. - * - * See the [Rust documentation for `try_from_str`](https://docs.rs/icu/2.0.0/icu/time/zone/struct.UtcOffset.html#method.try_from_str) for more information. - * - * Additional information: [1](https://docs.rs/icu/2.0.0/icu/time/zone/struct.UtcOffset.html) + * Creates an offset from a string. + * + * See the [Rust documentation for `try_from_str`](https://docs.rs/icu/2.0.0/icu/time/zone/struct.UtcOffset.html#method.try_from_str) for more information. + * + * Additional information: [1](https://docs.rs/icu/2.0.0/icu/time/zone/struct.UtcOffset.html) */ - inline static diplomat::result, icu4x::TimeZoneInvalidOffsetError> from_string(std::string_view offset); + inline static icu4x::diplomat::result, icu4x::TimeZoneInvalidOffsetError> from_string(std::string_view offset); /** - * Returns the value as offset seconds. - * - * See the [Rust documentation for `offset`](https://docs.rs/icu/2.0.0/icu/time/struct.TimeZoneInfo.html#method.offset) for more information. - * - * See the [Rust documentation for `to_seconds`](https://docs.rs/icu/2.0.0/icu/time/zone/struct.UtcOffset.html#method.to_seconds) for more information. - * - * Additional information: [1](https://docs.rs/icu/2.0.0/icu/time/zone/struct.UtcOffset.html) + * Returns the value as offset seconds. + * + * See the [Rust documentation for `offset`](https://docs.rs/icu/2.0.0/icu/time/struct.TimeZoneInfo.html#method.offset) for more information. + * + * See the [Rust documentation for `to_seconds`](https://docs.rs/icu/2.0.0/icu/time/zone/struct.UtcOffset.html#method.to_seconds) for more information. + * + * Additional information: [1](https://docs.rs/icu/2.0.0/icu/time/zone/struct.UtcOffset.html) */ inline int32_t seconds() const; /** - * Returns whether the offset is positive. - * - * See the [Rust documentation for `is_non_negative`](https://docs.rs/icu/2.0.0/icu/time/zone/struct.UtcOffset.html#method.is_non_negative) for more information. - * - * Additional information: [1](https://docs.rs/icu/2.0.0/icu/time/zone/struct.UtcOffset.html) + * Returns whether the offset is positive. + * + * See the [Rust documentation for `is_non_negative`](https://docs.rs/icu/2.0.0/icu/time/zone/struct.UtcOffset.html#method.is_non_negative) for more information. + * + * Additional information: [1](https://docs.rs/icu/2.0.0/icu/time/zone/struct.UtcOffset.html) */ inline bool is_non_negative() const; /** - * Returns whether the offset is zero. - * - * See the [Rust documentation for `is_zero`](https://docs.rs/icu/2.0.0/icu/time/zone/struct.UtcOffset.html#method.is_zero) for more information. - * - * Additional information: [1](https://docs.rs/icu/2.0.0/icu/time/zone/struct.UtcOffset.html) + * Returns whether the offset is zero. + * + * See the [Rust documentation for `is_zero`](https://docs.rs/icu/2.0.0/icu/time/zone/struct.UtcOffset.html#method.is_zero) for more information. + * + * Additional information: [1](https://docs.rs/icu/2.0.0/icu/time/zone/struct.UtcOffset.html) */ inline bool is_zero() const; /** - * Returns the hours part of the offset. - * - * See the [Rust documentation for `hours_part`](https://docs.rs/icu/2.0.0/icu/time/zone/struct.UtcOffset.html#method.hours_part) for more information. - * - * Additional information: [1](https://docs.rs/icu/2.0.0/icu/time/zone/struct.UtcOffset.html) + * Returns the hours part of the offset. + * + * See the [Rust documentation for `hours_part`](https://docs.rs/icu/2.0.0/icu/time/zone/struct.UtcOffset.html#method.hours_part) for more information. + * + * Additional information: [1](https://docs.rs/icu/2.0.0/icu/time/zone/struct.UtcOffset.html) */ inline int32_t hours_part() const; /** - * Returns the minutes part of the offset. - * - * See the [Rust documentation for `minutes_part`](https://docs.rs/icu/2.0.0/icu/time/zone/struct.UtcOffset.html#method.minutes_part) for more information. - * - * Additional information: [1](https://docs.rs/icu/2.0.0/icu/time/zone/struct.UtcOffset.html) + * Returns the minutes part of the offset. + * + * See the [Rust documentation for `minutes_part`](https://docs.rs/icu/2.0.0/icu/time/zone/struct.UtcOffset.html#method.minutes_part) for more information. + * + * Additional information: [1](https://docs.rs/icu/2.0.0/icu/time/zone/struct.UtcOffset.html) */ inline uint32_t minutes_part() const; /** - * Returns the seconds part of the offset. - * - * See the [Rust documentation for `seconds_part`](https://docs.rs/icu/2.0.0/icu/time/zone/struct.UtcOffset.html#method.seconds_part) for more information. - * - * Additional information: [1](https://docs.rs/icu/2.0.0/icu/time/zone/struct.UtcOffset.html) + * Returns the seconds part of the offset. + * + * See the [Rust documentation for `seconds_part`](https://docs.rs/icu/2.0.0/icu/time/zone/struct.UtcOffset.html#method.seconds_part) for more information. + * + * Additional information: [1](https://docs.rs/icu/2.0.0/icu/time/zone/struct.UtcOffset.html) */ inline uint32_t seconds_part() const; @@ -120,4 +120,4 @@ class UtcOffset { }; } // namespace -#endif // icu4x_UtcOffset_D_HPP +#endif // ICU4X_UtcOffset_D_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/UtcOffset.hpp b/ffi/capi/bindings/cpp/icu4x/UtcOffset.hpp index 91e20d62d94..d9e8335b192 100644 --- a/ffi/capi/bindings/cpp/icu4x/UtcOffset.hpp +++ b/ffi/capi/bindings/cpp/icu4x/UtcOffset.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_UtcOffset_HPP -#define icu4x_UtcOffset_HPP +#ifndef ICU4X_UtcOffset_HPP +#define ICU4X_UtcOffset_HPP #include "UtcOffset.d.hpp" @@ -11,8 +11,8 @@ #include #include #include -#include "../diplomat_runtime.hpp" #include "TimeZoneInvalidOffsetError.hpp" +#include "diplomat_runtime.hpp" namespace icu4x { @@ -23,7 +23,7 @@ namespace capi { icu4x_UtcOffset_from_seconds_mv1_result icu4x_UtcOffset_from_seconds_mv1(int32_t seconds); typedef struct icu4x_UtcOffset_from_string_mv1_result {union {icu4x::capi::UtcOffset* ok; }; bool is_ok;} icu4x_UtcOffset_from_string_mv1_result; - icu4x_UtcOffset_from_string_mv1_result icu4x_UtcOffset_from_string_mv1(diplomat::capi::DiplomatStringView offset); + icu4x_UtcOffset_from_string_mv1_result icu4x_UtcOffset_from_string_mv1(icu4x::diplomat::capi::DiplomatStringView offset); int32_t icu4x_UtcOffset_seconds_mv1(const icu4x::capi::UtcOffset* self); @@ -43,14 +43,14 @@ namespace capi { } // namespace capi } // namespace -inline diplomat::result, icu4x::TimeZoneInvalidOffsetError> icu4x::UtcOffset::from_seconds(int32_t seconds) { +inline icu4x::diplomat::result, icu4x::TimeZoneInvalidOffsetError> icu4x::UtcOffset::from_seconds(int32_t seconds) { auto result = icu4x::capi::icu4x_UtcOffset_from_seconds_mv1(seconds); - return result.is_ok ? diplomat::result, icu4x::TimeZoneInvalidOffsetError>(diplomat::Ok>(std::unique_ptr(icu4x::UtcOffset::FromFFI(result.ok)))) : diplomat::result, icu4x::TimeZoneInvalidOffsetError>(diplomat::Err(icu4x::TimeZoneInvalidOffsetError {})); + return result.is_ok ? icu4x::diplomat::result, icu4x::TimeZoneInvalidOffsetError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::UtcOffset::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::TimeZoneInvalidOffsetError>(icu4x::diplomat::Err(icu4x::TimeZoneInvalidOffsetError {})); } -inline diplomat::result, icu4x::TimeZoneInvalidOffsetError> icu4x::UtcOffset::from_string(std::string_view offset) { +inline icu4x::diplomat::result, icu4x::TimeZoneInvalidOffsetError> icu4x::UtcOffset::from_string(std::string_view offset) { auto result = icu4x::capi::icu4x_UtcOffset_from_string_mv1({offset.data(), offset.size()}); - return result.is_ok ? diplomat::result, icu4x::TimeZoneInvalidOffsetError>(diplomat::Ok>(std::unique_ptr(icu4x::UtcOffset::FromFFI(result.ok)))) : diplomat::result, icu4x::TimeZoneInvalidOffsetError>(diplomat::Err(icu4x::TimeZoneInvalidOffsetError {})); + return result.is_ok ? icu4x::diplomat::result, icu4x::TimeZoneInvalidOffsetError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::UtcOffset::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::TimeZoneInvalidOffsetError>(icu4x::diplomat::Err(icu4x::TimeZoneInvalidOffsetError {})); } inline int32_t icu4x::UtcOffset::seconds() const { @@ -104,4 +104,4 @@ inline void icu4x::UtcOffset::operator delete(void* ptr) { } -#endif // icu4x_UtcOffset_HPP +#endif // ICU4X_UtcOffset_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/VariantOffsets.d.hpp b/ffi/capi/bindings/cpp/icu4x/VariantOffsets.d.hpp index 209f8f28360..b02d2fd0e4d 100644 --- a/ffi/capi/bindings/cpp/icu4x/VariantOffsets.d.hpp +++ b/ffi/capi/bindings/cpp/icu4x/VariantOffsets.d.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_VariantOffsets_D_HPP -#define icu4x_VariantOffsets_D_HPP +#ifndef ICU4X_VariantOffsets_D_HPP +#define ICU4X_VariantOffsets_D_HPP #include #include @@ -9,12 +9,12 @@ #include #include #include -#include "../diplomat_runtime.hpp" - +#include "diplomat_runtime.hpp" namespace icu4x { namespace capi { struct UtcOffset; } class UtcOffset; -} +} // namespace icu4x + namespace icu4x { @@ -42,4 +42,4 @@ struct VariantOffsets { }; } // namespace -#endif // icu4x_VariantOffsets_D_HPP +#endif // ICU4X_VariantOffsets_D_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/VariantOffsets.hpp b/ffi/capi/bindings/cpp/icu4x/VariantOffsets.hpp index 36b3a89cd23..e9d5d3d1a50 100644 --- a/ffi/capi/bindings/cpp/icu4x/VariantOffsets.hpp +++ b/ffi/capi/bindings/cpp/icu4x/VariantOffsets.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_VariantOffsets_HPP -#define icu4x_VariantOffsets_HPP +#ifndef ICU4X_VariantOffsets_HPP +#define ICU4X_VariantOffsets_HPP #include "VariantOffsets.d.hpp" @@ -11,8 +11,8 @@ #include #include #include -#include "../diplomat_runtime.hpp" #include "UtcOffset.hpp" +#include "diplomat_runtime.hpp" namespace icu4x { @@ -39,4 +39,4 @@ inline icu4x::VariantOffsets icu4x::VariantOffsets::FromFFI(icu4x::capi::Variant } -#endif // icu4x_VariantOffsets_HPP +#endif // ICU4X_VariantOffsets_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/VariantOffsetsCalculator.d.hpp b/ffi/capi/bindings/cpp/icu4x/VariantOffsetsCalculator.d.hpp index 5a1d0f172b6..2a47b63c5d7 100644 --- a/ffi/capi/bindings/cpp/icu4x/VariantOffsetsCalculator.d.hpp +++ b/ffi/capi/bindings/cpp/icu4x/VariantOffsetsCalculator.d.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_VariantOffsetsCalculator_D_HPP -#define icu4x_VariantOffsetsCalculator_D_HPP +#ifndef ICU4X_VariantOffsetsCalculator_D_HPP +#define ICU4X_VariantOffsetsCalculator_D_HPP #include #include @@ -9,8 +9,7 @@ #include #include #include -#include "../diplomat_runtime.hpp" - +#include "diplomat_runtime.hpp" namespace icu4x { namespace capi { struct DataProvider; } class DataProvider; @@ -24,7 +23,8 @@ namespace capi { struct VariantOffsetsCalculator; } class VariantOffsetsCalculator; struct VariantOffsets; class DataError; -} +} // namespace icu4x + namespace icu4x { @@ -43,26 +43,26 @@ class [[deprecated("this API is a bad approximation of a time zone database")]] public: /** - * Construct a new {@link VariantOffsetsCalculator} instance using compiled data. - * - * See the [Rust documentation for `new`](https://docs.rs/icu/2.0.0/icu/time/zone/struct.VariantOffsetsCalculator.html#method.new) for more information. + * Construct a new {@link VariantOffsetsCalculator} instance using compiled data. + * + * See the [Rust documentation for `new`](https://docs.rs/icu/2.0.0/icu/time/zone/struct.VariantOffsetsCalculator.html#method.new) for more information. */ inline static std::unique_ptr create(); /** - * Construct a new {@link VariantOffsetsCalculator} instance using a particular data source. - * - * See the [Rust documentation for `new`](https://docs.rs/icu/2.0.0/icu/time/zone/struct.VariantOffsetsCalculator.html#method.new) for more information. + * Construct a new {@link VariantOffsetsCalculator} instance using a particular data source. + * + * See the [Rust documentation for `new`](https://docs.rs/icu/2.0.0/icu/time/zone/struct.VariantOffsetsCalculator.html#method.new) for more information. */ - inline static diplomat::result, icu4x::DataError> create_with_provider(const icu4x::DataProvider& provider); + inline static icu4x::diplomat::result, icu4x::DataError> create_with_provider(const icu4x::DataProvider& provider); /** - * See the [Rust documentation for `compute_offsets_from_time_zone_and_name_timestamp`](https://docs.rs/icu/2.0.0/icu/time/zone/struct.VariantOffsetsCalculatorBorrowed.html#method.compute_offsets_from_time_zone_and_name_timestamp) for more information. + * See the [Rust documentation for `compute_offsets_from_time_zone_and_name_timestamp`](https://docs.rs/icu/2.0.0/icu/time/zone/struct.VariantOffsetsCalculatorBorrowed.html#method.compute_offsets_from_time_zone_and_name_timestamp) for more information. */ inline std::optional compute_offsets_from_time_zone_and_date_time(const icu4x::TimeZone& time_zone, const icu4x::IsoDate& utc_date, const icu4x::Time& utc_time) const; /** - * See the [Rust documentation for `compute_offsets_from_time_zone_and_name_timestamp`](https://docs.rs/icu/2.0.0/icu/time/zone/struct.VariantOffsetsCalculatorBorrowed.html#method.compute_offsets_from_time_zone_and_name_timestamp) for more information. + * See the [Rust documentation for `compute_offsets_from_time_zone_and_name_timestamp`](https://docs.rs/icu/2.0.0/icu/time/zone/struct.VariantOffsetsCalculatorBorrowed.html#method.compute_offsets_from_time_zone_and_name_timestamp) for more information. */ inline std::optional compute_offsets_from_time_zone_and_timestamp(const icu4x::TimeZone& time_zone, int64_t timestamp) const; @@ -81,4 +81,4 @@ class [[deprecated("this API is a bad approximation of a time zone database")]] }; } // namespace -#endif // icu4x_VariantOffsetsCalculator_D_HPP +#endif // ICU4X_VariantOffsetsCalculator_D_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/VariantOffsetsCalculator.hpp b/ffi/capi/bindings/cpp/icu4x/VariantOffsetsCalculator.hpp index 9c569ac5814..20460661331 100644 --- a/ffi/capi/bindings/cpp/icu4x/VariantOffsetsCalculator.hpp +++ b/ffi/capi/bindings/cpp/icu4x/VariantOffsetsCalculator.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_VariantOffsetsCalculator_HPP -#define icu4x_VariantOffsetsCalculator_HPP +#ifndef ICU4X_VariantOffsetsCalculator_HPP +#define ICU4X_VariantOffsetsCalculator_HPP #include "VariantOffsetsCalculator.d.hpp" @@ -11,13 +11,13 @@ #include #include #include -#include "../diplomat_runtime.hpp" #include "DataError.hpp" #include "DataProvider.hpp" #include "IsoDate.hpp" #include "Time.hpp" #include "TimeZone.hpp" #include "VariantOffsets.hpp" +#include "diplomat_runtime.hpp" namespace icu4x { @@ -46,9 +46,9 @@ inline std::unique_ptr icu4x::VariantOffsetsCal return std::unique_ptr(icu4x::VariantOffsetsCalculator::FromFFI(result)); } -inline diplomat::result, icu4x::DataError> icu4x::VariantOffsetsCalculator::create_with_provider(const icu4x::DataProvider& provider) { +inline icu4x::diplomat::result, icu4x::DataError> icu4x::VariantOffsetsCalculator::create_with_provider(const icu4x::DataProvider& provider) { auto result = icu4x::capi::icu4x_VariantOffsetsCalculator_create_with_provider_mv1(provider.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DataError>(diplomat::Ok>(std::unique_ptr(icu4x::VariantOffsetsCalculator::FromFFI(result.ok)))) : diplomat::result, icu4x::DataError>(diplomat::Err(icu4x::DataError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::VariantOffsetsCalculator::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Err(icu4x::DataError::FromFFI(result.err))); } inline std::optional icu4x::VariantOffsetsCalculator::compute_offsets_from_time_zone_and_date_time(const icu4x::TimeZone& time_zone, const icu4x::IsoDate& utc_date, const icu4x::Time& utc_time) const { @@ -87,4 +87,4 @@ inline void icu4x::VariantOffsetsCalculator::operator delete(void* ptr) { } -#endif // icu4x_VariantOffsetsCalculator_HPP +#endif // ICU4X_VariantOffsetsCalculator_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/VerticalOrientation.d.hpp b/ffi/capi/bindings/cpp/icu4x/VerticalOrientation.d.hpp index 53a52afda5a..cd04f9da089 100644 --- a/ffi/capi/bindings/cpp/icu4x/VerticalOrientation.d.hpp +++ b/ffi/capi/bindings/cpp/icu4x/VerticalOrientation.d.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_VerticalOrientation_D_HPP -#define icu4x_VerticalOrientation_D_HPP +#ifndef ICU4X_VerticalOrientation_D_HPP +#define ICU4X_VerticalOrientation_D_HPP #include #include @@ -9,11 +9,11 @@ #include #include #include -#include "../diplomat_runtime.hpp" - +#include "diplomat_runtime.hpp" namespace icu4x { class VerticalOrientation; -} +} // namespace icu4x + namespace icu4x { @@ -51,35 +51,35 @@ class VerticalOrientation { explicit operator bool() const = delete; /** - * See the [Rust documentation for `for_char`](https://docs.rs/icu/2.0.0/icu/properties/props/trait.EnumeratedProperty.html#tymethod.for_char) for more information. + * See the [Rust documentation for `for_char`](https://docs.rs/icu/2.0.0/icu/properties/props/trait.EnumeratedProperty.html#tymethod.for_char) for more information. */ inline static icu4x::VerticalOrientation for_char(char32_t ch); /** - * Get the "long" name of this property value (returns empty if property value is unknown) - * - * See the [Rust documentation for `get`](https://docs.rs/icu/2.0.0/icu/properties/struct.PropertyNamesLongBorrowed.html#method.get) for more information. + * Get the "long" name of this property value (returns empty if property value is unknown) + * + * See the [Rust documentation for `get`](https://docs.rs/icu/2.0.0/icu/properties/struct.PropertyNamesLongBorrowed.html#method.get) for more information. */ inline std::optional long_name() const; /** - * Get the "short" name of this property value (returns empty if property value is unknown) - * - * See the [Rust documentation for `get`](https://docs.rs/icu/2.0.0/icu/properties/struct.PropertyNamesShortBorrowed.html#method.get) for more information. + * Get the "short" name of this property value (returns empty if property value is unknown) + * + * See the [Rust documentation for `get`](https://docs.rs/icu/2.0.0/icu/properties/struct.PropertyNamesShortBorrowed.html#method.get) for more information. */ inline std::optional short_name() const; /** - * Convert to an integer value usable with ICU4C and CodePointMapData - * - * See the [Rust documentation for `to_icu4c_value`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.VerticalOrientation.html#method.to_icu4c_value) for more information. + * Convert to an integer value usable with ICU4C and CodePointMapData + * + * See the [Rust documentation for `to_icu4c_value`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.VerticalOrientation.html#method.to_icu4c_value) for more information. */ inline uint8_t to_integer_value() const; /** - * Convert from an integer value from ICU4C or CodePointMapData - * - * See the [Rust documentation for `from_icu4c_value`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.VerticalOrientation.html#method.from_icu4c_value) for more information. + * Convert from an integer value from ICU4C or CodePointMapData + * + * See the [Rust documentation for `from_icu4c_value`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.VerticalOrientation.html#method.from_icu4c_value) for more information. */ inline static std::optional from_integer_value(uint8_t other); @@ -90,4 +90,4 @@ class VerticalOrientation { }; } // namespace -#endif // icu4x_VerticalOrientation_D_HPP +#endif // ICU4X_VerticalOrientation_D_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/VerticalOrientation.hpp b/ffi/capi/bindings/cpp/icu4x/VerticalOrientation.hpp index 4b73835d62d..574482951ed 100644 --- a/ffi/capi/bindings/cpp/icu4x/VerticalOrientation.hpp +++ b/ffi/capi/bindings/cpp/icu4x/VerticalOrientation.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_VerticalOrientation_HPP -#define icu4x_VerticalOrientation_HPP +#ifndef ICU4X_VerticalOrientation_HPP +#define ICU4X_VerticalOrientation_HPP #include "VerticalOrientation.d.hpp" @@ -11,7 +11,7 @@ #include #include #include -#include "../diplomat_runtime.hpp" +#include "diplomat_runtime.hpp" namespace icu4x { @@ -20,10 +20,10 @@ namespace capi { icu4x::capi::VerticalOrientation icu4x_VerticalOrientation_for_char_mv1(char32_t ch); - typedef struct icu4x_VerticalOrientation_long_name_mv1_result {union {diplomat::capi::DiplomatStringView ok; }; bool is_ok;} icu4x_VerticalOrientation_long_name_mv1_result; + typedef struct icu4x_VerticalOrientation_long_name_mv1_result {union {icu4x::diplomat::capi::DiplomatStringView ok; }; bool is_ok;} icu4x_VerticalOrientation_long_name_mv1_result; icu4x_VerticalOrientation_long_name_mv1_result icu4x_VerticalOrientation_long_name_mv1(icu4x::capi::VerticalOrientation self); - typedef struct icu4x_VerticalOrientation_short_name_mv1_result {union {diplomat::capi::DiplomatStringView ok; }; bool is_ok;} icu4x_VerticalOrientation_short_name_mv1_result; + typedef struct icu4x_VerticalOrientation_short_name_mv1_result {union {icu4x::diplomat::capi::DiplomatStringView ok; }; bool is_ok;} icu4x_VerticalOrientation_short_name_mv1_result; icu4x_VerticalOrientation_short_name_mv1_result icu4x_VerticalOrientation_short_name_mv1(icu4x::capi::VerticalOrientation self); uint8_t icu4x_VerticalOrientation_to_integer_value_mv1(icu4x::capi::VerticalOrientation self); @@ -75,4 +75,4 @@ inline std::optional icu4x::VerticalOrientation::fro auto result = icu4x::capi::icu4x_VerticalOrientation_from_integer_value_mv1(other); return result.is_ok ? std::optional(icu4x::VerticalOrientation::FromFFI(result.ok)) : std::nullopt; } -#endif // icu4x_VerticalOrientation_HPP +#endif // ICU4X_VerticalOrientation_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/WeekInformation.d.hpp b/ffi/capi/bindings/cpp/icu4x/WeekInformation.d.hpp index 73854abf478..bc68196fbdb 100644 --- a/ffi/capi/bindings/cpp/icu4x/WeekInformation.d.hpp +++ b/ffi/capi/bindings/cpp/icu4x/WeekInformation.d.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_WeekInformation_D_HPP -#define icu4x_WeekInformation_D_HPP +#ifndef ICU4X_WeekInformation_D_HPP +#define ICU4X_WeekInformation_D_HPP #include #include @@ -9,8 +9,7 @@ #include #include #include -#include "../diplomat_runtime.hpp" - +#include "diplomat_runtime.hpp" namespace icu4x { namespace capi { struct DataProvider; } class DataProvider; @@ -22,7 +21,8 @@ namespace capi { struct WeekdaySetIterator; } class WeekdaySetIterator; class DataError; class Weekday; -} +} // namespace icu4x + namespace icu4x { @@ -41,35 +41,35 @@ class WeekInformation { public: /** - * Creates a new {@link WeekInformation} from locale data using compiled data. - * - * See the [Rust documentation for `try_new`](https://docs.rs/icu/2.0.0/icu/calendar/week/struct.WeekInformation.html#method.try_new) for more information. + * Creates a new {@link WeekInformation} from locale data using compiled data. + * + * See the [Rust documentation for `try_new`](https://docs.rs/icu/2.0.0/icu/calendar/week/struct.WeekInformation.html#method.try_new) for more information. */ - inline static diplomat::result, icu4x::DataError> create(const icu4x::Locale& locale); + inline static icu4x::diplomat::result, icu4x::DataError> create(const icu4x::Locale& locale); /** - * Creates a new {@link WeekInformation} from locale data using a particular data source. - * - * See the [Rust documentation for `try_new`](https://docs.rs/icu/2.0.0/icu/calendar/week/struct.WeekInformation.html#method.try_new) for more information. + * Creates a new {@link WeekInformation} from locale data using a particular data source. + * + * See the [Rust documentation for `try_new`](https://docs.rs/icu/2.0.0/icu/calendar/week/struct.WeekInformation.html#method.try_new) for more information. */ - inline static diplomat::result, icu4x::DataError> create_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale); + inline static icu4x::diplomat::result, icu4x::DataError> create_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale); /** - * Returns the weekday that starts the week for this object's locale - * - * See the [Rust documentation for `first_weekday`](https://docs.rs/icu/2.0.0/icu/calendar/week/struct.WeekInformation.html#structfield.first_weekday) for more information. + * Returns the weekday that starts the week for this object's locale + * + * See the [Rust documentation for `first_weekday`](https://docs.rs/icu/2.0.0/icu/calendar/week/struct.WeekInformation.html#structfield.first_weekday) for more information. */ inline icu4x::Weekday first_weekday() const; /** - * See the [Rust documentation for `weekend`](https://docs.rs/icu/2.0.0/icu/calendar/week/struct.WeekInformation.html#structfield.weekend) for more information. - * - * See the [Rust documentation for `contains`](https://docs.rs/icu/2.0.0/icu/calendar/provider/struct.WeekdaySet.html#method.contains) for more information. + * See the [Rust documentation for `weekend`](https://docs.rs/icu/2.0.0/icu/calendar/week/struct.WeekInformation.html#structfield.weekend) for more information. + * + * See the [Rust documentation for `contains`](https://docs.rs/icu/2.0.0/icu/calendar/provider/struct.WeekdaySet.html#method.contains) for more information. */ inline bool is_weekend(icu4x::Weekday day) const; /** - * See the [Rust documentation for `weekend`](https://docs.rs/icu/2.0.0/icu/calendar/week/struct.WeekInformation.html#method.weekend) for more information. + * See the [Rust documentation for `weekend`](https://docs.rs/icu/2.0.0/icu/calendar/week/struct.WeekInformation.html#method.weekend) for more information. */ inline std::unique_ptr weekend() const; @@ -88,4 +88,4 @@ class WeekInformation { }; } // namespace -#endif // icu4x_WeekInformation_D_HPP +#endif // ICU4X_WeekInformation_D_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/WeekInformation.hpp b/ffi/capi/bindings/cpp/icu4x/WeekInformation.hpp index 9c41d5ae349..7122d095562 100644 --- a/ffi/capi/bindings/cpp/icu4x/WeekInformation.hpp +++ b/ffi/capi/bindings/cpp/icu4x/WeekInformation.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_WeekInformation_HPP -#define icu4x_WeekInformation_HPP +#ifndef ICU4X_WeekInformation_HPP +#define ICU4X_WeekInformation_HPP #include "WeekInformation.d.hpp" @@ -11,12 +11,12 @@ #include #include #include -#include "../diplomat_runtime.hpp" #include "DataError.hpp" #include "DataProvider.hpp" #include "Locale.hpp" #include "Weekday.hpp" #include "WeekdaySetIterator.hpp" +#include "diplomat_runtime.hpp" namespace icu4x { @@ -41,15 +41,15 @@ namespace capi { } // namespace capi } // namespace -inline diplomat::result, icu4x::DataError> icu4x::WeekInformation::create(const icu4x::Locale& locale) { +inline icu4x::diplomat::result, icu4x::DataError> icu4x::WeekInformation::create(const icu4x::Locale& locale) { auto result = icu4x::capi::icu4x_WeekInformation_create_mv1(locale.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DataError>(diplomat::Ok>(std::unique_ptr(icu4x::WeekInformation::FromFFI(result.ok)))) : diplomat::result, icu4x::DataError>(diplomat::Err(icu4x::DataError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::WeekInformation::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Err(icu4x::DataError::FromFFI(result.err))); } -inline diplomat::result, icu4x::DataError> icu4x::WeekInformation::create_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale) { +inline icu4x::diplomat::result, icu4x::DataError> icu4x::WeekInformation::create_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale) { auto result = icu4x::capi::icu4x_WeekInformation_create_with_provider_mv1(provider.AsFFI(), locale.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DataError>(diplomat::Ok>(std::unique_ptr(icu4x::WeekInformation::FromFFI(result.ok)))) : diplomat::result, icu4x::DataError>(diplomat::Err(icu4x::DataError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::WeekInformation::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Err(icu4x::DataError::FromFFI(result.err))); } inline icu4x::Weekday icu4x::WeekInformation::first_weekday() const { @@ -89,4 +89,4 @@ inline void icu4x::WeekInformation::operator delete(void* ptr) { } -#endif // icu4x_WeekInformation_HPP +#endif // ICU4X_WeekInformation_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/Weekday.d.hpp b/ffi/capi/bindings/cpp/icu4x/Weekday.d.hpp index 89f76281ef2..278137b75b8 100644 --- a/ffi/capi/bindings/cpp/icu4x/Weekday.d.hpp +++ b/ffi/capi/bindings/cpp/icu4x/Weekday.d.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_Weekday_D_HPP -#define icu4x_Weekday_D_HPP +#ifndef ICU4X_Weekday_D_HPP +#define ICU4X_Weekday_D_HPP #include #include @@ -9,7 +9,7 @@ #include #include #include -#include "../diplomat_runtime.hpp" +#include "diplomat_runtime.hpp" namespace icu4x { @@ -56,4 +56,4 @@ class Weekday { }; } // namespace -#endif // icu4x_Weekday_D_HPP +#endif // ICU4X_Weekday_D_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/Weekday.hpp b/ffi/capi/bindings/cpp/icu4x/Weekday.hpp index 2e88ce0fd5c..3c25bf03a90 100644 --- a/ffi/capi/bindings/cpp/icu4x/Weekday.hpp +++ b/ffi/capi/bindings/cpp/icu4x/Weekday.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_Weekday_HPP -#define icu4x_Weekday_HPP +#ifndef ICU4X_Weekday_HPP +#define ICU4X_Weekday_HPP #include "Weekday.d.hpp" @@ -11,7 +11,7 @@ #include #include #include -#include "../diplomat_runtime.hpp" +#include "diplomat_runtime.hpp" namespace icu4x { @@ -40,4 +40,4 @@ inline icu4x::Weekday icu4x::Weekday::FromFFI(icu4x::capi::Weekday c_enum) { std::abort(); } } -#endif // icu4x_Weekday_HPP +#endif // ICU4X_Weekday_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/WeekdaySetIterator.d.hpp b/ffi/capi/bindings/cpp/icu4x/WeekdaySetIterator.d.hpp index 6ba95a7ea63..2e5f09acd3f 100644 --- a/ffi/capi/bindings/cpp/icu4x/WeekdaySetIterator.d.hpp +++ b/ffi/capi/bindings/cpp/icu4x/WeekdaySetIterator.d.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_WeekdaySetIterator_D_HPP -#define icu4x_WeekdaySetIterator_D_HPP +#ifndef ICU4X_WeekdaySetIterator_D_HPP +#define ICU4X_WeekdaySetIterator_D_HPP #include #include @@ -9,11 +9,11 @@ #include #include #include -#include "../diplomat_runtime.hpp" - +#include "diplomat_runtime.hpp" namespace icu4x { class Weekday; -} +} // namespace icu4x + namespace icu4x { @@ -32,7 +32,7 @@ class WeekdaySetIterator { public: /** - * See the [Rust documentation for `next`](https://docs.rs/icu/2.0.0/icu/calendar/week/struct.WeekdaySetIterator.html#method.next) for more information. + * See the [Rust documentation for `next`](https://docs.rs/icu/2.0.0/icu/calendar/week/struct.WeekdaySetIterator.html#method.next) for more information. */ inline std::optional next(); @@ -51,4 +51,4 @@ class WeekdaySetIterator { }; } // namespace -#endif // icu4x_WeekdaySetIterator_D_HPP +#endif // ICU4X_WeekdaySetIterator_D_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/WeekdaySetIterator.hpp b/ffi/capi/bindings/cpp/icu4x/WeekdaySetIterator.hpp index 6dd91b280c9..1efdb7eca99 100644 --- a/ffi/capi/bindings/cpp/icu4x/WeekdaySetIterator.hpp +++ b/ffi/capi/bindings/cpp/icu4x/WeekdaySetIterator.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_WeekdaySetIterator_HPP -#define icu4x_WeekdaySetIterator_HPP +#ifndef ICU4X_WeekdaySetIterator_HPP +#define ICU4X_WeekdaySetIterator_HPP #include "WeekdaySetIterator.d.hpp" @@ -11,8 +11,8 @@ #include #include #include -#include "../diplomat_runtime.hpp" #include "Weekday.hpp" +#include "diplomat_runtime.hpp" namespace icu4x { @@ -54,4 +54,4 @@ inline void icu4x::WeekdaySetIterator::operator delete(void* ptr) { } -#endif // icu4x_WeekdaySetIterator_HPP +#endif // ICU4X_WeekdaySetIterator_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/WindowsParser.d.hpp b/ffi/capi/bindings/cpp/icu4x/WindowsParser.d.hpp index fec405b41fd..880f96e79f2 100644 --- a/ffi/capi/bindings/cpp/icu4x/WindowsParser.d.hpp +++ b/ffi/capi/bindings/cpp/icu4x/WindowsParser.d.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_WindowsParser_D_HPP -#define icu4x_WindowsParser_D_HPP +#ifndef ICU4X_WindowsParser_D_HPP +#define ICU4X_WindowsParser_D_HPP #include #include @@ -9,8 +9,7 @@ #include #include #include -#include "../diplomat_runtime.hpp" - +#include "diplomat_runtime.hpp" namespace icu4x { namespace capi { struct DataProvider; } class DataProvider; @@ -19,7 +18,8 @@ class TimeZone; namespace capi { struct WindowsParser; } class WindowsParser; class DataError; -} +} // namespace icu4x + namespace icu4x { @@ -41,21 +41,21 @@ class WindowsParser { public: /** - * Create a new {@link WindowsParser} using compiled data - * - * See the [Rust documentation for `new`](https://docs.rs/icu/2.0.0/icu/time/zone/windows/struct.WindowsParser.html#method.new) for more information. + * Create a new {@link WindowsParser} using compiled data + * + * See the [Rust documentation for `new`](https://docs.rs/icu/2.0.0/icu/time/zone/windows/struct.WindowsParser.html#method.new) for more information. */ inline static std::unique_ptr create(); /** - * Create a new {@link WindowsParser} using a particular data source - * - * See the [Rust documentation for `new`](https://docs.rs/icu/2.0.0/icu/time/zone/windows/struct.WindowsParser.html#method.new) for more information. + * Create a new {@link WindowsParser} using a particular data source + * + * See the [Rust documentation for `new`](https://docs.rs/icu/2.0.0/icu/time/zone/windows/struct.WindowsParser.html#method.new) for more information. */ - inline static diplomat::result, icu4x::DataError> create_with_provider(const icu4x::DataProvider& provider); + inline static icu4x::diplomat::result, icu4x::DataError> create_with_provider(const icu4x::DataProvider& provider); /** - * See the [Rust documentation for `parse`](https://docs.rs/icu/2.0.0/icu/time/zone/windows/struct.WindowsParserBorrowed.html#method.parse) for more information. + * See the [Rust documentation for `parse`](https://docs.rs/icu/2.0.0/icu/time/zone/windows/struct.WindowsParserBorrowed.html#method.parse) for more information. */ inline std::unique_ptr parse(std::string_view value, std::string_view region) const; @@ -74,4 +74,4 @@ class WindowsParser { }; } // namespace -#endif // icu4x_WindowsParser_D_HPP +#endif // ICU4X_WindowsParser_D_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/WindowsParser.hpp b/ffi/capi/bindings/cpp/icu4x/WindowsParser.hpp index 96791ecabb7..0f117cd13d4 100644 --- a/ffi/capi/bindings/cpp/icu4x/WindowsParser.hpp +++ b/ffi/capi/bindings/cpp/icu4x/WindowsParser.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_WindowsParser_HPP -#define icu4x_WindowsParser_HPP +#ifndef ICU4X_WindowsParser_HPP +#define ICU4X_WindowsParser_HPP #include "WindowsParser.d.hpp" @@ -11,10 +11,10 @@ #include #include #include -#include "../diplomat_runtime.hpp" #include "DataError.hpp" #include "DataProvider.hpp" #include "TimeZone.hpp" +#include "diplomat_runtime.hpp" namespace icu4x { @@ -26,7 +26,7 @@ namespace capi { typedef struct icu4x_WindowsParser_create_with_provider_mv1_result {union {icu4x::capi::WindowsParser* ok; icu4x::capi::DataError err;}; bool is_ok;} icu4x_WindowsParser_create_with_provider_mv1_result; icu4x_WindowsParser_create_with_provider_mv1_result icu4x_WindowsParser_create_with_provider_mv1(const icu4x::capi::DataProvider* provider); - icu4x::capi::TimeZone* icu4x_WindowsParser_parse_mv1(const icu4x::capi::WindowsParser* self, diplomat::capi::DiplomatStringView value, diplomat::capi::DiplomatStringView region); + icu4x::capi::TimeZone* icu4x_WindowsParser_parse_mv1(const icu4x::capi::WindowsParser* self, icu4x::diplomat::capi::DiplomatStringView value, icu4x::diplomat::capi::DiplomatStringView region); void icu4x_WindowsParser_destroy_mv1(WindowsParser* self); @@ -39,9 +39,9 @@ inline std::unique_ptr icu4x::WindowsParser::create() { return std::unique_ptr(icu4x::WindowsParser::FromFFI(result)); } -inline diplomat::result, icu4x::DataError> icu4x::WindowsParser::create_with_provider(const icu4x::DataProvider& provider) { +inline icu4x::diplomat::result, icu4x::DataError> icu4x::WindowsParser::create_with_provider(const icu4x::DataProvider& provider) { auto result = icu4x::capi::icu4x_WindowsParser_create_with_provider_mv1(provider.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DataError>(diplomat::Ok>(std::unique_ptr(icu4x::WindowsParser::FromFFI(result.ok)))) : diplomat::result, icu4x::DataError>(diplomat::Err(icu4x::DataError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::WindowsParser::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Err(icu4x::DataError::FromFFI(result.err))); } inline std::unique_ptr icu4x::WindowsParser::parse(std::string_view value, std::string_view region) const { @@ -72,4 +72,4 @@ inline void icu4x::WindowsParser::operator delete(void* ptr) { } -#endif // icu4x_WindowsParser_HPP +#endif // ICU4X_WindowsParser_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/WordBreak.d.hpp b/ffi/capi/bindings/cpp/icu4x/WordBreak.d.hpp index 7f61667afb6..bb5774b493a 100644 --- a/ffi/capi/bindings/cpp/icu4x/WordBreak.d.hpp +++ b/ffi/capi/bindings/cpp/icu4x/WordBreak.d.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_WordBreak_D_HPP -#define icu4x_WordBreak_D_HPP +#ifndef ICU4X_WordBreak_D_HPP +#define ICU4X_WordBreak_D_HPP #include #include @@ -9,11 +9,11 @@ #include #include #include -#include "../diplomat_runtime.hpp" - +#include "diplomat_runtime.hpp" namespace icu4x { class WordBreak; -} +} // namespace icu4x + namespace icu4x { @@ -89,35 +89,35 @@ class WordBreak { explicit operator bool() const = delete; /** - * See the [Rust documentation for `for_char`](https://docs.rs/icu/2.0.0/icu/properties/props/trait.EnumeratedProperty.html#tymethod.for_char) for more information. + * See the [Rust documentation for `for_char`](https://docs.rs/icu/2.0.0/icu/properties/props/trait.EnumeratedProperty.html#tymethod.for_char) for more information. */ inline static icu4x::WordBreak for_char(char32_t ch); /** - * Get the "long" name of this property value (returns empty if property value is unknown) - * - * See the [Rust documentation for `get`](https://docs.rs/icu/2.0.0/icu/properties/struct.PropertyNamesLongBorrowed.html#method.get) for more information. + * Get the "long" name of this property value (returns empty if property value is unknown) + * + * See the [Rust documentation for `get`](https://docs.rs/icu/2.0.0/icu/properties/struct.PropertyNamesLongBorrowed.html#method.get) for more information. */ inline std::optional long_name() const; /** - * Get the "short" name of this property value (returns empty if property value is unknown) - * - * See the [Rust documentation for `get`](https://docs.rs/icu/2.0.0/icu/properties/struct.PropertyNamesShortBorrowed.html#method.get) for more information. + * Get the "short" name of this property value (returns empty if property value is unknown) + * + * See the [Rust documentation for `get`](https://docs.rs/icu/2.0.0/icu/properties/struct.PropertyNamesShortBorrowed.html#method.get) for more information. */ inline std::optional short_name() const; /** - * Convert to an integer value usable with ICU4C and CodePointMapData - * - * See the [Rust documentation for `to_icu4c_value`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.WordBreak.html#method.to_icu4c_value) for more information. + * Convert to an integer value usable with ICU4C and CodePointMapData + * + * See the [Rust documentation for `to_icu4c_value`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.WordBreak.html#method.to_icu4c_value) for more information. */ inline uint8_t to_integer_value() const; /** - * Convert from an integer value from ICU4C or CodePointMapData - * - * See the [Rust documentation for `from_icu4c_value`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.WordBreak.html#method.from_icu4c_value) for more information. + * Convert from an integer value from ICU4C or CodePointMapData + * + * See the [Rust documentation for `from_icu4c_value`](https://docs.rs/icu/2.0.0/icu/properties/props/struct.WordBreak.html#method.from_icu4c_value) for more information. */ inline static std::optional from_integer_value(uint8_t other); @@ -128,4 +128,4 @@ class WordBreak { }; } // namespace -#endif // icu4x_WordBreak_D_HPP +#endif // ICU4X_WordBreak_D_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/WordBreak.hpp b/ffi/capi/bindings/cpp/icu4x/WordBreak.hpp index 21d5bf46f76..8df899486ce 100644 --- a/ffi/capi/bindings/cpp/icu4x/WordBreak.hpp +++ b/ffi/capi/bindings/cpp/icu4x/WordBreak.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_WordBreak_HPP -#define icu4x_WordBreak_HPP +#ifndef ICU4X_WordBreak_HPP +#define ICU4X_WordBreak_HPP #include "WordBreak.d.hpp" @@ -11,7 +11,7 @@ #include #include #include -#include "../diplomat_runtime.hpp" +#include "diplomat_runtime.hpp" namespace icu4x { @@ -20,10 +20,10 @@ namespace capi { icu4x::capi::WordBreak icu4x_WordBreak_for_char_mv1(char32_t ch); - typedef struct icu4x_WordBreak_long_name_mv1_result {union {diplomat::capi::DiplomatStringView ok; }; bool is_ok;} icu4x_WordBreak_long_name_mv1_result; + typedef struct icu4x_WordBreak_long_name_mv1_result {union {icu4x::diplomat::capi::DiplomatStringView ok; }; bool is_ok;} icu4x_WordBreak_long_name_mv1_result; icu4x_WordBreak_long_name_mv1_result icu4x_WordBreak_long_name_mv1(icu4x::capi::WordBreak self); - typedef struct icu4x_WordBreak_short_name_mv1_result {union {diplomat::capi::DiplomatStringView ok; }; bool is_ok;} icu4x_WordBreak_short_name_mv1_result; + typedef struct icu4x_WordBreak_short_name_mv1_result {union {icu4x::diplomat::capi::DiplomatStringView ok; }; bool is_ok;} icu4x_WordBreak_short_name_mv1_result; icu4x_WordBreak_short_name_mv1_result icu4x_WordBreak_short_name_mv1(icu4x::capi::WordBreak self); uint8_t icu4x_WordBreak_to_integer_value_mv1(icu4x::capi::WordBreak self); @@ -94,4 +94,4 @@ inline std::optional icu4x::WordBreak::from_integer_value(uint auto result = icu4x::capi::icu4x_WordBreak_from_integer_value_mv1(other); return result.is_ok ? std::optional(icu4x::WordBreak::FromFFI(result.ok)) : std::nullopt; } -#endif // icu4x_WordBreak_HPP +#endif // ICU4X_WordBreak_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/WordBreakIteratorLatin1.d.hpp b/ffi/capi/bindings/cpp/icu4x/WordBreakIteratorLatin1.d.hpp index efccac93b54..86b99717577 100644 --- a/ffi/capi/bindings/cpp/icu4x/WordBreakIteratorLatin1.d.hpp +++ b/ffi/capi/bindings/cpp/icu4x/WordBreakIteratorLatin1.d.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_WordBreakIteratorLatin1_D_HPP -#define icu4x_WordBreakIteratorLatin1_D_HPP +#ifndef ICU4X_WordBreakIteratorLatin1_D_HPP +#define ICU4X_WordBreakIteratorLatin1_D_HPP #include #include @@ -9,11 +9,11 @@ #include #include #include -#include "../diplomat_runtime.hpp" - +#include "diplomat_runtime.hpp" namespace icu4x { class SegmenterWordType; -} +} // namespace icu4x + namespace icu4x { @@ -30,24 +30,24 @@ class WordBreakIteratorLatin1 { public: /** - * Finds the next breakpoint. Returns -1 if at the end of the string or if the index is - * out of range of a 32-bit signed integer. - * - * See the [Rust documentation for `next`](https://docs.rs/icu/2.0.0/icu/segmenter/iterators/struct.WordBreakIterator.html#method.next) for more information. + * Finds the next breakpoint. Returns -1 if at the end of the string or if the index is + * out of range of a 32-bit signed integer. + * + * See the [Rust documentation for `next`](https://docs.rs/icu/2.0.0/icu/segmenter/iterators/struct.WordBreakIterator.html#method.next) for more information. */ inline int32_t next(); /** - * Return the status value of break boundary. - * - * See the [Rust documentation for `word_type`](https://docs.rs/icu/2.0.0/icu/segmenter/iterators/struct.WordBreakIterator.html#method.word_type) for more information. + * Return the status value of break boundary. + * + * See the [Rust documentation for `word_type`](https://docs.rs/icu/2.0.0/icu/segmenter/iterators/struct.WordBreakIterator.html#method.word_type) for more information. */ inline icu4x::SegmenterWordType word_type() const; /** - * Return true when break boundary is word-like such as letter/number/CJK - * - * See the [Rust documentation for `is_word_like`](https://docs.rs/icu/2.0.0/icu/segmenter/iterators/struct.WordBreakIterator.html#method.is_word_like) for more information. + * Return true when break boundary is word-like such as letter/number/CJK + * + * See the [Rust documentation for `is_word_like`](https://docs.rs/icu/2.0.0/icu/segmenter/iterators/struct.WordBreakIterator.html#method.is_word_like) for more information. */ inline bool is_word_like() const; @@ -66,4 +66,4 @@ class WordBreakIteratorLatin1 { }; } // namespace -#endif // icu4x_WordBreakIteratorLatin1_D_HPP +#endif // ICU4X_WordBreakIteratorLatin1_D_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/WordBreakIteratorLatin1.hpp b/ffi/capi/bindings/cpp/icu4x/WordBreakIteratorLatin1.hpp index 76ef8346160..cee9b76e9c8 100644 --- a/ffi/capi/bindings/cpp/icu4x/WordBreakIteratorLatin1.hpp +++ b/ffi/capi/bindings/cpp/icu4x/WordBreakIteratorLatin1.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_WordBreakIteratorLatin1_HPP -#define icu4x_WordBreakIteratorLatin1_HPP +#ifndef ICU4X_WordBreakIteratorLatin1_HPP +#define ICU4X_WordBreakIteratorLatin1_HPP #include "WordBreakIteratorLatin1.d.hpp" @@ -11,8 +11,8 @@ #include #include #include -#include "../diplomat_runtime.hpp" #include "SegmenterWordType.hpp" +#include "diplomat_runtime.hpp" namespace icu4x { @@ -67,4 +67,4 @@ inline void icu4x::WordBreakIteratorLatin1::operator delete(void* ptr) { } -#endif // icu4x_WordBreakIteratorLatin1_HPP +#endif // ICU4X_WordBreakIteratorLatin1_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/WordBreakIteratorUtf16.d.hpp b/ffi/capi/bindings/cpp/icu4x/WordBreakIteratorUtf16.d.hpp index 4f2b790a311..d7a084dc0fb 100644 --- a/ffi/capi/bindings/cpp/icu4x/WordBreakIteratorUtf16.d.hpp +++ b/ffi/capi/bindings/cpp/icu4x/WordBreakIteratorUtf16.d.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_WordBreakIteratorUtf16_D_HPP -#define icu4x_WordBreakIteratorUtf16_D_HPP +#ifndef ICU4X_WordBreakIteratorUtf16_D_HPP +#define ICU4X_WordBreakIteratorUtf16_D_HPP #include #include @@ -9,11 +9,11 @@ #include #include #include -#include "../diplomat_runtime.hpp" - +#include "diplomat_runtime.hpp" namespace icu4x { class SegmenterWordType; -} +} // namespace icu4x + namespace icu4x { @@ -30,24 +30,24 @@ class WordBreakIteratorUtf16 { public: /** - * Finds the next breakpoint. Returns -1 if at the end of the string or if the index is - * out of range of a 32-bit signed integer. - * - * See the [Rust documentation for `next`](https://docs.rs/icu/2.0.0/icu/segmenter/iterators/struct.WordBreakIterator.html#method.next) for more information. + * Finds the next breakpoint. Returns -1 if at the end of the string or if the index is + * out of range of a 32-bit signed integer. + * + * See the [Rust documentation for `next`](https://docs.rs/icu/2.0.0/icu/segmenter/iterators/struct.WordBreakIterator.html#method.next) for more information. */ inline int32_t next(); /** - * Return the status value of break boundary. - * - * See the [Rust documentation for `word_type`](https://docs.rs/icu/2.0.0/icu/segmenter/iterators/struct.WordBreakIterator.html#method.word_type) for more information. + * Return the status value of break boundary. + * + * See the [Rust documentation for `word_type`](https://docs.rs/icu/2.0.0/icu/segmenter/iterators/struct.WordBreakIterator.html#method.word_type) for more information. */ inline icu4x::SegmenterWordType word_type() const; /** - * Return true when break boundary is word-like such as letter/number/CJK - * - * See the [Rust documentation for `is_word_like`](https://docs.rs/icu/2.0.0/icu/segmenter/iterators/struct.WordBreakIterator.html#method.is_word_like) for more information. + * Return true when break boundary is word-like such as letter/number/CJK + * + * See the [Rust documentation for `is_word_like`](https://docs.rs/icu/2.0.0/icu/segmenter/iterators/struct.WordBreakIterator.html#method.is_word_like) for more information. */ inline bool is_word_like() const; @@ -66,4 +66,4 @@ class WordBreakIteratorUtf16 { }; } // namespace -#endif // icu4x_WordBreakIteratorUtf16_D_HPP +#endif // ICU4X_WordBreakIteratorUtf16_D_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/WordBreakIteratorUtf16.hpp b/ffi/capi/bindings/cpp/icu4x/WordBreakIteratorUtf16.hpp index 737d5a1b1d1..c4ee2f2b9f2 100644 --- a/ffi/capi/bindings/cpp/icu4x/WordBreakIteratorUtf16.hpp +++ b/ffi/capi/bindings/cpp/icu4x/WordBreakIteratorUtf16.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_WordBreakIteratorUtf16_HPP -#define icu4x_WordBreakIteratorUtf16_HPP +#ifndef ICU4X_WordBreakIteratorUtf16_HPP +#define ICU4X_WordBreakIteratorUtf16_HPP #include "WordBreakIteratorUtf16.d.hpp" @@ -11,8 +11,8 @@ #include #include #include -#include "../diplomat_runtime.hpp" #include "SegmenterWordType.hpp" +#include "diplomat_runtime.hpp" namespace icu4x { @@ -67,4 +67,4 @@ inline void icu4x::WordBreakIteratorUtf16::operator delete(void* ptr) { } -#endif // icu4x_WordBreakIteratorUtf16_HPP +#endif // ICU4X_WordBreakIteratorUtf16_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/WordBreakIteratorUtf8.d.hpp b/ffi/capi/bindings/cpp/icu4x/WordBreakIteratorUtf8.d.hpp index 68e2787e5b1..e22a47b3d05 100644 --- a/ffi/capi/bindings/cpp/icu4x/WordBreakIteratorUtf8.d.hpp +++ b/ffi/capi/bindings/cpp/icu4x/WordBreakIteratorUtf8.d.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_WordBreakIteratorUtf8_D_HPP -#define icu4x_WordBreakIteratorUtf8_D_HPP +#ifndef ICU4X_WordBreakIteratorUtf8_D_HPP +#define ICU4X_WordBreakIteratorUtf8_D_HPP #include #include @@ -9,11 +9,11 @@ #include #include #include -#include "../diplomat_runtime.hpp" - +#include "diplomat_runtime.hpp" namespace icu4x { class SegmenterWordType; -} +} // namespace icu4x + namespace icu4x { @@ -30,24 +30,24 @@ class WordBreakIteratorUtf8 { public: /** - * Finds the next breakpoint. Returns -1 if at the end of the string or if the index is - * out of range of a 32-bit signed integer. - * - * See the [Rust documentation for `next`](https://docs.rs/icu/2.0.0/icu/segmenter/iterators/struct.WordBreakIterator.html#method.next) for more information. + * Finds the next breakpoint. Returns -1 if at the end of the string or if the index is + * out of range of a 32-bit signed integer. + * + * See the [Rust documentation for `next`](https://docs.rs/icu/2.0.0/icu/segmenter/iterators/struct.WordBreakIterator.html#method.next) for more information. */ inline int32_t next(); /** - * Return the status value of break boundary. - * - * See the [Rust documentation for `word_type`](https://docs.rs/icu/2.0.0/icu/segmenter/iterators/struct.WordBreakIterator.html#method.word_type) for more information. + * Return the status value of break boundary. + * + * See the [Rust documentation for `word_type`](https://docs.rs/icu/2.0.0/icu/segmenter/iterators/struct.WordBreakIterator.html#method.word_type) for more information. */ inline icu4x::SegmenterWordType word_type() const; /** - * Return true when break boundary is word-like such as letter/number/CJK - * - * See the [Rust documentation for `is_word_like`](https://docs.rs/icu/2.0.0/icu/segmenter/iterators/struct.WordBreakIterator.html#method.is_word_like) for more information. + * Return true when break boundary is word-like such as letter/number/CJK + * + * See the [Rust documentation for `is_word_like`](https://docs.rs/icu/2.0.0/icu/segmenter/iterators/struct.WordBreakIterator.html#method.is_word_like) for more information. */ inline bool is_word_like() const; @@ -66,4 +66,4 @@ class WordBreakIteratorUtf8 { }; } // namespace -#endif // icu4x_WordBreakIteratorUtf8_D_HPP +#endif // ICU4X_WordBreakIteratorUtf8_D_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/WordBreakIteratorUtf8.hpp b/ffi/capi/bindings/cpp/icu4x/WordBreakIteratorUtf8.hpp index e451ad569f7..44632cbcdcd 100644 --- a/ffi/capi/bindings/cpp/icu4x/WordBreakIteratorUtf8.hpp +++ b/ffi/capi/bindings/cpp/icu4x/WordBreakIteratorUtf8.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_WordBreakIteratorUtf8_HPP -#define icu4x_WordBreakIteratorUtf8_HPP +#ifndef ICU4X_WordBreakIteratorUtf8_HPP +#define ICU4X_WordBreakIteratorUtf8_HPP #include "WordBreakIteratorUtf8.d.hpp" @@ -11,8 +11,8 @@ #include #include #include -#include "../diplomat_runtime.hpp" #include "SegmenterWordType.hpp" +#include "diplomat_runtime.hpp" namespace icu4x { @@ -67,4 +67,4 @@ inline void icu4x::WordBreakIteratorUtf8::operator delete(void* ptr) { } -#endif // icu4x_WordBreakIteratorUtf8_HPP +#endif // ICU4X_WordBreakIteratorUtf8_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/WordSegmenter.d.hpp b/ffi/capi/bindings/cpp/icu4x/WordSegmenter.d.hpp index fccdd9f7ca4..bdc832cf20b 100644 --- a/ffi/capi/bindings/cpp/icu4x/WordSegmenter.d.hpp +++ b/ffi/capi/bindings/cpp/icu4x/WordSegmenter.d.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_WordSegmenter_D_HPP -#define icu4x_WordSegmenter_D_HPP +#ifndef ICU4X_WordSegmenter_D_HPP +#define ICU4X_WordSegmenter_D_HPP #include #include @@ -9,8 +9,7 @@ #include #include #include -#include "../diplomat_runtime.hpp" - +#include "diplomat_runtime.hpp" namespace icu4x { namespace capi { struct DataProvider; } class DataProvider; @@ -25,7 +24,8 @@ class WordBreakIteratorUtf8; namespace capi { struct WordSegmenter; } class WordSegmenter; class DataError; -} +} // namespace icu4x + namespace icu4x { @@ -44,130 +44,130 @@ class WordSegmenter { public: /** - * Construct an {@link WordSegmenter} with automatically selecting the best available LSTM - * or dictionary payload data, using compiled data. This does not assume any content locale. - * - * Note: currently, it uses dictionary for Chinese and Japanese, and LSTM for Burmese, - * Khmer, Lao, and Thai. - * - * See the [Rust documentation for `new_auto`](https://docs.rs/icu/2.0.0/icu/segmenter/struct.WordSegmenter.html#method.new_auto) for more information. + * Construct an {@link WordSegmenter} with automatically selecting the best available LSTM + * or dictionary payload data, using compiled data. This does not assume any content locale. + * + * Note: currently, it uses dictionary for Chinese and Japanese, and LSTM for Burmese, + * Khmer, Lao, and Thai. + * + * See the [Rust documentation for `new_auto`](https://docs.rs/icu/2.0.0/icu/segmenter/struct.WordSegmenter.html#method.new_auto) for more information. */ inline static std::unique_ptr create_auto(); /** - * Construct an {@link WordSegmenter} with automatically selecting the best available LSTM - * or dictionary payload data, using compiled data. - * - * Note: currently, it uses dictionary for Chinese and Japanese, and LSTM for Burmese, - * Khmer, Lao, and Thai. - * - * See the [Rust documentation for `try_new_auto`](https://docs.rs/icu/2.0.0/icu/segmenter/struct.WordSegmenter.html#method.try_new_auto) for more information. + * Construct an {@link WordSegmenter} with automatically selecting the best available LSTM + * or dictionary payload data, using compiled data. + * + * Note: currently, it uses dictionary for Chinese and Japanese, and LSTM for Burmese, + * Khmer, Lao, and Thai. + * + * See the [Rust documentation for `try_new_auto`](https://docs.rs/icu/2.0.0/icu/segmenter/struct.WordSegmenter.html#method.try_new_auto) for more information. */ - inline static diplomat::result, icu4x::DataError> create_auto_with_content_locale(const icu4x::Locale& locale); + inline static icu4x::diplomat::result, icu4x::DataError> create_auto_with_content_locale(const icu4x::Locale& locale); /** - * Construct an {@link WordSegmenter} with automatically selecting the best available LSTM - * or dictionary payload data, using a particular data source. - * - * Note: currently, it uses dictionary for Chinese and Japanese, and LSTM for Burmese, - * Khmer, Lao, and Thai. - * - * See the [Rust documentation for `try_new_auto`](https://docs.rs/icu/2.0.0/icu/segmenter/struct.WordSegmenter.html#method.try_new_auto) for more information. + * Construct an {@link WordSegmenter} with automatically selecting the best available LSTM + * or dictionary payload data, using a particular data source. + * + * Note: currently, it uses dictionary for Chinese and Japanese, and LSTM for Burmese, + * Khmer, Lao, and Thai. + * + * See the [Rust documentation for `try_new_auto`](https://docs.rs/icu/2.0.0/icu/segmenter/struct.WordSegmenter.html#method.try_new_auto) for more information. */ - inline static diplomat::result, icu4x::DataError> create_auto_with_content_locale_and_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale); + inline static icu4x::diplomat::result, icu4x::DataError> create_auto_with_content_locale_and_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale); /** - * Construct an {@link WordSegmenter} with LSTM payload data for Burmese, Khmer, Lao, and - * Thai, using compiled data. This does not assume any content locale. - * - * Note: currently, it uses dictionary for Chinese and Japanese, and LSTM for Burmese, - * Khmer, Lao, and Thai. - * - * See the [Rust documentation for `new_lstm`](https://docs.rs/icu/2.0.0/icu/segmenter/struct.WordSegmenter.html#method.new_lstm) for more information. + * Construct an {@link WordSegmenter} with LSTM payload data for Burmese, Khmer, Lao, and + * Thai, using compiled data. This does not assume any content locale. + * + * Note: currently, it uses dictionary for Chinese and Japanese, and LSTM for Burmese, + * Khmer, Lao, and Thai. + * + * See the [Rust documentation for `new_lstm`](https://docs.rs/icu/2.0.0/icu/segmenter/struct.WordSegmenter.html#method.new_lstm) for more information. */ inline static std::unique_ptr create_lstm(); /** - * Construct an {@link WordSegmenter} with LSTM payload data for Burmese, Khmer, Lao, and - * Thai, using compiled data. - * - * Note: currently, it uses dictionary for Chinese and Japanese, and LSTM for Burmese, - * Khmer, Lao, and Thai. - * - * See the [Rust documentation for `try_new_lstm`](https://docs.rs/icu/2.0.0/icu/segmenter/struct.WordSegmenter.html#method.try_new_lstm) for more information. + * Construct an {@link WordSegmenter} with LSTM payload data for Burmese, Khmer, Lao, and + * Thai, using compiled data. + * + * Note: currently, it uses dictionary for Chinese and Japanese, and LSTM for Burmese, + * Khmer, Lao, and Thai. + * + * See the [Rust documentation for `try_new_lstm`](https://docs.rs/icu/2.0.0/icu/segmenter/struct.WordSegmenter.html#method.try_new_lstm) for more information. */ - inline static diplomat::result, icu4x::DataError> create_lstm_with_content_locale(const icu4x::Locale& locale); + inline static icu4x::diplomat::result, icu4x::DataError> create_lstm_with_content_locale(const icu4x::Locale& locale); /** - * Construct an {@link WordSegmenter} with LSTM payload data for Burmese, Khmer, Lao, and - * Thai, using a particular data source. - * - * Note: currently, it uses dictionary for Chinese and Japanese, and LSTM for Burmese, - * Khmer, Lao, and Thai. - * - * See the [Rust documentation for `try_new_lstm`](https://docs.rs/icu/2.0.0/icu/segmenter/struct.WordSegmenter.html#method.try_new_lstm) for more information. + * Construct an {@link WordSegmenter} with LSTM payload data for Burmese, Khmer, Lao, and + * Thai, using a particular data source. + * + * Note: currently, it uses dictionary for Chinese and Japanese, and LSTM for Burmese, + * Khmer, Lao, and Thai. + * + * See the [Rust documentation for `try_new_lstm`](https://docs.rs/icu/2.0.0/icu/segmenter/struct.WordSegmenter.html#method.try_new_lstm) for more information. */ - inline static diplomat::result, icu4x::DataError> create_lstm_with_content_locale_and_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale); + inline static icu4x::diplomat::result, icu4x::DataError> create_lstm_with_content_locale_and_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale); /** - * Construct an {@link WordSegmenter} with with dictionary payload data for Chinese, Japanese, - * Burmese, Khmer, Lao, and Thai, using compiled data. This does not assume any content locale. - * - * Note: currently, it uses dictionary for Chinese and Japanese, and dictionary for Burmese, - * Khmer, Lao, and Thai. - * - * See the [Rust documentation for `new_dictionary`](https://docs.rs/icu/2.0.0/icu/segmenter/struct.WordSegmenter.html#method.new_dictionary) for more information. + * Construct an {@link WordSegmenter} with with dictionary payload data for Chinese, Japanese, + * Burmese, Khmer, Lao, and Thai, using compiled data. This does not assume any content locale. + * + * Note: currently, it uses dictionary for Chinese and Japanese, and dictionary for Burmese, + * Khmer, Lao, and Thai. + * + * See the [Rust documentation for `new_dictionary`](https://docs.rs/icu/2.0.0/icu/segmenter/struct.WordSegmenter.html#method.new_dictionary) for more information. */ inline static std::unique_ptr create_dictionary(); /** - * Construct an {@link WordSegmenter} with dictionary payload data for Chinese, Japanese, - * Burmese, Khmer, Lao, and Thai, using compiled data. - * - * Note: currently, it uses dictionary for Chinese and Japanese, and dictionary for Burmese, - * Khmer, Lao, and Thai. - * - * See the [Rust documentation for `try_new_dictionary`](https://docs.rs/icu/2.0.0/icu/segmenter/struct.WordSegmenter.html#method.try_new_dictionary) for more information. + * Construct an {@link WordSegmenter} with dictionary payload data for Chinese, Japanese, + * Burmese, Khmer, Lao, and Thai, using compiled data. + * + * Note: currently, it uses dictionary for Chinese and Japanese, and dictionary for Burmese, + * Khmer, Lao, and Thai. + * + * See the [Rust documentation for `try_new_dictionary`](https://docs.rs/icu/2.0.0/icu/segmenter/struct.WordSegmenter.html#method.try_new_dictionary) for more information. */ - inline static diplomat::result, icu4x::DataError> create_dictionary_with_content_locale(const icu4x::Locale& locale); + inline static icu4x::diplomat::result, icu4x::DataError> create_dictionary_with_content_locale(const icu4x::Locale& locale); /** - * Construct an {@link WordSegmenter} with dictionary payload data for Chinese, Japanese, - * Burmese, Khmer, Lao, and Thai, using a particular data source. - * - * Note: currently, it uses dictionary for Chinese and Japanese, and dictionary for Burmese, - * Khmer, Lao, and Thai. - * - * See the [Rust documentation for `try_new_dictionary`](https://docs.rs/icu/2.0.0/icu/segmenter/struct.WordSegmenter.html#method.try_new_dictionary) for more information. + * Construct an {@link WordSegmenter} with dictionary payload data for Chinese, Japanese, + * Burmese, Khmer, Lao, and Thai, using a particular data source. + * + * Note: currently, it uses dictionary for Chinese and Japanese, and dictionary for Burmese, + * Khmer, Lao, and Thai. + * + * See the [Rust documentation for `try_new_dictionary`](https://docs.rs/icu/2.0.0/icu/segmenter/struct.WordSegmenter.html#method.try_new_dictionary) for more information. */ - inline static diplomat::result, icu4x::DataError> create_dictionary_with_content_locale_and_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale); + inline static icu4x::diplomat::result, icu4x::DataError> create_dictionary_with_content_locale_and_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale); /** - * Segments a string. - * - * Ill-formed input is treated as if errors had been replaced with REPLACEMENT CHARACTERs according - * to the WHATWG Encoding Standard. - * - * See the [Rust documentation for `segment_utf8`](https://docs.rs/icu/2.0.0/icu/segmenter/struct.WordSegmenterBorrowed.html#method.segment_utf8) for more information. + * Segments a string. + * + * Ill-formed input is treated as if errors had been replaced with REPLACEMENT CHARACTERs according + * to the WHATWG Encoding Standard. + * + * See the [Rust documentation for `segment_utf8`](https://docs.rs/icu/2.0.0/icu/segmenter/struct.WordSegmenterBorrowed.html#method.segment_utf8) for more information. */ inline std::unique_ptr segment(std::string_view input) const; /** - * Segments a string. - * - * Ill-formed input is treated as if errors had been replaced with REPLACEMENT CHARACTERs according - * to the WHATWG Encoding Standard. - * - * See the [Rust documentation for `segment_utf16`](https://docs.rs/icu/2.0.0/icu/segmenter/struct.WordSegmenterBorrowed.html#method.segment_utf16) for more information. + * Segments a string. + * + * Ill-formed input is treated as if errors had been replaced with REPLACEMENT CHARACTERs according + * to the WHATWG Encoding Standard. + * + * See the [Rust documentation for `segment_utf16`](https://docs.rs/icu/2.0.0/icu/segmenter/struct.WordSegmenterBorrowed.html#method.segment_utf16) for more information. */ inline std::unique_ptr segment16(std::u16string_view input) const; /** - * Segments a Latin-1 string. - * - * See the [Rust documentation for `segment_latin1`](https://docs.rs/icu/2.0.0/icu/segmenter/struct.WordSegmenterBorrowed.html#method.segment_latin1) for more information. + * Segments a Latin-1 string. + * + * See the [Rust documentation for `segment_latin1`](https://docs.rs/icu/2.0.0/icu/segmenter/struct.WordSegmenterBorrowed.html#method.segment_latin1) for more information. */ - inline std::unique_ptr segment_latin1(diplomat::span input) const; + inline std::unique_ptr segment_latin1(icu4x::diplomat::span input) const; inline const icu4x::capi::WordSegmenter* AsFFI() const; inline icu4x::capi::WordSegmenter* AsFFI(); @@ -184,4 +184,4 @@ class WordSegmenter { }; } // namespace -#endif // icu4x_WordSegmenter_D_HPP +#endif // ICU4X_WordSegmenter_D_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/WordSegmenter.hpp b/ffi/capi/bindings/cpp/icu4x/WordSegmenter.hpp index dd8c7109de2..b8d9c3c096d 100644 --- a/ffi/capi/bindings/cpp/icu4x/WordSegmenter.hpp +++ b/ffi/capi/bindings/cpp/icu4x/WordSegmenter.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_WordSegmenter_HPP -#define icu4x_WordSegmenter_HPP +#ifndef ICU4X_WordSegmenter_HPP +#define ICU4X_WordSegmenter_HPP #include "WordSegmenter.d.hpp" @@ -11,13 +11,13 @@ #include #include #include -#include "../diplomat_runtime.hpp" #include "DataError.hpp" #include "DataProvider.hpp" #include "Locale.hpp" #include "WordBreakIteratorLatin1.hpp" #include "WordBreakIteratorUtf16.hpp" #include "WordBreakIteratorUtf8.hpp" +#include "diplomat_runtime.hpp" namespace icu4x { @@ -48,11 +48,11 @@ namespace capi { typedef struct icu4x_WordSegmenter_create_dictionary_with_content_locale_and_provider_mv1_result {union {icu4x::capi::WordSegmenter* ok; icu4x::capi::DataError err;}; bool is_ok;} icu4x_WordSegmenter_create_dictionary_with_content_locale_and_provider_mv1_result; icu4x_WordSegmenter_create_dictionary_with_content_locale_and_provider_mv1_result icu4x_WordSegmenter_create_dictionary_with_content_locale_and_provider_mv1(const icu4x::capi::DataProvider* provider, const icu4x::capi::Locale* locale); - icu4x::capi::WordBreakIteratorUtf8* icu4x_WordSegmenter_segment_utf8_mv1(const icu4x::capi::WordSegmenter* self, diplomat::capi::DiplomatStringView input); + icu4x::capi::WordBreakIteratorUtf8* icu4x_WordSegmenter_segment_utf8_mv1(const icu4x::capi::WordSegmenter* self, icu4x::diplomat::capi::DiplomatStringView input); - icu4x::capi::WordBreakIteratorUtf16* icu4x_WordSegmenter_segment_utf16_mv1(const icu4x::capi::WordSegmenter* self, diplomat::capi::DiplomatString16View input); + icu4x::capi::WordBreakIteratorUtf16* icu4x_WordSegmenter_segment_utf16_mv1(const icu4x::capi::WordSegmenter* self, icu4x::diplomat::capi::DiplomatString16View input); - icu4x::capi::WordBreakIteratorLatin1* icu4x_WordSegmenter_segment_latin1_mv1(const icu4x::capi::WordSegmenter* self, diplomat::capi::DiplomatU8View input); + icu4x::capi::WordBreakIteratorLatin1* icu4x_WordSegmenter_segment_latin1_mv1(const icu4x::capi::WordSegmenter* self, icu4x::diplomat::capi::DiplomatU8View input); void icu4x_WordSegmenter_destroy_mv1(WordSegmenter* self); @@ -65,15 +65,15 @@ inline std::unique_ptr icu4x::WordSegmenter::create_auto() return std::unique_ptr(icu4x::WordSegmenter::FromFFI(result)); } -inline diplomat::result, icu4x::DataError> icu4x::WordSegmenter::create_auto_with_content_locale(const icu4x::Locale& locale) { +inline icu4x::diplomat::result, icu4x::DataError> icu4x::WordSegmenter::create_auto_with_content_locale(const icu4x::Locale& locale) { auto result = icu4x::capi::icu4x_WordSegmenter_create_auto_with_content_locale_mv1(locale.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DataError>(diplomat::Ok>(std::unique_ptr(icu4x::WordSegmenter::FromFFI(result.ok)))) : diplomat::result, icu4x::DataError>(diplomat::Err(icu4x::DataError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::WordSegmenter::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Err(icu4x::DataError::FromFFI(result.err))); } -inline diplomat::result, icu4x::DataError> icu4x::WordSegmenter::create_auto_with_content_locale_and_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale) { +inline icu4x::diplomat::result, icu4x::DataError> icu4x::WordSegmenter::create_auto_with_content_locale_and_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale) { auto result = icu4x::capi::icu4x_WordSegmenter_create_auto_with_content_locale_and_provider_mv1(provider.AsFFI(), locale.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DataError>(diplomat::Ok>(std::unique_ptr(icu4x::WordSegmenter::FromFFI(result.ok)))) : diplomat::result, icu4x::DataError>(diplomat::Err(icu4x::DataError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::WordSegmenter::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Err(icu4x::DataError::FromFFI(result.err))); } inline std::unique_ptr icu4x::WordSegmenter::create_lstm() { @@ -81,15 +81,15 @@ inline std::unique_ptr icu4x::WordSegmenter::create_lstm() return std::unique_ptr(icu4x::WordSegmenter::FromFFI(result)); } -inline diplomat::result, icu4x::DataError> icu4x::WordSegmenter::create_lstm_with_content_locale(const icu4x::Locale& locale) { +inline icu4x::diplomat::result, icu4x::DataError> icu4x::WordSegmenter::create_lstm_with_content_locale(const icu4x::Locale& locale) { auto result = icu4x::capi::icu4x_WordSegmenter_create_lstm_with_content_locale_mv1(locale.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DataError>(diplomat::Ok>(std::unique_ptr(icu4x::WordSegmenter::FromFFI(result.ok)))) : diplomat::result, icu4x::DataError>(diplomat::Err(icu4x::DataError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::WordSegmenter::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Err(icu4x::DataError::FromFFI(result.err))); } -inline diplomat::result, icu4x::DataError> icu4x::WordSegmenter::create_lstm_with_content_locale_and_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale) { +inline icu4x::diplomat::result, icu4x::DataError> icu4x::WordSegmenter::create_lstm_with_content_locale_and_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale) { auto result = icu4x::capi::icu4x_WordSegmenter_create_lstm_with_content_locale_and_provider_mv1(provider.AsFFI(), locale.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DataError>(diplomat::Ok>(std::unique_ptr(icu4x::WordSegmenter::FromFFI(result.ok)))) : diplomat::result, icu4x::DataError>(diplomat::Err(icu4x::DataError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::WordSegmenter::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Err(icu4x::DataError::FromFFI(result.err))); } inline std::unique_ptr icu4x::WordSegmenter::create_dictionary() { @@ -97,15 +97,15 @@ inline std::unique_ptr icu4x::WordSegmenter::create_dictio return std::unique_ptr(icu4x::WordSegmenter::FromFFI(result)); } -inline diplomat::result, icu4x::DataError> icu4x::WordSegmenter::create_dictionary_with_content_locale(const icu4x::Locale& locale) { +inline icu4x::diplomat::result, icu4x::DataError> icu4x::WordSegmenter::create_dictionary_with_content_locale(const icu4x::Locale& locale) { auto result = icu4x::capi::icu4x_WordSegmenter_create_dictionary_with_content_locale_mv1(locale.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DataError>(diplomat::Ok>(std::unique_ptr(icu4x::WordSegmenter::FromFFI(result.ok)))) : diplomat::result, icu4x::DataError>(diplomat::Err(icu4x::DataError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::WordSegmenter::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Err(icu4x::DataError::FromFFI(result.err))); } -inline diplomat::result, icu4x::DataError> icu4x::WordSegmenter::create_dictionary_with_content_locale_and_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale) { +inline icu4x::diplomat::result, icu4x::DataError> icu4x::WordSegmenter::create_dictionary_with_content_locale_and_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale) { auto result = icu4x::capi::icu4x_WordSegmenter_create_dictionary_with_content_locale_and_provider_mv1(provider.AsFFI(), locale.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DataError>(diplomat::Ok>(std::unique_ptr(icu4x::WordSegmenter::FromFFI(result.ok)))) : diplomat::result, icu4x::DataError>(diplomat::Err(icu4x::DataError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::WordSegmenter::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DataError>(icu4x::diplomat::Err(icu4x::DataError::FromFFI(result.err))); } inline std::unique_ptr icu4x::WordSegmenter::segment(std::string_view input) const { @@ -120,7 +120,7 @@ inline std::unique_ptr icu4x::WordSegmenter::segm return std::unique_ptr(icu4x::WordBreakIteratorUtf16::FromFFI(result)); } -inline std::unique_ptr icu4x::WordSegmenter::segment_latin1(diplomat::span input) const { +inline std::unique_ptr icu4x::WordSegmenter::segment_latin1(icu4x::diplomat::span input) const { auto result = icu4x::capi::icu4x_WordSegmenter_segment_latin1_mv1(this->AsFFI(), {input.data(), input.size()}); return std::unique_ptr(icu4x::WordBreakIteratorLatin1::FromFFI(result)); @@ -147,4 +147,4 @@ inline void icu4x::WordSegmenter::operator delete(void* ptr) { } -#endif // icu4x_WordSegmenter_HPP +#endif // ICU4X_WordSegmenter_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/YearStyle.d.hpp b/ffi/capi/bindings/cpp/icu4x/YearStyle.d.hpp index 9a719962733..c3b11dd50d4 100644 --- a/ffi/capi/bindings/cpp/icu4x/YearStyle.d.hpp +++ b/ffi/capi/bindings/cpp/icu4x/YearStyle.d.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_YearStyle_D_HPP -#define icu4x_YearStyle_D_HPP +#ifndef ICU4X_YearStyle_D_HPP +#define ICU4X_YearStyle_D_HPP #include #include @@ -9,7 +9,7 @@ #include #include #include -#include "../diplomat_runtime.hpp" +#include "diplomat_runtime.hpp" namespace icu4x { @@ -51,4 +51,4 @@ class YearStyle { }; } // namespace -#endif // icu4x_YearStyle_D_HPP +#endif // ICU4X_YearStyle_D_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/YearStyle.hpp b/ffi/capi/bindings/cpp/icu4x/YearStyle.hpp index c92a58d2322..f50bca9db35 100644 --- a/ffi/capi/bindings/cpp/icu4x/YearStyle.hpp +++ b/ffi/capi/bindings/cpp/icu4x/YearStyle.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_YearStyle_HPP -#define icu4x_YearStyle_HPP +#ifndef ICU4X_YearStyle_HPP +#define ICU4X_YearStyle_HPP #include "YearStyle.d.hpp" @@ -11,7 +11,7 @@ #include #include #include -#include "../diplomat_runtime.hpp" +#include "diplomat_runtime.hpp" namespace icu4x { @@ -36,4 +36,4 @@ inline icu4x::YearStyle icu4x::YearStyle::FromFFI(icu4x::capi::YearStyle c_enum) std::abort(); } } -#endif // icu4x_YearStyle_HPP +#endif // ICU4X_YearStyle_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/ZonedDateFormatter.d.hpp b/ffi/capi/bindings/cpp/icu4x/ZonedDateFormatter.d.hpp index ac38dae0534..263c67b5f1f 100644 --- a/ffi/capi/bindings/cpp/icu4x/ZonedDateFormatter.d.hpp +++ b/ffi/capi/bindings/cpp/icu4x/ZonedDateFormatter.d.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_ZonedDateFormatter_D_HPP -#define icu4x_ZonedDateFormatter_D_HPP +#ifndef ICU4X_ZonedDateFormatter_D_HPP +#define ICU4X_ZonedDateFormatter_D_HPP #include #include @@ -9,8 +9,7 @@ #include #include #include -#include "../diplomat_runtime.hpp" - +#include "diplomat_runtime.hpp" namespace icu4x { namespace capi { struct DataProvider; } class DataProvider; @@ -26,7 +25,8 @@ namespace capi { struct ZonedDateFormatter; } class ZonedDateFormatter; class DateTimeFormatterLoadError; class DateTimeWriteError; -} +} // namespace icu4x + namespace icu4x { @@ -43,171 +43,171 @@ class ZonedDateFormatter { public: /** - * Creates a zoned formatter based on a non-zoned formatter. - * - * Caution: The locale provided here must match the locale used to construct the non-zoned formatter, - * or else unexpected behavior may occur! - * - * See the [Rust documentation for `SpecificLong`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/zone/struct.SpecificLong.html) for more information. + * Creates a zoned formatter based on a non-zoned formatter. + * + * Caution: The locale provided here must match the locale used to construct the non-zoned formatter, + * or else unexpected behavior may occur! + * + * See the [Rust documentation for `SpecificLong`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/zone/struct.SpecificLong.html) for more information. */ - inline static diplomat::result, icu4x::DateTimeFormatterLoadError> create_specific_long(const icu4x::Locale& locale, const icu4x::DateFormatter& formatter); + inline static icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> create_specific_long(const icu4x::Locale& locale, const icu4x::DateFormatter& formatter); /** - * Creates a zoned formatter based on a non-zoned formatter. - * - * Caution: The locale provided here must match the locale used to construct the non-zoned formatter, - * or else unexpected behavior may occur! - * - * See the [Rust documentation for `SpecificLong`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/zone/struct.SpecificLong.html) for more information. + * Creates a zoned formatter based on a non-zoned formatter. + * + * Caution: The locale provided here must match the locale used to construct the non-zoned formatter, + * or else unexpected behavior may occur! + * + * See the [Rust documentation for `SpecificLong`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/zone/struct.SpecificLong.html) for more information. */ - inline static diplomat::result, icu4x::DateTimeFormatterLoadError> create_specific_long_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, const icu4x::DateFormatter& formatter); + inline static icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> create_specific_long_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, const icu4x::DateFormatter& formatter); /** - * Creates a zoned formatter based on a non-zoned formatter. - * - * Caution: The locale provided here must match the locale used to construct the non-zoned formatter, - * or else unexpected behavior may occur! - * - * See the [Rust documentation for `SpecificShort`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/zone/struct.SpecificShort.html) for more information. + * Creates a zoned formatter based on a non-zoned formatter. + * + * Caution: The locale provided here must match the locale used to construct the non-zoned formatter, + * or else unexpected behavior may occur! + * + * See the [Rust documentation for `SpecificShort`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/zone/struct.SpecificShort.html) for more information. */ - inline static diplomat::result, icu4x::DateTimeFormatterLoadError> create_specific_short(const icu4x::Locale& locale, const icu4x::DateFormatter& formatter); + inline static icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> create_specific_short(const icu4x::Locale& locale, const icu4x::DateFormatter& formatter); /** - * Creates a zoned formatter based on a non-zoned formatter. - * - * Caution: The locale provided here must match the locale used to construct the non-zoned formatter, - * or else unexpected behavior may occur! - * - * See the [Rust documentation for `SpecificShort`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/zone/struct.SpecificShort.html) for more information. + * Creates a zoned formatter based on a non-zoned formatter. + * + * Caution: The locale provided here must match the locale used to construct the non-zoned formatter, + * or else unexpected behavior may occur! + * + * See the [Rust documentation for `SpecificShort`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/zone/struct.SpecificShort.html) for more information. */ - inline static diplomat::result, icu4x::DateTimeFormatterLoadError> create_specific_short_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, const icu4x::DateFormatter& formatter); + inline static icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> create_specific_short_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, const icu4x::DateFormatter& formatter); /** - * Creates a zoned formatter based on a non-zoned formatter. - * - * Caution: The locale provided here must match the locale used to construct the non-zoned formatter, - * or else unexpected behavior may occur! - * - * See the [Rust documentation for `LocalizedOffsetLong`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/zone/struct.LocalizedOffsetLong.html) for more information. + * Creates a zoned formatter based on a non-zoned formatter. + * + * Caution: The locale provided here must match the locale used to construct the non-zoned formatter, + * or else unexpected behavior may occur! + * + * See the [Rust documentation for `LocalizedOffsetLong`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/zone/struct.LocalizedOffsetLong.html) for more information. */ - inline static diplomat::result, icu4x::DateTimeFormatterLoadError> create_localized_offset_long(const icu4x::Locale& locale, const icu4x::DateFormatter& formatter); + inline static icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> create_localized_offset_long(const icu4x::Locale& locale, const icu4x::DateFormatter& formatter); /** - * Creates a zoned formatter based on a non-zoned formatter. - * - * Caution: The locale provided here must match the locale used to construct the non-zoned formatter, - * or else unexpected behavior may occur! - * - * See the [Rust documentation for `LocalizedOffsetLong`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/zone/struct.LocalizedOffsetLong.html) for more information. + * Creates a zoned formatter based on a non-zoned formatter. + * + * Caution: The locale provided here must match the locale used to construct the non-zoned formatter, + * or else unexpected behavior may occur! + * + * See the [Rust documentation for `LocalizedOffsetLong`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/zone/struct.LocalizedOffsetLong.html) for more information. */ - inline static diplomat::result, icu4x::DateTimeFormatterLoadError> create_localized_offset_long_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, const icu4x::DateFormatter& formatter); + inline static icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> create_localized_offset_long_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, const icu4x::DateFormatter& formatter); /** - * Creates a zoned formatter based on a non-zoned formatter. - * - * Caution: The locale provided here must match the locale used to construct the non-zoned formatter, - * or else unexpected behavior may occur! - * - * See the [Rust documentation for `LocalizedOffsetShort`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/zone/struct.LocalizedOffsetShort.html) for more information. + * Creates a zoned formatter based on a non-zoned formatter. + * + * Caution: The locale provided here must match the locale used to construct the non-zoned formatter, + * or else unexpected behavior may occur! + * + * See the [Rust documentation for `LocalizedOffsetShort`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/zone/struct.LocalizedOffsetShort.html) for more information. */ - inline static diplomat::result, icu4x::DateTimeFormatterLoadError> create_localized_offset_short(const icu4x::Locale& locale, const icu4x::DateFormatter& formatter); + inline static icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> create_localized_offset_short(const icu4x::Locale& locale, const icu4x::DateFormatter& formatter); /** - * Creates a zoned formatter based on a non-zoned formatter. - * - * Caution: The locale provided here must match the locale used to construct the non-zoned formatter, - * or else unexpected behavior may occur! - * - * See the [Rust documentation for `LocalizedOffsetShort`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/zone/struct.LocalizedOffsetShort.html) for more information. + * Creates a zoned formatter based on a non-zoned formatter. + * + * Caution: The locale provided here must match the locale used to construct the non-zoned formatter, + * or else unexpected behavior may occur! + * + * See the [Rust documentation for `LocalizedOffsetShort`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/zone/struct.LocalizedOffsetShort.html) for more information. */ - inline static diplomat::result, icu4x::DateTimeFormatterLoadError> create_localized_offset_short_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, const icu4x::DateFormatter& formatter); + inline static icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> create_localized_offset_short_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, const icu4x::DateFormatter& formatter); /** - * Creates a zoned formatter based on a non-zoned formatter. - * - * Caution: The locale provided here must match the locale used to construct the non-zoned formatter, - * or else unexpected behavior may occur! - * - * See the [Rust documentation for `GenericLong`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/zone/struct.GenericLong.html) for more information. + * Creates a zoned formatter based on a non-zoned formatter. + * + * Caution: The locale provided here must match the locale used to construct the non-zoned formatter, + * or else unexpected behavior may occur! + * + * See the [Rust documentation for `GenericLong`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/zone/struct.GenericLong.html) for more information. */ - inline static diplomat::result, icu4x::DateTimeFormatterLoadError> create_generic_long(const icu4x::Locale& locale, const icu4x::DateFormatter& formatter); + inline static icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> create_generic_long(const icu4x::Locale& locale, const icu4x::DateFormatter& formatter); /** - * Creates a zoned formatter based on a non-zoned formatter. - * - * Caution: The locale provided here must match the locale used to construct the non-zoned formatter, - * or else unexpected behavior may occur! - * - * See the [Rust documentation for `GenericLong`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/zone/struct.GenericLong.html) for more information. + * Creates a zoned formatter based on a non-zoned formatter. + * + * Caution: The locale provided here must match the locale used to construct the non-zoned formatter, + * or else unexpected behavior may occur! + * + * See the [Rust documentation for `GenericLong`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/zone/struct.GenericLong.html) for more information. */ - inline static diplomat::result, icu4x::DateTimeFormatterLoadError> create_generic_long_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, const icu4x::DateFormatter& formatter); + inline static icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> create_generic_long_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, const icu4x::DateFormatter& formatter); /** - * Creates a zoned formatter based on a non-zoned formatter. - * - * Caution: The locale provided here must match the locale used to construct the non-zoned formatter, - * or else unexpected behavior may occur! - * - * See the [Rust documentation for `GenericShort`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/zone/struct.GenericShort.html) for more information. + * Creates a zoned formatter based on a non-zoned formatter. + * + * Caution: The locale provided here must match the locale used to construct the non-zoned formatter, + * or else unexpected behavior may occur! + * + * See the [Rust documentation for `GenericShort`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/zone/struct.GenericShort.html) for more information. */ - inline static diplomat::result, icu4x::DateTimeFormatterLoadError> create_generic_short(const icu4x::Locale& locale, const icu4x::DateFormatter& formatter); + inline static icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> create_generic_short(const icu4x::Locale& locale, const icu4x::DateFormatter& formatter); /** - * Creates a zoned formatter based on a non-zoned formatter. - * - * Caution: The locale provided here must match the locale used to construct the non-zoned formatter, - * or else unexpected behavior may occur! - * - * See the [Rust documentation for `GenericShort`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/zone/struct.GenericShort.html) for more information. + * Creates a zoned formatter based on a non-zoned formatter. + * + * Caution: The locale provided here must match the locale used to construct the non-zoned formatter, + * or else unexpected behavior may occur! + * + * See the [Rust documentation for `GenericShort`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/zone/struct.GenericShort.html) for more information. */ - inline static diplomat::result, icu4x::DateTimeFormatterLoadError> create_generic_short_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, const icu4x::DateFormatter& formatter); + inline static icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> create_generic_short_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, const icu4x::DateFormatter& formatter); /** - * Creates a zoned formatter based on a non-zoned formatter. - * - * Caution: The locale provided here must match the locale used to construct the non-zoned formatter, - * or else unexpected behavior may occur! - * - * See the [Rust documentation for `Location`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/zone/struct.Location.html) for more information. + * Creates a zoned formatter based on a non-zoned formatter. + * + * Caution: The locale provided here must match the locale used to construct the non-zoned formatter, + * or else unexpected behavior may occur! + * + * See the [Rust documentation for `Location`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/zone/struct.Location.html) for more information. */ - inline static diplomat::result, icu4x::DateTimeFormatterLoadError> create_location(const icu4x::Locale& locale, const icu4x::DateFormatter& formatter); + inline static icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> create_location(const icu4x::Locale& locale, const icu4x::DateFormatter& formatter); /** - * Creates a zoned formatter based on a non-zoned formatter. - * - * Caution: The locale provided here must match the locale used to construct the non-zoned formatter, - * or else unexpected behavior may occur! - * - * See the [Rust documentation for `Location`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/zone/struct.Location.html) for more information. + * Creates a zoned formatter based on a non-zoned formatter. + * + * Caution: The locale provided here must match the locale used to construct the non-zoned formatter, + * or else unexpected behavior may occur! + * + * See the [Rust documentation for `Location`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/zone/struct.Location.html) for more information. */ - inline static diplomat::result, icu4x::DateTimeFormatterLoadError> create_location_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, const icu4x::DateFormatter& formatter); + inline static icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> create_location_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, const icu4x::DateFormatter& formatter); /** - * Creates a zoned formatter based on a non-zoned formatter. - * - * Caution: The locale provided here must match the locale used to construct the non-zoned formatter, - * or else unexpected behavior may occur! - * - * See the [Rust documentation for `ExemplarCity`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/zone/struct.ExemplarCity.html) for more information. + * Creates a zoned formatter based on a non-zoned formatter. + * + * Caution: The locale provided here must match the locale used to construct the non-zoned formatter, + * or else unexpected behavior may occur! + * + * See the [Rust documentation for `ExemplarCity`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/zone/struct.ExemplarCity.html) for more information. */ - inline static diplomat::result, icu4x::DateTimeFormatterLoadError> create_exemplar_city(const icu4x::Locale& locale, const icu4x::DateFormatter& formatter); + inline static icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> create_exemplar_city(const icu4x::Locale& locale, const icu4x::DateFormatter& formatter); /** - * Creates a zoned formatter based on a non-zoned formatter. - * - * Caution: The locale provided here must match the locale used to construct the non-zoned formatter, - * or else unexpected behavior may occur! - * - * See the [Rust documentation for `ExemplarCity`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/zone/struct.ExemplarCity.html) for more information. + * Creates a zoned formatter based on a non-zoned formatter. + * + * Caution: The locale provided here must match the locale used to construct the non-zoned formatter, + * or else unexpected behavior may occur! + * + * See the [Rust documentation for `ExemplarCity`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/zone/struct.ExemplarCity.html) for more information. */ - inline static diplomat::result, icu4x::DateTimeFormatterLoadError> create_exemplar_city_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, const icu4x::DateFormatter& formatter); + inline static icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> create_exemplar_city_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, const icu4x::DateFormatter& formatter); /** - * See the [Rust documentation for `format`](https://docs.rs/icu/2.0.0/icu/datetime/struct.DateTimeFormatter.html#method.format) for more information. + * See the [Rust documentation for `format`](https://docs.rs/icu/2.0.0/icu/datetime/struct.DateTimeFormatter.html#method.format) for more information. */ - inline diplomat::result format_iso(const icu4x::IsoDate& iso_date, const icu4x::TimeZoneInfo& zone) const; + inline icu4x::diplomat::result format_iso(const icu4x::IsoDate& iso_date, const icu4x::TimeZoneInfo& zone) const; template - inline diplomat::result format_iso_write(const icu4x::IsoDate& iso_date, const icu4x::TimeZoneInfo& zone, W& writeable_output) const; + inline icu4x::diplomat::result format_iso_write(const icu4x::IsoDate& iso_date, const icu4x::TimeZoneInfo& zone, W& writeable_output) const; inline const icu4x::capi::ZonedDateFormatter* AsFFI() const; inline icu4x::capi::ZonedDateFormatter* AsFFI(); @@ -224,4 +224,4 @@ class ZonedDateFormatter { }; } // namespace -#endif // icu4x_ZonedDateFormatter_D_HPP +#endif // ICU4X_ZonedDateFormatter_D_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/ZonedDateFormatter.hpp b/ffi/capi/bindings/cpp/icu4x/ZonedDateFormatter.hpp index bb59446616e..262ae613362 100644 --- a/ffi/capi/bindings/cpp/icu4x/ZonedDateFormatter.hpp +++ b/ffi/capi/bindings/cpp/icu4x/ZonedDateFormatter.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_ZonedDateFormatter_HPP -#define icu4x_ZonedDateFormatter_HPP +#ifndef ICU4X_ZonedDateFormatter_HPP +#define ICU4X_ZonedDateFormatter_HPP #include "ZonedDateFormatter.d.hpp" @@ -11,7 +11,6 @@ #include #include #include -#include "../diplomat_runtime.hpp" #include "DataProvider.hpp" #include "DateFormatter.hpp" #include "DateTimeFormatterLoadError.hpp" @@ -19,6 +18,7 @@ #include "IsoDate.hpp" #include "Locale.hpp" #include "TimeZoneInfo.hpp" +#include "diplomat_runtime.hpp" namespace icu4x { @@ -74,7 +74,7 @@ namespace capi { icu4x_ZonedDateFormatter_create_exemplar_city_with_provider_mv1_result icu4x_ZonedDateFormatter_create_exemplar_city_with_provider_mv1(const icu4x::capi::DataProvider* provider, const icu4x::capi::Locale* locale, const icu4x::capi::DateFormatter* formatter); typedef struct icu4x_ZonedDateFormatter_format_iso_mv1_result {union { icu4x::capi::DateTimeWriteError err;}; bool is_ok;} icu4x_ZonedDateFormatter_format_iso_mv1_result; - icu4x_ZonedDateFormatter_format_iso_mv1_result icu4x_ZonedDateFormatter_format_iso_mv1(const icu4x::capi::ZonedDateFormatter* self, const icu4x::capi::IsoDate* iso_date, const icu4x::capi::TimeZoneInfo* zone, diplomat::capi::DiplomatWrite* write); + icu4x_ZonedDateFormatter_format_iso_mv1_result icu4x_ZonedDateFormatter_format_iso_mv1(const icu4x::capi::ZonedDateFormatter* self, const icu4x::capi::IsoDate* iso_date, const icu4x::capi::TimeZoneInfo* zone, icu4x::diplomat::capi::DiplomatWrite* write); void icu4x_ZonedDateFormatter_destroy_mv1(ZonedDateFormatter* self); @@ -82,127 +82,127 @@ namespace capi { } // namespace capi } // namespace -inline diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::ZonedDateFormatter::create_specific_long(const icu4x::Locale& locale, const icu4x::DateFormatter& formatter) { +inline icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::ZonedDateFormatter::create_specific_long(const icu4x::Locale& locale, const icu4x::DateFormatter& formatter) { auto result = icu4x::capi::icu4x_ZonedDateFormatter_create_specific_long_mv1(locale.AsFFI(), formatter.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Ok>(std::unique_ptr(icu4x::ZonedDateFormatter::FromFFI(result.ok)))) : diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::ZonedDateFormatter::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); } -inline diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::ZonedDateFormatter::create_specific_long_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, const icu4x::DateFormatter& formatter) { +inline icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::ZonedDateFormatter::create_specific_long_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, const icu4x::DateFormatter& formatter) { auto result = icu4x::capi::icu4x_ZonedDateFormatter_create_specific_long_with_provider_mv1(provider.AsFFI(), locale.AsFFI(), formatter.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Ok>(std::unique_ptr(icu4x::ZonedDateFormatter::FromFFI(result.ok)))) : diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::ZonedDateFormatter::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); } -inline diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::ZonedDateFormatter::create_specific_short(const icu4x::Locale& locale, const icu4x::DateFormatter& formatter) { +inline icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::ZonedDateFormatter::create_specific_short(const icu4x::Locale& locale, const icu4x::DateFormatter& formatter) { auto result = icu4x::capi::icu4x_ZonedDateFormatter_create_specific_short_mv1(locale.AsFFI(), formatter.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Ok>(std::unique_ptr(icu4x::ZonedDateFormatter::FromFFI(result.ok)))) : diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::ZonedDateFormatter::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); } -inline diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::ZonedDateFormatter::create_specific_short_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, const icu4x::DateFormatter& formatter) { +inline icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::ZonedDateFormatter::create_specific_short_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, const icu4x::DateFormatter& formatter) { auto result = icu4x::capi::icu4x_ZonedDateFormatter_create_specific_short_with_provider_mv1(provider.AsFFI(), locale.AsFFI(), formatter.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Ok>(std::unique_ptr(icu4x::ZonedDateFormatter::FromFFI(result.ok)))) : diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::ZonedDateFormatter::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); } -inline diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::ZonedDateFormatter::create_localized_offset_long(const icu4x::Locale& locale, const icu4x::DateFormatter& formatter) { +inline icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::ZonedDateFormatter::create_localized_offset_long(const icu4x::Locale& locale, const icu4x::DateFormatter& formatter) { auto result = icu4x::capi::icu4x_ZonedDateFormatter_create_localized_offset_long_mv1(locale.AsFFI(), formatter.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Ok>(std::unique_ptr(icu4x::ZonedDateFormatter::FromFFI(result.ok)))) : diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::ZonedDateFormatter::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); } -inline diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::ZonedDateFormatter::create_localized_offset_long_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, const icu4x::DateFormatter& formatter) { +inline icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::ZonedDateFormatter::create_localized_offset_long_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, const icu4x::DateFormatter& formatter) { auto result = icu4x::capi::icu4x_ZonedDateFormatter_create_localized_offset_long_with_provider_mv1(provider.AsFFI(), locale.AsFFI(), formatter.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Ok>(std::unique_ptr(icu4x::ZonedDateFormatter::FromFFI(result.ok)))) : diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::ZonedDateFormatter::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); } -inline diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::ZonedDateFormatter::create_localized_offset_short(const icu4x::Locale& locale, const icu4x::DateFormatter& formatter) { +inline icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::ZonedDateFormatter::create_localized_offset_short(const icu4x::Locale& locale, const icu4x::DateFormatter& formatter) { auto result = icu4x::capi::icu4x_ZonedDateFormatter_create_localized_offset_short_mv1(locale.AsFFI(), formatter.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Ok>(std::unique_ptr(icu4x::ZonedDateFormatter::FromFFI(result.ok)))) : diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::ZonedDateFormatter::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); } -inline diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::ZonedDateFormatter::create_localized_offset_short_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, const icu4x::DateFormatter& formatter) { +inline icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::ZonedDateFormatter::create_localized_offset_short_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, const icu4x::DateFormatter& formatter) { auto result = icu4x::capi::icu4x_ZonedDateFormatter_create_localized_offset_short_with_provider_mv1(provider.AsFFI(), locale.AsFFI(), formatter.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Ok>(std::unique_ptr(icu4x::ZonedDateFormatter::FromFFI(result.ok)))) : diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::ZonedDateFormatter::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); } -inline diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::ZonedDateFormatter::create_generic_long(const icu4x::Locale& locale, const icu4x::DateFormatter& formatter) { +inline icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::ZonedDateFormatter::create_generic_long(const icu4x::Locale& locale, const icu4x::DateFormatter& formatter) { auto result = icu4x::capi::icu4x_ZonedDateFormatter_create_generic_long_mv1(locale.AsFFI(), formatter.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Ok>(std::unique_ptr(icu4x::ZonedDateFormatter::FromFFI(result.ok)))) : diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::ZonedDateFormatter::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); } -inline diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::ZonedDateFormatter::create_generic_long_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, const icu4x::DateFormatter& formatter) { +inline icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::ZonedDateFormatter::create_generic_long_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, const icu4x::DateFormatter& formatter) { auto result = icu4x::capi::icu4x_ZonedDateFormatter_create_generic_long_with_provider_mv1(provider.AsFFI(), locale.AsFFI(), formatter.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Ok>(std::unique_ptr(icu4x::ZonedDateFormatter::FromFFI(result.ok)))) : diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::ZonedDateFormatter::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); } -inline diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::ZonedDateFormatter::create_generic_short(const icu4x::Locale& locale, const icu4x::DateFormatter& formatter) { +inline icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::ZonedDateFormatter::create_generic_short(const icu4x::Locale& locale, const icu4x::DateFormatter& formatter) { auto result = icu4x::capi::icu4x_ZonedDateFormatter_create_generic_short_mv1(locale.AsFFI(), formatter.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Ok>(std::unique_ptr(icu4x::ZonedDateFormatter::FromFFI(result.ok)))) : diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::ZonedDateFormatter::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); } -inline diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::ZonedDateFormatter::create_generic_short_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, const icu4x::DateFormatter& formatter) { +inline icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::ZonedDateFormatter::create_generic_short_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, const icu4x::DateFormatter& formatter) { auto result = icu4x::capi::icu4x_ZonedDateFormatter_create_generic_short_with_provider_mv1(provider.AsFFI(), locale.AsFFI(), formatter.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Ok>(std::unique_ptr(icu4x::ZonedDateFormatter::FromFFI(result.ok)))) : diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::ZonedDateFormatter::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); } -inline diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::ZonedDateFormatter::create_location(const icu4x::Locale& locale, const icu4x::DateFormatter& formatter) { +inline icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::ZonedDateFormatter::create_location(const icu4x::Locale& locale, const icu4x::DateFormatter& formatter) { auto result = icu4x::capi::icu4x_ZonedDateFormatter_create_location_mv1(locale.AsFFI(), formatter.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Ok>(std::unique_ptr(icu4x::ZonedDateFormatter::FromFFI(result.ok)))) : diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::ZonedDateFormatter::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); } -inline diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::ZonedDateFormatter::create_location_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, const icu4x::DateFormatter& formatter) { +inline icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::ZonedDateFormatter::create_location_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, const icu4x::DateFormatter& formatter) { auto result = icu4x::capi::icu4x_ZonedDateFormatter_create_location_with_provider_mv1(provider.AsFFI(), locale.AsFFI(), formatter.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Ok>(std::unique_ptr(icu4x::ZonedDateFormatter::FromFFI(result.ok)))) : diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::ZonedDateFormatter::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); } -inline diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::ZonedDateFormatter::create_exemplar_city(const icu4x::Locale& locale, const icu4x::DateFormatter& formatter) { +inline icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::ZonedDateFormatter::create_exemplar_city(const icu4x::Locale& locale, const icu4x::DateFormatter& formatter) { auto result = icu4x::capi::icu4x_ZonedDateFormatter_create_exemplar_city_mv1(locale.AsFFI(), formatter.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Ok>(std::unique_ptr(icu4x::ZonedDateFormatter::FromFFI(result.ok)))) : diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::ZonedDateFormatter::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); } -inline diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::ZonedDateFormatter::create_exemplar_city_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, const icu4x::DateFormatter& formatter) { +inline icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::ZonedDateFormatter::create_exemplar_city_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, const icu4x::DateFormatter& formatter) { auto result = icu4x::capi::icu4x_ZonedDateFormatter_create_exemplar_city_with_provider_mv1(provider.AsFFI(), locale.AsFFI(), formatter.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Ok>(std::unique_ptr(icu4x::ZonedDateFormatter::FromFFI(result.ok)))) : diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::ZonedDateFormatter::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); } -inline diplomat::result icu4x::ZonedDateFormatter::format_iso(const icu4x::IsoDate& iso_date, const icu4x::TimeZoneInfo& zone) const { +inline icu4x::diplomat::result icu4x::ZonedDateFormatter::format_iso(const icu4x::IsoDate& iso_date, const icu4x::TimeZoneInfo& zone) const { std::string output; - diplomat::capi::DiplomatWrite write = diplomat::WriteFromString(output); + icu4x::diplomat::capi::DiplomatWrite write = icu4x::diplomat::WriteFromString(output); auto result = icu4x::capi::icu4x_ZonedDateFormatter_format_iso_mv1(this->AsFFI(), iso_date.AsFFI(), zone.AsFFI(), &write); - return result.is_ok ? diplomat::result(diplomat::Ok(std::move(output))) : diplomat::result(diplomat::Err(icu4x::DateTimeWriteError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result(icu4x::diplomat::Ok(std::move(output))) : icu4x::diplomat::result(icu4x::diplomat::Err(icu4x::DateTimeWriteError::FromFFI(result.err))); } template -inline diplomat::result icu4x::ZonedDateFormatter::format_iso_write(const icu4x::IsoDate& iso_date, const icu4x::TimeZoneInfo& zone, W& writeable) const { - diplomat::capi::DiplomatWrite write = diplomat::WriteTrait::Construct(writeable); +inline icu4x::diplomat::result icu4x::ZonedDateFormatter::format_iso_write(const icu4x::IsoDate& iso_date, const icu4x::TimeZoneInfo& zone, W& writeable) const { + icu4x::diplomat::capi::DiplomatWrite write = icu4x::diplomat::WriteTrait::Construct(writeable); auto result = icu4x::capi::icu4x_ZonedDateFormatter_format_iso_mv1(this->AsFFI(), iso_date.AsFFI(), zone.AsFFI(), &write); - return result.is_ok ? diplomat::result(diplomat::Ok()) : diplomat::result(diplomat::Err(icu4x::DateTimeWriteError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result(icu4x::diplomat::Ok()) : icu4x::diplomat::result(icu4x::diplomat::Err(icu4x::DateTimeWriteError::FromFFI(result.err))); } inline const icu4x::capi::ZonedDateFormatter* icu4x::ZonedDateFormatter::AsFFI() const { @@ -226,4 +226,4 @@ inline void icu4x::ZonedDateFormatter::operator delete(void* ptr) { } -#endif // icu4x_ZonedDateFormatter_HPP +#endif // ICU4X_ZonedDateFormatter_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/ZonedDateFormatterGregorian.d.hpp b/ffi/capi/bindings/cpp/icu4x/ZonedDateFormatterGregorian.d.hpp index dfca87bbbe1..96c9bfca477 100644 --- a/ffi/capi/bindings/cpp/icu4x/ZonedDateFormatterGregorian.d.hpp +++ b/ffi/capi/bindings/cpp/icu4x/ZonedDateFormatterGregorian.d.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_ZonedDateFormatterGregorian_D_HPP -#define icu4x_ZonedDateFormatterGregorian_D_HPP +#ifndef ICU4X_ZonedDateFormatterGregorian_D_HPP +#define ICU4X_ZonedDateFormatterGregorian_D_HPP #include #include @@ -9,8 +9,7 @@ #include #include #include -#include "../diplomat_runtime.hpp" - +#include "diplomat_runtime.hpp" namespace icu4x { namespace capi { struct DataProvider; } class DataProvider; @@ -26,7 +25,8 @@ namespace capi { struct ZonedDateFormatterGregorian; } class ZonedDateFormatterGregorian; class DateTimeFormatterLoadError; class DateTimeWriteError; -} +} // namespace icu4x + namespace icu4x { @@ -43,171 +43,171 @@ class ZonedDateFormatterGregorian { public: /** - * Creates a zoned formatter based on a non-zoned formatter. - * - * Caution: The locale provided here must match the locale used to construct the non-zoned formatter, - * or else unexpected behavior may occur! - * - * See the [Rust documentation for `SpecificLong`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/zone/struct.SpecificLong.html) for more information. + * Creates a zoned formatter based on a non-zoned formatter. + * + * Caution: The locale provided here must match the locale used to construct the non-zoned formatter, + * or else unexpected behavior may occur! + * + * See the [Rust documentation for `SpecificLong`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/zone/struct.SpecificLong.html) for more information. */ - inline static diplomat::result, icu4x::DateTimeFormatterLoadError> create_specific_long(const icu4x::Locale& locale, const icu4x::DateFormatterGregorian& formatter); + inline static icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> create_specific_long(const icu4x::Locale& locale, const icu4x::DateFormatterGregorian& formatter); /** - * Creates a zoned formatter based on a non-zoned formatter. - * - * Caution: The locale provided here must match the locale used to construct the non-zoned formatter, - * or else unexpected behavior may occur! - * - * See the [Rust documentation for `SpecificLong`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/zone/struct.SpecificLong.html) for more information. + * Creates a zoned formatter based on a non-zoned formatter. + * + * Caution: The locale provided here must match the locale used to construct the non-zoned formatter, + * or else unexpected behavior may occur! + * + * See the [Rust documentation for `SpecificLong`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/zone/struct.SpecificLong.html) for more information. */ - inline static diplomat::result, icu4x::DateTimeFormatterLoadError> create_specific_long_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, const icu4x::DateFormatterGregorian& formatter); + inline static icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> create_specific_long_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, const icu4x::DateFormatterGregorian& formatter); /** - * Creates a zoned formatter based on a non-zoned formatter. - * - * Caution: The locale provided here must match the locale used to construct the non-zoned formatter, - * or else unexpected behavior may occur! - * - * See the [Rust documentation for `SpecificShort`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/zone/struct.SpecificShort.html) for more information. + * Creates a zoned formatter based on a non-zoned formatter. + * + * Caution: The locale provided here must match the locale used to construct the non-zoned formatter, + * or else unexpected behavior may occur! + * + * See the [Rust documentation for `SpecificShort`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/zone/struct.SpecificShort.html) for more information. */ - inline static diplomat::result, icu4x::DateTimeFormatterLoadError> create_specific_short(const icu4x::Locale& locale, const icu4x::DateFormatterGregorian& formatter); + inline static icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> create_specific_short(const icu4x::Locale& locale, const icu4x::DateFormatterGregorian& formatter); /** - * Creates a zoned formatter based on a non-zoned formatter. - * - * Caution: The locale provided here must match the locale used to construct the non-zoned formatter, - * or else unexpected behavior may occur! - * - * See the [Rust documentation for `SpecificShort`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/zone/struct.SpecificShort.html) for more information. + * Creates a zoned formatter based on a non-zoned formatter. + * + * Caution: The locale provided here must match the locale used to construct the non-zoned formatter, + * or else unexpected behavior may occur! + * + * See the [Rust documentation for `SpecificShort`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/zone/struct.SpecificShort.html) for more information. */ - inline static diplomat::result, icu4x::DateTimeFormatterLoadError> create_specific_short_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, const icu4x::DateFormatterGregorian& formatter); + inline static icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> create_specific_short_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, const icu4x::DateFormatterGregorian& formatter); /** - * Creates a zoned formatter based on a non-zoned formatter. - * - * Caution: The locale provided here must match the locale used to construct the non-zoned formatter, - * or else unexpected behavior may occur! - * - * See the [Rust documentation for `LocalizedOffsetLong`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/zone/struct.LocalizedOffsetLong.html) for more information. + * Creates a zoned formatter based on a non-zoned formatter. + * + * Caution: The locale provided here must match the locale used to construct the non-zoned formatter, + * or else unexpected behavior may occur! + * + * See the [Rust documentation for `LocalizedOffsetLong`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/zone/struct.LocalizedOffsetLong.html) for more information. */ - inline static diplomat::result, icu4x::DateTimeFormatterLoadError> create_localized_offset_long(const icu4x::Locale& locale, const icu4x::DateFormatterGregorian& formatter); + inline static icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> create_localized_offset_long(const icu4x::Locale& locale, const icu4x::DateFormatterGregorian& formatter); /** - * Creates a zoned formatter based on a non-zoned formatter. - * - * Caution: The locale provided here must match the locale used to construct the non-zoned formatter, - * or else unexpected behavior may occur! - * - * See the [Rust documentation for `LocalizedOffsetLong`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/zone/struct.LocalizedOffsetLong.html) for more information. + * Creates a zoned formatter based on a non-zoned formatter. + * + * Caution: The locale provided here must match the locale used to construct the non-zoned formatter, + * or else unexpected behavior may occur! + * + * See the [Rust documentation for `LocalizedOffsetLong`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/zone/struct.LocalizedOffsetLong.html) for more information. */ - inline static diplomat::result, icu4x::DateTimeFormatterLoadError> create_localized_offset_long_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, const icu4x::DateFormatterGregorian& formatter); + inline static icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> create_localized_offset_long_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, const icu4x::DateFormatterGregorian& formatter); /** - * Creates a zoned formatter based on a non-zoned formatter. - * - * Caution: The locale provided here must match the locale used to construct the non-zoned formatter, - * or else unexpected behavior may occur! - * - * See the [Rust documentation for `LocalizedOffsetShort`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/zone/struct.LocalizedOffsetShort.html) for more information. + * Creates a zoned formatter based on a non-zoned formatter. + * + * Caution: The locale provided here must match the locale used to construct the non-zoned formatter, + * or else unexpected behavior may occur! + * + * See the [Rust documentation for `LocalizedOffsetShort`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/zone/struct.LocalizedOffsetShort.html) for more information. */ - inline static diplomat::result, icu4x::DateTimeFormatterLoadError> create_localized_offset_short(const icu4x::Locale& locale, const icu4x::DateFormatterGregorian& formatter); + inline static icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> create_localized_offset_short(const icu4x::Locale& locale, const icu4x::DateFormatterGregorian& formatter); /** - * Creates a zoned formatter based on a non-zoned formatter. - * - * Caution: The locale provided here must match the locale used to construct the non-zoned formatter, - * or else unexpected behavior may occur! - * - * See the [Rust documentation for `LocalizedOffsetShort`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/zone/struct.LocalizedOffsetShort.html) for more information. + * Creates a zoned formatter based on a non-zoned formatter. + * + * Caution: The locale provided here must match the locale used to construct the non-zoned formatter, + * or else unexpected behavior may occur! + * + * See the [Rust documentation for `LocalizedOffsetShort`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/zone/struct.LocalizedOffsetShort.html) for more information. */ - inline static diplomat::result, icu4x::DateTimeFormatterLoadError> create_localized_offset_short_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, const icu4x::DateFormatterGregorian& formatter); + inline static icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> create_localized_offset_short_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, const icu4x::DateFormatterGregorian& formatter); /** - * Creates a zoned formatter based on a non-zoned formatter. - * - * Caution: The locale provided here must match the locale used to construct the non-zoned formatter, - * or else unexpected behavior may occur! - * - * See the [Rust documentation for `GenericLong`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/zone/struct.GenericLong.html) for more information. + * Creates a zoned formatter based on a non-zoned formatter. + * + * Caution: The locale provided here must match the locale used to construct the non-zoned formatter, + * or else unexpected behavior may occur! + * + * See the [Rust documentation for `GenericLong`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/zone/struct.GenericLong.html) for more information. */ - inline static diplomat::result, icu4x::DateTimeFormatterLoadError> create_generic_long(const icu4x::Locale& locale, const icu4x::DateFormatterGregorian& formatter); + inline static icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> create_generic_long(const icu4x::Locale& locale, const icu4x::DateFormatterGregorian& formatter); /** - * Creates a zoned formatter based on a non-zoned formatter. - * - * Caution: The locale provided here must match the locale used to construct the non-zoned formatter, - * or else unexpected behavior may occur! - * - * See the [Rust documentation for `GenericLong`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/zone/struct.GenericLong.html) for more information. + * Creates a zoned formatter based on a non-zoned formatter. + * + * Caution: The locale provided here must match the locale used to construct the non-zoned formatter, + * or else unexpected behavior may occur! + * + * See the [Rust documentation for `GenericLong`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/zone/struct.GenericLong.html) for more information. */ - inline static diplomat::result, icu4x::DateTimeFormatterLoadError> create_generic_long_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, const icu4x::DateFormatterGregorian& formatter); + inline static icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> create_generic_long_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, const icu4x::DateFormatterGregorian& formatter); /** - * Creates a zoned formatter based on a non-zoned formatter. - * - * Caution: The locale provided here must match the locale used to construct the non-zoned formatter, - * or else unexpected behavior may occur! - * - * See the [Rust documentation for `GenericShort`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/zone/struct.GenericShort.html) for more information. + * Creates a zoned formatter based on a non-zoned formatter. + * + * Caution: The locale provided here must match the locale used to construct the non-zoned formatter, + * or else unexpected behavior may occur! + * + * See the [Rust documentation for `GenericShort`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/zone/struct.GenericShort.html) for more information. */ - inline static diplomat::result, icu4x::DateTimeFormatterLoadError> create_generic_short(const icu4x::Locale& locale, const icu4x::DateFormatterGregorian& formatter); + inline static icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> create_generic_short(const icu4x::Locale& locale, const icu4x::DateFormatterGregorian& formatter); /** - * Creates a zoned formatter based on a non-zoned formatter. - * - * Caution: The locale provided here must match the locale used to construct the non-zoned formatter, - * or else unexpected behavior may occur! - * - * See the [Rust documentation for `GenericShort`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/zone/struct.GenericShort.html) for more information. + * Creates a zoned formatter based on a non-zoned formatter. + * + * Caution: The locale provided here must match the locale used to construct the non-zoned formatter, + * or else unexpected behavior may occur! + * + * See the [Rust documentation for `GenericShort`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/zone/struct.GenericShort.html) for more information. */ - inline static diplomat::result, icu4x::DateTimeFormatterLoadError> create_generic_short_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, const icu4x::DateFormatterGregorian& formatter); + inline static icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> create_generic_short_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, const icu4x::DateFormatterGregorian& formatter); /** - * Creates a zoned formatter based on a non-zoned formatter. - * - * Caution: The locale provided here must match the locale used to construct the non-zoned formatter, - * or else unexpected behavior may occur! - * - * See the [Rust documentation for `Location`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/zone/struct.Location.html) for more information. + * Creates a zoned formatter based on a non-zoned formatter. + * + * Caution: The locale provided here must match the locale used to construct the non-zoned formatter, + * or else unexpected behavior may occur! + * + * See the [Rust documentation for `Location`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/zone/struct.Location.html) for more information. */ - inline static diplomat::result, icu4x::DateTimeFormatterLoadError> create_location(const icu4x::Locale& locale, const icu4x::DateFormatterGregorian& formatter); + inline static icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> create_location(const icu4x::Locale& locale, const icu4x::DateFormatterGregorian& formatter); /** - * Creates a zoned formatter based on a non-zoned formatter. - * - * Caution: The locale provided here must match the locale used to construct the non-zoned formatter, - * or else unexpected behavior may occur! - * - * See the [Rust documentation for `Location`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/zone/struct.Location.html) for more information. + * Creates a zoned formatter based on a non-zoned formatter. + * + * Caution: The locale provided here must match the locale used to construct the non-zoned formatter, + * or else unexpected behavior may occur! + * + * See the [Rust documentation for `Location`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/zone/struct.Location.html) for more information. */ - inline static diplomat::result, icu4x::DateTimeFormatterLoadError> create_location_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, const icu4x::DateFormatterGregorian& formatter); + inline static icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> create_location_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, const icu4x::DateFormatterGregorian& formatter); /** - * Creates a zoned formatter based on a non-zoned formatter. - * - * Caution: The locale provided here must match the locale used to construct the non-zoned formatter, - * or else unexpected behavior may occur! - * - * See the [Rust documentation for `ExemplarCity`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/zone/struct.ExemplarCity.html) for more information. + * Creates a zoned formatter based on a non-zoned formatter. + * + * Caution: The locale provided here must match the locale used to construct the non-zoned formatter, + * or else unexpected behavior may occur! + * + * See the [Rust documentation for `ExemplarCity`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/zone/struct.ExemplarCity.html) for more information. */ - inline static diplomat::result, icu4x::DateTimeFormatterLoadError> create_exemplar_city(const icu4x::Locale& locale, const icu4x::DateFormatterGregorian& formatter); + inline static icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> create_exemplar_city(const icu4x::Locale& locale, const icu4x::DateFormatterGregorian& formatter); /** - * Creates a zoned formatter based on a non-zoned formatter. - * - * Caution: The locale provided here must match the locale used to construct the non-zoned formatter, - * or else unexpected behavior may occur! - * - * See the [Rust documentation for `ExemplarCity`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/zone/struct.ExemplarCity.html) for more information. + * Creates a zoned formatter based on a non-zoned formatter. + * + * Caution: The locale provided here must match the locale used to construct the non-zoned formatter, + * or else unexpected behavior may occur! + * + * See the [Rust documentation for `ExemplarCity`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/zone/struct.ExemplarCity.html) for more information. */ - inline static diplomat::result, icu4x::DateTimeFormatterLoadError> create_exemplar_city_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, const icu4x::DateFormatterGregorian& formatter); + inline static icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> create_exemplar_city_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, const icu4x::DateFormatterGregorian& formatter); /** - * See the [Rust documentation for `format`](https://docs.rs/icu/2.0.0/icu/datetime/struct.FixedCalendarDateTimeFormatter.html#method.format) for more information. + * See the [Rust documentation for `format`](https://docs.rs/icu/2.0.0/icu/datetime/struct.FixedCalendarDateTimeFormatter.html#method.format) for more information. */ - inline diplomat::result format_iso(const icu4x::IsoDate& iso_date, const icu4x::TimeZoneInfo& zone) const; + inline icu4x::diplomat::result format_iso(const icu4x::IsoDate& iso_date, const icu4x::TimeZoneInfo& zone) const; template - inline diplomat::result format_iso_write(const icu4x::IsoDate& iso_date, const icu4x::TimeZoneInfo& zone, W& writeable_output) const; + inline icu4x::diplomat::result format_iso_write(const icu4x::IsoDate& iso_date, const icu4x::TimeZoneInfo& zone, W& writeable_output) const; inline const icu4x::capi::ZonedDateFormatterGregorian* AsFFI() const; inline icu4x::capi::ZonedDateFormatterGregorian* AsFFI(); @@ -224,4 +224,4 @@ class ZonedDateFormatterGregorian { }; } // namespace -#endif // icu4x_ZonedDateFormatterGregorian_D_HPP +#endif // ICU4X_ZonedDateFormatterGregorian_D_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/ZonedDateFormatterGregorian.hpp b/ffi/capi/bindings/cpp/icu4x/ZonedDateFormatterGregorian.hpp index b24eae6035e..605edc022f6 100644 --- a/ffi/capi/bindings/cpp/icu4x/ZonedDateFormatterGregorian.hpp +++ b/ffi/capi/bindings/cpp/icu4x/ZonedDateFormatterGregorian.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_ZonedDateFormatterGregorian_HPP -#define icu4x_ZonedDateFormatterGregorian_HPP +#ifndef ICU4X_ZonedDateFormatterGregorian_HPP +#define ICU4X_ZonedDateFormatterGregorian_HPP #include "ZonedDateFormatterGregorian.d.hpp" @@ -11,7 +11,6 @@ #include #include #include -#include "../diplomat_runtime.hpp" #include "DataProvider.hpp" #include "DateFormatterGregorian.hpp" #include "DateTimeFormatterLoadError.hpp" @@ -19,6 +18,7 @@ #include "IsoDate.hpp" #include "Locale.hpp" #include "TimeZoneInfo.hpp" +#include "diplomat_runtime.hpp" namespace icu4x { @@ -74,7 +74,7 @@ namespace capi { icu4x_ZonedDateFormatterGregorian_create_exemplar_city_with_provider_mv1_result icu4x_ZonedDateFormatterGregorian_create_exemplar_city_with_provider_mv1(const icu4x::capi::DataProvider* provider, const icu4x::capi::Locale* locale, const icu4x::capi::DateFormatterGregorian* formatter); typedef struct icu4x_ZonedDateFormatterGregorian_format_iso_mv1_result {union { icu4x::capi::DateTimeWriteError err;}; bool is_ok;} icu4x_ZonedDateFormatterGregorian_format_iso_mv1_result; - icu4x_ZonedDateFormatterGregorian_format_iso_mv1_result icu4x_ZonedDateFormatterGregorian_format_iso_mv1(const icu4x::capi::ZonedDateFormatterGregorian* self, const icu4x::capi::IsoDate* iso_date, const icu4x::capi::TimeZoneInfo* zone, diplomat::capi::DiplomatWrite* write); + icu4x_ZonedDateFormatterGregorian_format_iso_mv1_result icu4x_ZonedDateFormatterGregorian_format_iso_mv1(const icu4x::capi::ZonedDateFormatterGregorian* self, const icu4x::capi::IsoDate* iso_date, const icu4x::capi::TimeZoneInfo* zone, icu4x::diplomat::capi::DiplomatWrite* write); void icu4x_ZonedDateFormatterGregorian_destroy_mv1(ZonedDateFormatterGregorian* self); @@ -82,127 +82,127 @@ namespace capi { } // namespace capi } // namespace -inline diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::ZonedDateFormatterGregorian::create_specific_long(const icu4x::Locale& locale, const icu4x::DateFormatterGregorian& formatter) { +inline icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::ZonedDateFormatterGregorian::create_specific_long(const icu4x::Locale& locale, const icu4x::DateFormatterGregorian& formatter) { auto result = icu4x::capi::icu4x_ZonedDateFormatterGregorian_create_specific_long_mv1(locale.AsFFI(), formatter.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Ok>(std::unique_ptr(icu4x::ZonedDateFormatterGregorian::FromFFI(result.ok)))) : diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::ZonedDateFormatterGregorian::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); } -inline diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::ZonedDateFormatterGregorian::create_specific_long_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, const icu4x::DateFormatterGregorian& formatter) { +inline icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::ZonedDateFormatterGregorian::create_specific_long_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, const icu4x::DateFormatterGregorian& formatter) { auto result = icu4x::capi::icu4x_ZonedDateFormatterGregorian_create_specific_long_with_provider_mv1(provider.AsFFI(), locale.AsFFI(), formatter.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Ok>(std::unique_ptr(icu4x::ZonedDateFormatterGregorian::FromFFI(result.ok)))) : diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::ZonedDateFormatterGregorian::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); } -inline diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::ZonedDateFormatterGregorian::create_specific_short(const icu4x::Locale& locale, const icu4x::DateFormatterGregorian& formatter) { +inline icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::ZonedDateFormatterGregorian::create_specific_short(const icu4x::Locale& locale, const icu4x::DateFormatterGregorian& formatter) { auto result = icu4x::capi::icu4x_ZonedDateFormatterGregorian_create_specific_short_mv1(locale.AsFFI(), formatter.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Ok>(std::unique_ptr(icu4x::ZonedDateFormatterGregorian::FromFFI(result.ok)))) : diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::ZonedDateFormatterGregorian::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); } -inline diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::ZonedDateFormatterGregorian::create_specific_short_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, const icu4x::DateFormatterGregorian& formatter) { +inline icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::ZonedDateFormatterGregorian::create_specific_short_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, const icu4x::DateFormatterGregorian& formatter) { auto result = icu4x::capi::icu4x_ZonedDateFormatterGregorian_create_specific_short_with_provider_mv1(provider.AsFFI(), locale.AsFFI(), formatter.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Ok>(std::unique_ptr(icu4x::ZonedDateFormatterGregorian::FromFFI(result.ok)))) : diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::ZonedDateFormatterGregorian::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); } -inline diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::ZonedDateFormatterGregorian::create_localized_offset_long(const icu4x::Locale& locale, const icu4x::DateFormatterGregorian& formatter) { +inline icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::ZonedDateFormatterGregorian::create_localized_offset_long(const icu4x::Locale& locale, const icu4x::DateFormatterGregorian& formatter) { auto result = icu4x::capi::icu4x_ZonedDateFormatterGregorian_create_localized_offset_long_mv1(locale.AsFFI(), formatter.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Ok>(std::unique_ptr(icu4x::ZonedDateFormatterGregorian::FromFFI(result.ok)))) : diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::ZonedDateFormatterGregorian::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); } -inline diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::ZonedDateFormatterGregorian::create_localized_offset_long_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, const icu4x::DateFormatterGregorian& formatter) { +inline icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::ZonedDateFormatterGregorian::create_localized_offset_long_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, const icu4x::DateFormatterGregorian& formatter) { auto result = icu4x::capi::icu4x_ZonedDateFormatterGregorian_create_localized_offset_long_with_provider_mv1(provider.AsFFI(), locale.AsFFI(), formatter.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Ok>(std::unique_ptr(icu4x::ZonedDateFormatterGregorian::FromFFI(result.ok)))) : diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::ZonedDateFormatterGregorian::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); } -inline diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::ZonedDateFormatterGregorian::create_localized_offset_short(const icu4x::Locale& locale, const icu4x::DateFormatterGregorian& formatter) { +inline icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::ZonedDateFormatterGregorian::create_localized_offset_short(const icu4x::Locale& locale, const icu4x::DateFormatterGregorian& formatter) { auto result = icu4x::capi::icu4x_ZonedDateFormatterGregorian_create_localized_offset_short_mv1(locale.AsFFI(), formatter.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Ok>(std::unique_ptr(icu4x::ZonedDateFormatterGregorian::FromFFI(result.ok)))) : diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::ZonedDateFormatterGregorian::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); } -inline diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::ZonedDateFormatterGregorian::create_localized_offset_short_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, const icu4x::DateFormatterGregorian& formatter) { +inline icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::ZonedDateFormatterGregorian::create_localized_offset_short_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, const icu4x::DateFormatterGregorian& formatter) { auto result = icu4x::capi::icu4x_ZonedDateFormatterGregorian_create_localized_offset_short_with_provider_mv1(provider.AsFFI(), locale.AsFFI(), formatter.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Ok>(std::unique_ptr(icu4x::ZonedDateFormatterGregorian::FromFFI(result.ok)))) : diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::ZonedDateFormatterGregorian::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); } -inline diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::ZonedDateFormatterGregorian::create_generic_long(const icu4x::Locale& locale, const icu4x::DateFormatterGregorian& formatter) { +inline icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::ZonedDateFormatterGregorian::create_generic_long(const icu4x::Locale& locale, const icu4x::DateFormatterGregorian& formatter) { auto result = icu4x::capi::icu4x_ZonedDateFormatterGregorian_create_generic_long_mv1(locale.AsFFI(), formatter.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Ok>(std::unique_ptr(icu4x::ZonedDateFormatterGregorian::FromFFI(result.ok)))) : diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::ZonedDateFormatterGregorian::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); } -inline diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::ZonedDateFormatterGregorian::create_generic_long_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, const icu4x::DateFormatterGregorian& formatter) { +inline icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::ZonedDateFormatterGregorian::create_generic_long_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, const icu4x::DateFormatterGregorian& formatter) { auto result = icu4x::capi::icu4x_ZonedDateFormatterGregorian_create_generic_long_with_provider_mv1(provider.AsFFI(), locale.AsFFI(), formatter.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Ok>(std::unique_ptr(icu4x::ZonedDateFormatterGregorian::FromFFI(result.ok)))) : diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::ZonedDateFormatterGregorian::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); } -inline diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::ZonedDateFormatterGregorian::create_generic_short(const icu4x::Locale& locale, const icu4x::DateFormatterGregorian& formatter) { +inline icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::ZonedDateFormatterGregorian::create_generic_short(const icu4x::Locale& locale, const icu4x::DateFormatterGregorian& formatter) { auto result = icu4x::capi::icu4x_ZonedDateFormatterGregorian_create_generic_short_mv1(locale.AsFFI(), formatter.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Ok>(std::unique_ptr(icu4x::ZonedDateFormatterGregorian::FromFFI(result.ok)))) : diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::ZonedDateFormatterGregorian::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); } -inline diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::ZonedDateFormatterGregorian::create_generic_short_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, const icu4x::DateFormatterGregorian& formatter) { +inline icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::ZonedDateFormatterGregorian::create_generic_short_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, const icu4x::DateFormatterGregorian& formatter) { auto result = icu4x::capi::icu4x_ZonedDateFormatterGregorian_create_generic_short_with_provider_mv1(provider.AsFFI(), locale.AsFFI(), formatter.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Ok>(std::unique_ptr(icu4x::ZonedDateFormatterGregorian::FromFFI(result.ok)))) : diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::ZonedDateFormatterGregorian::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); } -inline diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::ZonedDateFormatterGregorian::create_location(const icu4x::Locale& locale, const icu4x::DateFormatterGregorian& formatter) { +inline icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::ZonedDateFormatterGregorian::create_location(const icu4x::Locale& locale, const icu4x::DateFormatterGregorian& formatter) { auto result = icu4x::capi::icu4x_ZonedDateFormatterGregorian_create_location_mv1(locale.AsFFI(), formatter.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Ok>(std::unique_ptr(icu4x::ZonedDateFormatterGregorian::FromFFI(result.ok)))) : diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::ZonedDateFormatterGregorian::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); } -inline diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::ZonedDateFormatterGregorian::create_location_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, const icu4x::DateFormatterGregorian& formatter) { +inline icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::ZonedDateFormatterGregorian::create_location_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, const icu4x::DateFormatterGregorian& formatter) { auto result = icu4x::capi::icu4x_ZonedDateFormatterGregorian_create_location_with_provider_mv1(provider.AsFFI(), locale.AsFFI(), formatter.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Ok>(std::unique_ptr(icu4x::ZonedDateFormatterGregorian::FromFFI(result.ok)))) : diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::ZonedDateFormatterGregorian::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); } -inline diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::ZonedDateFormatterGregorian::create_exemplar_city(const icu4x::Locale& locale, const icu4x::DateFormatterGregorian& formatter) { +inline icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::ZonedDateFormatterGregorian::create_exemplar_city(const icu4x::Locale& locale, const icu4x::DateFormatterGregorian& formatter) { auto result = icu4x::capi::icu4x_ZonedDateFormatterGregorian_create_exemplar_city_mv1(locale.AsFFI(), formatter.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Ok>(std::unique_ptr(icu4x::ZonedDateFormatterGregorian::FromFFI(result.ok)))) : diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::ZonedDateFormatterGregorian::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); } -inline diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::ZonedDateFormatterGregorian::create_exemplar_city_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, const icu4x::DateFormatterGregorian& formatter) { +inline icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::ZonedDateFormatterGregorian::create_exemplar_city_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, const icu4x::DateFormatterGregorian& formatter) { auto result = icu4x::capi::icu4x_ZonedDateFormatterGregorian_create_exemplar_city_with_provider_mv1(provider.AsFFI(), locale.AsFFI(), formatter.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Ok>(std::unique_ptr(icu4x::ZonedDateFormatterGregorian::FromFFI(result.ok)))) : diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::ZonedDateFormatterGregorian::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); } -inline diplomat::result icu4x::ZonedDateFormatterGregorian::format_iso(const icu4x::IsoDate& iso_date, const icu4x::TimeZoneInfo& zone) const { +inline icu4x::diplomat::result icu4x::ZonedDateFormatterGregorian::format_iso(const icu4x::IsoDate& iso_date, const icu4x::TimeZoneInfo& zone) const { std::string output; - diplomat::capi::DiplomatWrite write = diplomat::WriteFromString(output); + icu4x::diplomat::capi::DiplomatWrite write = icu4x::diplomat::WriteFromString(output); auto result = icu4x::capi::icu4x_ZonedDateFormatterGregorian_format_iso_mv1(this->AsFFI(), iso_date.AsFFI(), zone.AsFFI(), &write); - return result.is_ok ? diplomat::result(diplomat::Ok(std::move(output))) : diplomat::result(diplomat::Err(icu4x::DateTimeWriteError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result(icu4x::diplomat::Ok(std::move(output))) : icu4x::diplomat::result(icu4x::diplomat::Err(icu4x::DateTimeWriteError::FromFFI(result.err))); } template -inline diplomat::result icu4x::ZonedDateFormatterGregorian::format_iso_write(const icu4x::IsoDate& iso_date, const icu4x::TimeZoneInfo& zone, W& writeable) const { - diplomat::capi::DiplomatWrite write = diplomat::WriteTrait::Construct(writeable); +inline icu4x::diplomat::result icu4x::ZonedDateFormatterGregorian::format_iso_write(const icu4x::IsoDate& iso_date, const icu4x::TimeZoneInfo& zone, W& writeable) const { + icu4x::diplomat::capi::DiplomatWrite write = icu4x::diplomat::WriteTrait::Construct(writeable); auto result = icu4x::capi::icu4x_ZonedDateFormatterGregorian_format_iso_mv1(this->AsFFI(), iso_date.AsFFI(), zone.AsFFI(), &write); - return result.is_ok ? diplomat::result(diplomat::Ok()) : diplomat::result(diplomat::Err(icu4x::DateTimeWriteError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result(icu4x::diplomat::Ok()) : icu4x::diplomat::result(icu4x::diplomat::Err(icu4x::DateTimeWriteError::FromFFI(result.err))); } inline const icu4x::capi::ZonedDateFormatterGregorian* icu4x::ZonedDateFormatterGregorian::AsFFI() const { @@ -226,4 +226,4 @@ inline void icu4x::ZonedDateFormatterGregorian::operator delete(void* ptr) { } -#endif // icu4x_ZonedDateFormatterGregorian_HPP +#endif // ICU4X_ZonedDateFormatterGregorian_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/ZonedDateTime.d.hpp b/ffi/capi/bindings/cpp/icu4x/ZonedDateTime.d.hpp index 991bd9e92cf..48289d06c02 100644 --- a/ffi/capi/bindings/cpp/icu4x/ZonedDateTime.d.hpp +++ b/ffi/capi/bindings/cpp/icu4x/ZonedDateTime.d.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_ZonedDateTime_D_HPP -#define icu4x_ZonedDateTime_D_HPP +#ifndef ICU4X_ZonedDateTime_D_HPP +#define ICU4X_ZonedDateTime_D_HPP #include #include @@ -9,8 +9,7 @@ #include #include #include -#include "../diplomat_runtime.hpp" - +#include "diplomat_runtime.hpp" namespace icu4x { namespace capi { struct Calendar; } class Calendar; @@ -26,7 +25,8 @@ namespace capi { struct VariantOffsetsCalculator; } class VariantOffsetsCalculator; struct ZonedDateTime; class Rfc9557ParseError; -} +} // namespace icu4x + namespace icu4x { @@ -54,46 +54,46 @@ struct ZonedDateTime { std::unique_ptr zone; /** - * Creates a new {@link ZonedIsoDateTime} from an IXDTF string. - * - * See the [Rust documentation for `try_strict_from_str`](https://docs.rs/icu/2.0.0/icu/time/struct.ZonedDateTime.html#method.try_strict_from_str) for more information. + * Creates a new {@link ZonedIsoDateTime} from an IXDTF string. + * + * See the [Rust documentation for `try_strict_from_str`](https://docs.rs/icu/2.0.0/icu/time/struct.ZonedDateTime.html#method.try_strict_from_str) for more information. */ - inline static diplomat::result strict_from_string(std::string_view v, const icu4x::Calendar& calendar, const icu4x::IanaParser& iana_parser); + inline static icu4x::diplomat::result strict_from_string(std::string_view v, const icu4x::Calendar& calendar, const icu4x::IanaParser& iana_parser); /** - * Creates a new {@link ZonedDateTime} from an IXDTF string. - * - * See the [Rust documentation for `try_full_from_str`](https://docs.rs/icu/2.0.0/icu/time/struct.ZonedDateTime.html#method.try_full_from_str) for more information. - * - * \deprecated use strict_from_string + * Creates a new {@link ZonedDateTime} from an IXDTF string. + * + * See the [Rust documentation for `try_full_from_str`](https://docs.rs/icu/2.0.0/icu/time/struct.ZonedDateTime.html#method.try_full_from_str) for more information. + * + * \deprecated use strict_from_string */ [[deprecated("use strict_from_string")]] - inline static diplomat::result full_from_string(std::string_view v, const icu4x::Calendar& calendar, const icu4x::IanaParser& iana_parser, const icu4x::VariantOffsetsCalculator& _offset_calculator); + inline static icu4x::diplomat::result full_from_string(std::string_view v, const icu4x::Calendar& calendar, const icu4x::IanaParser& iana_parser, const icu4x::VariantOffsetsCalculator& _offset_calculator); /** - * Creates a new {@link ZonedDateTime} from a location-only IXDTF string. - * - * See the [Rust documentation for `try_location_only_from_str`](https://docs.rs/icu/2.0.0/icu/time/struct.ZonedDateTime.html#method.try_location_only_from_str) for more information. + * Creates a new {@link ZonedDateTime} from a location-only IXDTF string. + * + * See the [Rust documentation for `try_location_only_from_str`](https://docs.rs/icu/2.0.0/icu/time/struct.ZonedDateTime.html#method.try_location_only_from_str) for more information. */ - inline static diplomat::result location_only_from_string(std::string_view v, const icu4x::Calendar& calendar, const icu4x::IanaParser& iana_parser); + inline static icu4x::diplomat::result location_only_from_string(std::string_view v, const icu4x::Calendar& calendar, const icu4x::IanaParser& iana_parser); /** - * Creates a new {@link ZonedDateTime} from an offset-only IXDTF string. - * - * See the [Rust documentation for `try_offset_only_from_str`](https://docs.rs/icu/2.0.0/icu/time/struct.ZonedDateTime.html#method.try_offset_only_from_str) for more information. + * Creates a new {@link ZonedDateTime} from an offset-only IXDTF string. + * + * See the [Rust documentation for `try_offset_only_from_str`](https://docs.rs/icu/2.0.0/icu/time/struct.ZonedDateTime.html#method.try_offset_only_from_str) for more information. */ - inline static diplomat::result offset_only_from_string(std::string_view v, const icu4x::Calendar& calendar); + inline static icu4x::diplomat::result offset_only_from_string(std::string_view v, const icu4x::Calendar& calendar); /** - * Creates a new {@link ZonedDateTime} from an IXDTF string, without requiring the offset. - * - * See the [Rust documentation for `try_lenient_from_str`](https://docs.rs/icu/2.0.0/icu/time/struct.ZonedDateTime.html#method.try_lenient_from_str) for more information. + * Creates a new {@link ZonedDateTime} from an IXDTF string, without requiring the offset. + * + * See the [Rust documentation for `try_lenient_from_str`](https://docs.rs/icu/2.0.0/icu/time/struct.ZonedDateTime.html#method.try_lenient_from_str) for more information. */ - inline static diplomat::result lenient_from_string(std::string_view v, const icu4x::Calendar& calendar, const icu4x::IanaParser& iana_parser); + inline static icu4x::diplomat::result lenient_from_string(std::string_view v, const icu4x::Calendar& calendar, const icu4x::IanaParser& iana_parser); inline icu4x::capi::ZonedDateTime AsFFI() const; inline static icu4x::ZonedDateTime FromFFI(icu4x::capi::ZonedDateTime c_struct); }; } // namespace -#endif // icu4x_ZonedDateTime_D_HPP +#endif // ICU4X_ZonedDateTime_D_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/ZonedDateTime.hpp b/ffi/capi/bindings/cpp/icu4x/ZonedDateTime.hpp index b1ebca9731c..0253ce318d1 100644 --- a/ffi/capi/bindings/cpp/icu4x/ZonedDateTime.hpp +++ b/ffi/capi/bindings/cpp/icu4x/ZonedDateTime.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_ZonedDateTime_HPP -#define icu4x_ZonedDateTime_HPP +#ifndef ICU4X_ZonedDateTime_HPP +#define ICU4X_ZonedDateTime_HPP #include "ZonedDateTime.d.hpp" @@ -11,7 +11,6 @@ #include #include #include -#include "../diplomat_runtime.hpp" #include "Calendar.hpp" #include "Date.hpp" #include "IanaParser.hpp" @@ -19,6 +18,7 @@ #include "Time.hpp" #include "TimeZoneInfo.hpp" #include "VariantOffsetsCalculator.hpp" +#include "diplomat_runtime.hpp" namespace icu4x { @@ -26,57 +26,57 @@ namespace capi { extern "C" { typedef struct icu4x_ZonedDateTime_strict_from_string_mv1_result {union {icu4x::capi::ZonedDateTime ok; icu4x::capi::Rfc9557ParseError err;}; bool is_ok;} icu4x_ZonedDateTime_strict_from_string_mv1_result; - icu4x_ZonedDateTime_strict_from_string_mv1_result icu4x_ZonedDateTime_strict_from_string_mv1(diplomat::capi::DiplomatStringView v, const icu4x::capi::Calendar* calendar, const icu4x::capi::IanaParser* iana_parser); + icu4x_ZonedDateTime_strict_from_string_mv1_result icu4x_ZonedDateTime_strict_from_string_mv1(icu4x::diplomat::capi::DiplomatStringView v, const icu4x::capi::Calendar* calendar, const icu4x::capi::IanaParser* iana_parser); typedef struct icu4x_ZonedDateTime_full_from_string_mv1_result {union {icu4x::capi::ZonedDateTime ok; icu4x::capi::Rfc9557ParseError err;}; bool is_ok;} icu4x_ZonedDateTime_full_from_string_mv1_result; - icu4x_ZonedDateTime_full_from_string_mv1_result icu4x_ZonedDateTime_full_from_string_mv1(diplomat::capi::DiplomatStringView v, const icu4x::capi::Calendar* calendar, const icu4x::capi::IanaParser* iana_parser, const icu4x::capi::VariantOffsetsCalculator* _offset_calculator); + icu4x_ZonedDateTime_full_from_string_mv1_result icu4x_ZonedDateTime_full_from_string_mv1(icu4x::diplomat::capi::DiplomatStringView v, const icu4x::capi::Calendar* calendar, const icu4x::capi::IanaParser* iana_parser, const icu4x::capi::VariantOffsetsCalculator* _offset_calculator); typedef struct icu4x_ZonedDateTime_location_only_from_string_mv1_result {union {icu4x::capi::ZonedDateTime ok; icu4x::capi::Rfc9557ParseError err;}; bool is_ok;} icu4x_ZonedDateTime_location_only_from_string_mv1_result; - icu4x_ZonedDateTime_location_only_from_string_mv1_result icu4x_ZonedDateTime_location_only_from_string_mv1(diplomat::capi::DiplomatStringView v, const icu4x::capi::Calendar* calendar, const icu4x::capi::IanaParser* iana_parser); + icu4x_ZonedDateTime_location_only_from_string_mv1_result icu4x_ZonedDateTime_location_only_from_string_mv1(icu4x::diplomat::capi::DiplomatStringView v, const icu4x::capi::Calendar* calendar, const icu4x::capi::IanaParser* iana_parser); typedef struct icu4x_ZonedDateTime_offset_only_from_string_mv1_result {union {icu4x::capi::ZonedDateTime ok; icu4x::capi::Rfc9557ParseError err;}; bool is_ok;} icu4x_ZonedDateTime_offset_only_from_string_mv1_result; - icu4x_ZonedDateTime_offset_only_from_string_mv1_result icu4x_ZonedDateTime_offset_only_from_string_mv1(diplomat::capi::DiplomatStringView v, const icu4x::capi::Calendar* calendar); + icu4x_ZonedDateTime_offset_only_from_string_mv1_result icu4x_ZonedDateTime_offset_only_from_string_mv1(icu4x::diplomat::capi::DiplomatStringView v, const icu4x::capi::Calendar* calendar); typedef struct icu4x_ZonedDateTime_lenient_from_string_mv1_result {union {icu4x::capi::ZonedDateTime ok; icu4x::capi::Rfc9557ParseError err;}; bool is_ok;} icu4x_ZonedDateTime_lenient_from_string_mv1_result; - icu4x_ZonedDateTime_lenient_from_string_mv1_result icu4x_ZonedDateTime_lenient_from_string_mv1(diplomat::capi::DiplomatStringView v, const icu4x::capi::Calendar* calendar, const icu4x::capi::IanaParser* iana_parser); + icu4x_ZonedDateTime_lenient_from_string_mv1_result icu4x_ZonedDateTime_lenient_from_string_mv1(icu4x::diplomat::capi::DiplomatStringView v, const icu4x::capi::Calendar* calendar, const icu4x::capi::IanaParser* iana_parser); } // extern "C" } // namespace capi } // namespace -inline diplomat::result icu4x::ZonedDateTime::strict_from_string(std::string_view v, const icu4x::Calendar& calendar, const icu4x::IanaParser& iana_parser) { +inline icu4x::diplomat::result icu4x::ZonedDateTime::strict_from_string(std::string_view v, const icu4x::Calendar& calendar, const icu4x::IanaParser& iana_parser) { auto result = icu4x::capi::icu4x_ZonedDateTime_strict_from_string_mv1({v.data(), v.size()}, calendar.AsFFI(), iana_parser.AsFFI()); - return result.is_ok ? diplomat::result(diplomat::Ok(icu4x::ZonedDateTime::FromFFI(result.ok))) : diplomat::result(diplomat::Err(icu4x::Rfc9557ParseError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result(icu4x::diplomat::Ok(icu4x::ZonedDateTime::FromFFI(result.ok))) : icu4x::diplomat::result(icu4x::diplomat::Err(icu4x::Rfc9557ParseError::FromFFI(result.err))); } -inline diplomat::result icu4x::ZonedDateTime::full_from_string(std::string_view v, const icu4x::Calendar& calendar, const icu4x::IanaParser& iana_parser, const icu4x::VariantOffsetsCalculator& _offset_calculator) { +inline icu4x::diplomat::result icu4x::ZonedDateTime::full_from_string(std::string_view v, const icu4x::Calendar& calendar, const icu4x::IanaParser& iana_parser, const icu4x::VariantOffsetsCalculator& _offset_calculator) { auto result = icu4x::capi::icu4x_ZonedDateTime_full_from_string_mv1({v.data(), v.size()}, calendar.AsFFI(), iana_parser.AsFFI(), _offset_calculator.AsFFI()); - return result.is_ok ? diplomat::result(diplomat::Ok(icu4x::ZonedDateTime::FromFFI(result.ok))) : diplomat::result(diplomat::Err(icu4x::Rfc9557ParseError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result(icu4x::diplomat::Ok(icu4x::ZonedDateTime::FromFFI(result.ok))) : icu4x::diplomat::result(icu4x::diplomat::Err(icu4x::Rfc9557ParseError::FromFFI(result.err))); } -inline diplomat::result icu4x::ZonedDateTime::location_only_from_string(std::string_view v, const icu4x::Calendar& calendar, const icu4x::IanaParser& iana_parser) { +inline icu4x::diplomat::result icu4x::ZonedDateTime::location_only_from_string(std::string_view v, const icu4x::Calendar& calendar, const icu4x::IanaParser& iana_parser) { auto result = icu4x::capi::icu4x_ZonedDateTime_location_only_from_string_mv1({v.data(), v.size()}, calendar.AsFFI(), iana_parser.AsFFI()); - return result.is_ok ? diplomat::result(diplomat::Ok(icu4x::ZonedDateTime::FromFFI(result.ok))) : diplomat::result(diplomat::Err(icu4x::Rfc9557ParseError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result(icu4x::diplomat::Ok(icu4x::ZonedDateTime::FromFFI(result.ok))) : icu4x::diplomat::result(icu4x::diplomat::Err(icu4x::Rfc9557ParseError::FromFFI(result.err))); } -inline diplomat::result icu4x::ZonedDateTime::offset_only_from_string(std::string_view v, const icu4x::Calendar& calendar) { +inline icu4x::diplomat::result icu4x::ZonedDateTime::offset_only_from_string(std::string_view v, const icu4x::Calendar& calendar) { auto result = icu4x::capi::icu4x_ZonedDateTime_offset_only_from_string_mv1({v.data(), v.size()}, calendar.AsFFI()); - return result.is_ok ? diplomat::result(diplomat::Ok(icu4x::ZonedDateTime::FromFFI(result.ok))) : diplomat::result(diplomat::Err(icu4x::Rfc9557ParseError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result(icu4x::diplomat::Ok(icu4x::ZonedDateTime::FromFFI(result.ok))) : icu4x::diplomat::result(icu4x::diplomat::Err(icu4x::Rfc9557ParseError::FromFFI(result.err))); } -inline diplomat::result icu4x::ZonedDateTime::lenient_from_string(std::string_view v, const icu4x::Calendar& calendar, const icu4x::IanaParser& iana_parser) { +inline icu4x::diplomat::result icu4x::ZonedDateTime::lenient_from_string(std::string_view v, const icu4x::Calendar& calendar, const icu4x::IanaParser& iana_parser) { auto result = icu4x::capi::icu4x_ZonedDateTime_lenient_from_string_mv1({v.data(), v.size()}, calendar.AsFFI(), iana_parser.AsFFI()); - return result.is_ok ? diplomat::result(diplomat::Ok(icu4x::ZonedDateTime::FromFFI(result.ok))) : diplomat::result(diplomat::Err(icu4x::Rfc9557ParseError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result(icu4x::diplomat::Ok(icu4x::ZonedDateTime::FromFFI(result.ok))) : icu4x::diplomat::result(icu4x::diplomat::Err(icu4x::Rfc9557ParseError::FromFFI(result.err))); } @@ -97,4 +97,4 @@ inline icu4x::ZonedDateTime icu4x::ZonedDateTime::FromFFI(icu4x::capi::ZonedDate } -#endif // icu4x_ZonedDateTime_HPP +#endif // ICU4X_ZonedDateTime_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/ZonedDateTimeFormatter.d.hpp b/ffi/capi/bindings/cpp/icu4x/ZonedDateTimeFormatter.d.hpp index 212627fd8f9..3a8b27a29e2 100644 --- a/ffi/capi/bindings/cpp/icu4x/ZonedDateTimeFormatter.d.hpp +++ b/ffi/capi/bindings/cpp/icu4x/ZonedDateTimeFormatter.d.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_ZonedDateTimeFormatter_D_HPP -#define icu4x_ZonedDateTimeFormatter_D_HPP +#ifndef ICU4X_ZonedDateTimeFormatter_D_HPP +#define ICU4X_ZonedDateTimeFormatter_D_HPP #include #include @@ -9,8 +9,7 @@ #include #include #include -#include "../diplomat_runtime.hpp" - +#include "diplomat_runtime.hpp" namespace icu4x { namespace capi { struct DataProvider; } class DataProvider; @@ -28,7 +27,8 @@ namespace capi { struct ZonedDateTimeFormatter; } class ZonedDateTimeFormatter; class DateTimeFormatterLoadError; class DateTimeWriteError; -} +} // namespace icu4x + namespace icu4x { @@ -45,171 +45,171 @@ class ZonedDateTimeFormatter { public: /** - * Creates a zoned formatter based on a non-zoned formatter. - * - * Caution: The locale provided here must match the locale used to construct the non-zoned formatter, - * or else unexpected behavior may occur! - * - * See the [Rust documentation for `SpecificLong`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/zone/struct.SpecificLong.html) for more information. + * Creates a zoned formatter based on a non-zoned formatter. + * + * Caution: The locale provided here must match the locale used to construct the non-zoned formatter, + * or else unexpected behavior may occur! + * + * See the [Rust documentation for `SpecificLong`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/zone/struct.SpecificLong.html) for more information. */ - inline static diplomat::result, icu4x::DateTimeFormatterLoadError> create_specific_long(const icu4x::Locale& locale, const icu4x::DateTimeFormatter& formatter); + inline static icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> create_specific_long(const icu4x::Locale& locale, const icu4x::DateTimeFormatter& formatter); /** - * Creates a zoned formatter based on a non-zoned formatter. - * - * Caution: The locale provided here must match the locale used to construct the non-zoned formatter, - * or else unexpected behavior may occur! - * - * See the [Rust documentation for `SpecificLong`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/zone/struct.SpecificLong.html) for more information. + * Creates a zoned formatter based on a non-zoned formatter. + * + * Caution: The locale provided here must match the locale used to construct the non-zoned formatter, + * or else unexpected behavior may occur! + * + * See the [Rust documentation for `SpecificLong`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/zone/struct.SpecificLong.html) for more information. */ - inline static diplomat::result, icu4x::DateTimeFormatterLoadError> create_specific_long_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, const icu4x::DateTimeFormatter& formatter); + inline static icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> create_specific_long_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, const icu4x::DateTimeFormatter& formatter); /** - * Creates a zoned formatter based on a non-zoned formatter. - * - * Caution: The locale provided here must match the locale used to construct the non-zoned formatter, - * or else unexpected behavior may occur! - * - * See the [Rust documentation for `SpecificShort`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/zone/struct.SpecificShort.html) for more information. + * Creates a zoned formatter based on a non-zoned formatter. + * + * Caution: The locale provided here must match the locale used to construct the non-zoned formatter, + * or else unexpected behavior may occur! + * + * See the [Rust documentation for `SpecificShort`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/zone/struct.SpecificShort.html) for more information. */ - inline static diplomat::result, icu4x::DateTimeFormatterLoadError> create_specific_short(const icu4x::Locale& locale, const icu4x::DateTimeFormatter& formatter); + inline static icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> create_specific_short(const icu4x::Locale& locale, const icu4x::DateTimeFormatter& formatter); /** - * Creates a zoned formatter based on a non-zoned formatter. - * - * Caution: The locale provided here must match the locale used to construct the non-zoned formatter, - * or else unexpected behavior may occur! - * - * See the [Rust documentation for `SpecificShort`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/zone/struct.SpecificShort.html) for more information. + * Creates a zoned formatter based on a non-zoned formatter. + * + * Caution: The locale provided here must match the locale used to construct the non-zoned formatter, + * or else unexpected behavior may occur! + * + * See the [Rust documentation for `SpecificShort`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/zone/struct.SpecificShort.html) for more information. */ - inline static diplomat::result, icu4x::DateTimeFormatterLoadError> create_specific_short_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, const icu4x::DateTimeFormatter& formatter); + inline static icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> create_specific_short_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, const icu4x::DateTimeFormatter& formatter); /** - * Creates a zoned formatter based on a non-zoned formatter. - * - * Caution: The locale provided here must match the locale used to construct the non-zoned formatter, - * or else unexpected behavior may occur! - * - * See the [Rust documentation for `LocalizedOffsetLong`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/zone/struct.LocalizedOffsetLong.html) for more information. + * Creates a zoned formatter based on a non-zoned formatter. + * + * Caution: The locale provided here must match the locale used to construct the non-zoned formatter, + * or else unexpected behavior may occur! + * + * See the [Rust documentation for `LocalizedOffsetLong`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/zone/struct.LocalizedOffsetLong.html) for more information. */ - inline static diplomat::result, icu4x::DateTimeFormatterLoadError> create_localized_offset_long(const icu4x::Locale& locale, const icu4x::DateTimeFormatter& formatter); + inline static icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> create_localized_offset_long(const icu4x::Locale& locale, const icu4x::DateTimeFormatter& formatter); /** - * Creates a zoned formatter based on a non-zoned formatter. - * - * Caution: The locale provided here must match the locale used to construct the non-zoned formatter, - * or else unexpected behavior may occur! - * - * See the [Rust documentation for `LocalizedOffsetLong`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/zone/struct.LocalizedOffsetLong.html) for more information. + * Creates a zoned formatter based on a non-zoned formatter. + * + * Caution: The locale provided here must match the locale used to construct the non-zoned formatter, + * or else unexpected behavior may occur! + * + * See the [Rust documentation for `LocalizedOffsetLong`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/zone/struct.LocalizedOffsetLong.html) for more information. */ - inline static diplomat::result, icu4x::DateTimeFormatterLoadError> create_localized_offset_long_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, const icu4x::DateTimeFormatter& formatter); + inline static icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> create_localized_offset_long_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, const icu4x::DateTimeFormatter& formatter); /** - * Creates a zoned formatter based on a non-zoned formatter. - * - * Caution: The locale provided here must match the locale used to construct the non-zoned formatter, - * or else unexpected behavior may occur! - * - * See the [Rust documentation for `LocalizedOffsetShort`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/zone/struct.LocalizedOffsetShort.html) for more information. + * Creates a zoned formatter based on a non-zoned formatter. + * + * Caution: The locale provided here must match the locale used to construct the non-zoned formatter, + * or else unexpected behavior may occur! + * + * See the [Rust documentation for `LocalizedOffsetShort`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/zone/struct.LocalizedOffsetShort.html) for more information. */ - inline static diplomat::result, icu4x::DateTimeFormatterLoadError> create_localized_offset_short(const icu4x::Locale& locale, const icu4x::DateTimeFormatter& formatter); + inline static icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> create_localized_offset_short(const icu4x::Locale& locale, const icu4x::DateTimeFormatter& formatter); /** - * Creates a zoned formatter based on a non-zoned formatter. - * - * Caution: The locale provided here must match the locale used to construct the non-zoned formatter, - * or else unexpected behavior may occur! - * - * See the [Rust documentation for `LocalizedOffsetShort`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/zone/struct.LocalizedOffsetShort.html) for more information. + * Creates a zoned formatter based on a non-zoned formatter. + * + * Caution: The locale provided here must match the locale used to construct the non-zoned formatter, + * or else unexpected behavior may occur! + * + * See the [Rust documentation for `LocalizedOffsetShort`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/zone/struct.LocalizedOffsetShort.html) for more information. */ - inline static diplomat::result, icu4x::DateTimeFormatterLoadError> create_localized_offset_short_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, const icu4x::DateTimeFormatter& formatter); + inline static icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> create_localized_offset_short_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, const icu4x::DateTimeFormatter& formatter); /** - * Creates a zoned formatter based on a non-zoned formatter. - * - * Caution: The locale provided here must match the locale used to construct the non-zoned formatter, - * or else unexpected behavior may occur! - * - * See the [Rust documentation for `GenericLong`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/zone/struct.GenericLong.html) for more information. + * Creates a zoned formatter based on a non-zoned formatter. + * + * Caution: The locale provided here must match the locale used to construct the non-zoned formatter, + * or else unexpected behavior may occur! + * + * See the [Rust documentation for `GenericLong`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/zone/struct.GenericLong.html) for more information. */ - inline static diplomat::result, icu4x::DateTimeFormatterLoadError> create_generic_long(const icu4x::Locale& locale, const icu4x::DateTimeFormatter& formatter); + inline static icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> create_generic_long(const icu4x::Locale& locale, const icu4x::DateTimeFormatter& formatter); /** - * Creates a zoned formatter based on a non-zoned formatter. - * - * Caution: The locale provided here must match the locale used to construct the non-zoned formatter, - * or else unexpected behavior may occur! - * - * See the [Rust documentation for `GenericLong`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/zone/struct.GenericLong.html) for more information. + * Creates a zoned formatter based on a non-zoned formatter. + * + * Caution: The locale provided here must match the locale used to construct the non-zoned formatter, + * or else unexpected behavior may occur! + * + * See the [Rust documentation for `GenericLong`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/zone/struct.GenericLong.html) for more information. */ - inline static diplomat::result, icu4x::DateTimeFormatterLoadError> create_generic_long_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, const icu4x::DateTimeFormatter& formatter); + inline static icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> create_generic_long_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, const icu4x::DateTimeFormatter& formatter); /** - * Creates a zoned formatter based on a non-zoned formatter. - * - * Caution: The locale provided here must match the locale used to construct the non-zoned formatter, - * or else unexpected behavior may occur! - * - * See the [Rust documentation for `GenericShort`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/zone/struct.GenericShort.html) for more information. + * Creates a zoned formatter based on a non-zoned formatter. + * + * Caution: The locale provided here must match the locale used to construct the non-zoned formatter, + * or else unexpected behavior may occur! + * + * See the [Rust documentation for `GenericShort`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/zone/struct.GenericShort.html) for more information. */ - inline static diplomat::result, icu4x::DateTimeFormatterLoadError> create_generic_short(const icu4x::Locale& locale, const icu4x::DateTimeFormatter& formatter); + inline static icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> create_generic_short(const icu4x::Locale& locale, const icu4x::DateTimeFormatter& formatter); /** - * Creates a zoned formatter based on a non-zoned formatter. - * - * Caution: The locale provided here must match the locale used to construct the non-zoned formatter, - * or else unexpected behavior may occur! - * - * See the [Rust documentation for `GenericShort`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/zone/struct.GenericShort.html) for more information. + * Creates a zoned formatter based on a non-zoned formatter. + * + * Caution: The locale provided here must match the locale used to construct the non-zoned formatter, + * or else unexpected behavior may occur! + * + * See the [Rust documentation for `GenericShort`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/zone/struct.GenericShort.html) for more information. */ - inline static diplomat::result, icu4x::DateTimeFormatterLoadError> create_generic_short_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, const icu4x::DateTimeFormatter& formatter); + inline static icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> create_generic_short_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, const icu4x::DateTimeFormatter& formatter); /** - * Creates a zoned formatter based on a non-zoned formatter. - * - * Caution: The locale provided here must match the locale used to construct the non-zoned formatter, - * or else unexpected behavior may occur! - * - * See the [Rust documentation for `Location`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/zone/struct.Location.html) for more information. + * Creates a zoned formatter based on a non-zoned formatter. + * + * Caution: The locale provided here must match the locale used to construct the non-zoned formatter, + * or else unexpected behavior may occur! + * + * See the [Rust documentation for `Location`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/zone/struct.Location.html) for more information. */ - inline static diplomat::result, icu4x::DateTimeFormatterLoadError> create_location(const icu4x::Locale& locale, const icu4x::DateTimeFormatter& formatter); + inline static icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> create_location(const icu4x::Locale& locale, const icu4x::DateTimeFormatter& formatter); /** - * Creates a zoned formatter based on a non-zoned formatter. - * - * Caution: The locale provided here must match the locale used to construct the non-zoned formatter, - * or else unexpected behavior may occur! - * - * See the [Rust documentation for `Location`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/zone/struct.Location.html) for more information. + * Creates a zoned formatter based on a non-zoned formatter. + * + * Caution: The locale provided here must match the locale used to construct the non-zoned formatter, + * or else unexpected behavior may occur! + * + * See the [Rust documentation for `Location`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/zone/struct.Location.html) for more information. */ - inline static diplomat::result, icu4x::DateTimeFormatterLoadError> create_location_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, const icu4x::DateTimeFormatter& formatter); + inline static icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> create_location_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, const icu4x::DateTimeFormatter& formatter); /** - * Creates a zoned formatter based on a non-zoned formatter. - * - * Caution: The locale provided here must match the locale used to construct the non-zoned formatter, - * or else unexpected behavior may occur! - * - * See the [Rust documentation for `ExemplarCity`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/zone/struct.ExemplarCity.html) for more information. + * Creates a zoned formatter based on a non-zoned formatter. + * + * Caution: The locale provided here must match the locale used to construct the non-zoned formatter, + * or else unexpected behavior may occur! + * + * See the [Rust documentation for `ExemplarCity`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/zone/struct.ExemplarCity.html) for more information. */ - inline static diplomat::result, icu4x::DateTimeFormatterLoadError> create_exemplar_city(const icu4x::Locale& locale, const icu4x::DateTimeFormatter& formatter); + inline static icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> create_exemplar_city(const icu4x::Locale& locale, const icu4x::DateTimeFormatter& formatter); /** - * Creates a zoned formatter based on a non-zoned formatter. - * - * Caution: The locale provided here must match the locale used to construct the non-zoned formatter, - * or else unexpected behavior may occur! - * - * See the [Rust documentation for `ExemplarCity`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/zone/struct.ExemplarCity.html) for more information. + * Creates a zoned formatter based on a non-zoned formatter. + * + * Caution: The locale provided here must match the locale used to construct the non-zoned formatter, + * or else unexpected behavior may occur! + * + * See the [Rust documentation for `ExemplarCity`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/zone/struct.ExemplarCity.html) for more information. */ - inline static diplomat::result, icu4x::DateTimeFormatterLoadError> create_exemplar_city_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, const icu4x::DateTimeFormatter& formatter); + inline static icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> create_exemplar_city_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, const icu4x::DateTimeFormatter& formatter); /** - * See the [Rust documentation for `format`](https://docs.rs/icu/2.0.0/icu/datetime/struct.DateTimeFormatter.html#method.format) for more information. + * See the [Rust documentation for `format`](https://docs.rs/icu/2.0.0/icu/datetime/struct.DateTimeFormatter.html#method.format) for more information. */ - inline diplomat::result format_iso(const icu4x::IsoDate& iso_date, const icu4x::Time& time, const icu4x::TimeZoneInfo& zone) const; + inline icu4x::diplomat::result format_iso(const icu4x::IsoDate& iso_date, const icu4x::Time& time, const icu4x::TimeZoneInfo& zone) const; template - inline diplomat::result format_iso_write(const icu4x::IsoDate& iso_date, const icu4x::Time& time, const icu4x::TimeZoneInfo& zone, W& writeable_output) const; + inline icu4x::diplomat::result format_iso_write(const icu4x::IsoDate& iso_date, const icu4x::Time& time, const icu4x::TimeZoneInfo& zone, W& writeable_output) const; inline const icu4x::capi::ZonedDateTimeFormatter* AsFFI() const; inline icu4x::capi::ZonedDateTimeFormatter* AsFFI(); @@ -226,4 +226,4 @@ class ZonedDateTimeFormatter { }; } // namespace -#endif // icu4x_ZonedDateTimeFormatter_D_HPP +#endif // ICU4X_ZonedDateTimeFormatter_D_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/ZonedDateTimeFormatter.hpp b/ffi/capi/bindings/cpp/icu4x/ZonedDateTimeFormatter.hpp index df3411ee9fd..3730dec1787 100644 --- a/ffi/capi/bindings/cpp/icu4x/ZonedDateTimeFormatter.hpp +++ b/ffi/capi/bindings/cpp/icu4x/ZonedDateTimeFormatter.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_ZonedDateTimeFormatter_HPP -#define icu4x_ZonedDateTimeFormatter_HPP +#ifndef ICU4X_ZonedDateTimeFormatter_HPP +#define ICU4X_ZonedDateTimeFormatter_HPP #include "ZonedDateTimeFormatter.d.hpp" @@ -11,7 +11,6 @@ #include #include #include -#include "../diplomat_runtime.hpp" #include "DataProvider.hpp" #include "DateTimeFormatter.hpp" #include "DateTimeFormatterLoadError.hpp" @@ -20,6 +19,7 @@ #include "Locale.hpp" #include "Time.hpp" #include "TimeZoneInfo.hpp" +#include "diplomat_runtime.hpp" namespace icu4x { @@ -75,7 +75,7 @@ namespace capi { icu4x_ZonedDateTimeFormatter_create_exemplar_city_with_provider_mv1_result icu4x_ZonedDateTimeFormatter_create_exemplar_city_with_provider_mv1(const icu4x::capi::DataProvider* provider, const icu4x::capi::Locale* locale, const icu4x::capi::DateTimeFormatter* formatter); typedef struct icu4x_ZonedDateTimeFormatter_format_iso_mv1_result {union { icu4x::capi::DateTimeWriteError err;}; bool is_ok;} icu4x_ZonedDateTimeFormatter_format_iso_mv1_result; - icu4x_ZonedDateTimeFormatter_format_iso_mv1_result icu4x_ZonedDateTimeFormatter_format_iso_mv1(const icu4x::capi::ZonedDateTimeFormatter* self, const icu4x::capi::IsoDate* iso_date, const icu4x::capi::Time* time, const icu4x::capi::TimeZoneInfo* zone, diplomat::capi::DiplomatWrite* write); + icu4x_ZonedDateTimeFormatter_format_iso_mv1_result icu4x_ZonedDateTimeFormatter_format_iso_mv1(const icu4x::capi::ZonedDateTimeFormatter* self, const icu4x::capi::IsoDate* iso_date, const icu4x::capi::Time* time, const icu4x::capi::TimeZoneInfo* zone, icu4x::diplomat::capi::DiplomatWrite* write); void icu4x_ZonedDateTimeFormatter_destroy_mv1(ZonedDateTimeFormatter* self); @@ -83,129 +83,129 @@ namespace capi { } // namespace capi } // namespace -inline diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::ZonedDateTimeFormatter::create_specific_long(const icu4x::Locale& locale, const icu4x::DateTimeFormatter& formatter) { +inline icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::ZonedDateTimeFormatter::create_specific_long(const icu4x::Locale& locale, const icu4x::DateTimeFormatter& formatter) { auto result = icu4x::capi::icu4x_ZonedDateTimeFormatter_create_specific_long_mv1(locale.AsFFI(), formatter.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Ok>(std::unique_ptr(icu4x::ZonedDateTimeFormatter::FromFFI(result.ok)))) : diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::ZonedDateTimeFormatter::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); } -inline diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::ZonedDateTimeFormatter::create_specific_long_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, const icu4x::DateTimeFormatter& formatter) { +inline icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::ZonedDateTimeFormatter::create_specific_long_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, const icu4x::DateTimeFormatter& formatter) { auto result = icu4x::capi::icu4x_ZonedDateTimeFormatter_create_specific_long_with_provider_mv1(provider.AsFFI(), locale.AsFFI(), formatter.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Ok>(std::unique_ptr(icu4x::ZonedDateTimeFormatter::FromFFI(result.ok)))) : diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::ZonedDateTimeFormatter::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); } -inline diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::ZonedDateTimeFormatter::create_specific_short(const icu4x::Locale& locale, const icu4x::DateTimeFormatter& formatter) { +inline icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::ZonedDateTimeFormatter::create_specific_short(const icu4x::Locale& locale, const icu4x::DateTimeFormatter& formatter) { auto result = icu4x::capi::icu4x_ZonedDateTimeFormatter_create_specific_short_mv1(locale.AsFFI(), formatter.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Ok>(std::unique_ptr(icu4x::ZonedDateTimeFormatter::FromFFI(result.ok)))) : diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::ZonedDateTimeFormatter::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); } -inline diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::ZonedDateTimeFormatter::create_specific_short_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, const icu4x::DateTimeFormatter& formatter) { +inline icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::ZonedDateTimeFormatter::create_specific_short_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, const icu4x::DateTimeFormatter& formatter) { auto result = icu4x::capi::icu4x_ZonedDateTimeFormatter_create_specific_short_with_provider_mv1(provider.AsFFI(), locale.AsFFI(), formatter.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Ok>(std::unique_ptr(icu4x::ZonedDateTimeFormatter::FromFFI(result.ok)))) : diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::ZonedDateTimeFormatter::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); } -inline diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::ZonedDateTimeFormatter::create_localized_offset_long(const icu4x::Locale& locale, const icu4x::DateTimeFormatter& formatter) { +inline icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::ZonedDateTimeFormatter::create_localized_offset_long(const icu4x::Locale& locale, const icu4x::DateTimeFormatter& formatter) { auto result = icu4x::capi::icu4x_ZonedDateTimeFormatter_create_localized_offset_long_mv1(locale.AsFFI(), formatter.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Ok>(std::unique_ptr(icu4x::ZonedDateTimeFormatter::FromFFI(result.ok)))) : diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::ZonedDateTimeFormatter::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); } -inline diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::ZonedDateTimeFormatter::create_localized_offset_long_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, const icu4x::DateTimeFormatter& formatter) { +inline icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::ZonedDateTimeFormatter::create_localized_offset_long_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, const icu4x::DateTimeFormatter& formatter) { auto result = icu4x::capi::icu4x_ZonedDateTimeFormatter_create_localized_offset_long_with_provider_mv1(provider.AsFFI(), locale.AsFFI(), formatter.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Ok>(std::unique_ptr(icu4x::ZonedDateTimeFormatter::FromFFI(result.ok)))) : diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::ZonedDateTimeFormatter::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); } -inline diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::ZonedDateTimeFormatter::create_localized_offset_short(const icu4x::Locale& locale, const icu4x::DateTimeFormatter& formatter) { +inline icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::ZonedDateTimeFormatter::create_localized_offset_short(const icu4x::Locale& locale, const icu4x::DateTimeFormatter& formatter) { auto result = icu4x::capi::icu4x_ZonedDateTimeFormatter_create_localized_offset_short_mv1(locale.AsFFI(), formatter.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Ok>(std::unique_ptr(icu4x::ZonedDateTimeFormatter::FromFFI(result.ok)))) : diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::ZonedDateTimeFormatter::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); } -inline diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::ZonedDateTimeFormatter::create_localized_offset_short_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, const icu4x::DateTimeFormatter& formatter) { +inline icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::ZonedDateTimeFormatter::create_localized_offset_short_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, const icu4x::DateTimeFormatter& formatter) { auto result = icu4x::capi::icu4x_ZonedDateTimeFormatter_create_localized_offset_short_with_provider_mv1(provider.AsFFI(), locale.AsFFI(), formatter.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Ok>(std::unique_ptr(icu4x::ZonedDateTimeFormatter::FromFFI(result.ok)))) : diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::ZonedDateTimeFormatter::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); } -inline diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::ZonedDateTimeFormatter::create_generic_long(const icu4x::Locale& locale, const icu4x::DateTimeFormatter& formatter) { +inline icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::ZonedDateTimeFormatter::create_generic_long(const icu4x::Locale& locale, const icu4x::DateTimeFormatter& formatter) { auto result = icu4x::capi::icu4x_ZonedDateTimeFormatter_create_generic_long_mv1(locale.AsFFI(), formatter.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Ok>(std::unique_ptr(icu4x::ZonedDateTimeFormatter::FromFFI(result.ok)))) : diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::ZonedDateTimeFormatter::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); } -inline diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::ZonedDateTimeFormatter::create_generic_long_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, const icu4x::DateTimeFormatter& formatter) { +inline icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::ZonedDateTimeFormatter::create_generic_long_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, const icu4x::DateTimeFormatter& formatter) { auto result = icu4x::capi::icu4x_ZonedDateTimeFormatter_create_generic_long_with_provider_mv1(provider.AsFFI(), locale.AsFFI(), formatter.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Ok>(std::unique_ptr(icu4x::ZonedDateTimeFormatter::FromFFI(result.ok)))) : diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::ZonedDateTimeFormatter::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); } -inline diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::ZonedDateTimeFormatter::create_generic_short(const icu4x::Locale& locale, const icu4x::DateTimeFormatter& formatter) { +inline icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::ZonedDateTimeFormatter::create_generic_short(const icu4x::Locale& locale, const icu4x::DateTimeFormatter& formatter) { auto result = icu4x::capi::icu4x_ZonedDateTimeFormatter_create_generic_short_mv1(locale.AsFFI(), formatter.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Ok>(std::unique_ptr(icu4x::ZonedDateTimeFormatter::FromFFI(result.ok)))) : diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::ZonedDateTimeFormatter::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); } -inline diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::ZonedDateTimeFormatter::create_generic_short_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, const icu4x::DateTimeFormatter& formatter) { +inline icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::ZonedDateTimeFormatter::create_generic_short_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, const icu4x::DateTimeFormatter& formatter) { auto result = icu4x::capi::icu4x_ZonedDateTimeFormatter_create_generic_short_with_provider_mv1(provider.AsFFI(), locale.AsFFI(), formatter.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Ok>(std::unique_ptr(icu4x::ZonedDateTimeFormatter::FromFFI(result.ok)))) : diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::ZonedDateTimeFormatter::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); } -inline diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::ZonedDateTimeFormatter::create_location(const icu4x::Locale& locale, const icu4x::DateTimeFormatter& formatter) { +inline icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::ZonedDateTimeFormatter::create_location(const icu4x::Locale& locale, const icu4x::DateTimeFormatter& formatter) { auto result = icu4x::capi::icu4x_ZonedDateTimeFormatter_create_location_mv1(locale.AsFFI(), formatter.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Ok>(std::unique_ptr(icu4x::ZonedDateTimeFormatter::FromFFI(result.ok)))) : diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::ZonedDateTimeFormatter::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); } -inline diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::ZonedDateTimeFormatter::create_location_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, const icu4x::DateTimeFormatter& formatter) { +inline icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::ZonedDateTimeFormatter::create_location_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, const icu4x::DateTimeFormatter& formatter) { auto result = icu4x::capi::icu4x_ZonedDateTimeFormatter_create_location_with_provider_mv1(provider.AsFFI(), locale.AsFFI(), formatter.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Ok>(std::unique_ptr(icu4x::ZonedDateTimeFormatter::FromFFI(result.ok)))) : diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::ZonedDateTimeFormatter::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); } -inline diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::ZonedDateTimeFormatter::create_exemplar_city(const icu4x::Locale& locale, const icu4x::DateTimeFormatter& formatter) { +inline icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::ZonedDateTimeFormatter::create_exemplar_city(const icu4x::Locale& locale, const icu4x::DateTimeFormatter& formatter) { auto result = icu4x::capi::icu4x_ZonedDateTimeFormatter_create_exemplar_city_mv1(locale.AsFFI(), formatter.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Ok>(std::unique_ptr(icu4x::ZonedDateTimeFormatter::FromFFI(result.ok)))) : diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::ZonedDateTimeFormatter::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); } -inline diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::ZonedDateTimeFormatter::create_exemplar_city_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, const icu4x::DateTimeFormatter& formatter) { +inline icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::ZonedDateTimeFormatter::create_exemplar_city_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, const icu4x::DateTimeFormatter& formatter) { auto result = icu4x::capi::icu4x_ZonedDateTimeFormatter_create_exemplar_city_with_provider_mv1(provider.AsFFI(), locale.AsFFI(), formatter.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Ok>(std::unique_ptr(icu4x::ZonedDateTimeFormatter::FromFFI(result.ok)))) : diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::ZonedDateTimeFormatter::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); } -inline diplomat::result icu4x::ZonedDateTimeFormatter::format_iso(const icu4x::IsoDate& iso_date, const icu4x::Time& time, const icu4x::TimeZoneInfo& zone) const { +inline icu4x::diplomat::result icu4x::ZonedDateTimeFormatter::format_iso(const icu4x::IsoDate& iso_date, const icu4x::Time& time, const icu4x::TimeZoneInfo& zone) const { std::string output; - diplomat::capi::DiplomatWrite write = diplomat::WriteFromString(output); + icu4x::diplomat::capi::DiplomatWrite write = icu4x::diplomat::WriteFromString(output); auto result = icu4x::capi::icu4x_ZonedDateTimeFormatter_format_iso_mv1(this->AsFFI(), iso_date.AsFFI(), time.AsFFI(), zone.AsFFI(), &write); - return result.is_ok ? diplomat::result(diplomat::Ok(std::move(output))) : diplomat::result(diplomat::Err(icu4x::DateTimeWriteError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result(icu4x::diplomat::Ok(std::move(output))) : icu4x::diplomat::result(icu4x::diplomat::Err(icu4x::DateTimeWriteError::FromFFI(result.err))); } template -inline diplomat::result icu4x::ZonedDateTimeFormatter::format_iso_write(const icu4x::IsoDate& iso_date, const icu4x::Time& time, const icu4x::TimeZoneInfo& zone, W& writeable) const { - diplomat::capi::DiplomatWrite write = diplomat::WriteTrait::Construct(writeable); +inline icu4x::diplomat::result icu4x::ZonedDateTimeFormatter::format_iso_write(const icu4x::IsoDate& iso_date, const icu4x::Time& time, const icu4x::TimeZoneInfo& zone, W& writeable) const { + icu4x::diplomat::capi::DiplomatWrite write = icu4x::diplomat::WriteTrait::Construct(writeable); auto result = icu4x::capi::icu4x_ZonedDateTimeFormatter_format_iso_mv1(this->AsFFI(), iso_date.AsFFI(), time.AsFFI(), zone.AsFFI(), &write); - return result.is_ok ? diplomat::result(diplomat::Ok()) : diplomat::result(diplomat::Err(icu4x::DateTimeWriteError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result(icu4x::diplomat::Ok()) : icu4x::diplomat::result(icu4x::diplomat::Err(icu4x::DateTimeWriteError::FromFFI(result.err))); } inline const icu4x::capi::ZonedDateTimeFormatter* icu4x::ZonedDateTimeFormatter::AsFFI() const { @@ -229,4 +229,4 @@ inline void icu4x::ZonedDateTimeFormatter::operator delete(void* ptr) { } -#endif // icu4x_ZonedDateTimeFormatter_HPP +#endif // ICU4X_ZonedDateTimeFormatter_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/ZonedDateTimeFormatterGregorian.d.hpp b/ffi/capi/bindings/cpp/icu4x/ZonedDateTimeFormatterGregorian.d.hpp index 528d109d97e..062c5398e7d 100644 --- a/ffi/capi/bindings/cpp/icu4x/ZonedDateTimeFormatterGregorian.d.hpp +++ b/ffi/capi/bindings/cpp/icu4x/ZonedDateTimeFormatterGregorian.d.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_ZonedDateTimeFormatterGregorian_D_HPP -#define icu4x_ZonedDateTimeFormatterGregorian_D_HPP +#ifndef ICU4X_ZonedDateTimeFormatterGregorian_D_HPP +#define ICU4X_ZonedDateTimeFormatterGregorian_D_HPP #include #include @@ -9,8 +9,7 @@ #include #include #include -#include "../diplomat_runtime.hpp" - +#include "diplomat_runtime.hpp" namespace icu4x { namespace capi { struct DataProvider; } class DataProvider; @@ -28,7 +27,8 @@ namespace capi { struct ZonedDateTimeFormatterGregorian; } class ZonedDateTimeFormatterGregorian; class DateTimeFormatterLoadError; class DateTimeWriteError; -} +} // namespace icu4x + namespace icu4x { @@ -45,171 +45,171 @@ class ZonedDateTimeFormatterGregorian { public: /** - * Creates a zoned formatter based on a non-zoned formatter. - * - * Caution: The locale provided here must match the locale used to construct the non-zoned formatter, - * or else unexpected behavior may occur! - * - * See the [Rust documentation for `SpecificLong`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/zone/struct.SpecificLong.html) for more information. + * Creates a zoned formatter based on a non-zoned formatter. + * + * Caution: The locale provided here must match the locale used to construct the non-zoned formatter, + * or else unexpected behavior may occur! + * + * See the [Rust documentation for `SpecificLong`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/zone/struct.SpecificLong.html) for more information. */ - inline static diplomat::result, icu4x::DateTimeFormatterLoadError> create_specific_long(const icu4x::Locale& locale, const icu4x::DateTimeFormatterGregorian& formatter); + inline static icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> create_specific_long(const icu4x::Locale& locale, const icu4x::DateTimeFormatterGregorian& formatter); /** - * Creates a zoned formatter based on a non-zoned formatter. - * - * Caution: The locale provided here must match the locale used to construct the non-zoned formatter, - * or else unexpected behavior may occur! - * - * See the [Rust documentation for `SpecificLong`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/zone/struct.SpecificLong.html) for more information. + * Creates a zoned formatter based on a non-zoned formatter. + * + * Caution: The locale provided here must match the locale used to construct the non-zoned formatter, + * or else unexpected behavior may occur! + * + * See the [Rust documentation for `SpecificLong`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/zone/struct.SpecificLong.html) for more information. */ - inline static diplomat::result, icu4x::DateTimeFormatterLoadError> create_specific_long_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, const icu4x::DateTimeFormatterGregorian& formatter); + inline static icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> create_specific_long_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, const icu4x::DateTimeFormatterGregorian& formatter); /** - * Creates a zoned formatter based on a non-zoned formatter. - * - * Caution: The locale provided here must match the locale used to construct the non-zoned formatter, - * or else unexpected behavior may occur! - * - * See the [Rust documentation for `SpecificShort`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/zone/struct.SpecificShort.html) for more information. + * Creates a zoned formatter based on a non-zoned formatter. + * + * Caution: The locale provided here must match the locale used to construct the non-zoned formatter, + * or else unexpected behavior may occur! + * + * See the [Rust documentation for `SpecificShort`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/zone/struct.SpecificShort.html) for more information. */ - inline static diplomat::result, icu4x::DateTimeFormatterLoadError> create_specific_short(const icu4x::Locale& locale, const icu4x::DateTimeFormatterGregorian& formatter); + inline static icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> create_specific_short(const icu4x::Locale& locale, const icu4x::DateTimeFormatterGregorian& formatter); /** - * Creates a zoned formatter based on a non-zoned formatter. - * - * Caution: The locale provided here must match the locale used to construct the non-zoned formatter, - * or else unexpected behavior may occur! - * - * See the [Rust documentation for `SpecificShort`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/zone/struct.SpecificShort.html) for more information. + * Creates a zoned formatter based on a non-zoned formatter. + * + * Caution: The locale provided here must match the locale used to construct the non-zoned formatter, + * or else unexpected behavior may occur! + * + * See the [Rust documentation for `SpecificShort`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/zone/struct.SpecificShort.html) for more information. */ - inline static diplomat::result, icu4x::DateTimeFormatterLoadError> create_specific_short_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, const icu4x::DateTimeFormatterGregorian& formatter); + inline static icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> create_specific_short_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, const icu4x::DateTimeFormatterGregorian& formatter); /** - * Creates a zoned formatter based on a non-zoned formatter. - * - * Caution: The locale provided here must match the locale used to construct the non-zoned formatter, - * or else unexpected behavior may occur! - * - * See the [Rust documentation for `LocalizedOffsetLong`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/zone/struct.LocalizedOffsetLong.html) for more information. + * Creates a zoned formatter based on a non-zoned formatter. + * + * Caution: The locale provided here must match the locale used to construct the non-zoned formatter, + * or else unexpected behavior may occur! + * + * See the [Rust documentation for `LocalizedOffsetLong`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/zone/struct.LocalizedOffsetLong.html) for more information. */ - inline static diplomat::result, icu4x::DateTimeFormatterLoadError> create_localized_offset_long(const icu4x::Locale& locale, const icu4x::DateTimeFormatterGregorian& formatter); + inline static icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> create_localized_offset_long(const icu4x::Locale& locale, const icu4x::DateTimeFormatterGregorian& formatter); /** - * Creates a zoned formatter based on a non-zoned formatter. - * - * Caution: The locale provided here must match the locale used to construct the non-zoned formatter, - * or else unexpected behavior may occur! - * - * See the [Rust documentation for `LocalizedOffsetLong`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/zone/struct.LocalizedOffsetLong.html) for more information. + * Creates a zoned formatter based on a non-zoned formatter. + * + * Caution: The locale provided here must match the locale used to construct the non-zoned formatter, + * or else unexpected behavior may occur! + * + * See the [Rust documentation for `LocalizedOffsetLong`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/zone/struct.LocalizedOffsetLong.html) for more information. */ - inline static diplomat::result, icu4x::DateTimeFormatterLoadError> create_localized_offset_long_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, const icu4x::DateTimeFormatterGregorian& formatter); + inline static icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> create_localized_offset_long_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, const icu4x::DateTimeFormatterGregorian& formatter); /** - * Creates a zoned formatter based on a non-zoned formatter. - * - * Caution: The locale provided here must match the locale used to construct the non-zoned formatter, - * or else unexpected behavior may occur! - * - * See the [Rust documentation for `LocalizedOffsetShort`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/zone/struct.LocalizedOffsetShort.html) for more information. + * Creates a zoned formatter based on a non-zoned formatter. + * + * Caution: The locale provided here must match the locale used to construct the non-zoned formatter, + * or else unexpected behavior may occur! + * + * See the [Rust documentation for `LocalizedOffsetShort`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/zone/struct.LocalizedOffsetShort.html) for more information. */ - inline static diplomat::result, icu4x::DateTimeFormatterLoadError> create_localized_offset_short(const icu4x::Locale& locale, const icu4x::DateTimeFormatterGregorian& formatter); + inline static icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> create_localized_offset_short(const icu4x::Locale& locale, const icu4x::DateTimeFormatterGregorian& formatter); /** - * Creates a zoned formatter based on a non-zoned formatter. - * - * Caution: The locale provided here must match the locale used to construct the non-zoned formatter, - * or else unexpected behavior may occur! - * - * See the [Rust documentation for `LocalizedOffsetShort`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/zone/struct.LocalizedOffsetShort.html) for more information. + * Creates a zoned formatter based on a non-zoned formatter. + * + * Caution: The locale provided here must match the locale used to construct the non-zoned formatter, + * or else unexpected behavior may occur! + * + * See the [Rust documentation for `LocalizedOffsetShort`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/zone/struct.LocalizedOffsetShort.html) for more information. */ - inline static diplomat::result, icu4x::DateTimeFormatterLoadError> create_localized_offset_short_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, const icu4x::DateTimeFormatterGregorian& formatter); + inline static icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> create_localized_offset_short_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, const icu4x::DateTimeFormatterGregorian& formatter); /** - * Creates a zoned formatter based on a non-zoned formatter. - * - * Caution: The locale provided here must match the locale used to construct the non-zoned formatter, - * or else unexpected behavior may occur! - * - * See the [Rust documentation for `GenericLong`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/zone/struct.GenericLong.html) for more information. + * Creates a zoned formatter based on a non-zoned formatter. + * + * Caution: The locale provided here must match the locale used to construct the non-zoned formatter, + * or else unexpected behavior may occur! + * + * See the [Rust documentation for `GenericLong`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/zone/struct.GenericLong.html) for more information. */ - inline static diplomat::result, icu4x::DateTimeFormatterLoadError> create_generic_long(const icu4x::Locale& locale, const icu4x::DateTimeFormatterGregorian& formatter); + inline static icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> create_generic_long(const icu4x::Locale& locale, const icu4x::DateTimeFormatterGregorian& formatter); /** - * Creates a zoned formatter based on a non-zoned formatter. - * - * Caution: The locale provided here must match the locale used to construct the non-zoned formatter, - * or else unexpected behavior may occur! - * - * See the [Rust documentation for `GenericLong`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/zone/struct.GenericLong.html) for more information. + * Creates a zoned formatter based on a non-zoned formatter. + * + * Caution: The locale provided here must match the locale used to construct the non-zoned formatter, + * or else unexpected behavior may occur! + * + * See the [Rust documentation for `GenericLong`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/zone/struct.GenericLong.html) for more information. */ - inline static diplomat::result, icu4x::DateTimeFormatterLoadError> create_generic_long_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, const icu4x::DateTimeFormatterGregorian& formatter); + inline static icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> create_generic_long_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, const icu4x::DateTimeFormatterGregorian& formatter); /** - * Creates a zoned formatter based on a non-zoned formatter. - * - * Caution: The locale provided here must match the locale used to construct the non-zoned formatter, - * or else unexpected behavior may occur! - * - * See the [Rust documentation for `GenericShort`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/zone/struct.GenericShort.html) for more information. + * Creates a zoned formatter based on a non-zoned formatter. + * + * Caution: The locale provided here must match the locale used to construct the non-zoned formatter, + * or else unexpected behavior may occur! + * + * See the [Rust documentation for `GenericShort`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/zone/struct.GenericShort.html) for more information. */ - inline static diplomat::result, icu4x::DateTimeFormatterLoadError> create_generic_short(const icu4x::Locale& locale, const icu4x::DateTimeFormatterGregorian& formatter); + inline static icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> create_generic_short(const icu4x::Locale& locale, const icu4x::DateTimeFormatterGregorian& formatter); /** - * Creates a zoned formatter based on a non-zoned formatter. - * - * Caution: The locale provided here must match the locale used to construct the non-zoned formatter, - * or else unexpected behavior may occur! - * - * See the [Rust documentation for `GenericShort`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/zone/struct.GenericShort.html) for more information. + * Creates a zoned formatter based on a non-zoned formatter. + * + * Caution: The locale provided here must match the locale used to construct the non-zoned formatter, + * or else unexpected behavior may occur! + * + * See the [Rust documentation for `GenericShort`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/zone/struct.GenericShort.html) for more information. */ - inline static diplomat::result, icu4x::DateTimeFormatterLoadError> create_generic_short_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, const icu4x::DateTimeFormatterGregorian& formatter); + inline static icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> create_generic_short_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, const icu4x::DateTimeFormatterGregorian& formatter); /** - * Creates a zoned formatter based on a non-zoned formatter. - * - * Caution: The locale provided here must match the locale used to construct the non-zoned formatter, - * or else unexpected behavior may occur! - * - * See the [Rust documentation for `Location`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/zone/struct.Location.html) for more information. + * Creates a zoned formatter based on a non-zoned formatter. + * + * Caution: The locale provided here must match the locale used to construct the non-zoned formatter, + * or else unexpected behavior may occur! + * + * See the [Rust documentation for `Location`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/zone/struct.Location.html) for more information. */ - inline static diplomat::result, icu4x::DateTimeFormatterLoadError> create_location(const icu4x::Locale& locale, const icu4x::DateTimeFormatterGregorian& formatter); + inline static icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> create_location(const icu4x::Locale& locale, const icu4x::DateTimeFormatterGregorian& formatter); /** - * Creates a zoned formatter based on a non-zoned formatter. - * - * Caution: The locale provided here must match the locale used to construct the non-zoned formatter, - * or else unexpected behavior may occur! - * - * See the [Rust documentation for `Location`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/zone/struct.Location.html) for more information. + * Creates a zoned formatter based on a non-zoned formatter. + * + * Caution: The locale provided here must match the locale used to construct the non-zoned formatter, + * or else unexpected behavior may occur! + * + * See the [Rust documentation for `Location`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/zone/struct.Location.html) for more information. */ - inline static diplomat::result, icu4x::DateTimeFormatterLoadError> create_location_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, const icu4x::DateTimeFormatterGregorian& formatter); + inline static icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> create_location_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, const icu4x::DateTimeFormatterGregorian& formatter); /** - * Creates a zoned formatter based on a non-zoned formatter. - * - * Caution: The locale provided here must match the locale used to construct the non-zoned formatter, - * or else unexpected behavior may occur! - * - * See the [Rust documentation for `ExemplarCity`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/zone/struct.ExemplarCity.html) for more information. + * Creates a zoned formatter based on a non-zoned formatter. + * + * Caution: The locale provided here must match the locale used to construct the non-zoned formatter, + * or else unexpected behavior may occur! + * + * See the [Rust documentation for `ExemplarCity`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/zone/struct.ExemplarCity.html) for more information. */ - inline static diplomat::result, icu4x::DateTimeFormatterLoadError> create_exemplar_city(const icu4x::Locale& locale, const icu4x::DateTimeFormatterGregorian& formatter); + inline static icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> create_exemplar_city(const icu4x::Locale& locale, const icu4x::DateTimeFormatterGregorian& formatter); /** - * Creates a zoned formatter based on a non-zoned formatter. - * - * Caution: The locale provided here must match the locale used to construct the non-zoned formatter, - * or else unexpected behavior may occur! - * - * See the [Rust documentation for `ExemplarCity`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/zone/struct.ExemplarCity.html) for more information. + * Creates a zoned formatter based on a non-zoned formatter. + * + * Caution: The locale provided here must match the locale used to construct the non-zoned formatter, + * or else unexpected behavior may occur! + * + * See the [Rust documentation for `ExemplarCity`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/zone/struct.ExemplarCity.html) for more information. */ - inline static diplomat::result, icu4x::DateTimeFormatterLoadError> create_exemplar_city_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, const icu4x::DateTimeFormatterGregorian& formatter); + inline static icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> create_exemplar_city_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, const icu4x::DateTimeFormatterGregorian& formatter); /** - * See the [Rust documentation for `format`](https://docs.rs/icu/2.0.0/icu/datetime/struct.FixedCalendarDateTimeFormatter.html#method.format) for more information. + * See the [Rust documentation for `format`](https://docs.rs/icu/2.0.0/icu/datetime/struct.FixedCalendarDateTimeFormatter.html#method.format) for more information. */ - inline diplomat::result format_iso(const icu4x::IsoDate& iso_date, const icu4x::Time& time, const icu4x::TimeZoneInfo& zone) const; + inline icu4x::diplomat::result format_iso(const icu4x::IsoDate& iso_date, const icu4x::Time& time, const icu4x::TimeZoneInfo& zone) const; template - inline diplomat::result format_iso_write(const icu4x::IsoDate& iso_date, const icu4x::Time& time, const icu4x::TimeZoneInfo& zone, W& writeable_output) const; + inline icu4x::diplomat::result format_iso_write(const icu4x::IsoDate& iso_date, const icu4x::Time& time, const icu4x::TimeZoneInfo& zone, W& writeable_output) const; inline const icu4x::capi::ZonedDateTimeFormatterGregorian* AsFFI() const; inline icu4x::capi::ZonedDateTimeFormatterGregorian* AsFFI(); @@ -226,4 +226,4 @@ class ZonedDateTimeFormatterGregorian { }; } // namespace -#endif // icu4x_ZonedDateTimeFormatterGregorian_D_HPP +#endif // ICU4X_ZonedDateTimeFormatterGregorian_D_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/ZonedDateTimeFormatterGregorian.hpp b/ffi/capi/bindings/cpp/icu4x/ZonedDateTimeFormatterGregorian.hpp index a9f29002110..4e2a990d053 100644 --- a/ffi/capi/bindings/cpp/icu4x/ZonedDateTimeFormatterGregorian.hpp +++ b/ffi/capi/bindings/cpp/icu4x/ZonedDateTimeFormatterGregorian.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_ZonedDateTimeFormatterGregorian_HPP -#define icu4x_ZonedDateTimeFormatterGregorian_HPP +#ifndef ICU4X_ZonedDateTimeFormatterGregorian_HPP +#define ICU4X_ZonedDateTimeFormatterGregorian_HPP #include "ZonedDateTimeFormatterGregorian.d.hpp" @@ -11,7 +11,6 @@ #include #include #include -#include "../diplomat_runtime.hpp" #include "DataProvider.hpp" #include "DateTimeFormatterGregorian.hpp" #include "DateTimeFormatterLoadError.hpp" @@ -20,6 +19,7 @@ #include "Locale.hpp" #include "Time.hpp" #include "TimeZoneInfo.hpp" +#include "diplomat_runtime.hpp" namespace icu4x { @@ -75,7 +75,7 @@ namespace capi { icu4x_ZonedDateTimeFormatterGregorian_create_exemplar_city_with_provider_mv1_result icu4x_ZonedDateTimeFormatterGregorian_create_exemplar_city_with_provider_mv1(const icu4x::capi::DataProvider* provider, const icu4x::capi::Locale* locale, const icu4x::capi::DateTimeFormatterGregorian* formatter); typedef struct icu4x_ZonedDateTimeFormatterGregorian_format_iso_mv1_result {union { icu4x::capi::DateTimeWriteError err;}; bool is_ok;} icu4x_ZonedDateTimeFormatterGregorian_format_iso_mv1_result; - icu4x_ZonedDateTimeFormatterGregorian_format_iso_mv1_result icu4x_ZonedDateTimeFormatterGregorian_format_iso_mv1(const icu4x::capi::ZonedDateTimeFormatterGregorian* self, const icu4x::capi::IsoDate* iso_date, const icu4x::capi::Time* time, const icu4x::capi::TimeZoneInfo* zone, diplomat::capi::DiplomatWrite* write); + icu4x_ZonedDateTimeFormatterGregorian_format_iso_mv1_result icu4x_ZonedDateTimeFormatterGregorian_format_iso_mv1(const icu4x::capi::ZonedDateTimeFormatterGregorian* self, const icu4x::capi::IsoDate* iso_date, const icu4x::capi::Time* time, const icu4x::capi::TimeZoneInfo* zone, icu4x::diplomat::capi::DiplomatWrite* write); void icu4x_ZonedDateTimeFormatterGregorian_destroy_mv1(ZonedDateTimeFormatterGregorian* self); @@ -83,129 +83,129 @@ namespace capi { } // namespace capi } // namespace -inline diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::ZonedDateTimeFormatterGregorian::create_specific_long(const icu4x::Locale& locale, const icu4x::DateTimeFormatterGregorian& formatter) { +inline icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::ZonedDateTimeFormatterGregorian::create_specific_long(const icu4x::Locale& locale, const icu4x::DateTimeFormatterGregorian& formatter) { auto result = icu4x::capi::icu4x_ZonedDateTimeFormatterGregorian_create_specific_long_mv1(locale.AsFFI(), formatter.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Ok>(std::unique_ptr(icu4x::ZonedDateTimeFormatterGregorian::FromFFI(result.ok)))) : diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::ZonedDateTimeFormatterGregorian::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); } -inline diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::ZonedDateTimeFormatterGregorian::create_specific_long_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, const icu4x::DateTimeFormatterGregorian& formatter) { +inline icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::ZonedDateTimeFormatterGregorian::create_specific_long_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, const icu4x::DateTimeFormatterGregorian& formatter) { auto result = icu4x::capi::icu4x_ZonedDateTimeFormatterGregorian_create_specific_long_with_provider_mv1(provider.AsFFI(), locale.AsFFI(), formatter.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Ok>(std::unique_ptr(icu4x::ZonedDateTimeFormatterGregorian::FromFFI(result.ok)))) : diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::ZonedDateTimeFormatterGregorian::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); } -inline diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::ZonedDateTimeFormatterGregorian::create_specific_short(const icu4x::Locale& locale, const icu4x::DateTimeFormatterGregorian& formatter) { +inline icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::ZonedDateTimeFormatterGregorian::create_specific_short(const icu4x::Locale& locale, const icu4x::DateTimeFormatterGregorian& formatter) { auto result = icu4x::capi::icu4x_ZonedDateTimeFormatterGregorian_create_specific_short_mv1(locale.AsFFI(), formatter.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Ok>(std::unique_ptr(icu4x::ZonedDateTimeFormatterGregorian::FromFFI(result.ok)))) : diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::ZonedDateTimeFormatterGregorian::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); } -inline diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::ZonedDateTimeFormatterGregorian::create_specific_short_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, const icu4x::DateTimeFormatterGregorian& formatter) { +inline icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::ZonedDateTimeFormatterGregorian::create_specific_short_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, const icu4x::DateTimeFormatterGregorian& formatter) { auto result = icu4x::capi::icu4x_ZonedDateTimeFormatterGregorian_create_specific_short_with_provider_mv1(provider.AsFFI(), locale.AsFFI(), formatter.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Ok>(std::unique_ptr(icu4x::ZonedDateTimeFormatterGregorian::FromFFI(result.ok)))) : diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::ZonedDateTimeFormatterGregorian::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); } -inline diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::ZonedDateTimeFormatterGregorian::create_localized_offset_long(const icu4x::Locale& locale, const icu4x::DateTimeFormatterGregorian& formatter) { +inline icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::ZonedDateTimeFormatterGregorian::create_localized_offset_long(const icu4x::Locale& locale, const icu4x::DateTimeFormatterGregorian& formatter) { auto result = icu4x::capi::icu4x_ZonedDateTimeFormatterGregorian_create_localized_offset_long_mv1(locale.AsFFI(), formatter.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Ok>(std::unique_ptr(icu4x::ZonedDateTimeFormatterGregorian::FromFFI(result.ok)))) : diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::ZonedDateTimeFormatterGregorian::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); } -inline diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::ZonedDateTimeFormatterGregorian::create_localized_offset_long_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, const icu4x::DateTimeFormatterGregorian& formatter) { +inline icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::ZonedDateTimeFormatterGregorian::create_localized_offset_long_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, const icu4x::DateTimeFormatterGregorian& formatter) { auto result = icu4x::capi::icu4x_ZonedDateTimeFormatterGregorian_create_localized_offset_long_with_provider_mv1(provider.AsFFI(), locale.AsFFI(), formatter.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Ok>(std::unique_ptr(icu4x::ZonedDateTimeFormatterGregorian::FromFFI(result.ok)))) : diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::ZonedDateTimeFormatterGregorian::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); } -inline diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::ZonedDateTimeFormatterGregorian::create_localized_offset_short(const icu4x::Locale& locale, const icu4x::DateTimeFormatterGregorian& formatter) { +inline icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::ZonedDateTimeFormatterGregorian::create_localized_offset_short(const icu4x::Locale& locale, const icu4x::DateTimeFormatterGregorian& formatter) { auto result = icu4x::capi::icu4x_ZonedDateTimeFormatterGregorian_create_localized_offset_short_mv1(locale.AsFFI(), formatter.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Ok>(std::unique_ptr(icu4x::ZonedDateTimeFormatterGregorian::FromFFI(result.ok)))) : diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::ZonedDateTimeFormatterGregorian::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); } -inline diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::ZonedDateTimeFormatterGregorian::create_localized_offset_short_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, const icu4x::DateTimeFormatterGregorian& formatter) { +inline icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::ZonedDateTimeFormatterGregorian::create_localized_offset_short_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, const icu4x::DateTimeFormatterGregorian& formatter) { auto result = icu4x::capi::icu4x_ZonedDateTimeFormatterGregorian_create_localized_offset_short_with_provider_mv1(provider.AsFFI(), locale.AsFFI(), formatter.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Ok>(std::unique_ptr(icu4x::ZonedDateTimeFormatterGregorian::FromFFI(result.ok)))) : diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::ZonedDateTimeFormatterGregorian::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); } -inline diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::ZonedDateTimeFormatterGregorian::create_generic_long(const icu4x::Locale& locale, const icu4x::DateTimeFormatterGregorian& formatter) { +inline icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::ZonedDateTimeFormatterGregorian::create_generic_long(const icu4x::Locale& locale, const icu4x::DateTimeFormatterGregorian& formatter) { auto result = icu4x::capi::icu4x_ZonedDateTimeFormatterGregorian_create_generic_long_mv1(locale.AsFFI(), formatter.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Ok>(std::unique_ptr(icu4x::ZonedDateTimeFormatterGregorian::FromFFI(result.ok)))) : diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::ZonedDateTimeFormatterGregorian::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); } -inline diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::ZonedDateTimeFormatterGregorian::create_generic_long_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, const icu4x::DateTimeFormatterGregorian& formatter) { +inline icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::ZonedDateTimeFormatterGregorian::create_generic_long_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, const icu4x::DateTimeFormatterGregorian& formatter) { auto result = icu4x::capi::icu4x_ZonedDateTimeFormatterGregorian_create_generic_long_with_provider_mv1(provider.AsFFI(), locale.AsFFI(), formatter.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Ok>(std::unique_ptr(icu4x::ZonedDateTimeFormatterGregorian::FromFFI(result.ok)))) : diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::ZonedDateTimeFormatterGregorian::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); } -inline diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::ZonedDateTimeFormatterGregorian::create_generic_short(const icu4x::Locale& locale, const icu4x::DateTimeFormatterGregorian& formatter) { +inline icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::ZonedDateTimeFormatterGregorian::create_generic_short(const icu4x::Locale& locale, const icu4x::DateTimeFormatterGregorian& formatter) { auto result = icu4x::capi::icu4x_ZonedDateTimeFormatterGregorian_create_generic_short_mv1(locale.AsFFI(), formatter.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Ok>(std::unique_ptr(icu4x::ZonedDateTimeFormatterGregorian::FromFFI(result.ok)))) : diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::ZonedDateTimeFormatterGregorian::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); } -inline diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::ZonedDateTimeFormatterGregorian::create_generic_short_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, const icu4x::DateTimeFormatterGregorian& formatter) { +inline icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::ZonedDateTimeFormatterGregorian::create_generic_short_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, const icu4x::DateTimeFormatterGregorian& formatter) { auto result = icu4x::capi::icu4x_ZonedDateTimeFormatterGregorian_create_generic_short_with_provider_mv1(provider.AsFFI(), locale.AsFFI(), formatter.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Ok>(std::unique_ptr(icu4x::ZonedDateTimeFormatterGregorian::FromFFI(result.ok)))) : diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::ZonedDateTimeFormatterGregorian::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); } -inline diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::ZonedDateTimeFormatterGregorian::create_location(const icu4x::Locale& locale, const icu4x::DateTimeFormatterGregorian& formatter) { +inline icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::ZonedDateTimeFormatterGregorian::create_location(const icu4x::Locale& locale, const icu4x::DateTimeFormatterGregorian& formatter) { auto result = icu4x::capi::icu4x_ZonedDateTimeFormatterGregorian_create_location_mv1(locale.AsFFI(), formatter.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Ok>(std::unique_ptr(icu4x::ZonedDateTimeFormatterGregorian::FromFFI(result.ok)))) : diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::ZonedDateTimeFormatterGregorian::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); } -inline diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::ZonedDateTimeFormatterGregorian::create_location_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, const icu4x::DateTimeFormatterGregorian& formatter) { +inline icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::ZonedDateTimeFormatterGregorian::create_location_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, const icu4x::DateTimeFormatterGregorian& formatter) { auto result = icu4x::capi::icu4x_ZonedDateTimeFormatterGregorian_create_location_with_provider_mv1(provider.AsFFI(), locale.AsFFI(), formatter.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Ok>(std::unique_ptr(icu4x::ZonedDateTimeFormatterGregorian::FromFFI(result.ok)))) : diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::ZonedDateTimeFormatterGregorian::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); } -inline diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::ZonedDateTimeFormatterGregorian::create_exemplar_city(const icu4x::Locale& locale, const icu4x::DateTimeFormatterGregorian& formatter) { +inline icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::ZonedDateTimeFormatterGregorian::create_exemplar_city(const icu4x::Locale& locale, const icu4x::DateTimeFormatterGregorian& formatter) { auto result = icu4x::capi::icu4x_ZonedDateTimeFormatterGregorian_create_exemplar_city_mv1(locale.AsFFI(), formatter.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Ok>(std::unique_ptr(icu4x::ZonedDateTimeFormatterGregorian::FromFFI(result.ok)))) : diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::ZonedDateTimeFormatterGregorian::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); } -inline diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::ZonedDateTimeFormatterGregorian::create_exemplar_city_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, const icu4x::DateTimeFormatterGregorian& formatter) { +inline icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::ZonedDateTimeFormatterGregorian::create_exemplar_city_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, const icu4x::DateTimeFormatterGregorian& formatter) { auto result = icu4x::capi::icu4x_ZonedDateTimeFormatterGregorian_create_exemplar_city_with_provider_mv1(provider.AsFFI(), locale.AsFFI(), formatter.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Ok>(std::unique_ptr(icu4x::ZonedDateTimeFormatterGregorian::FromFFI(result.ok)))) : diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::ZonedDateTimeFormatterGregorian::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); } -inline diplomat::result icu4x::ZonedDateTimeFormatterGregorian::format_iso(const icu4x::IsoDate& iso_date, const icu4x::Time& time, const icu4x::TimeZoneInfo& zone) const { +inline icu4x::diplomat::result icu4x::ZonedDateTimeFormatterGregorian::format_iso(const icu4x::IsoDate& iso_date, const icu4x::Time& time, const icu4x::TimeZoneInfo& zone) const { std::string output; - diplomat::capi::DiplomatWrite write = diplomat::WriteFromString(output); + icu4x::diplomat::capi::DiplomatWrite write = icu4x::diplomat::WriteFromString(output); auto result = icu4x::capi::icu4x_ZonedDateTimeFormatterGregorian_format_iso_mv1(this->AsFFI(), iso_date.AsFFI(), time.AsFFI(), zone.AsFFI(), &write); - return result.is_ok ? diplomat::result(diplomat::Ok(std::move(output))) : diplomat::result(diplomat::Err(icu4x::DateTimeWriteError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result(icu4x::diplomat::Ok(std::move(output))) : icu4x::diplomat::result(icu4x::diplomat::Err(icu4x::DateTimeWriteError::FromFFI(result.err))); } template -inline diplomat::result icu4x::ZonedDateTimeFormatterGregorian::format_iso_write(const icu4x::IsoDate& iso_date, const icu4x::Time& time, const icu4x::TimeZoneInfo& zone, W& writeable) const { - diplomat::capi::DiplomatWrite write = diplomat::WriteTrait::Construct(writeable); +inline icu4x::diplomat::result icu4x::ZonedDateTimeFormatterGregorian::format_iso_write(const icu4x::IsoDate& iso_date, const icu4x::Time& time, const icu4x::TimeZoneInfo& zone, W& writeable) const { + icu4x::diplomat::capi::DiplomatWrite write = icu4x::diplomat::WriteTrait::Construct(writeable); auto result = icu4x::capi::icu4x_ZonedDateTimeFormatterGregorian_format_iso_mv1(this->AsFFI(), iso_date.AsFFI(), time.AsFFI(), zone.AsFFI(), &write); - return result.is_ok ? diplomat::result(diplomat::Ok()) : diplomat::result(diplomat::Err(icu4x::DateTimeWriteError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result(icu4x::diplomat::Ok()) : icu4x::diplomat::result(icu4x::diplomat::Err(icu4x::DateTimeWriteError::FromFFI(result.err))); } inline const icu4x::capi::ZonedDateTimeFormatterGregorian* icu4x::ZonedDateTimeFormatterGregorian::AsFFI() const { @@ -229,4 +229,4 @@ inline void icu4x::ZonedDateTimeFormatterGregorian::operator delete(void* ptr) { } -#endif // icu4x_ZonedDateTimeFormatterGregorian_HPP +#endif // ICU4X_ZonedDateTimeFormatterGregorian_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/ZonedIsoDateTime.d.hpp b/ffi/capi/bindings/cpp/icu4x/ZonedIsoDateTime.d.hpp index 77d0f315049..0ade26b5ad6 100644 --- a/ffi/capi/bindings/cpp/icu4x/ZonedIsoDateTime.d.hpp +++ b/ffi/capi/bindings/cpp/icu4x/ZonedIsoDateTime.d.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_ZonedIsoDateTime_D_HPP -#define icu4x_ZonedIsoDateTime_D_HPP +#ifndef ICU4X_ZonedIsoDateTime_D_HPP +#define ICU4X_ZonedIsoDateTime_D_HPP #include #include @@ -9,8 +9,7 @@ #include #include #include -#include "../diplomat_runtime.hpp" - +#include "diplomat_runtime.hpp" namespace icu4x { namespace capi { struct IanaParser; } class IanaParser; @@ -26,7 +25,8 @@ namespace capi { struct VariantOffsetsCalculator; } class VariantOffsetsCalculator; struct ZonedIsoDateTime; class Rfc9557ParseError; -} +} // namespace icu4x + namespace icu4x { @@ -54,28 +54,28 @@ struct ZonedIsoDateTime { std::unique_ptr zone; /** - * Creates a new {@link ZonedIsoDateTime} from an IXDTF string. - * - * See the [Rust documentation for `try_strict_from_str`](https://docs.rs/icu/2.0.0/icu/time/struct.ZonedDateTime.html#method.try_strict_from_str) for more information. + * Creates a new {@link ZonedIsoDateTime} from an IXDTF string. + * + * See the [Rust documentation for `try_strict_from_str`](https://docs.rs/icu/2.0.0/icu/time/struct.ZonedDateTime.html#method.try_strict_from_str) for more information. */ - inline static diplomat::result strict_from_string(std::string_view v, const icu4x::IanaParser& iana_parser); + inline static icu4x::diplomat::result strict_from_string(std::string_view v, const icu4x::IanaParser& iana_parser); /** - * Creates a new {@link ZonedIsoDateTime} from an IXDTF string. - * - * See the [Rust documentation for `try_full_from_str`](https://docs.rs/icu/2.0.0/icu/time/struct.ZonedDateTime.html#method.try_full_from_str) for more information. - * - * \deprecated use strict_from_string + * Creates a new {@link ZonedIsoDateTime} from an IXDTF string. + * + * See the [Rust documentation for `try_full_from_str`](https://docs.rs/icu/2.0.0/icu/time/struct.ZonedDateTime.html#method.try_full_from_str) for more information. + * + * \deprecated use strict_from_string */ [[deprecated("use strict_from_string")]] - inline static diplomat::result full_from_string(std::string_view v, const icu4x::IanaParser& iana_parser, const icu4x::VariantOffsetsCalculator& _offset_calculator); + inline static icu4x::diplomat::result full_from_string(std::string_view v, const icu4x::IanaParser& iana_parser, const icu4x::VariantOffsetsCalculator& _offset_calculator); /** - * Creates a new {@link ZonedIsoDateTime} from milliseconds since epoch (timestamp) and a UTC offset. - * - * Note: {@link ZonedIsoDateTime}s created with this constructor can only be formatted using localized offset zone styles. - * - * See the [Rust documentation for `from_epoch_milliseconds_and_utc_offset`](https://docs.rs/icu/2.0.0/icu/time/struct.ZonedDateTime.html#method.from_epoch_milliseconds_and_utc_offset) for more information. + * Creates a new {@link ZonedIsoDateTime} from milliseconds since epoch (timestamp) and a UTC offset. + * + * Note: {@link ZonedIsoDateTime}s created with this constructor can only be formatted using localized offset zone styles. + * + * See the [Rust documentation for `from_epoch_milliseconds_and_utc_offset`](https://docs.rs/icu/2.0.0/icu/time/struct.ZonedDateTime.html#method.from_epoch_milliseconds_and_utc_offset) for more information. */ inline static icu4x::ZonedIsoDateTime from_epoch_milliseconds_and_utc_offset(int64_t epoch_milliseconds, const icu4x::UtcOffset& utc_offset); @@ -84,4 +84,4 @@ struct ZonedIsoDateTime { }; } // namespace -#endif // icu4x_ZonedIsoDateTime_D_HPP +#endif // ICU4X_ZonedIsoDateTime_D_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/ZonedIsoDateTime.hpp b/ffi/capi/bindings/cpp/icu4x/ZonedIsoDateTime.hpp index 8ab59870673..c80e3452faf 100644 --- a/ffi/capi/bindings/cpp/icu4x/ZonedIsoDateTime.hpp +++ b/ffi/capi/bindings/cpp/icu4x/ZonedIsoDateTime.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_ZonedIsoDateTime_HPP -#define icu4x_ZonedIsoDateTime_HPP +#ifndef ICU4X_ZonedIsoDateTime_HPP +#define ICU4X_ZonedIsoDateTime_HPP #include "ZonedIsoDateTime.d.hpp" @@ -11,7 +11,6 @@ #include #include #include -#include "../diplomat_runtime.hpp" #include "IanaParser.hpp" #include "IsoDate.hpp" #include "Rfc9557ParseError.hpp" @@ -19,6 +18,7 @@ #include "TimeZoneInfo.hpp" #include "UtcOffset.hpp" #include "VariantOffsetsCalculator.hpp" +#include "diplomat_runtime.hpp" namespace icu4x { @@ -26,10 +26,10 @@ namespace capi { extern "C" { typedef struct icu4x_ZonedIsoDateTime_strict_from_string_mv1_result {union {icu4x::capi::ZonedIsoDateTime ok; icu4x::capi::Rfc9557ParseError err;}; bool is_ok;} icu4x_ZonedIsoDateTime_strict_from_string_mv1_result; - icu4x_ZonedIsoDateTime_strict_from_string_mv1_result icu4x_ZonedIsoDateTime_strict_from_string_mv1(diplomat::capi::DiplomatStringView v, const icu4x::capi::IanaParser* iana_parser); + icu4x_ZonedIsoDateTime_strict_from_string_mv1_result icu4x_ZonedIsoDateTime_strict_from_string_mv1(icu4x::diplomat::capi::DiplomatStringView v, const icu4x::capi::IanaParser* iana_parser); typedef struct icu4x_ZonedIsoDateTime_full_from_string_mv1_result {union {icu4x::capi::ZonedIsoDateTime ok; icu4x::capi::Rfc9557ParseError err;}; bool is_ok;} icu4x_ZonedIsoDateTime_full_from_string_mv1_result; - icu4x_ZonedIsoDateTime_full_from_string_mv1_result icu4x_ZonedIsoDateTime_full_from_string_mv1(diplomat::capi::DiplomatStringView v, const icu4x::capi::IanaParser* iana_parser, const icu4x::capi::VariantOffsetsCalculator* _offset_calculator); + icu4x_ZonedIsoDateTime_full_from_string_mv1_result icu4x_ZonedIsoDateTime_full_from_string_mv1(icu4x::diplomat::capi::DiplomatStringView v, const icu4x::capi::IanaParser* iana_parser, const icu4x::capi::VariantOffsetsCalculator* _offset_calculator); icu4x::capi::ZonedIsoDateTime icu4x_ZonedIsoDateTime_from_epoch_milliseconds_and_utc_offset_mv1(int64_t epoch_milliseconds, const icu4x::capi::UtcOffset* utc_offset); @@ -37,17 +37,17 @@ namespace capi { } // namespace capi } // namespace -inline diplomat::result icu4x::ZonedIsoDateTime::strict_from_string(std::string_view v, const icu4x::IanaParser& iana_parser) { +inline icu4x::diplomat::result icu4x::ZonedIsoDateTime::strict_from_string(std::string_view v, const icu4x::IanaParser& iana_parser) { auto result = icu4x::capi::icu4x_ZonedIsoDateTime_strict_from_string_mv1({v.data(), v.size()}, iana_parser.AsFFI()); - return result.is_ok ? diplomat::result(diplomat::Ok(icu4x::ZonedIsoDateTime::FromFFI(result.ok))) : diplomat::result(diplomat::Err(icu4x::Rfc9557ParseError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result(icu4x::diplomat::Ok(icu4x::ZonedIsoDateTime::FromFFI(result.ok))) : icu4x::diplomat::result(icu4x::diplomat::Err(icu4x::Rfc9557ParseError::FromFFI(result.err))); } -inline diplomat::result icu4x::ZonedIsoDateTime::full_from_string(std::string_view v, const icu4x::IanaParser& iana_parser, const icu4x::VariantOffsetsCalculator& _offset_calculator) { +inline icu4x::diplomat::result icu4x::ZonedIsoDateTime::full_from_string(std::string_view v, const icu4x::IanaParser& iana_parser, const icu4x::VariantOffsetsCalculator& _offset_calculator) { auto result = icu4x::capi::icu4x_ZonedIsoDateTime_full_from_string_mv1({v.data(), v.size()}, iana_parser.AsFFI(), _offset_calculator.AsFFI()); - return result.is_ok ? diplomat::result(diplomat::Ok(icu4x::ZonedIsoDateTime::FromFFI(result.ok))) : diplomat::result(diplomat::Err(icu4x::Rfc9557ParseError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result(icu4x::diplomat::Ok(icu4x::ZonedIsoDateTime::FromFFI(result.ok))) : icu4x::diplomat::result(icu4x::diplomat::Err(icu4x::Rfc9557ParseError::FromFFI(result.err))); } inline icu4x::ZonedIsoDateTime icu4x::ZonedIsoDateTime::from_epoch_milliseconds_and_utc_offset(int64_t epoch_milliseconds, const icu4x::UtcOffset& utc_offset) { @@ -74,4 +74,4 @@ inline icu4x::ZonedIsoDateTime icu4x::ZonedIsoDateTime::FromFFI(icu4x::capi::Zon } -#endif // icu4x_ZonedIsoDateTime_HPP +#endif // ICU4X_ZonedIsoDateTime_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/ZonedTimeFormatter.d.hpp b/ffi/capi/bindings/cpp/icu4x/ZonedTimeFormatter.d.hpp index a53df4c4d4c..81417adacea 100644 --- a/ffi/capi/bindings/cpp/icu4x/ZonedTimeFormatter.d.hpp +++ b/ffi/capi/bindings/cpp/icu4x/ZonedTimeFormatter.d.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_ZonedTimeFormatter_D_HPP -#define icu4x_ZonedTimeFormatter_D_HPP +#ifndef ICU4X_ZonedTimeFormatter_D_HPP +#define ICU4X_ZonedTimeFormatter_D_HPP #include #include @@ -9,8 +9,7 @@ #include #include #include -#include "../diplomat_runtime.hpp" - +#include "diplomat_runtime.hpp" namespace icu4x { namespace capi { struct DataProvider; } class DataProvider; @@ -27,7 +26,8 @@ class DateTimeFormatterLoadError; class DateTimeLength; class DateTimeWriteError; class TimePrecision; -} +} // namespace icu4x + namespace icu4x { @@ -44,171 +44,171 @@ class ZonedTimeFormatter { public: /** - * Creates a zoned formatter based on a non-zoned formatter. - * - * Caution: The locale provided here must match the locale used to construct the non-zoned formatter, - * or else unexpected behavior may occur! - * - * See the [Rust documentation for `SpecificLong`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/zone/struct.SpecificLong.html) for more information. + * Creates a zoned formatter based on a non-zoned formatter. + * + * Caution: The locale provided here must match the locale used to construct the non-zoned formatter, + * or else unexpected behavior may occur! + * + * See the [Rust documentation for `SpecificLong`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/zone/struct.SpecificLong.html) for more information. */ - inline static diplomat::result, icu4x::DateTimeFormatterLoadError> create_specific_long(const icu4x::Locale& locale, std::optional length, std::optional time_precision, std::optional alignment); + inline static icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> create_specific_long(const icu4x::Locale& locale, std::optional length, std::optional time_precision, std::optional alignment); /** - * Creates a zoned formatter based on a non-zoned formatter. - * - * Caution: The locale provided here must match the locale used to construct the non-zoned formatter, - * or else unexpected behavior may occur! - * - * See the [Rust documentation for `SpecificLong`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/zone/struct.SpecificLong.html) for more information. + * Creates a zoned formatter based on a non-zoned formatter. + * + * Caution: The locale provided here must match the locale used to construct the non-zoned formatter, + * or else unexpected behavior may occur! + * + * See the [Rust documentation for `SpecificLong`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/zone/struct.SpecificLong.html) for more information. */ - inline static diplomat::result, icu4x::DateTimeFormatterLoadError> create_specific_long_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, std::optional length, std::optional time_precision, std::optional alignment); + inline static icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> create_specific_long_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, std::optional length, std::optional time_precision, std::optional alignment); /** - * Creates a zoned formatter based on a non-zoned formatter. - * - * Caution: The locale provided here must match the locale used to construct the non-zoned formatter, - * or else unexpected behavior may occur! - * - * See the [Rust documentation for `SpecificShort`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/zone/struct.SpecificShort.html) for more information. + * Creates a zoned formatter based on a non-zoned formatter. + * + * Caution: The locale provided here must match the locale used to construct the non-zoned formatter, + * or else unexpected behavior may occur! + * + * See the [Rust documentation for `SpecificShort`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/zone/struct.SpecificShort.html) for more information. */ - inline static diplomat::result, icu4x::DateTimeFormatterLoadError> create_specific_short(const icu4x::Locale& locale, std::optional length, std::optional time_precision, std::optional alignment); + inline static icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> create_specific_short(const icu4x::Locale& locale, std::optional length, std::optional time_precision, std::optional alignment); /** - * Creates a zoned formatter based on a non-zoned formatter. - * - * Caution: The locale provided here must match the locale used to construct the non-zoned formatter, - * or else unexpected behavior may occur! - * - * See the [Rust documentation for `SpecificShort`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/zone/struct.SpecificShort.html) for more information. + * Creates a zoned formatter based on a non-zoned formatter. + * + * Caution: The locale provided here must match the locale used to construct the non-zoned formatter, + * or else unexpected behavior may occur! + * + * See the [Rust documentation for `SpecificShort`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/zone/struct.SpecificShort.html) for more information. */ - inline static diplomat::result, icu4x::DateTimeFormatterLoadError> create_specific_short_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, std::optional length, std::optional time_precision, std::optional alignment); + inline static icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> create_specific_short_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, std::optional length, std::optional time_precision, std::optional alignment); /** - * Creates a zoned formatter based on a non-zoned formatter. - * - * Caution: The locale provided here must match the locale used to construct the non-zoned formatter, - * or else unexpected behavior may occur! - * - * See the [Rust documentation for `LocalizedOffsetLong`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/zone/struct.LocalizedOffsetLong.html) for more information. + * Creates a zoned formatter based on a non-zoned formatter. + * + * Caution: The locale provided here must match the locale used to construct the non-zoned formatter, + * or else unexpected behavior may occur! + * + * See the [Rust documentation for `LocalizedOffsetLong`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/zone/struct.LocalizedOffsetLong.html) for more information. */ - inline static diplomat::result, icu4x::DateTimeFormatterLoadError> create_localized_offset_long(const icu4x::Locale& locale, std::optional length, std::optional time_precision, std::optional alignment); + inline static icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> create_localized_offset_long(const icu4x::Locale& locale, std::optional length, std::optional time_precision, std::optional alignment); /** - * Creates a zoned formatter based on a non-zoned formatter. - * - * Caution: The locale provided here must match the locale used to construct the non-zoned formatter, - * or else unexpected behavior may occur! - * - * See the [Rust documentation for `LocalizedOffsetLong`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/zone/struct.LocalizedOffsetLong.html) for more information. + * Creates a zoned formatter based on a non-zoned formatter. + * + * Caution: The locale provided here must match the locale used to construct the non-zoned formatter, + * or else unexpected behavior may occur! + * + * See the [Rust documentation for `LocalizedOffsetLong`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/zone/struct.LocalizedOffsetLong.html) for more information. */ - inline static diplomat::result, icu4x::DateTimeFormatterLoadError> create_localized_offset_long_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, std::optional length, std::optional time_precision, std::optional alignment); + inline static icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> create_localized_offset_long_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, std::optional length, std::optional time_precision, std::optional alignment); /** - * Creates a zoned formatter based on a non-zoned formatter. - * - * Caution: The locale provided here must match the locale used to construct the non-zoned formatter, - * or else unexpected behavior may occur! - * - * See the [Rust documentation for `LocalizedOffsetShort`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/zone/struct.LocalizedOffsetShort.html) for more information. + * Creates a zoned formatter based on a non-zoned formatter. + * + * Caution: The locale provided here must match the locale used to construct the non-zoned formatter, + * or else unexpected behavior may occur! + * + * See the [Rust documentation for `LocalizedOffsetShort`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/zone/struct.LocalizedOffsetShort.html) for more information. */ - inline static diplomat::result, icu4x::DateTimeFormatterLoadError> create_localized_offset_short(const icu4x::Locale& locale, std::optional length, std::optional time_precision, std::optional alignment); + inline static icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> create_localized_offset_short(const icu4x::Locale& locale, std::optional length, std::optional time_precision, std::optional alignment); /** - * Creates a zoned formatter based on a non-zoned formatter. - * - * Caution: The locale provided here must match the locale used to construct the non-zoned formatter, - * or else unexpected behavior may occur! - * - * See the [Rust documentation for `LocalizedOffsetShort`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/zone/struct.LocalizedOffsetShort.html) for more information. + * Creates a zoned formatter based on a non-zoned formatter. + * + * Caution: The locale provided here must match the locale used to construct the non-zoned formatter, + * or else unexpected behavior may occur! + * + * See the [Rust documentation for `LocalizedOffsetShort`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/zone/struct.LocalizedOffsetShort.html) for more information. */ - inline static diplomat::result, icu4x::DateTimeFormatterLoadError> create_localized_offset_short_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, std::optional length, std::optional time_precision, std::optional alignment); + inline static icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> create_localized_offset_short_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, std::optional length, std::optional time_precision, std::optional alignment); /** - * Creates a zoned formatter based on a non-zoned formatter. - * - * Caution: The locale provided here must match the locale used to construct the non-zoned formatter, - * or else unexpected behavior may occur! - * - * See the [Rust documentation for `GenericLong`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/zone/struct.GenericLong.html) for more information. + * Creates a zoned formatter based on a non-zoned formatter. + * + * Caution: The locale provided here must match the locale used to construct the non-zoned formatter, + * or else unexpected behavior may occur! + * + * See the [Rust documentation for `GenericLong`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/zone/struct.GenericLong.html) for more information. */ - inline static diplomat::result, icu4x::DateTimeFormatterLoadError> create_generic_long(const icu4x::Locale& locale, std::optional length, std::optional time_precision, std::optional alignment); + inline static icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> create_generic_long(const icu4x::Locale& locale, std::optional length, std::optional time_precision, std::optional alignment); /** - * Creates a zoned formatter based on a non-zoned formatter. - * - * Caution: The locale provided here must match the locale used to construct the non-zoned formatter, - * or else unexpected behavior may occur! - * - * See the [Rust documentation for `GenericLong`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/zone/struct.GenericLong.html) for more information. + * Creates a zoned formatter based on a non-zoned formatter. + * + * Caution: The locale provided here must match the locale used to construct the non-zoned formatter, + * or else unexpected behavior may occur! + * + * See the [Rust documentation for `GenericLong`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/zone/struct.GenericLong.html) for more information. */ - inline static diplomat::result, icu4x::DateTimeFormatterLoadError> create_generic_long_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, std::optional length, std::optional time_precision, std::optional alignment); + inline static icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> create_generic_long_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, std::optional length, std::optional time_precision, std::optional alignment); /** - * Creates a zoned formatter based on a non-zoned formatter. - * - * Caution: The locale provided here must match the locale used to construct the non-zoned formatter, - * or else unexpected behavior may occur! - * - * See the [Rust documentation for `GenericShort`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/zone/struct.GenericShort.html) for more information. + * Creates a zoned formatter based on a non-zoned formatter. + * + * Caution: The locale provided here must match the locale used to construct the non-zoned formatter, + * or else unexpected behavior may occur! + * + * See the [Rust documentation for `GenericShort`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/zone/struct.GenericShort.html) for more information. */ - inline static diplomat::result, icu4x::DateTimeFormatterLoadError> create_generic_short(const icu4x::Locale& locale, std::optional length, std::optional time_precision, std::optional alignment); + inline static icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> create_generic_short(const icu4x::Locale& locale, std::optional length, std::optional time_precision, std::optional alignment); /** - * Creates a zoned formatter based on a non-zoned formatter. - * - * Caution: The locale provided here must match the locale used to construct the non-zoned formatter, - * or else unexpected behavior may occur! - * - * See the [Rust documentation for `GenericShort`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/zone/struct.GenericShort.html) for more information. + * Creates a zoned formatter based on a non-zoned formatter. + * + * Caution: The locale provided here must match the locale used to construct the non-zoned formatter, + * or else unexpected behavior may occur! + * + * See the [Rust documentation for `GenericShort`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/zone/struct.GenericShort.html) for more information. */ - inline static diplomat::result, icu4x::DateTimeFormatterLoadError> create_generic_short_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, std::optional length, std::optional time_precision, std::optional alignment); + inline static icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> create_generic_short_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, std::optional length, std::optional time_precision, std::optional alignment); /** - * Creates a zoned formatter based on a non-zoned formatter. - * - * Caution: The locale provided here must match the locale used to construct the non-zoned formatter, - * or else unexpected behavior may occur! - * - * See the [Rust documentation for `Location`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/zone/struct.Location.html) for more information. + * Creates a zoned formatter based on a non-zoned formatter. + * + * Caution: The locale provided here must match the locale used to construct the non-zoned formatter, + * or else unexpected behavior may occur! + * + * See the [Rust documentation for `Location`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/zone/struct.Location.html) for more information. */ - inline static diplomat::result, icu4x::DateTimeFormatterLoadError> create_location(const icu4x::Locale& locale, std::optional length, std::optional time_precision, std::optional alignment); + inline static icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> create_location(const icu4x::Locale& locale, std::optional length, std::optional time_precision, std::optional alignment); /** - * Creates a zoned formatter based on a non-zoned formatter. - * - * Caution: The locale provided here must match the locale used to construct the non-zoned formatter, - * or else unexpected behavior may occur! - * - * See the [Rust documentation for `Location`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/zone/struct.Location.html) for more information. + * Creates a zoned formatter based on a non-zoned formatter. + * + * Caution: The locale provided here must match the locale used to construct the non-zoned formatter, + * or else unexpected behavior may occur! + * + * See the [Rust documentation for `Location`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/zone/struct.Location.html) for more information. */ - inline static diplomat::result, icu4x::DateTimeFormatterLoadError> create_location_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, std::optional length, std::optional time_precision, std::optional alignment); + inline static icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> create_location_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, std::optional length, std::optional time_precision, std::optional alignment); /** - * Creates a zoned formatter based on a non-zoned formatter. - * - * Caution: The locale provided here must match the locale used to construct the non-zoned formatter, - * or else unexpected behavior may occur! - * - * See the [Rust documentation for `ExemplarCity`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/zone/struct.ExemplarCity.html) for more information. + * Creates a zoned formatter based on a non-zoned formatter. + * + * Caution: The locale provided here must match the locale used to construct the non-zoned formatter, + * or else unexpected behavior may occur! + * + * See the [Rust documentation for `ExemplarCity`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/zone/struct.ExemplarCity.html) for more information. */ - inline static diplomat::result, icu4x::DateTimeFormatterLoadError> create_exemplar_city(const icu4x::Locale& locale, std::optional length, std::optional time_precision, std::optional alignment); + inline static icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> create_exemplar_city(const icu4x::Locale& locale, std::optional length, std::optional time_precision, std::optional alignment); /** - * Creates a zoned formatter based on a non-zoned formatter. - * - * Caution: The locale provided here must match the locale used to construct the non-zoned formatter, - * or else unexpected behavior may occur! - * - * See the [Rust documentation for `ExemplarCity`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/zone/struct.ExemplarCity.html) for more information. + * Creates a zoned formatter based on a non-zoned formatter. + * + * Caution: The locale provided here must match the locale used to construct the non-zoned formatter, + * or else unexpected behavior may occur! + * + * See the [Rust documentation for `ExemplarCity`](https://docs.rs/icu/2.0.0/icu/datetime/fieldsets/zone/struct.ExemplarCity.html) for more information. */ - inline static diplomat::result, icu4x::DateTimeFormatterLoadError> create_exemplar_city_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, std::optional length, std::optional time_precision, std::optional alignment); + inline static icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> create_exemplar_city_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, std::optional length, std::optional time_precision, std::optional alignment); /** - * See the [Rust documentation for `format`](https://docs.rs/icu/2.0.0/icu/datetime/struct.FixedCalendarDateTimeFormatter.html#method.format) for more information. + * See the [Rust documentation for `format`](https://docs.rs/icu/2.0.0/icu/datetime/struct.FixedCalendarDateTimeFormatter.html#method.format) for more information. */ - inline diplomat::result format(const icu4x::Time& time, const icu4x::TimeZoneInfo& zone) const; + inline icu4x::diplomat::result format(const icu4x::Time& time, const icu4x::TimeZoneInfo& zone) const; template - inline diplomat::result format_write(const icu4x::Time& time, const icu4x::TimeZoneInfo& zone, W& writeable_output) const; + inline icu4x::diplomat::result format_write(const icu4x::Time& time, const icu4x::TimeZoneInfo& zone, W& writeable_output) const; inline const icu4x::capi::ZonedTimeFormatter* AsFFI() const; inline icu4x::capi::ZonedTimeFormatter* AsFFI(); @@ -225,4 +225,4 @@ class ZonedTimeFormatter { }; } // namespace -#endif // icu4x_ZonedTimeFormatter_D_HPP +#endif // ICU4X_ZonedTimeFormatter_D_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/ZonedTimeFormatter.hpp b/ffi/capi/bindings/cpp/icu4x/ZonedTimeFormatter.hpp index 737e0da04d9..5730844d831 100644 --- a/ffi/capi/bindings/cpp/icu4x/ZonedTimeFormatter.hpp +++ b/ffi/capi/bindings/cpp/icu4x/ZonedTimeFormatter.hpp @@ -1,5 +1,5 @@ -#ifndef icu4x_ZonedTimeFormatter_HPP -#define icu4x_ZonedTimeFormatter_HPP +#ifndef ICU4X_ZonedTimeFormatter_HPP +#define ICU4X_ZonedTimeFormatter_HPP #include "ZonedTimeFormatter.d.hpp" @@ -11,7 +11,6 @@ #include #include #include -#include "../diplomat_runtime.hpp" #include "DataProvider.hpp" #include "DateTimeAlignment.hpp" #include "DateTimeFormatterLoadError.hpp" @@ -21,6 +20,7 @@ #include "Time.hpp" #include "TimePrecision.hpp" #include "TimeZoneInfo.hpp" +#include "diplomat_runtime.hpp" namespace icu4x { @@ -76,7 +76,7 @@ namespace capi { icu4x_ZonedTimeFormatter_create_exemplar_city_with_provider_mv1_result icu4x_ZonedTimeFormatter_create_exemplar_city_with_provider_mv1(const icu4x::capi::DataProvider* provider, const icu4x::capi::Locale* locale, icu4x::capi::DateTimeLength_option length, icu4x::capi::TimePrecision_option time_precision, icu4x::capi::DateTimeAlignment_option alignment); typedef struct icu4x_ZonedTimeFormatter_format_mv1_result {union { icu4x::capi::DateTimeWriteError err;}; bool is_ok;} icu4x_ZonedTimeFormatter_format_mv1_result; - icu4x_ZonedTimeFormatter_format_mv1_result icu4x_ZonedTimeFormatter_format_mv1(const icu4x::capi::ZonedTimeFormatter* self, const icu4x::capi::Time* time, const icu4x::capi::TimeZoneInfo* zone, diplomat::capi::DiplomatWrite* write); + icu4x_ZonedTimeFormatter_format_mv1_result icu4x_ZonedTimeFormatter_format_mv1(const icu4x::capi::ZonedTimeFormatter* self, const icu4x::capi::Time* time, const icu4x::capi::TimeZoneInfo* zone, icu4x::diplomat::capi::DiplomatWrite* write); void icu4x_ZonedTimeFormatter_destroy_mv1(ZonedTimeFormatter* self); @@ -84,159 +84,159 @@ namespace capi { } // namespace capi } // namespace -inline diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::ZonedTimeFormatter::create_specific_long(const icu4x::Locale& locale, std::optional length, std::optional time_precision, std::optional alignment) { +inline icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::ZonedTimeFormatter::create_specific_long(const icu4x::Locale& locale, std::optional length, std::optional time_precision, std::optional alignment) { auto result = icu4x::capi::icu4x_ZonedTimeFormatter_create_specific_long_mv1(locale.AsFFI(), length.has_value() ? (icu4x::capi::DateTimeLength_option{ { length.value().AsFFI() }, true }) : (icu4x::capi::DateTimeLength_option{ {}, false }), time_precision.has_value() ? (icu4x::capi::TimePrecision_option{ { time_precision.value().AsFFI() }, true }) : (icu4x::capi::TimePrecision_option{ {}, false }), alignment.has_value() ? (icu4x::capi::DateTimeAlignment_option{ { alignment.value().AsFFI() }, true }) : (icu4x::capi::DateTimeAlignment_option{ {}, false })); - return result.is_ok ? diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Ok>(std::unique_ptr(icu4x::ZonedTimeFormatter::FromFFI(result.ok)))) : diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::ZonedTimeFormatter::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); } -inline diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::ZonedTimeFormatter::create_specific_long_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, std::optional length, std::optional time_precision, std::optional alignment) { +inline icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::ZonedTimeFormatter::create_specific_long_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, std::optional length, std::optional time_precision, std::optional alignment) { auto result = icu4x::capi::icu4x_ZonedTimeFormatter_create_specific_long_with_provider_mv1(provider.AsFFI(), locale.AsFFI(), length.has_value() ? (icu4x::capi::DateTimeLength_option{ { length.value().AsFFI() }, true }) : (icu4x::capi::DateTimeLength_option{ {}, false }), time_precision.has_value() ? (icu4x::capi::TimePrecision_option{ { time_precision.value().AsFFI() }, true }) : (icu4x::capi::TimePrecision_option{ {}, false }), alignment.has_value() ? (icu4x::capi::DateTimeAlignment_option{ { alignment.value().AsFFI() }, true }) : (icu4x::capi::DateTimeAlignment_option{ {}, false })); - return result.is_ok ? diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Ok>(std::unique_ptr(icu4x::ZonedTimeFormatter::FromFFI(result.ok)))) : diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::ZonedTimeFormatter::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); } -inline diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::ZonedTimeFormatter::create_specific_short(const icu4x::Locale& locale, std::optional length, std::optional time_precision, std::optional alignment) { +inline icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::ZonedTimeFormatter::create_specific_short(const icu4x::Locale& locale, std::optional length, std::optional time_precision, std::optional alignment) { auto result = icu4x::capi::icu4x_ZonedTimeFormatter_create_specific_short_mv1(locale.AsFFI(), length.has_value() ? (icu4x::capi::DateTimeLength_option{ { length.value().AsFFI() }, true }) : (icu4x::capi::DateTimeLength_option{ {}, false }), time_precision.has_value() ? (icu4x::capi::TimePrecision_option{ { time_precision.value().AsFFI() }, true }) : (icu4x::capi::TimePrecision_option{ {}, false }), alignment.has_value() ? (icu4x::capi::DateTimeAlignment_option{ { alignment.value().AsFFI() }, true }) : (icu4x::capi::DateTimeAlignment_option{ {}, false })); - return result.is_ok ? diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Ok>(std::unique_ptr(icu4x::ZonedTimeFormatter::FromFFI(result.ok)))) : diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::ZonedTimeFormatter::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); } -inline diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::ZonedTimeFormatter::create_specific_short_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, std::optional length, std::optional time_precision, std::optional alignment) { +inline icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::ZonedTimeFormatter::create_specific_short_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, std::optional length, std::optional time_precision, std::optional alignment) { auto result = icu4x::capi::icu4x_ZonedTimeFormatter_create_specific_short_with_provider_mv1(provider.AsFFI(), locale.AsFFI(), length.has_value() ? (icu4x::capi::DateTimeLength_option{ { length.value().AsFFI() }, true }) : (icu4x::capi::DateTimeLength_option{ {}, false }), time_precision.has_value() ? (icu4x::capi::TimePrecision_option{ { time_precision.value().AsFFI() }, true }) : (icu4x::capi::TimePrecision_option{ {}, false }), alignment.has_value() ? (icu4x::capi::DateTimeAlignment_option{ { alignment.value().AsFFI() }, true }) : (icu4x::capi::DateTimeAlignment_option{ {}, false })); - return result.is_ok ? diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Ok>(std::unique_ptr(icu4x::ZonedTimeFormatter::FromFFI(result.ok)))) : diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::ZonedTimeFormatter::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); } -inline diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::ZonedTimeFormatter::create_localized_offset_long(const icu4x::Locale& locale, std::optional length, std::optional time_precision, std::optional alignment) { +inline icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::ZonedTimeFormatter::create_localized_offset_long(const icu4x::Locale& locale, std::optional length, std::optional time_precision, std::optional alignment) { auto result = icu4x::capi::icu4x_ZonedTimeFormatter_create_localized_offset_long_mv1(locale.AsFFI(), length.has_value() ? (icu4x::capi::DateTimeLength_option{ { length.value().AsFFI() }, true }) : (icu4x::capi::DateTimeLength_option{ {}, false }), time_precision.has_value() ? (icu4x::capi::TimePrecision_option{ { time_precision.value().AsFFI() }, true }) : (icu4x::capi::TimePrecision_option{ {}, false }), alignment.has_value() ? (icu4x::capi::DateTimeAlignment_option{ { alignment.value().AsFFI() }, true }) : (icu4x::capi::DateTimeAlignment_option{ {}, false })); - return result.is_ok ? diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Ok>(std::unique_ptr(icu4x::ZonedTimeFormatter::FromFFI(result.ok)))) : diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::ZonedTimeFormatter::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); } -inline diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::ZonedTimeFormatter::create_localized_offset_long_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, std::optional length, std::optional time_precision, std::optional alignment) { +inline icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::ZonedTimeFormatter::create_localized_offset_long_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, std::optional length, std::optional time_precision, std::optional alignment) { auto result = icu4x::capi::icu4x_ZonedTimeFormatter_create_localized_offset_long_with_provider_mv1(provider.AsFFI(), locale.AsFFI(), length.has_value() ? (icu4x::capi::DateTimeLength_option{ { length.value().AsFFI() }, true }) : (icu4x::capi::DateTimeLength_option{ {}, false }), time_precision.has_value() ? (icu4x::capi::TimePrecision_option{ { time_precision.value().AsFFI() }, true }) : (icu4x::capi::TimePrecision_option{ {}, false }), alignment.has_value() ? (icu4x::capi::DateTimeAlignment_option{ { alignment.value().AsFFI() }, true }) : (icu4x::capi::DateTimeAlignment_option{ {}, false })); - return result.is_ok ? diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Ok>(std::unique_ptr(icu4x::ZonedTimeFormatter::FromFFI(result.ok)))) : diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::ZonedTimeFormatter::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); } -inline diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::ZonedTimeFormatter::create_localized_offset_short(const icu4x::Locale& locale, std::optional length, std::optional time_precision, std::optional alignment) { +inline icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::ZonedTimeFormatter::create_localized_offset_short(const icu4x::Locale& locale, std::optional length, std::optional time_precision, std::optional alignment) { auto result = icu4x::capi::icu4x_ZonedTimeFormatter_create_localized_offset_short_mv1(locale.AsFFI(), length.has_value() ? (icu4x::capi::DateTimeLength_option{ { length.value().AsFFI() }, true }) : (icu4x::capi::DateTimeLength_option{ {}, false }), time_precision.has_value() ? (icu4x::capi::TimePrecision_option{ { time_precision.value().AsFFI() }, true }) : (icu4x::capi::TimePrecision_option{ {}, false }), alignment.has_value() ? (icu4x::capi::DateTimeAlignment_option{ { alignment.value().AsFFI() }, true }) : (icu4x::capi::DateTimeAlignment_option{ {}, false })); - return result.is_ok ? diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Ok>(std::unique_ptr(icu4x::ZonedTimeFormatter::FromFFI(result.ok)))) : diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::ZonedTimeFormatter::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); } -inline diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::ZonedTimeFormatter::create_localized_offset_short_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, std::optional length, std::optional time_precision, std::optional alignment) { +inline icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::ZonedTimeFormatter::create_localized_offset_short_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, std::optional length, std::optional time_precision, std::optional alignment) { auto result = icu4x::capi::icu4x_ZonedTimeFormatter_create_localized_offset_short_with_provider_mv1(provider.AsFFI(), locale.AsFFI(), length.has_value() ? (icu4x::capi::DateTimeLength_option{ { length.value().AsFFI() }, true }) : (icu4x::capi::DateTimeLength_option{ {}, false }), time_precision.has_value() ? (icu4x::capi::TimePrecision_option{ { time_precision.value().AsFFI() }, true }) : (icu4x::capi::TimePrecision_option{ {}, false }), alignment.has_value() ? (icu4x::capi::DateTimeAlignment_option{ { alignment.value().AsFFI() }, true }) : (icu4x::capi::DateTimeAlignment_option{ {}, false })); - return result.is_ok ? diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Ok>(std::unique_ptr(icu4x::ZonedTimeFormatter::FromFFI(result.ok)))) : diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::ZonedTimeFormatter::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); } -inline diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::ZonedTimeFormatter::create_generic_long(const icu4x::Locale& locale, std::optional length, std::optional time_precision, std::optional alignment) { +inline icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::ZonedTimeFormatter::create_generic_long(const icu4x::Locale& locale, std::optional length, std::optional time_precision, std::optional alignment) { auto result = icu4x::capi::icu4x_ZonedTimeFormatter_create_generic_long_mv1(locale.AsFFI(), length.has_value() ? (icu4x::capi::DateTimeLength_option{ { length.value().AsFFI() }, true }) : (icu4x::capi::DateTimeLength_option{ {}, false }), time_precision.has_value() ? (icu4x::capi::TimePrecision_option{ { time_precision.value().AsFFI() }, true }) : (icu4x::capi::TimePrecision_option{ {}, false }), alignment.has_value() ? (icu4x::capi::DateTimeAlignment_option{ { alignment.value().AsFFI() }, true }) : (icu4x::capi::DateTimeAlignment_option{ {}, false })); - return result.is_ok ? diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Ok>(std::unique_ptr(icu4x::ZonedTimeFormatter::FromFFI(result.ok)))) : diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::ZonedTimeFormatter::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); } -inline diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::ZonedTimeFormatter::create_generic_long_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, std::optional length, std::optional time_precision, std::optional alignment) { +inline icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::ZonedTimeFormatter::create_generic_long_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, std::optional length, std::optional time_precision, std::optional alignment) { auto result = icu4x::capi::icu4x_ZonedTimeFormatter_create_generic_long_with_provider_mv1(provider.AsFFI(), locale.AsFFI(), length.has_value() ? (icu4x::capi::DateTimeLength_option{ { length.value().AsFFI() }, true }) : (icu4x::capi::DateTimeLength_option{ {}, false }), time_precision.has_value() ? (icu4x::capi::TimePrecision_option{ { time_precision.value().AsFFI() }, true }) : (icu4x::capi::TimePrecision_option{ {}, false }), alignment.has_value() ? (icu4x::capi::DateTimeAlignment_option{ { alignment.value().AsFFI() }, true }) : (icu4x::capi::DateTimeAlignment_option{ {}, false })); - return result.is_ok ? diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Ok>(std::unique_ptr(icu4x::ZonedTimeFormatter::FromFFI(result.ok)))) : diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::ZonedTimeFormatter::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); } -inline diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::ZonedTimeFormatter::create_generic_short(const icu4x::Locale& locale, std::optional length, std::optional time_precision, std::optional alignment) { +inline icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::ZonedTimeFormatter::create_generic_short(const icu4x::Locale& locale, std::optional length, std::optional time_precision, std::optional alignment) { auto result = icu4x::capi::icu4x_ZonedTimeFormatter_create_generic_short_mv1(locale.AsFFI(), length.has_value() ? (icu4x::capi::DateTimeLength_option{ { length.value().AsFFI() }, true }) : (icu4x::capi::DateTimeLength_option{ {}, false }), time_precision.has_value() ? (icu4x::capi::TimePrecision_option{ { time_precision.value().AsFFI() }, true }) : (icu4x::capi::TimePrecision_option{ {}, false }), alignment.has_value() ? (icu4x::capi::DateTimeAlignment_option{ { alignment.value().AsFFI() }, true }) : (icu4x::capi::DateTimeAlignment_option{ {}, false })); - return result.is_ok ? diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Ok>(std::unique_ptr(icu4x::ZonedTimeFormatter::FromFFI(result.ok)))) : diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::ZonedTimeFormatter::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); } -inline diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::ZonedTimeFormatter::create_generic_short_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, std::optional length, std::optional time_precision, std::optional alignment) { +inline icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::ZonedTimeFormatter::create_generic_short_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, std::optional length, std::optional time_precision, std::optional alignment) { auto result = icu4x::capi::icu4x_ZonedTimeFormatter_create_generic_short_with_provider_mv1(provider.AsFFI(), locale.AsFFI(), length.has_value() ? (icu4x::capi::DateTimeLength_option{ { length.value().AsFFI() }, true }) : (icu4x::capi::DateTimeLength_option{ {}, false }), time_precision.has_value() ? (icu4x::capi::TimePrecision_option{ { time_precision.value().AsFFI() }, true }) : (icu4x::capi::TimePrecision_option{ {}, false }), alignment.has_value() ? (icu4x::capi::DateTimeAlignment_option{ { alignment.value().AsFFI() }, true }) : (icu4x::capi::DateTimeAlignment_option{ {}, false })); - return result.is_ok ? diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Ok>(std::unique_ptr(icu4x::ZonedTimeFormatter::FromFFI(result.ok)))) : diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::ZonedTimeFormatter::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); } -inline diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::ZonedTimeFormatter::create_location(const icu4x::Locale& locale, std::optional length, std::optional time_precision, std::optional alignment) { +inline icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::ZonedTimeFormatter::create_location(const icu4x::Locale& locale, std::optional length, std::optional time_precision, std::optional alignment) { auto result = icu4x::capi::icu4x_ZonedTimeFormatter_create_location_mv1(locale.AsFFI(), length.has_value() ? (icu4x::capi::DateTimeLength_option{ { length.value().AsFFI() }, true }) : (icu4x::capi::DateTimeLength_option{ {}, false }), time_precision.has_value() ? (icu4x::capi::TimePrecision_option{ { time_precision.value().AsFFI() }, true }) : (icu4x::capi::TimePrecision_option{ {}, false }), alignment.has_value() ? (icu4x::capi::DateTimeAlignment_option{ { alignment.value().AsFFI() }, true }) : (icu4x::capi::DateTimeAlignment_option{ {}, false })); - return result.is_ok ? diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Ok>(std::unique_ptr(icu4x::ZonedTimeFormatter::FromFFI(result.ok)))) : diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::ZonedTimeFormatter::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); } -inline diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::ZonedTimeFormatter::create_location_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, std::optional length, std::optional time_precision, std::optional alignment) { +inline icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::ZonedTimeFormatter::create_location_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, std::optional length, std::optional time_precision, std::optional alignment) { auto result = icu4x::capi::icu4x_ZonedTimeFormatter_create_location_with_provider_mv1(provider.AsFFI(), locale.AsFFI(), length.has_value() ? (icu4x::capi::DateTimeLength_option{ { length.value().AsFFI() }, true }) : (icu4x::capi::DateTimeLength_option{ {}, false }), time_precision.has_value() ? (icu4x::capi::TimePrecision_option{ { time_precision.value().AsFFI() }, true }) : (icu4x::capi::TimePrecision_option{ {}, false }), alignment.has_value() ? (icu4x::capi::DateTimeAlignment_option{ { alignment.value().AsFFI() }, true }) : (icu4x::capi::DateTimeAlignment_option{ {}, false })); - return result.is_ok ? diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Ok>(std::unique_ptr(icu4x::ZonedTimeFormatter::FromFFI(result.ok)))) : diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::ZonedTimeFormatter::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); } -inline diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::ZonedTimeFormatter::create_exemplar_city(const icu4x::Locale& locale, std::optional length, std::optional time_precision, std::optional alignment) { +inline icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::ZonedTimeFormatter::create_exemplar_city(const icu4x::Locale& locale, std::optional length, std::optional time_precision, std::optional alignment) { auto result = icu4x::capi::icu4x_ZonedTimeFormatter_create_exemplar_city_mv1(locale.AsFFI(), length.has_value() ? (icu4x::capi::DateTimeLength_option{ { length.value().AsFFI() }, true }) : (icu4x::capi::DateTimeLength_option{ {}, false }), time_precision.has_value() ? (icu4x::capi::TimePrecision_option{ { time_precision.value().AsFFI() }, true }) : (icu4x::capi::TimePrecision_option{ {}, false }), alignment.has_value() ? (icu4x::capi::DateTimeAlignment_option{ { alignment.value().AsFFI() }, true }) : (icu4x::capi::DateTimeAlignment_option{ {}, false })); - return result.is_ok ? diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Ok>(std::unique_ptr(icu4x::ZonedTimeFormatter::FromFFI(result.ok)))) : diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::ZonedTimeFormatter::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); } -inline diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::ZonedTimeFormatter::create_exemplar_city_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, std::optional length, std::optional time_precision, std::optional alignment) { +inline icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::ZonedTimeFormatter::create_exemplar_city_with_provider(const icu4x::DataProvider& provider, const icu4x::Locale& locale, std::optional length, std::optional time_precision, std::optional alignment) { auto result = icu4x::capi::icu4x_ZonedTimeFormatter_create_exemplar_city_with_provider_mv1(provider.AsFFI(), locale.AsFFI(), length.has_value() ? (icu4x::capi::DateTimeLength_option{ { length.value().AsFFI() }, true }) : (icu4x::capi::DateTimeLength_option{ {}, false }), time_precision.has_value() ? (icu4x::capi::TimePrecision_option{ { time_precision.value().AsFFI() }, true }) : (icu4x::capi::TimePrecision_option{ {}, false }), alignment.has_value() ? (icu4x::capi::DateTimeAlignment_option{ { alignment.value().AsFFI() }, true }) : (icu4x::capi::DateTimeAlignment_option{ {}, false })); - return result.is_ok ? diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Ok>(std::unique_ptr(icu4x::ZonedTimeFormatter::FromFFI(result.ok)))) : diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Ok>(std::unique_ptr(icu4x::ZonedTimeFormatter::FromFFI(result.ok)))) : icu4x::diplomat::result, icu4x::DateTimeFormatterLoadError>(icu4x::diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); } -inline diplomat::result icu4x::ZonedTimeFormatter::format(const icu4x::Time& time, const icu4x::TimeZoneInfo& zone) const { +inline icu4x::diplomat::result icu4x::ZonedTimeFormatter::format(const icu4x::Time& time, const icu4x::TimeZoneInfo& zone) const { std::string output; - diplomat::capi::DiplomatWrite write = diplomat::WriteFromString(output); + icu4x::diplomat::capi::DiplomatWrite write = icu4x::diplomat::WriteFromString(output); auto result = icu4x::capi::icu4x_ZonedTimeFormatter_format_mv1(this->AsFFI(), time.AsFFI(), zone.AsFFI(), &write); - return result.is_ok ? diplomat::result(diplomat::Ok(std::move(output))) : diplomat::result(diplomat::Err(icu4x::DateTimeWriteError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result(icu4x::diplomat::Ok(std::move(output))) : icu4x::diplomat::result(icu4x::diplomat::Err(icu4x::DateTimeWriteError::FromFFI(result.err))); } template -inline diplomat::result icu4x::ZonedTimeFormatter::format_write(const icu4x::Time& time, const icu4x::TimeZoneInfo& zone, W& writeable) const { - diplomat::capi::DiplomatWrite write = diplomat::WriteTrait::Construct(writeable); +inline icu4x::diplomat::result icu4x::ZonedTimeFormatter::format_write(const icu4x::Time& time, const icu4x::TimeZoneInfo& zone, W& writeable) const { + icu4x::diplomat::capi::DiplomatWrite write = icu4x::diplomat::WriteTrait::Construct(writeable); auto result = icu4x::capi::icu4x_ZonedTimeFormatter_format_mv1(this->AsFFI(), time.AsFFI(), zone.AsFFI(), &write); - return result.is_ok ? diplomat::result(diplomat::Ok()) : diplomat::result(diplomat::Err(icu4x::DateTimeWriteError::FromFFI(result.err))); + return result.is_ok ? icu4x::diplomat::result(icu4x::diplomat::Ok()) : icu4x::diplomat::result(icu4x::diplomat::Err(icu4x::DateTimeWriteError::FromFFI(result.err))); } inline const icu4x::capi::ZonedTimeFormatter* icu4x::ZonedTimeFormatter::AsFFI() const { @@ -260,4 +260,4 @@ inline void icu4x::ZonedTimeFormatter::operator delete(void* ptr) { } -#endif // icu4x_ZonedTimeFormatter_HPP +#endif // ICU4X_ZonedTimeFormatter_HPP diff --git a/ffi/capi/bindings/cpp/diplomat_runtime.hpp b/ffi/capi/bindings/cpp/icu4x/diplomat_runtime.hpp similarity index 99% rename from ffi/capi/bindings/cpp/diplomat_runtime.hpp rename to ffi/capi/bindings/cpp/icu4x/diplomat_runtime.hpp index 216564e7cf6..2f3a43d80ff 100644 --- a/ffi/capi/bindings/cpp/diplomat_runtime.hpp +++ b/ffi/capi/bindings/cpp/icu4x/diplomat_runtime.hpp @@ -1,5 +1,5 @@ -#ifndef DIPLOMAT_RUNTIME_CPP_H -#define DIPLOMAT_RUNTIME_CPP_H +#ifndef ICU4X_DIPLOMAT_RUNTIME_CPP_H +#define ICU4X_DIPLOMAT_RUNTIME_CPP_H #include #include @@ -18,6 +18,7 @@ #include #endif +namespace icu4x { namespace diplomat { namespace capi { @@ -499,5 +500,5 @@ struct next_to_iter_helper { }; } // namespace diplomat - +} // namespace icu4x #endif \ No newline at end of file diff --git a/ffi/capi/config.toml b/ffi/capi/config.toml index 46cff2eefd9..42bcea74e2b 100644 --- a/ffi/capi/config.toml +++ b/ffi/capi/config.toml @@ -5,4 +5,9 @@ lib-name = "icu" [demo-gen] -module-name = "icu" \ No newline at end of file +module-name = "icu" + +[cpp] +# lib-name becomes a namespace, we don't want to clash +# with ICU4C +lib-name = "icu4x" diff --git a/ffi/capi/src/bidi.rs b/ffi/capi/src/bidi.rs index fa76b06df07..b3fc78f6ce2 100644 --- a/ffi/capi/src/bidi.rs +++ b/ffi/capi/src/bidi.rs @@ -4,7 +4,6 @@ #[diplomat::bridge] #[diplomat::abi_rename = "icu4x_{0}_mv1"] -#[diplomat::attr(auto, namespace = "icu4x")] pub mod ffi { use alloc::boxed::Box; use alloc::vec::Vec; diff --git a/ffi/capi/src/calendar.rs b/ffi/capi/src/calendar.rs index 68a596cd60d..a4b6be0c30c 100644 --- a/ffi/capi/src/calendar.rs +++ b/ffi/capi/src/calendar.rs @@ -4,7 +4,6 @@ #[diplomat::bridge] #[diplomat::abi_rename = "icu4x_{0}_mv1"] -#[diplomat::attr(auto, namespace = "icu4x")] pub mod ffi { use alloc::boxed::Box; use alloc::sync::Arc; diff --git a/ffi/capi/src/casemap.rs b/ffi/capi/src/casemap.rs index 28efa1bd217..e49f69d4cd0 100644 --- a/ffi/capi/src/casemap.rs +++ b/ffi/capi/src/casemap.rs @@ -6,7 +6,6 @@ use icu_casemap::options::TitlecaseOptions; #[diplomat::bridge] #[diplomat::abi_rename = "icu4x_{0}_mv1"] -#[diplomat::attr(auto, namespace = "icu4x")] pub mod ffi { use alloc::boxed::Box; diff --git a/ffi/capi/src/collator.rs b/ffi/capi/src/collator.rs index 0788b2f33ab..1a228bb9738 100644 --- a/ffi/capi/src/collator.rs +++ b/ffi/capi/src/collator.rs @@ -6,7 +6,6 @@ use icu_collator::options::{CollatorOptions, ResolvedCollatorOptions}; #[diplomat::bridge] #[diplomat::abi_rename = "icu4x_{0}_mv1"] -#[diplomat::attr(auto, namespace = "icu4x")] pub mod ffi { use alloc::boxed::Box; diff --git a/ffi/capi/src/collections_sets.rs b/ffi/capi/src/collections_sets.rs index b83f24a1f4c..d1d539e478e 100644 --- a/ffi/capi/src/collections_sets.rs +++ b/ffi/capi/src/collections_sets.rs @@ -4,7 +4,6 @@ #[diplomat::bridge] #[diplomat::abi_rename = "icu4x_{0}_mv1"] -#[diplomat::attr(auto, namespace = "icu4x")] pub mod ffi { use alloc::boxed::Box; diff --git a/ffi/capi/src/date.rs b/ffi/capi/src/date.rs index 23b4f85d7c6..58c516f5e24 100644 --- a/ffi/capi/src/date.rs +++ b/ffi/capi/src/date.rs @@ -6,7 +6,6 @@ use ffi::IsoWeekOfYear; #[diplomat::bridge] #[diplomat::abi_rename = "icu4x_{0}_mv1"] -#[diplomat::attr(auto, namespace = "icu4x")] pub mod ffi { use alloc::boxed::Box; use alloc::sync::Arc; diff --git a/ffi/capi/src/date_formatter.rs b/ffi/capi/src/date_formatter.rs index 2e7b684b85c..655331d6604 100644 --- a/ffi/capi/src/date_formatter.rs +++ b/ffi/capi/src/date_formatter.rs @@ -7,7 +7,6 @@ #[rustfmt::skip] #[diplomat::bridge] #[diplomat::abi_rename = "icu4x_{0}_mv1"] -#[diplomat::attr(auto, namespace = "icu4x")] pub mod ffi { use alloc::boxed::Box; use icu_calendar::Gregorian; diff --git a/ffi/capi/src/date_time_formatter.rs b/ffi/capi/src/date_time_formatter.rs index e433425a8f7..d930d0930db 100644 --- a/ffi/capi/src/date_time_formatter.rs +++ b/ffi/capi/src/date_time_formatter.rs @@ -7,7 +7,6 @@ #[rustfmt::skip] #[diplomat::bridge] #[diplomat::abi_rename = "icu4x_{0}_mv1"] -#[diplomat::attr(auto, namespace = "icu4x")] pub mod ffi { use alloc::boxed::Box; use icu_calendar::Gregorian; diff --git a/ffi/capi/src/datetime.rs b/ffi/capi/src/datetime.rs index 75c7106a933..7fd0a6ff114 100644 --- a/ffi/capi/src/datetime.rs +++ b/ffi/capi/src/datetime.rs @@ -4,7 +4,6 @@ #[diplomat::bridge] #[diplomat::abi_rename = "icu4x_{0}_mv1"] -#[diplomat::attr(auto, namespace = "icu4x")] pub mod ffi { use alloc::boxed::Box; use icu_calendar::Iso; diff --git a/ffi/capi/src/datetime_options.rs b/ffi/capi/src/datetime_options.rs index 1b321848e73..15806747ad8 100644 --- a/ffi/capi/src/datetime_options.rs +++ b/ffi/capi/src/datetime_options.rs @@ -4,7 +4,6 @@ #[diplomat::bridge] #[diplomat::abi_rename = "icu4x_{0}_mv1"] -#[diplomat::attr(auto, namespace = "icu4x")] pub mod ffi { #[diplomat::enum_convert(icu_datetime::options::Length, needs_wildcard)] #[diplomat::rust_link(icu::datetime::options::Length, Enum)] diff --git a/ffi/capi/src/decimal.rs b/ffi/capi/src/decimal.rs index d3a0313db75..ab7169c78b9 100644 --- a/ffi/capi/src/decimal.rs +++ b/ffi/capi/src/decimal.rs @@ -4,7 +4,6 @@ #[diplomat::bridge] #[diplomat::abi_rename = "icu4x_{0}_mv1"] -#[diplomat::attr(auto, namespace = "icu4x")] pub mod ffi { use alloc::boxed::Box; diff --git a/ffi/capi/src/displaynames.rs b/ffi/capi/src/displaynames.rs index c2dc61280b3..520c5aeaffd 100644 --- a/ffi/capi/src/displaynames.rs +++ b/ffi/capi/src/displaynames.rs @@ -4,7 +4,6 @@ #[diplomat::bridge] #[diplomat::abi_rename = "icu4x_{0}_mv1"] -#[diplomat::attr(auto, namespace = "icu4x")] pub mod ffi { use alloc::boxed::Box; diff --git a/ffi/capi/src/errors.rs b/ffi/capi/src/errors.rs index 589d990dae2..a57862e8613 100644 --- a/ffi/capi/src/errors.rs +++ b/ffi/capi/src/errors.rs @@ -6,7 +6,6 @@ use ffi::*; #[diplomat::bridge] #[diplomat::abi_rename = "icu4x_{0}_mv1"] -#[diplomat::attr(auto, namespace = "icu4x")] pub mod ffi { #[cfg(feature = "datetime")] use diplomat_runtime::DiplomatOption; diff --git a/ffi/capi/src/exemplar_chars.rs b/ffi/capi/src/exemplar_chars.rs index 7d725e8c8db..987ab6b654d 100644 --- a/ffi/capi/src/exemplar_chars.rs +++ b/ffi/capi/src/exemplar_chars.rs @@ -4,7 +4,6 @@ #[diplomat::bridge] #[diplomat::abi_rename = "icu4x_{0}_mv1"] -#[diplomat::attr(auto, namespace = "icu4x")] pub mod ffi { use alloc::boxed::Box; diff --git a/ffi/capi/src/fallbacker.rs b/ffi/capi/src/fallbacker.rs index ca2ec8ec2ed..72a2ab08ea0 100644 --- a/ffi/capi/src/fallbacker.rs +++ b/ffi/capi/src/fallbacker.rs @@ -4,7 +4,6 @@ #[diplomat::bridge] #[diplomat::abi_rename = "icu4x_{0}_mv1"] -#[diplomat::attr(auto, namespace = "icu4x")] pub mod ffi { use alloc::boxed::Box; diff --git a/ffi/capi/src/fixed_decimal.rs b/ffi/capi/src/fixed_decimal.rs index 68ffa64a9d2..e63f4b7e86d 100644 --- a/ffi/capi/src/fixed_decimal.rs +++ b/ffi/capi/src/fixed_decimal.rs @@ -6,7 +6,6 @@ use ffi::DecimalSignedRoundingMode; #[diplomat::bridge] #[diplomat::abi_rename = "icu4x_{0}_mv1"] -#[diplomat::attr(auto, namespace = "icu4x")] pub mod ffi { use alloc::boxed::Box; diff --git a/ffi/capi/src/iana_parser.rs b/ffi/capi/src/iana_parser.rs index 2692be25518..ae3be5b737a 100644 --- a/ffi/capi/src/iana_parser.rs +++ b/ffi/capi/src/iana_parser.rs @@ -4,7 +4,6 @@ #[diplomat::bridge] #[diplomat::abi_rename = "icu4x_{0}_mv1"] -#[diplomat::attr(auto, namespace = "icu4x")] pub mod ffi { use alloc::boxed::Box; use diplomat_runtime::DiplomatStr; diff --git a/ffi/capi/src/list.rs b/ffi/capi/src/list.rs index 02fbb54c3e5..9a062fd18b7 100644 --- a/ffi/capi/src/list.rs +++ b/ffi/capi/src/list.rs @@ -4,7 +4,6 @@ #[diplomat::bridge] #[diplomat::abi_rename = "icu4x_{0}_mv1"] -#[diplomat::attr(auto, namespace = "icu4x")] pub mod ffi { use alloc::boxed::Box; use diplomat_runtime::{DiplomatStr16Slice, DiplomatStrSlice}; diff --git a/ffi/capi/src/locale.rs b/ffi/capi/src/locale.rs index bb3fdb9e907..5d2aa36cbd1 100644 --- a/ffi/capi/src/locale.rs +++ b/ffi/capi/src/locale.rs @@ -4,7 +4,6 @@ #[diplomat::bridge] #[diplomat::abi_rename = "icu4x_{0}_mv1"] -#[diplomat::attr(auto, namespace = "icu4x")] pub mod ffi { use alloc::boxed::Box; diff --git a/ffi/capi/src/locale_core.rs b/ffi/capi/src/locale_core.rs index afe15286cd4..0a4952bb7aa 100644 --- a/ffi/capi/src/locale_core.rs +++ b/ffi/capi/src/locale_core.rs @@ -4,7 +4,6 @@ #[diplomat::bridge] #[diplomat::abi_rename = "icu4x_{0}_mv1"] -#[diplomat::attr(auto, namespace = "icu4x")] pub mod ffi { use alloc::boxed::Box; diff --git a/ffi/capi/src/locale_directionality.rs b/ffi/capi/src/locale_directionality.rs index ba8f86b42f3..352d31d7877 100644 --- a/ffi/capi/src/locale_directionality.rs +++ b/ffi/capi/src/locale_directionality.rs @@ -4,7 +4,6 @@ #[diplomat::bridge] #[diplomat::abi_rename = "icu4x_{0}_mv1"] -#[diplomat::attr(auto, namespace = "icu4x")] pub mod ffi { use alloc::boxed::Box; diff --git a/ffi/capi/src/logging.rs b/ffi/capi/src/logging.rs index ab080024634..455c82a05a1 100644 --- a/ffi/capi/src/logging.rs +++ b/ffi/capi/src/logging.rs @@ -4,7 +4,6 @@ #[diplomat::bridge] #[diplomat::abi_rename = "icu4x_{0}_mv1"] -#[diplomat::attr(auto, namespace = "icu4x")] pub mod ffi { use alloc::boxed::Box; diff --git a/ffi/capi/src/normalizer.rs b/ffi/capi/src/normalizer.rs index c5d3228ec98..b3a09822c84 100644 --- a/ffi/capi/src/normalizer.rs +++ b/ffi/capi/src/normalizer.rs @@ -4,7 +4,6 @@ #[diplomat::bridge] #[diplomat::abi_rename = "icu4x_{0}_mv1"] -#[diplomat::attr(auto, namespace = "icu4x")] pub mod ffi { use alloc::boxed::Box; diff --git a/ffi/capi/src/normalizer_properties.rs b/ffi/capi/src/normalizer_properties.rs index d851ae914fe..7f82e6981f0 100644 --- a/ffi/capi/src/normalizer_properties.rs +++ b/ffi/capi/src/normalizer_properties.rs @@ -4,7 +4,6 @@ #[diplomat::bridge] #[diplomat::abi_rename = "icu4x_{0}_mv1"] -#[diplomat::attr(auto, namespace = "icu4x")] pub mod ffi { use alloc::boxed::Box; diff --git a/ffi/capi/src/pluralrules.rs b/ffi/capi/src/pluralrules.rs index 7d6ddea95ce..03be9220c64 100644 --- a/ffi/capi/src/pluralrules.rs +++ b/ffi/capi/src/pluralrules.rs @@ -4,7 +4,6 @@ #[diplomat::bridge] #[diplomat::abi_rename = "icu4x_{0}_mv1"] -#[diplomat::attr(auto, namespace = "icu4x")] pub mod ffi { use alloc::boxed::Box; diff --git a/ffi/capi/src/properties_bidi.rs b/ffi/capi/src/properties_bidi.rs index face9a8ca77..008f09abcd5 100644 --- a/ffi/capi/src/properties_bidi.rs +++ b/ffi/capi/src/properties_bidi.rs @@ -4,7 +4,6 @@ #[diplomat::bridge] #[diplomat::abi_rename = "icu4x_{0}_mv1"] -#[diplomat::attr(auto, namespace = "icu4x")] pub mod ffi { use diplomat_runtime::DiplomatChar; use icu_properties::props; diff --git a/ffi/capi/src/properties_enums.rs b/ffi/capi/src/properties_enums.rs index efae2c2bec2..fb9e70f8c38 100644 --- a/ffi/capi/src/properties_enums.rs +++ b/ffi/capi/src/properties_enums.rs @@ -4,7 +4,6 @@ #[diplomat::bridge] #[diplomat::abi_rename = "icu4x_{0}_mv1"] -#[diplomat::attr(auto, namespace = "icu4x")] pub mod ffi { use icu_properties::props; diff --git a/ffi/capi/src/properties_iter.rs b/ffi/capi/src/properties_iter.rs index ab49ede8f4e..6c5cefa55c1 100644 --- a/ffi/capi/src/properties_iter.rs +++ b/ffi/capi/src/properties_iter.rs @@ -4,7 +4,6 @@ #[diplomat::bridge] #[diplomat::abi_rename = "icu4x_{0}_mv1"] -#[diplomat::attr(auto, namespace = "icu4x")] pub mod ffi { use alloc::boxed::Box; use core::ops::RangeInclusive; diff --git a/ffi/capi/src/properties_maps.rs b/ffi/capi/src/properties_maps.rs index 9607e275399..75dc0257632 100644 --- a/ffi/capi/src/properties_maps.rs +++ b/ffi/capi/src/properties_maps.rs @@ -4,7 +4,6 @@ #[diplomat::bridge] #[diplomat::abi_rename = "icu4x_{0}_mv1"] -#[diplomat::attr(auto, namespace = "icu4x")] pub mod ffi { use alloc::boxed::Box; #[cfg(any(feature = "compiled_data", feature = "buffer_provider"))] diff --git a/ffi/capi/src/properties_names.rs b/ffi/capi/src/properties_names.rs index 906c79feaf7..c286848e625 100644 --- a/ffi/capi/src/properties_names.rs +++ b/ffi/capi/src/properties_names.rs @@ -4,7 +4,6 @@ #[diplomat::bridge] #[diplomat::abi_rename = "icu4x_{0}_mv1"] -#[diplomat::attr(auto, namespace = "icu4x")] pub mod ffi { use crate::unstable::properties_enums::ffi::GeneralCategoryGroup; use alloc::boxed::Box; diff --git a/ffi/capi/src/properties_sets.rs b/ffi/capi/src/properties_sets.rs index 1967f033a31..e106e56d648 100644 --- a/ffi/capi/src/properties_sets.rs +++ b/ffi/capi/src/properties_sets.rs @@ -4,7 +4,6 @@ #[diplomat::bridge] #[diplomat::abi_rename = "icu4x_{0}_mv1"] -#[diplomat::attr(auto, namespace = "icu4x")] pub mod ffi { use alloc::boxed::Box; #[cfg(any(feature = "compiled_data", feature = "buffer_provider"))] diff --git a/ffi/capi/src/properties_unisets.rs b/ffi/capi/src/properties_unisets.rs index 8c9d79b1945..d6f1d2e1954 100644 --- a/ffi/capi/src/properties_unisets.rs +++ b/ffi/capi/src/properties_unisets.rs @@ -4,7 +4,6 @@ #[diplomat::bridge] #[diplomat::abi_rename = "icu4x_{0}_mv1"] -#[diplomat::attr(auto, namespace = "icu4x")] pub mod ffi { use alloc::boxed::Box; #[cfg(any(feature = "compiled_data", feature = "buffer_provider"))] diff --git a/ffi/capi/src/provider.rs b/ffi/capi/src/provider.rs index 62387e49d8b..ecc7c498c0e 100644 --- a/ffi/capi/src/provider.rs +++ b/ffi/capi/src/provider.rs @@ -4,7 +4,6 @@ #[diplomat::bridge] #[diplomat::abi_rename = "icu4x_{0}_mv1"] -#[diplomat::attr(auto, namespace = "icu4x")] #[cfg(feature = "buffer_provider")] pub mod ffi { use alloc::boxed::Box; diff --git a/ffi/capi/src/script.rs b/ffi/capi/src/script.rs index 3aa4e67f38f..f1aaab1ff9c 100644 --- a/ffi/capi/src/script.rs +++ b/ffi/capi/src/script.rs @@ -4,7 +4,6 @@ #[diplomat::bridge] #[diplomat::abi_rename = "icu4x_{0}_mv1"] -#[diplomat::attr(auto, namespace = "icu4x")] pub mod ffi { use alloc::boxed::Box; diff --git a/ffi/capi/src/segmenter_grapheme.rs b/ffi/capi/src/segmenter_grapheme.rs index 5275d972dda..8ccbed48468 100644 --- a/ffi/capi/src/segmenter_grapheme.rs +++ b/ffi/capi/src/segmenter_grapheme.rs @@ -4,7 +4,6 @@ #[diplomat::bridge] #[diplomat::abi_rename = "icu4x_{0}_mv1"] -#[diplomat::attr(auto, namespace = "icu4x")] pub mod ffi { use alloc::boxed::Box; use icu_segmenter::scaffold::{Latin1, PotentiallyIllFormedUtf8, Utf16}; diff --git a/ffi/capi/src/segmenter_line.rs b/ffi/capi/src/segmenter_line.rs index 431b9e69b48..a56eac949c0 100644 --- a/ffi/capi/src/segmenter_line.rs +++ b/ffi/capi/src/segmenter_line.rs @@ -4,7 +4,6 @@ #[diplomat::bridge] #[diplomat::abi_rename = "icu4x_{0}_mv1"] -#[diplomat::attr(auto, namespace = "icu4x")] pub mod ffi { use alloc::boxed::Box; use icu_segmenter::scaffold::{Latin1, PotentiallyIllFormedUtf8, Utf16}; diff --git a/ffi/capi/src/segmenter_sentence.rs b/ffi/capi/src/segmenter_sentence.rs index 826b1c269e9..175547ef79c 100644 --- a/ffi/capi/src/segmenter_sentence.rs +++ b/ffi/capi/src/segmenter_sentence.rs @@ -4,7 +4,6 @@ #[diplomat::bridge] #[diplomat::abi_rename = "icu4x_{0}_mv1"] -#[diplomat::attr(auto, namespace = "icu4x")] pub mod ffi { use alloc::boxed::Box; use icu_segmenter::scaffold::{Latin1, PotentiallyIllFormedUtf8, Utf16}; diff --git a/ffi/capi/src/segmenter_word.rs b/ffi/capi/src/segmenter_word.rs index 4accbbab8b8..de8cec29e67 100644 --- a/ffi/capi/src/segmenter_word.rs +++ b/ffi/capi/src/segmenter_word.rs @@ -4,7 +4,6 @@ #[diplomat::bridge] #[diplomat::abi_rename = "icu4x_{0}_mv1"] -#[diplomat::attr(auto, namespace = "icu4x")] pub mod ffi { use alloc::boxed::Box; use icu_segmenter::scaffold::{Latin1, PotentiallyIllFormedUtf8, Utf16}; diff --git a/ffi/capi/src/time.rs b/ffi/capi/src/time.rs index f5a7725df7a..c77d491c11b 100644 --- a/ffi/capi/src/time.rs +++ b/ffi/capi/src/time.rs @@ -4,7 +4,6 @@ #[diplomat::bridge] #[diplomat::abi_rename = "icu4x_{0}_mv1"] -#[diplomat::attr(auto, namespace = "icu4x")] pub mod ffi { use alloc::boxed::Box; diff --git a/ffi/capi/src/time_formatter.rs b/ffi/capi/src/time_formatter.rs index 305dab8dc10..b6479cb3853 100644 --- a/ffi/capi/src/time_formatter.rs +++ b/ffi/capi/src/time_formatter.rs @@ -7,7 +7,6 @@ #[rustfmt::skip] #[diplomat::bridge] #[diplomat::abi_rename = "icu4x_{0}_mv1"] -#[diplomat::attr(auto, namespace = "icu4x")] pub mod ffi { use alloc::boxed::Box; use writeable::Writeable; diff --git a/ffi/capi/src/timezone.rs b/ffi/capi/src/timezone.rs index c017123eaba..747dacaf638 100644 --- a/ffi/capi/src/timezone.rs +++ b/ffi/capi/src/timezone.rs @@ -6,7 +6,6 @@ use ffi::TimeZoneInfo; #[diplomat::bridge] #[diplomat::abi_rename = "icu4x_{0}_mv1"] -#[diplomat::attr(auto, namespace = "icu4x")] pub mod ffi { use alloc::boxed::Box; diff --git a/ffi/capi/src/timezone_formatter.rs b/ffi/capi/src/timezone_formatter.rs index 2f5541bac62..d984457a35d 100644 --- a/ffi/capi/src/timezone_formatter.rs +++ b/ffi/capi/src/timezone_formatter.rs @@ -7,7 +7,6 @@ #[rustfmt::skip] #[diplomat::bridge] #[diplomat::abi_rename = "icu4x_{0}_mv1"] -#[diplomat::attr(auto, namespace = "icu4x")] pub mod ffi { use alloc::boxed::Box; use writeable::TryWriteable; diff --git a/ffi/capi/src/variant_offset.rs b/ffi/capi/src/variant_offset.rs index 4d3101cfc46..84f470d020b 100644 --- a/ffi/capi/src/variant_offset.rs +++ b/ffi/capi/src/variant_offset.rs @@ -4,7 +4,6 @@ #[diplomat::bridge] #[diplomat::abi_rename = "icu4x_{0}_mv1"] -#[diplomat::attr(auto, namespace = "icu4x")] pub mod ffi { use alloc::boxed::Box; diff --git a/ffi/capi/src/week.rs b/ffi/capi/src/week.rs index ab10654d4e4..febc987f47c 100644 --- a/ffi/capi/src/week.rs +++ b/ffi/capi/src/week.rs @@ -4,7 +4,6 @@ #[diplomat::bridge] #[diplomat::abi_rename = "icu4x_{0}_mv1"] -#[diplomat::attr(auto, namespace = "icu4x")] pub mod ffi { use alloc::boxed::Box; diff --git a/ffi/capi/src/windows_parser.rs b/ffi/capi/src/windows_parser.rs index 3a34045f656..8b18417eb0f 100644 --- a/ffi/capi/src/windows_parser.rs +++ b/ffi/capi/src/windows_parser.rs @@ -4,7 +4,6 @@ #[diplomat::bridge] #[diplomat::abi_rename = "icu4x_{0}_mv1"] -#[diplomat::attr(auto, namespace = "icu4x")] pub mod ffi { use alloc::boxed::Box; use diplomat_runtime::DiplomatStr; diff --git a/ffi/capi/src/zoned_date_formatter.rs b/ffi/capi/src/zoned_date_formatter.rs index 16fb6acd1ec..e74e9fcdd5c 100644 --- a/ffi/capi/src/zoned_date_formatter.rs +++ b/ffi/capi/src/zoned_date_formatter.rs @@ -7,7 +7,6 @@ #[rustfmt::skip] #[diplomat::bridge] #[diplomat::abi_rename = "icu4x_{0}_mv1"] -#[diplomat::attr(auto, namespace = "icu4x")] pub mod ffi { use alloc::boxed::Box; use icu_calendar::Gregorian; diff --git a/ffi/capi/src/zoned_date_time_formatter.rs b/ffi/capi/src/zoned_date_time_formatter.rs index 93f556924d0..7a2432dfa46 100644 --- a/ffi/capi/src/zoned_date_time_formatter.rs +++ b/ffi/capi/src/zoned_date_time_formatter.rs @@ -7,7 +7,6 @@ #[rustfmt::skip] #[diplomat::bridge] #[diplomat::abi_rename = "icu4x_{0}_mv1"] -#[diplomat::attr(auto, namespace = "icu4x")] pub mod ffi { use alloc::boxed::Box; use icu_calendar::Gregorian; diff --git a/ffi/capi/src/zoned_datetime.rs b/ffi/capi/src/zoned_datetime.rs index c048b7e2e12..437f4b1583c 100644 --- a/ffi/capi/src/zoned_datetime.rs +++ b/ffi/capi/src/zoned_datetime.rs @@ -4,7 +4,6 @@ #[diplomat::bridge] #[diplomat::abi_rename = "icu4x_{0}_mv1"] -#[diplomat::attr(auto, namespace = "icu4x")] pub mod ffi { use alloc::boxed::Box; use icu_calendar::Iso; diff --git a/ffi/capi/src/zoned_time_formatter.rs b/ffi/capi/src/zoned_time_formatter.rs index 6f65564a5a0..564c20f18a8 100644 --- a/ffi/capi/src/zoned_time_formatter.rs +++ b/ffi/capi/src/zoned_time_formatter.rs @@ -7,7 +7,6 @@ #[rustfmt::skip] #[diplomat::bridge] #[diplomat::abi_rename = "icu4x_{0}_mv1"] -#[diplomat::attr(auto, namespace = "icu4x")] pub mod ffi { use alloc::boxed::Box; use writeable::TryWriteable; diff --git a/tools/make/codegen/templates/datetime_formatter.rs.jinja b/tools/make/codegen/templates/datetime_formatter.rs.jinja index e4da08d2a7e..d62d31aa01c 100644 --- a/tools/make/codegen/templates/datetime_formatter.rs.jinja +++ b/tools/make/codegen/templates/datetime_formatter.rs.jinja @@ -9,7 +9,6 @@ #[rustfmt::skip] #[diplomat::bridge] #[diplomat::abi_rename = "icu4x_{0}_mv1"] -#[diplomat::attr(auto, namespace = "icu4x")] pub mod ffi { use alloc::boxed::Box; {%- if flavor.has_date() %} diff --git a/tools/make/codegen/templates/zoned_formatter.rs.jinja b/tools/make/codegen/templates/zoned_formatter.rs.jinja index 7446710168b..ffea5773fe1 100644 --- a/tools/make/codegen/templates/zoned_formatter.rs.jinja +++ b/tools/make/codegen/templates/zoned_formatter.rs.jinja @@ -9,7 +9,6 @@ #[rustfmt::skip] #[diplomat::bridge] #[diplomat::abi_rename = "icu4x_{0}_mv1"] -#[diplomat::attr(auto, namespace = "icu4x")] pub mod ffi { use alloc::boxed::Box; {%- if flavor.has_date() %} diff --git a/tools/make/diplomat-gen/src/main.rs b/tools/make/diplomat-gen/src/main.rs index f5b4259edc2..85c57e892c3 100644 --- a/tools/make/diplomat-gen/src/main.rs +++ b/tools/make/diplomat-gen/src/main.rs @@ -84,13 +84,17 @@ fn main() -> std::io::Result<()> { &root.join("ffi/capi/src/lib.rs"), lang.as_str(), &{ - let include = if lang != "demo_gen" { + let mut include = if lang != "demo_gen" { root.join("ffi/capi/bindings").join(&lang) } else { root.join("tools/web-demo/gen") }; + std::fs::remove_dir_all(&include)?; - std::fs::create_dir(&include)?; + if lang == "cpp" { + include = include.join("icu4x"); + } + std::fs::create_dir_all(&include)?; include }, &docs_url_gen,