From f7bc6ada7bcaf811e1c7346e7e607107c03271d1 Mon Sep 17 00:00:00 2001 From: Robert Bastian <4706271+robertbastian@users.noreply.github.com> Date: Fri, 19 Jul 2024 00:07:29 +0200 Subject: [PATCH 1/8] Rename some FFI constructors (#5262) Renames * `create_from_*` -> `from_*`, e.g. `create_from_string` -> `from_string` * `create_*` -> `*` where the constructor doesn't take arguments, e.g. `create_und`, -> `und` These names were already used as named constructors, so this basically aligns C and C++ with that. --- Cargo.lock | 8 +-- Cargo.toml | 8 +-- ffi/capi/bindings/c/Collator.h | 2 +- ffi/capi/bindings/c/CustomTimeZone.h | 12 ++-- ffi/capi/bindings/c/DataProvider.h | 12 ++-- ffi/capi/bindings/c/Date.h | 8 +-- ffi/capi/bindings/c/DateTime.h | 10 +-- ffi/capi/bindings/c/FixedDecimal.h | 28 ++++---- ffi/capi/bindings/c/IsoDate.h | 2 +- ffi/capi/bindings/c/IsoDateTime.h | 4 +- ffi/capi/bindings/c/Locale.h | 6 +- .../bindings/c/LocaleDisplayNamesFormatter.h | 4 +- ffi/capi/bindings/c/LocaleFallbacker.h | 2 +- ffi/capi/bindings/c/PluralOperands.h | 6 +- ffi/capi/bindings/c/Time.h | 4 +- ffi/capi/bindings/c/TitlecaseOptionsV1.h | 2 +- ffi/capi/bindings/c/WeekCalculator.h | 2 +- ffi/capi/bindings/cpp/Collator.d.hpp | 2 +- ffi/capi/bindings/cpp/Collator.hpp | 6 +- ffi/capi/bindings/cpp/CustomTimeZone.d.hpp | 10 +-- ffi/capi/bindings/cpp/CustomTimeZone.hpp | 32 +++++----- ffi/capi/bindings/cpp/DataProvider.d.hpp | 8 +-- ffi/capi/bindings/cpp/DataProvider.hpp | 28 ++++---- ffi/capi/bindings/cpp/Date.d.hpp | 4 +- ffi/capi/bindings/cpp/Date.hpp | 16 ++--- ffi/capi/bindings/cpp/DateTime.d.hpp | 6 +- ffi/capi/bindings/cpp/DateTime.hpp | 22 +++---- ffi/capi/bindings/cpp/FixedDecimal.d.hpp | 18 +++--- ffi/capi/bindings/cpp/FixedDecimal.hpp | 64 +++++++++---------- ffi/capi/bindings/cpp/IsoDate.d.hpp | 2 +- ffi/capi/bindings/cpp/IsoDate.hpp | 6 +- ffi/capi/bindings/cpp/IsoDateTime.d.hpp | 4 +- ffi/capi/bindings/cpp/IsoDateTime.hpp | 12 ++-- ffi/capi/bindings/cpp/Locale.d.hpp | 4 +- ffi/capi/bindings/cpp/Locale.hpp | 14 ++-- .../cpp/LocaleDisplayNamesFormatter.d.hpp | 2 +- .../cpp/LocaleDisplayNamesFormatter.hpp | 8 +-- ffi/capi/bindings/cpp/LocaleFallbacker.d.hpp | 2 +- ffi/capi/bindings/cpp/LocaleFallbacker.hpp | 6 +- ffi/capi/bindings/cpp/PluralOperands.d.hpp | 4 +- ffi/capi/bindings/cpp/PluralOperands.hpp | 14 ++-- ffi/capi/bindings/cpp/Time.d.hpp | 2 +- ffi/capi/bindings/cpp/Time.hpp | 8 +-- ffi/capi/bindings/cpp/TitlecaseOptionsV1.hpp | 4 +- ffi/capi/bindings/cpp/WeekCalculator.d.hpp | 2 +- ffi/capi/bindings/cpp/WeekCalculator.hpp | 6 +- ffi/capi/bindings/dart/Collator.g.dart | 12 ++-- ....g.dart => CollatorResolvedOptions.g.dart} | 12 ++-- ffi/capi/bindings/dart/CustomTimeZone.g.dart | 40 ++++++------ ffi/capi/bindings/dart/DataProvider.g.dart | 24 +++---- ffi/capi/bindings/dart/Date.g.dart | 16 ++--- ffi/capi/bindings/dart/DateTime.g.dart | 24 +++---- ffi/capi/bindings/dart/FixedDecimal.g.dart | 40 ++++++------ ffi/capi/bindings/dart/IsoDate.g.dart | 10 +-- ffi/capi/bindings/dart/IsoDateTime.g.dart | 16 ++--- ffi/capi/bindings/dart/Locale.g.dart | 16 ++--- .../dart/LocaleDisplayNamesFormatter.g.dart | 8 +-- .../bindings/dart/LocaleFallbacker.g.dart | 8 +-- ffi/capi/bindings/dart/PluralOperands.g.dart | 16 ++--- ffi/capi/bindings/dart/Time.g.dart | 8 +-- .../bindings/dart/TitlecaseOptions.g.dart | 8 +-- ffi/capi/bindings/dart/WeekCalculator.g.dart | 8 +-- ffi/capi/bindings/dart/lib.g.dart | 2 +- ffi/capi/bindings/js/Collator.d.ts | 4 +- ffi/capi/bindings/js/Collator.mjs | 6 +- ...ions.d.ts => CollatorResolvedOptions.d.ts} | 2 +- ...ptions.mjs => CollatorResolvedOptions.mjs} | 2 +- ffi/capi/bindings/js/CustomTimeZone.d.ts | 10 +-- ffi/capi/bindings/js/CustomTimeZone.mjs | 20 +++--- ffi/capi/bindings/js/DataProvider.d.ts | 6 +- ffi/capi/bindings/js/DataProvider.mjs | 12 ++-- ffi/capi/bindings/js/Date.d.ts | 4 +- ffi/capi/bindings/js/Date.mjs | 8 +-- ffi/capi/bindings/js/DateTime.d.ts | 6 +- ffi/capi/bindings/js/DateTime.mjs | 12 ++-- ffi/capi/bindings/js/FixedDecimal.mjs | 12 ++-- ffi/capi/bindings/js/IsoDate.d.ts | 2 +- ffi/capi/bindings/js/IsoDate.mjs | 4 +- ffi/capi/bindings/js/IsoDateTime.d.ts | 4 +- ffi/capi/bindings/js/IsoDateTime.mjs | 8 +-- ffi/capi/bindings/js/Locale.d.ts | 4 +- ffi/capi/bindings/js/Locale.mjs | 8 +-- .../js/LocaleDisplayNamesFormatter.mjs | 2 +- ffi/capi/bindings/js/LocaleFallbacker.d.ts | 2 +- ffi/capi/bindings/js/LocaleFallbacker.mjs | 4 +- ffi/capi/bindings/js/PluralOperands.d.ts | 4 +- ffi/capi/bindings/js/PluralOperands.mjs | 8 +-- ffi/capi/bindings/js/Time.d.ts | 2 +- ffi/capi/bindings/js/Time.mjs | 4 +- ffi/capi/bindings/js/TitlecaseOptions.mjs | 2 +- ffi/capi/bindings/js/WeekCalculator.d.ts | 2 +- ffi/capi/bindings/js/WeekCalculator.mjs | 4 +- ffi/capi/bindings/js/index.d.ts | 2 +- ffi/capi/bindings/js/index.mjs | 2 +- ffi/capi/src/casemap.rs | 10 +-- ffi/capi/src/collator.rs | 9 +-- ffi/capi/src/date.rs | 12 ++-- ffi/capi/src/datetime.rs | 22 +++---- ffi/capi/src/displaynames.rs | 5 +- ffi/capi/src/errors.rs | 2 - ffi/capi/src/fallbacker.rs | 4 +- ffi/capi/src/fixed_decimal.rs | 46 +++++++------ ffi/capi/src/locale_core.rs | 8 +-- ffi/capi/src/pluralrules.rs | 10 ++- ffi/capi/src/provider.rs | 16 ++--- ffi/capi/src/segmenter_line.rs | 8 +-- ffi/capi/src/time.rs | 4 +- ffi/capi/src/timezone.rs | 20 +++--- ffi/capi/src/week.rs | 4 +- ffi/npm/test/data-providers.mjs | 4 +- ffi/npm/test/fixed-decimal-format.mjs | 4 +- tools/diplomat-gen/src/main.rs | 8 +-- tutorials/c-tiny/fixeddecimal/test.c | 6 +- tutorials/c-tiny/segmenter/test.c | 2 +- tutorials/c/Cargo.lock | 6 +- tutorials/c/fixeddecimal.c | 8 +-- tutorials/c/locale.c | 22 +++---- tutorials/c/pluralrules.c | 8 +-- tutorials/cpp/Cargo.lock | 6 +- tutorials/cpp/bidi.cpp | 2 +- tutorials/cpp/casemapping.cpp | 8 +-- tutorials/cpp/collator.cpp | 8 +-- tutorials/cpp/datetime.cpp | 10 +-- tutorials/cpp/fixeddecimal.cpp | 20 +++--- tutorials/cpp/locale.cpp | 6 +- tutorials/cpp/pluralrules.cpp | 8 +-- tutorials/cpp/properties.cpp | 4 +- tutorials/cpp/segmenter.cpp | 8 +-- tutorials/cpp/units_converter.cpp | 2 +- tutorials/js-tiny/Cargo.lock | 6 +- tutorials/js-tiny/ld.py | 6 +- tutorials/js-tiny/tiny.mjs | 4 +- 132 files changed, 606 insertions(+), 616 deletions(-) rename ffi/capi/bindings/dart/{ResolvedCollatorOptions.g.dart => CollatorResolvedOptions.g.dart} (88%) rename ffi/capi/bindings/js/{ResolvedCollatorOptions.d.ts => CollatorResolvedOptions.d.ts} (96%) rename ffi/capi/bindings/js/{ResolvedCollatorOptions.mjs => CollatorResolvedOptions.mjs} (98%) diff --git a/Cargo.lock b/Cargo.lock index a79ab6cad7d..0309e614866 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -600,7 +600,7 @@ dependencies = [ [[package]] name = "diplomat" version = "0.8.0" -source = "git+https://github.com/rust-diplomat/diplomat?rev=3b875c676f60a892eeb818c6a0f6f10086c69a24#3b875c676f60a892eeb818c6a0f6f10086c69a24" +source = "git+https://github.com/rust-diplomat/diplomat?rev=dee60cf0463e082b89931854ed3322ce049cd31c#dee60cf0463e082b89931854ed3322ce049cd31c" dependencies = [ "diplomat_core", "proc-macro2", @@ -618,7 +618,7 @@ dependencies = [ [[package]] name = "diplomat-runtime" version = "0.8.1" -source = "git+https://github.com/rust-diplomat/diplomat?rev=3b875c676f60a892eeb818c6a0f6f10086c69a24#3b875c676f60a892eeb818c6a0f6f10086c69a24" +source = "git+https://github.com/rust-diplomat/diplomat?rev=dee60cf0463e082b89931854ed3322ce049cd31c#dee60cf0463e082b89931854ed3322ce049cd31c" dependencies = [ "log", ] @@ -626,7 +626,7 @@ dependencies = [ [[package]] name = "diplomat-tool" version = "0.8.0" -source = "git+https://github.com/rust-diplomat/diplomat?rev=3b875c676f60a892eeb818c6a0f6f10086c69a24#3b875c676f60a892eeb818c6a0f6f10086c69a24" +source = "git+https://github.com/rust-diplomat/diplomat?rev=dee60cf0463e082b89931854ed3322ce049cd31c#dee60cf0463e082b89931854ed3322ce049cd31c" dependencies = [ "askama", "clap", @@ -646,7 +646,7 @@ dependencies = [ [[package]] name = "diplomat_core" version = "0.8.0" -source = "git+https://github.com/rust-diplomat/diplomat?rev=3b875c676f60a892eeb818c6a0f6f10086c69a24#3b875c676f60a892eeb818c6a0f6f10086c69a24" +source = "git+https://github.com/rust-diplomat/diplomat?rev=dee60cf0463e082b89931854ed3322ce049cd31c#dee60cf0463e082b89931854ed3322ce049cd31c" dependencies = [ "displaydoc", "either", diff --git a/Cargo.toml b/Cargo.toml index 0f84928201a..81d63269510 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -208,10 +208,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 = "3b875c676f60a892eeb818c6a0f6f10086c69a24" } -diplomat-runtime = { git = "https://github.com/rust-diplomat/diplomat", rev = "3b875c676f60a892eeb818c6a0f6f10086c69a24" } -diplomat_core = { git = "https://github.com/rust-diplomat/diplomat", rev = "3b875c676f60a892eeb818c6a0f6f10086c69a24" } -diplomat-tool = { git = "https://github.com/rust-diplomat/diplomat", rev = "3b875c676f60a892eeb818c6a0f6f10086c69a24" } +diplomat = { git = "https://github.com/rust-diplomat/diplomat", rev = "dee60cf0463e082b89931854ed3322ce049cd31c" } +diplomat-runtime = { git = "https://github.com/rust-diplomat/diplomat", rev = "dee60cf0463e082b89931854ed3322ce049cd31c" } +diplomat_core = { git = "https://github.com/rust-diplomat/diplomat", rev = "dee60cf0463e082b89931854ed3322ce049cd31c" } +diplomat-tool = { git = "https://github.com/rust-diplomat/diplomat", rev = "dee60cf0463e082b89931854ed3322ce049cd31c" } # EXTERNAL DEPENDENCIES # diff --git a/ffi/capi/bindings/c/Collator.h b/ffi/capi/bindings/c/Collator.h index 41d4ced1dc5..89fd8a7b638 100644 --- a/ffi/capi/bindings/c/Collator.h +++ b/ffi/capi/bindings/c/Collator.h @@ -27,7 +27,7 @@ int8_t icu4x_Collator_compare_utf16_mv1(const Collator* self, const char16_t* le int8_t icu4x_Collator_compare_mv1(const Collator* self, const char* left_data, size_t left_len, const char* right_data, size_t right_len); -CollatorResolvedOptionsV1 icu4x_Collator_resolved_options_mv1(const Collator* self); +CollatorResolvedOptionsV1 icu4x_Collator_resolved_options_v1_mv1(const Collator* self); void icu4x_Collator_destroy_mv1(Collator* self); diff --git a/ffi/capi/bindings/c/CustomTimeZone.h b/ffi/capi/bindings/c/CustomTimeZone.h index 6181a71e2e8..331ec15e215 100644 --- a/ffi/capi/bindings/c/CustomTimeZone.h +++ b/ffi/capi/bindings/c/CustomTimeZone.h @@ -20,16 +20,16 @@ -typedef struct icu4x_CustomTimeZone_create_from_string_mv1_result {union {CustomTimeZone* ok; TimeZoneInvalidOffsetError err;}; bool is_ok;} icu4x_CustomTimeZone_create_from_string_mv1_result; -icu4x_CustomTimeZone_create_from_string_mv1_result icu4x_CustomTimeZone_create_from_string_mv1(const char* s_data, size_t s_len); +typedef struct icu4x_CustomTimeZone_from_string_mv1_result {union {CustomTimeZone* ok; TimeZoneInvalidOffsetError err;}; bool is_ok;} icu4x_CustomTimeZone_from_string_mv1_result; +icu4x_CustomTimeZone_from_string_mv1_result icu4x_CustomTimeZone_from_string_mv1(const char* s_data, size_t s_len); -CustomTimeZone* icu4x_CustomTimeZone_create_empty_mv1(); +CustomTimeZone* icu4x_CustomTimeZone_empty_mv1(); -CustomTimeZone* icu4x_CustomTimeZone_create_utc_mv1(); +CustomTimeZone* icu4x_CustomTimeZone_utc_mv1(); -CustomTimeZone* icu4x_CustomTimeZone_create_gmt_mv1(); +CustomTimeZone* icu4x_CustomTimeZone_gmt_mv1(); -CustomTimeZone* icu4x_CustomTimeZone_create_bst_mv1(); +CustomTimeZone* icu4x_CustomTimeZone_bst_mv1(); typedef struct icu4x_CustomTimeZone_try_set_gmt_offset_seconds_mv1_result {union { TimeZoneInvalidOffsetError err;}; bool is_ok;} icu4x_CustomTimeZone_try_set_gmt_offset_seconds_mv1_result; icu4x_CustomTimeZone_try_set_gmt_offset_seconds_mv1_result icu4x_CustomTimeZone_try_set_gmt_offset_seconds_mv1(CustomTimeZone* self, int32_t offset_seconds); diff --git a/ffi/capi/bindings/c/DataProvider.h b/ffi/capi/bindings/c/DataProvider.h index 0543df31311..0033b81da82 100644 --- a/ffi/capi/bindings/c/DataProvider.h +++ b/ffi/capi/bindings/c/DataProvider.h @@ -17,15 +17,15 @@ -DataProvider* icu4x_DataProvider_create_compiled_mv1(); +DataProvider* icu4x_DataProvider_compiled_mv1(); -typedef struct icu4x_DataProvider_create_fs_mv1_result {union {DataProvider* ok; DataError err;}; bool is_ok;} icu4x_DataProvider_create_fs_mv1_result; -icu4x_DataProvider_create_fs_mv1_result icu4x_DataProvider_create_fs_mv1(const char* path_data, size_t path_len); +typedef struct icu4x_DataProvider_from_fs_mv1_result {union {DataProvider* ok; DataError err;}; bool is_ok;} icu4x_DataProvider_from_fs_mv1_result; +icu4x_DataProvider_from_fs_mv1_result icu4x_DataProvider_from_fs_mv1(const char* path_data, size_t path_len); -typedef struct icu4x_DataProvider_create_from_byte_slice_mv1_result {union {DataProvider* ok; DataError err;}; bool is_ok;} icu4x_DataProvider_create_from_byte_slice_mv1_result; -icu4x_DataProvider_create_from_byte_slice_mv1_result icu4x_DataProvider_create_from_byte_slice_mv1(const uint8_t* blob_data, size_t blob_len); +typedef struct icu4x_DataProvider_from_byte_slice_mv1_result {union {DataProvider* ok; 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(const uint8_t* blob_data, size_t blob_len); -DataProvider* icu4x_DataProvider_create_empty_mv1(); +DataProvider* icu4x_DataProvider_empty_mv1(); typedef struct icu4x_DataProvider_fork_by_key_mv1_result {union { DataError err;}; bool is_ok;} icu4x_DataProvider_fork_by_key_mv1_result; icu4x_DataProvider_fork_by_key_mv1_result icu4x_DataProvider_fork_by_key_mv1(DataProvider* self, DataProvider* other); diff --git a/ffi/capi/bindings/c/Date.h b/ffi/capi/bindings/c/Date.h index 4fec3e9208a..4afe9d72b60 100644 --- a/ffi/capi/bindings/c/Date.h +++ b/ffi/capi/bindings/c/Date.h @@ -21,11 +21,11 @@ -typedef struct icu4x_Date_create_from_iso_in_calendar_mv1_result {union {Date* ok; CalendarError err;}; bool is_ok;} icu4x_Date_create_from_iso_in_calendar_mv1_result; -icu4x_Date_create_from_iso_in_calendar_mv1_result icu4x_Date_create_from_iso_in_calendar_mv1(int32_t year, uint8_t month, uint8_t day, const Calendar* calendar); +typedef struct icu4x_Date_from_iso_in_calendar_mv1_result {union {Date* ok; CalendarError err;}; bool is_ok;} icu4x_Date_from_iso_in_calendar_mv1_result; +icu4x_Date_from_iso_in_calendar_mv1_result icu4x_Date_from_iso_in_calendar_mv1(int32_t year, uint8_t month, uint8_t day, const Calendar* calendar); -typedef struct icu4x_Date_create_from_codes_in_calendar_mv1_result {union {Date* ok; CalendarError err;}; bool is_ok;} icu4x_Date_create_from_codes_in_calendar_mv1_result; -icu4x_Date_create_from_codes_in_calendar_mv1_result icu4x_Date_create_from_codes_in_calendar_mv1(const char* era_code_data, size_t era_code_len, int32_t year, const char* month_code_data, size_t month_code_len, uint8_t day, const Calendar* calendar); +typedef struct icu4x_Date_from_codes_in_calendar_mv1_result {union {Date* ok; 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(const char* era_code_data, size_t era_code_len, int32_t year, const char* month_code_data, size_t month_code_len, uint8_t day, const Calendar* calendar); Date* icu4x_Date_to_calendar_mv1(const Date* self, const Calendar* calendar); diff --git a/ffi/capi/bindings/c/DateTime.h b/ffi/capi/bindings/c/DateTime.h index 5d61d0a088d..b39f3c1c7b3 100644 --- a/ffi/capi/bindings/c/DateTime.h +++ b/ffi/capi/bindings/c/DateTime.h @@ -23,13 +23,13 @@ -typedef struct icu4x_DateTime_create_from_iso_in_calendar_mv1_result {union {DateTime* ok; CalendarError err;}; bool is_ok;} icu4x_DateTime_create_from_iso_in_calendar_mv1_result; -icu4x_DateTime_create_from_iso_in_calendar_mv1_result icu4x_DateTime_create_from_iso_in_calendar_mv1(int32_t year, uint8_t month, uint8_t day, uint8_t hour, uint8_t minute, uint8_t second, uint32_t nanosecond, const Calendar* calendar); +typedef struct icu4x_DateTime_from_iso_in_calendar_mv1_result {union {DateTime* ok; CalendarError err;}; bool is_ok;} icu4x_DateTime_from_iso_in_calendar_mv1_result; +icu4x_DateTime_from_iso_in_calendar_mv1_result icu4x_DateTime_from_iso_in_calendar_mv1(int32_t year, uint8_t month, uint8_t day, uint8_t hour, uint8_t minute, uint8_t second, uint32_t nanosecond, const Calendar* calendar); -typedef struct icu4x_DateTime_create_from_codes_in_calendar_mv1_result {union {DateTime* ok; CalendarError err;}; bool is_ok;} icu4x_DateTime_create_from_codes_in_calendar_mv1_result; -icu4x_DateTime_create_from_codes_in_calendar_mv1_result icu4x_DateTime_create_from_codes_in_calendar_mv1(const char* era_code_data, size_t era_code_len, int32_t year, const char* month_code_data, size_t month_code_len, uint8_t day, uint8_t hour, uint8_t minute, uint8_t second, uint32_t nanosecond, const Calendar* calendar); +typedef struct icu4x_DateTime_from_codes_in_calendar_mv1_result {union {DateTime* ok; CalendarError err;}; bool is_ok;} icu4x_DateTime_from_codes_in_calendar_mv1_result; +icu4x_DateTime_from_codes_in_calendar_mv1_result icu4x_DateTime_from_codes_in_calendar_mv1(const char* era_code_data, size_t era_code_len, int32_t year, const char* month_code_data, size_t month_code_len, uint8_t day, uint8_t hour, uint8_t minute, uint8_t second, uint32_t nanosecond, const Calendar* calendar); -DateTime* icu4x_DateTime_create_from_date_and_time_mv1(const Date* date, const Time* time); +DateTime* icu4x_DateTime_from_date_and_time_mv1(const Date* date, const Time* time); Date* icu4x_DateTime_date_mv1(const DateTime* self); diff --git a/ffi/capi/bindings/c/FixedDecimal.h b/ffi/capi/bindings/c/FixedDecimal.h index 83c0bb16fd4..db15043fc70 100644 --- a/ffi/capi/bindings/c/FixedDecimal.h +++ b/ffi/capi/bindings/c/FixedDecimal.h @@ -21,28 +21,28 @@ -FixedDecimal* icu4x_FixedDecimal_create_from_i32_mv1(int32_t v); +FixedDecimal* icu4x_FixedDecimal_from_int32_mv1(int32_t v); -FixedDecimal* icu4x_FixedDecimal_create_from_u32_mv1(uint32_t v); +FixedDecimal* icu4x_FixedDecimal_from_uint32_mv1(uint32_t v); -FixedDecimal* icu4x_FixedDecimal_create_from_i64_mv1(int64_t v); +FixedDecimal* icu4x_FixedDecimal_from_int64_mv1(int64_t v); -FixedDecimal* icu4x_FixedDecimal_create_from_u64_mv1(uint64_t v); +FixedDecimal* icu4x_FixedDecimal_from_uint64_mv1(uint64_t v); -typedef struct icu4x_FixedDecimal_create_from_f64_with_integer_precision_mv1_result {union {FixedDecimal* ok; FixedDecimalLimitError err;}; bool is_ok;} icu4x_FixedDecimal_create_from_f64_with_integer_precision_mv1_result; -icu4x_FixedDecimal_create_from_f64_with_integer_precision_mv1_result icu4x_FixedDecimal_create_from_f64_with_integer_precision_mv1(double f); +typedef struct icu4x_FixedDecimal_from_double_with_integer_precision_mv1_result {union {FixedDecimal* ok; FixedDecimalLimitError err;}; bool is_ok;} icu4x_FixedDecimal_from_double_with_integer_precision_mv1_result; +icu4x_FixedDecimal_from_double_with_integer_precision_mv1_result icu4x_FixedDecimal_from_double_with_integer_precision_mv1(double f); -typedef struct icu4x_FixedDecimal_create_from_f64_with_lower_magnitude_mv1_result {union {FixedDecimal* ok; FixedDecimalLimitError err;}; bool is_ok;} icu4x_FixedDecimal_create_from_f64_with_lower_magnitude_mv1_result; -icu4x_FixedDecimal_create_from_f64_with_lower_magnitude_mv1_result icu4x_FixedDecimal_create_from_f64_with_lower_magnitude_mv1(double f, int16_t magnitude); +typedef struct icu4x_FixedDecimal_from_double_with_lower_magnitude_mv1_result {union {FixedDecimal* ok; FixedDecimalLimitError err;}; bool is_ok;} icu4x_FixedDecimal_from_double_with_lower_magnitude_mv1_result; +icu4x_FixedDecimal_from_double_with_lower_magnitude_mv1_result icu4x_FixedDecimal_from_double_with_lower_magnitude_mv1(double f, int16_t magnitude); -typedef struct icu4x_FixedDecimal_create_from_f64_with_significant_digits_mv1_result {union {FixedDecimal* ok; FixedDecimalLimitError err;}; bool is_ok;} icu4x_FixedDecimal_create_from_f64_with_significant_digits_mv1_result; -icu4x_FixedDecimal_create_from_f64_with_significant_digits_mv1_result icu4x_FixedDecimal_create_from_f64_with_significant_digits_mv1(double f, uint8_t digits); +typedef struct icu4x_FixedDecimal_from_double_with_significant_digits_mv1_result {union {FixedDecimal* ok; FixedDecimalLimitError err;}; bool is_ok;} icu4x_FixedDecimal_from_double_with_significant_digits_mv1_result; +icu4x_FixedDecimal_from_double_with_significant_digits_mv1_result icu4x_FixedDecimal_from_double_with_significant_digits_mv1(double f, uint8_t digits); -typedef struct icu4x_FixedDecimal_create_from_f64_with_floating_precision_mv1_result {union {FixedDecimal* ok; FixedDecimalLimitError err;}; bool is_ok;} icu4x_FixedDecimal_create_from_f64_with_floating_precision_mv1_result; -icu4x_FixedDecimal_create_from_f64_with_floating_precision_mv1_result icu4x_FixedDecimal_create_from_f64_with_floating_precision_mv1(double f); +typedef struct icu4x_FixedDecimal_from_double_with_floating_precision_mv1_result {union {FixedDecimal* ok; FixedDecimalLimitError err;}; bool is_ok;} icu4x_FixedDecimal_from_double_with_floating_precision_mv1_result; +icu4x_FixedDecimal_from_double_with_floating_precision_mv1_result icu4x_FixedDecimal_from_double_with_floating_precision_mv1(double f); -typedef struct icu4x_FixedDecimal_create_from_string_mv1_result {union {FixedDecimal* ok; FixedDecimalParseError err;}; bool is_ok;} icu4x_FixedDecimal_create_from_string_mv1_result; -icu4x_FixedDecimal_create_from_string_mv1_result icu4x_FixedDecimal_create_from_string_mv1(const char* v_data, size_t v_len); +typedef struct icu4x_FixedDecimal_from_string_mv1_result {union {FixedDecimal* ok; FixedDecimalParseError err;}; bool is_ok;} icu4x_FixedDecimal_from_string_mv1_result; +icu4x_FixedDecimal_from_string_mv1_result icu4x_FixedDecimal_from_string_mv1(const char* v_data, size_t v_len); uint8_t icu4x_FixedDecimal_digit_at_mv1(const FixedDecimal* self, int16_t magnitude); diff --git a/ffi/capi/bindings/c/IsoDate.h b/ffi/capi/bindings/c/IsoDate.h index f1ef11b7c99..480bd8f8be6 100644 --- a/ffi/capi/bindings/c/IsoDate.h +++ b/ffi/capi/bindings/c/IsoDate.h @@ -24,7 +24,7 @@ typedef struct icu4x_IsoDate_create_mv1_result {union {IsoDate* ok; CalendarError err;}; bool is_ok;} icu4x_IsoDate_create_mv1_result; icu4x_IsoDate_create_mv1_result icu4x_IsoDate_create_mv1(int32_t year, uint8_t month, uint8_t day); -IsoDate* icu4x_IsoDate_create_for_unix_epoch_mv1(); +IsoDate* icu4x_IsoDate_unix_epoch_mv1(); Date* icu4x_IsoDate_to_calendar_mv1(const IsoDate* self, const Calendar* calendar); diff --git a/ffi/capi/bindings/c/IsoDateTime.h b/ffi/capi/bindings/c/IsoDateTime.h index b759ad24fc8..6643f294372 100644 --- a/ffi/capi/bindings/c/IsoDateTime.h +++ b/ffi/capi/bindings/c/IsoDateTime.h @@ -26,11 +26,11 @@ typedef struct icu4x_IsoDateTime_create_mv1_result {union {IsoDateTime* ok; CalendarError err;}; bool is_ok;} icu4x_IsoDateTime_create_mv1_result; icu4x_IsoDateTime_create_mv1_result icu4x_IsoDateTime_create_mv1(int32_t year, uint8_t month, uint8_t day, uint8_t hour, uint8_t minute, uint8_t second, uint32_t nanosecond); -IsoDateTime* icu4x_IsoDateTime_crate_from_date_and_time_mv1(const IsoDate* date, const Time* time); +IsoDateTime* icu4x_IsoDateTime_from_date_and_time_mv1(const IsoDate* date, const Time* time); IsoDateTime* icu4x_IsoDateTime_local_unix_epoch_mv1(); -IsoDateTime* icu4x_IsoDateTime_create_from_minutes_since_local_unix_epoch_mv1(int32_t minutes); +IsoDateTime* icu4x_IsoDateTime_from_minutes_since_local_unix_epoch_mv1(int32_t minutes); IsoDate* icu4x_IsoDateTime_date_mv1(const IsoDateTime* self); diff --git a/ffi/capi/bindings/c/Locale.h b/ffi/capi/bindings/c/Locale.h index b86780fc6d4..66a5820343f 100644 --- a/ffi/capi/bindings/c/Locale.h +++ b/ffi/capi/bindings/c/Locale.h @@ -16,10 +16,10 @@ -typedef struct icu4x_Locale_create_from_string_mv1_result {union {Locale* ok; LocaleParseError err;}; bool is_ok;} icu4x_Locale_create_from_string_mv1_result; -icu4x_Locale_create_from_string_mv1_result icu4x_Locale_create_from_string_mv1(const char* name_data, size_t name_len); +typedef struct icu4x_Locale_from_string_mv1_result {union {Locale* ok; LocaleParseError err;}; bool is_ok;} icu4x_Locale_from_string_mv1_result; +icu4x_Locale_from_string_mv1_result icu4x_Locale_from_string_mv1(const char* name_data, size_t name_len); -Locale* icu4x_Locale_create_und_mv1(); +Locale* icu4x_Locale_und_mv1(); Locale* icu4x_Locale_clone_mv1(const Locale* self); diff --git a/ffi/capi/bindings/c/LocaleDisplayNamesFormatter.h b/ffi/capi/bindings/c/LocaleDisplayNamesFormatter.h index 8a7705bec81..9e6e61fcac7 100644 --- a/ffi/capi/bindings/c/LocaleDisplayNamesFormatter.h +++ b/ffi/capi/bindings/c/LocaleDisplayNamesFormatter.h @@ -19,8 +19,8 @@ -typedef struct icu4x_LocaleDisplayNamesFormatter_create_mv1_result {union {LocaleDisplayNamesFormatter* ok; DataError err;}; bool is_ok;} icu4x_LocaleDisplayNamesFormatter_create_mv1_result; -icu4x_LocaleDisplayNamesFormatter_create_mv1_result icu4x_LocaleDisplayNamesFormatter_create_mv1(const DataProvider* provider, const Locale* locale, DisplayNamesOptionsV1 options); +typedef struct icu4x_LocaleDisplayNamesFormatter_create_v1_mv1_result {union {LocaleDisplayNamesFormatter* ok; DataError err;}; bool is_ok;} icu4x_LocaleDisplayNamesFormatter_create_v1_mv1_result; +icu4x_LocaleDisplayNamesFormatter_create_v1_mv1_result icu4x_LocaleDisplayNamesFormatter_create_v1_mv1(const DataProvider* provider, const Locale* locale, DisplayNamesOptionsV1 options); void icu4x_LocaleDisplayNamesFormatter_of_mv1(const LocaleDisplayNamesFormatter* self, const Locale* locale, DiplomatWrite* write); diff --git a/ffi/capi/bindings/c/LocaleFallbacker.h b/ffi/capi/bindings/c/LocaleFallbacker.h index 16ff5c18b19..dc625107b3d 100644 --- a/ffi/capi/bindings/c/LocaleFallbacker.h +++ b/ffi/capi/bindings/c/LocaleFallbacker.h @@ -23,7 +23,7 @@ typedef struct icu4x_LocaleFallbacker_create_mv1_result {union {LocaleFallbacker* ok; DataError err;}; bool is_ok;} icu4x_LocaleFallbacker_create_mv1_result; icu4x_LocaleFallbacker_create_mv1_result icu4x_LocaleFallbacker_create_mv1(const DataProvider* provider); -LocaleFallbacker* icu4x_LocaleFallbacker_create_without_data_mv1(); +LocaleFallbacker* icu4x_LocaleFallbacker_without_data_mv1(); typedef struct icu4x_LocaleFallbacker_for_config_mv1_result {union {LocaleFallbackerWithConfig* ok; LocaleParseError err;}; bool is_ok;} icu4x_LocaleFallbacker_for_config_mv1_result; icu4x_LocaleFallbacker_for_config_mv1_result icu4x_LocaleFallbacker_for_config_mv1(const LocaleFallbacker* self, LocaleFallbackConfig config); diff --git a/ffi/capi/bindings/c/PluralOperands.h b/ffi/capi/bindings/c/PluralOperands.h index 260eeb75dd5..3448419dfb7 100644 --- a/ffi/capi/bindings/c/PluralOperands.h +++ b/ffi/capi/bindings/c/PluralOperands.h @@ -17,10 +17,10 @@ -typedef struct icu4x_PluralOperands_create_from_string_mv1_result {union {PluralOperands* ok; FixedDecimalParseError err;}; bool is_ok;} icu4x_PluralOperands_create_from_string_mv1_result; -icu4x_PluralOperands_create_from_string_mv1_result icu4x_PluralOperands_create_from_string_mv1(const char* s_data, size_t s_len); +typedef struct icu4x_PluralOperands_from_string_mv1_result {union {PluralOperands* ok; FixedDecimalParseError err;}; bool is_ok;} icu4x_PluralOperands_from_string_mv1_result; +icu4x_PluralOperands_from_string_mv1_result icu4x_PluralOperands_from_string_mv1(const char* s_data, size_t s_len); -PluralOperands* icu4x_PluralOperands_create_from_fixed_decimal_mv1(const FixedDecimal* x); +PluralOperands* icu4x_PluralOperands_from_fixed_decimal_mv1(const FixedDecimal* x); void icu4x_PluralOperands_destroy_mv1(PluralOperands* self); diff --git a/ffi/capi/bindings/c/Time.h b/ffi/capi/bindings/c/Time.h index 9ae1c2c25cb..3b53fdf0e3a 100644 --- a/ffi/capi/bindings/c/Time.h +++ b/ffi/capi/bindings/c/Time.h @@ -19,8 +19,8 @@ typedef struct icu4x_Time_create_mv1_result {union {Time* ok; CalendarError err;}; bool is_ok;} icu4x_Time_create_mv1_result; icu4x_Time_create_mv1_result icu4x_Time_create_mv1(uint8_t hour, uint8_t minute, uint8_t second, uint32_t nanosecond); -typedef struct icu4x_Time_create_midnight_mv1_result {union {Time* ok; CalendarError err;}; bool is_ok;} icu4x_Time_create_midnight_mv1_result; -icu4x_Time_create_midnight_mv1_result icu4x_Time_create_midnight_mv1(); +typedef struct icu4x_Time_midnight_mv1_result {union {Time* ok; CalendarError err;}; bool is_ok;} icu4x_Time_midnight_mv1_result; +icu4x_Time_midnight_mv1_result icu4x_Time_midnight_mv1(); uint8_t icu4x_Time_hour_mv1(const Time* self); diff --git a/ffi/capi/bindings/c/TitlecaseOptionsV1.h b/ffi/capi/bindings/c/TitlecaseOptionsV1.h index b5d102f7b69..c8125cced8a 100644 --- a/ffi/capi/bindings/c/TitlecaseOptionsV1.h +++ b/ffi/capi/bindings/c/TitlecaseOptionsV1.h @@ -15,7 +15,7 @@ -TitlecaseOptionsV1 icu4x_TitlecaseOptionsV1_default_options_mv1(); +TitlecaseOptionsV1 icu4x_TitlecaseOptionsV1_default_mv1(); diff --git a/ffi/capi/bindings/c/WeekCalculator.h b/ffi/capi/bindings/c/WeekCalculator.h index 053d32e2183..3157a1ab494 100644 --- a/ffi/capi/bindings/c/WeekCalculator.h +++ b/ffi/capi/bindings/c/WeekCalculator.h @@ -23,7 +23,7 @@ typedef struct icu4x_WeekCalculator_create_mv1_result {union {WeekCalculator* ok; DataError err;}; bool is_ok;} icu4x_WeekCalculator_create_mv1_result; icu4x_WeekCalculator_create_mv1_result icu4x_WeekCalculator_create_mv1(const DataProvider* provider, const Locale* locale); -WeekCalculator* icu4x_WeekCalculator_create_from_first_day_of_week_and_min_week_days_mv1(IsoWeekday first_weekday, uint8_t min_week_days); +WeekCalculator* icu4x_WeekCalculator_from_first_day_of_week_and_min_week_days_mv1(IsoWeekday first_weekday, uint8_t min_week_days); IsoWeekday icu4x_WeekCalculator_first_weekday_mv1(const WeekCalculator* self); diff --git a/ffi/capi/bindings/cpp/Collator.d.hpp b/ffi/capi/bindings/cpp/Collator.d.hpp index 0665970e3f9..5bbb89d2b0d 100644 --- a/ffi/capi/bindings/cpp/Collator.d.hpp +++ b/ffi/capi/bindings/cpp/Collator.d.hpp @@ -33,7 +33,7 @@ class Collator { inline int8_t compare(std::string_view left, std::string_view right) const; - inline CollatorResolvedOptionsV1 resolved_options() const; + inline CollatorResolvedOptionsV1 resolved_options_v1() const; inline const diplomat::capi::Collator* AsFFI() const; inline diplomat::capi::Collator* AsFFI(); diff --git a/ffi/capi/bindings/cpp/Collator.hpp b/ffi/capi/bindings/cpp/Collator.hpp index 6ceec452924..95afb2aa2ca 100644 --- a/ffi/capi/bindings/cpp/Collator.hpp +++ b/ffi/capi/bindings/cpp/Collator.hpp @@ -28,7 +28,7 @@ namespace capi { int8_t icu4x_Collator_compare_mv1(const diplomat::capi::Collator* self, const char* left_data, size_t left_len, const char* right_data, size_t right_len); - diplomat::capi::CollatorResolvedOptionsV1 icu4x_Collator_resolved_options_mv1(const diplomat::capi::Collator* self); + diplomat::capi::CollatorResolvedOptionsV1 icu4x_Collator_resolved_options_v1_mv1(const diplomat::capi::Collator* self); void icu4x_Collator_destroy_mv1(Collator* self); @@ -62,8 +62,8 @@ inline int8_t Collator::compare(std::string_view left, std::string_view right) c return result; } -inline CollatorResolvedOptionsV1 Collator::resolved_options() const { - auto result = diplomat::capi::icu4x_Collator_resolved_options_mv1(this->AsFFI()); +inline CollatorResolvedOptionsV1 Collator::resolved_options_v1() const { + auto result = diplomat::capi::icu4x_Collator_resolved_options_v1_mv1(this->AsFFI()); return CollatorResolvedOptionsV1::FromFFI(result); } diff --git a/ffi/capi/bindings/cpp/CustomTimeZone.d.hpp b/ffi/capi/bindings/cpp/CustomTimeZone.d.hpp index 1c64ff0679b..69d2f75a624 100644 --- a/ffi/capi/bindings/cpp/CustomTimeZone.d.hpp +++ b/ffi/capi/bindings/cpp/CustomTimeZone.d.hpp @@ -28,15 +28,15 @@ namespace capi { class CustomTimeZone { public: - inline static diplomat::result, TimeZoneInvalidOffsetError> create_from_string(std::string_view s); + inline static diplomat::result, TimeZoneInvalidOffsetError> from_string(std::string_view s); - inline static std::unique_ptr create_empty(); + inline static std::unique_ptr empty(); - inline static std::unique_ptr create_utc(); + inline static std::unique_ptr utc(); - inline static std::unique_ptr create_gmt(); + inline static std::unique_ptr gmt(); - inline static std::unique_ptr create_bst(); + inline static std::unique_ptr bst(); inline diplomat::result try_set_gmt_offset_seconds(int32_t offset_seconds); diff --git a/ffi/capi/bindings/cpp/CustomTimeZone.hpp b/ffi/capi/bindings/cpp/CustomTimeZone.hpp index db03e0f91e2..fa557c28e23 100644 --- a/ffi/capi/bindings/cpp/CustomTimeZone.hpp +++ b/ffi/capi/bindings/cpp/CustomTimeZone.hpp @@ -21,16 +21,16 @@ namespace diplomat { namespace capi { extern "C" { - typedef struct icu4x_CustomTimeZone_create_from_string_mv1_result {union {diplomat::capi::CustomTimeZone* ok; diplomat::capi::TimeZoneInvalidOffsetError err;}; bool is_ok;} icu4x_CustomTimeZone_create_from_string_mv1_result; - icu4x_CustomTimeZone_create_from_string_mv1_result icu4x_CustomTimeZone_create_from_string_mv1(const char* s_data, size_t s_len); + typedef struct icu4x_CustomTimeZone_from_string_mv1_result {union {diplomat::capi::CustomTimeZone* ok; diplomat::capi::TimeZoneInvalidOffsetError err;}; bool is_ok;} icu4x_CustomTimeZone_from_string_mv1_result; + icu4x_CustomTimeZone_from_string_mv1_result icu4x_CustomTimeZone_from_string_mv1(const char* s_data, size_t s_len); - diplomat::capi::CustomTimeZone* icu4x_CustomTimeZone_create_empty_mv1(); + diplomat::capi::CustomTimeZone* icu4x_CustomTimeZone_empty_mv1(); - diplomat::capi::CustomTimeZone* icu4x_CustomTimeZone_create_utc_mv1(); + diplomat::capi::CustomTimeZone* icu4x_CustomTimeZone_utc_mv1(); - diplomat::capi::CustomTimeZone* icu4x_CustomTimeZone_create_gmt_mv1(); + diplomat::capi::CustomTimeZone* icu4x_CustomTimeZone_gmt_mv1(); - diplomat::capi::CustomTimeZone* icu4x_CustomTimeZone_create_bst_mv1(); + diplomat::capi::CustomTimeZone* icu4x_CustomTimeZone_bst_mv1(); typedef struct icu4x_CustomTimeZone_try_set_gmt_offset_seconds_mv1_result {union { diplomat::capi::TimeZoneInvalidOffsetError err;}; bool is_ok;} icu4x_CustomTimeZone_try_set_gmt_offset_seconds_mv1_result; icu4x_CustomTimeZone_try_set_gmt_offset_seconds_mv1_result icu4x_CustomTimeZone_try_set_gmt_offset_seconds_mv1(diplomat::capi::CustomTimeZone* self, int32_t offset_seconds); @@ -100,29 +100,29 @@ namespace capi { } // namespace capi } // namespace -inline diplomat::result, TimeZoneInvalidOffsetError> CustomTimeZone::create_from_string(std::string_view s) { - auto result = diplomat::capi::icu4x_CustomTimeZone_create_from_string_mv1(s.data(), +inline diplomat::result, TimeZoneInvalidOffsetError> CustomTimeZone::from_string(std::string_view s) { + auto result = diplomat::capi::icu4x_CustomTimeZone_from_string_mv1(s.data(), s.size()); return result.is_ok ? diplomat::result, TimeZoneInvalidOffsetError>(diplomat::Ok>(std::unique_ptr(CustomTimeZone::FromFFI(result.ok)))) : diplomat::result, TimeZoneInvalidOffsetError>(diplomat::Err(TimeZoneInvalidOffsetError::FromFFI(result.err))); } -inline std::unique_ptr CustomTimeZone::create_empty() { - auto result = diplomat::capi::icu4x_CustomTimeZone_create_empty_mv1(); +inline std::unique_ptr CustomTimeZone::empty() { + auto result = diplomat::capi::icu4x_CustomTimeZone_empty_mv1(); return std::unique_ptr(CustomTimeZone::FromFFI(result)); } -inline std::unique_ptr CustomTimeZone::create_utc() { - auto result = diplomat::capi::icu4x_CustomTimeZone_create_utc_mv1(); +inline std::unique_ptr CustomTimeZone::utc() { + auto result = diplomat::capi::icu4x_CustomTimeZone_utc_mv1(); return std::unique_ptr(CustomTimeZone::FromFFI(result)); } -inline std::unique_ptr CustomTimeZone::create_gmt() { - auto result = diplomat::capi::icu4x_CustomTimeZone_create_gmt_mv1(); +inline std::unique_ptr CustomTimeZone::gmt() { + auto result = diplomat::capi::icu4x_CustomTimeZone_gmt_mv1(); return std::unique_ptr(CustomTimeZone::FromFFI(result)); } -inline std::unique_ptr CustomTimeZone::create_bst() { - auto result = diplomat::capi::icu4x_CustomTimeZone_create_bst_mv1(); +inline std::unique_ptr CustomTimeZone::bst() { + auto result = diplomat::capi::icu4x_CustomTimeZone_bst_mv1(); return std::unique_ptr(CustomTimeZone::FromFFI(result)); } diff --git a/ffi/capi/bindings/cpp/DataProvider.d.hpp b/ffi/capi/bindings/cpp/DataProvider.d.hpp index 6e6c87be07a..2b486797254 100644 --- a/ffi/capi/bindings/cpp/DataProvider.d.hpp +++ b/ffi/capi/bindings/cpp/DataProvider.d.hpp @@ -23,13 +23,13 @@ namespace capi { class DataProvider { public: - inline static std::unique_ptr create_compiled(); + inline static std::unique_ptr compiled(); - inline static diplomat::result, DataError> create_fs(std::string_view path); + inline static diplomat::result, DataError> from_fs(std::string_view path); - inline static diplomat::result, DataError> create_from_byte_slice(diplomat::span blob); + inline static diplomat::result, DataError> from_byte_slice(diplomat::span blob); - inline static std::unique_ptr create_empty(); + inline static std::unique_ptr empty(); inline diplomat::result fork_by_key(DataProvider& other); diff --git a/ffi/capi/bindings/cpp/DataProvider.hpp b/ffi/capi/bindings/cpp/DataProvider.hpp index b54c3e4ee92..b0dd403e074 100644 --- a/ffi/capi/bindings/cpp/DataProvider.hpp +++ b/ffi/capi/bindings/cpp/DataProvider.hpp @@ -18,15 +18,15 @@ namespace diplomat { namespace capi { extern "C" { - diplomat::capi::DataProvider* icu4x_DataProvider_create_compiled_mv1(); + diplomat::capi::DataProvider* icu4x_DataProvider_compiled_mv1(); - typedef struct icu4x_DataProvider_create_fs_mv1_result {union {diplomat::capi::DataProvider* ok; diplomat::capi::DataError err;}; bool is_ok;} icu4x_DataProvider_create_fs_mv1_result; - icu4x_DataProvider_create_fs_mv1_result icu4x_DataProvider_create_fs_mv1(const char* path_data, size_t path_len); + typedef struct icu4x_DataProvider_from_fs_mv1_result {union {diplomat::capi::DataProvider* ok; diplomat::capi::DataError err;}; bool is_ok;} icu4x_DataProvider_from_fs_mv1_result; + icu4x_DataProvider_from_fs_mv1_result icu4x_DataProvider_from_fs_mv1(const char* path_data, size_t path_len); - typedef struct icu4x_DataProvider_create_from_byte_slice_mv1_result {union {diplomat::capi::DataProvider* ok; diplomat::capi::DataError err;}; bool is_ok;} icu4x_DataProvider_create_from_byte_slice_mv1_result; - icu4x_DataProvider_create_from_byte_slice_mv1_result icu4x_DataProvider_create_from_byte_slice_mv1(const uint8_t* blob_data, size_t blob_len); + typedef struct icu4x_DataProvider_from_byte_slice_mv1_result {union {diplomat::capi::DataProvider* ok; diplomat::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(const uint8_t* blob_data, size_t blob_len); - diplomat::capi::DataProvider* icu4x_DataProvider_create_empty_mv1(); + diplomat::capi::DataProvider* icu4x_DataProvider_empty_mv1(); typedef struct icu4x_DataProvider_fork_by_key_mv1_result {union { diplomat::capi::DataError err;}; bool is_ok;} icu4x_DataProvider_fork_by_key_mv1_result; icu4x_DataProvider_fork_by_key_mv1_result icu4x_DataProvider_fork_by_key_mv1(diplomat::capi::DataProvider* self, diplomat::capi::DataProvider* other); @@ -44,25 +44,25 @@ namespace capi { } // namespace capi } // namespace -inline std::unique_ptr DataProvider::create_compiled() { - auto result = diplomat::capi::icu4x_DataProvider_create_compiled_mv1(); +inline std::unique_ptr DataProvider::compiled() { + auto result = diplomat::capi::icu4x_DataProvider_compiled_mv1(); return std::unique_ptr(DataProvider::FromFFI(result)); } -inline diplomat::result, DataError> DataProvider::create_fs(std::string_view path) { - auto result = diplomat::capi::icu4x_DataProvider_create_fs_mv1(path.data(), +inline diplomat::result, DataError> DataProvider::from_fs(std::string_view path) { + auto result = diplomat::capi::icu4x_DataProvider_from_fs_mv1(path.data(), path.size()); return result.is_ok ? diplomat::result, DataError>(diplomat::Ok>(std::unique_ptr(DataProvider::FromFFI(result.ok)))) : diplomat::result, DataError>(diplomat::Err(DataError::FromFFI(result.err))); } -inline diplomat::result, DataError> DataProvider::create_from_byte_slice(diplomat::span blob) { - auto result = diplomat::capi::icu4x_DataProvider_create_from_byte_slice_mv1(blob.data(), +inline diplomat::result, DataError> DataProvider::from_byte_slice(diplomat::span blob) { + auto result = diplomat::capi::icu4x_DataProvider_from_byte_slice_mv1(blob.data(), blob.size()); return result.is_ok ? diplomat::result, DataError>(diplomat::Ok>(std::unique_ptr(DataProvider::FromFFI(result.ok)))) : diplomat::result, DataError>(diplomat::Err(DataError::FromFFI(result.err))); } -inline std::unique_ptr DataProvider::create_empty() { - auto result = diplomat::capi::icu4x_DataProvider_create_empty_mv1(); +inline std::unique_ptr DataProvider::empty() { + auto result = diplomat::capi::icu4x_DataProvider_empty_mv1(); return std::unique_ptr(DataProvider::FromFFI(result)); } diff --git a/ffi/capi/bindings/cpp/Date.d.hpp b/ffi/capi/bindings/cpp/Date.d.hpp index 1e5a5a7916e..65f2c7474d3 100644 --- a/ffi/capi/bindings/cpp/Date.d.hpp +++ b/ffi/capi/bindings/cpp/Date.d.hpp @@ -29,9 +29,9 @@ namespace capi { class Date { public: - inline static diplomat::result, CalendarError> create_from_iso_in_calendar(int32_t year, uint8_t month, uint8_t day, const Calendar& calendar); + inline static diplomat::result, CalendarError> from_iso_in_calendar(int32_t year, uint8_t month, uint8_t day, const Calendar& calendar); - inline static diplomat::result, CalendarError> create_from_codes_in_calendar(std::string_view era_code, int32_t year, std::string_view month_code, uint8_t day, const Calendar& calendar); + inline static diplomat::result, CalendarError> from_codes_in_calendar(std::string_view era_code, int32_t year, std::string_view month_code, uint8_t day, const Calendar& calendar); inline std::unique_ptr to_calendar(const Calendar& calendar) const; diff --git a/ffi/capi/bindings/cpp/Date.hpp b/ffi/capi/bindings/cpp/Date.hpp index 39a9396e942..0d72555d7a8 100644 --- a/ffi/capi/bindings/cpp/Date.hpp +++ b/ffi/capi/bindings/cpp/Date.hpp @@ -22,11 +22,11 @@ namespace diplomat { namespace capi { extern "C" { - typedef struct icu4x_Date_create_from_iso_in_calendar_mv1_result {union {diplomat::capi::Date* ok; diplomat::capi::CalendarError err;}; bool is_ok;} icu4x_Date_create_from_iso_in_calendar_mv1_result; - icu4x_Date_create_from_iso_in_calendar_mv1_result icu4x_Date_create_from_iso_in_calendar_mv1(int32_t year, uint8_t month, uint8_t day, const diplomat::capi::Calendar* calendar); + typedef struct icu4x_Date_from_iso_in_calendar_mv1_result {union {diplomat::capi::Date* ok; diplomat::capi::CalendarError err;}; bool is_ok;} icu4x_Date_from_iso_in_calendar_mv1_result; + icu4x_Date_from_iso_in_calendar_mv1_result icu4x_Date_from_iso_in_calendar_mv1(int32_t year, uint8_t month, uint8_t day, const diplomat::capi::Calendar* calendar); - typedef struct icu4x_Date_create_from_codes_in_calendar_mv1_result {union {diplomat::capi::Date* ok; diplomat::capi::CalendarError err;}; bool is_ok;} icu4x_Date_create_from_codes_in_calendar_mv1_result; - icu4x_Date_create_from_codes_in_calendar_mv1_result icu4x_Date_create_from_codes_in_calendar_mv1(const char* era_code_data, size_t era_code_len, int32_t year, const char* month_code_data, size_t month_code_len, uint8_t day, const diplomat::capi::Calendar* calendar); + typedef struct icu4x_Date_from_codes_in_calendar_mv1_result {union {diplomat::capi::Date* ok; diplomat::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(const char* era_code_data, size_t era_code_len, int32_t year, const char* month_code_data, size_t month_code_len, uint8_t day, const diplomat::capi::Calendar* calendar); diplomat::capi::Date* icu4x_Date_to_calendar_mv1(const diplomat::capi::Date* self, const diplomat::capi::Calendar* calendar); @@ -65,16 +65,16 @@ namespace capi { } // namespace capi } // namespace -inline diplomat::result, CalendarError> Date::create_from_iso_in_calendar(int32_t year, uint8_t month, uint8_t day, const Calendar& calendar) { - auto result = diplomat::capi::icu4x_Date_create_from_iso_in_calendar_mv1(year, +inline diplomat::result, CalendarError> Date::from_iso_in_calendar(int32_t year, uint8_t month, uint8_t day, const Calendar& calendar) { + auto result = diplomat::capi::icu4x_Date_from_iso_in_calendar_mv1(year, month, day, calendar.AsFFI()); return result.is_ok ? diplomat::result, CalendarError>(diplomat::Ok>(std::unique_ptr(Date::FromFFI(result.ok)))) : diplomat::result, CalendarError>(diplomat::Err(CalendarError::FromFFI(result.err))); } -inline diplomat::result, CalendarError> Date::create_from_codes_in_calendar(std::string_view era_code, int32_t year, std::string_view month_code, uint8_t day, const Calendar& calendar) { - auto result = diplomat::capi::icu4x_Date_create_from_codes_in_calendar_mv1(era_code.data(), +inline diplomat::result, CalendarError> Date::from_codes_in_calendar(std::string_view era_code, int32_t year, std::string_view month_code, uint8_t day, const Calendar& calendar) { + auto result = diplomat::capi::icu4x_Date_from_codes_in_calendar_mv1(era_code.data(), era_code.size(), year, month_code.data(), diff --git a/ffi/capi/bindings/cpp/DateTime.d.hpp b/ffi/capi/bindings/cpp/DateTime.d.hpp index fad238deb1d..bd8baf37b60 100644 --- a/ffi/capi/bindings/cpp/DateTime.d.hpp +++ b/ffi/capi/bindings/cpp/DateTime.d.hpp @@ -33,11 +33,11 @@ namespace capi { class DateTime { public: - inline static diplomat::result, CalendarError> create_from_iso_in_calendar(int32_t year, uint8_t month, uint8_t day, uint8_t hour, uint8_t minute, uint8_t second, uint32_t nanosecond, const Calendar& calendar); + inline static diplomat::result, CalendarError> from_iso_in_calendar(int32_t year, uint8_t month, uint8_t day, uint8_t hour, uint8_t minute, uint8_t second, uint32_t nanosecond, const Calendar& calendar); - inline static diplomat::result, CalendarError> create_from_codes_in_calendar(std::string_view era_code, int32_t year, std::string_view month_code, uint8_t day, uint8_t hour, uint8_t minute, uint8_t second, uint32_t nanosecond, const Calendar& calendar); + inline static diplomat::result, CalendarError> from_codes_in_calendar(std::string_view era_code, int32_t year, std::string_view month_code, uint8_t day, uint8_t hour, uint8_t minute, uint8_t second, uint32_t nanosecond, const Calendar& calendar); - inline static std::unique_ptr create_from_date_and_time(const Date& date, const Time& time); + inline static std::unique_ptr from_date_and_time(const Date& date, const Time& time); inline std::unique_ptr date() const; diff --git a/ffi/capi/bindings/cpp/DateTime.hpp b/ffi/capi/bindings/cpp/DateTime.hpp index 6c45e802ef2..f5d3d579f15 100644 --- a/ffi/capi/bindings/cpp/DateTime.hpp +++ b/ffi/capi/bindings/cpp/DateTime.hpp @@ -24,13 +24,13 @@ namespace diplomat { namespace capi { extern "C" { - typedef struct icu4x_DateTime_create_from_iso_in_calendar_mv1_result {union {diplomat::capi::DateTime* ok; diplomat::capi::CalendarError err;}; bool is_ok;} icu4x_DateTime_create_from_iso_in_calendar_mv1_result; - icu4x_DateTime_create_from_iso_in_calendar_mv1_result icu4x_DateTime_create_from_iso_in_calendar_mv1(int32_t year, uint8_t month, uint8_t day, uint8_t hour, uint8_t minute, uint8_t second, uint32_t nanosecond, const diplomat::capi::Calendar* calendar); + typedef struct icu4x_DateTime_from_iso_in_calendar_mv1_result {union {diplomat::capi::DateTime* ok; diplomat::capi::CalendarError err;}; bool is_ok;} icu4x_DateTime_from_iso_in_calendar_mv1_result; + icu4x_DateTime_from_iso_in_calendar_mv1_result icu4x_DateTime_from_iso_in_calendar_mv1(int32_t year, uint8_t month, uint8_t day, uint8_t hour, uint8_t minute, uint8_t second, uint32_t nanosecond, const diplomat::capi::Calendar* calendar); - typedef struct icu4x_DateTime_create_from_codes_in_calendar_mv1_result {union {diplomat::capi::DateTime* ok; diplomat::capi::CalendarError err;}; bool is_ok;} icu4x_DateTime_create_from_codes_in_calendar_mv1_result; - icu4x_DateTime_create_from_codes_in_calendar_mv1_result icu4x_DateTime_create_from_codes_in_calendar_mv1(const char* era_code_data, size_t era_code_len, int32_t year, const char* month_code_data, size_t month_code_len, uint8_t day, uint8_t hour, uint8_t minute, uint8_t second, uint32_t nanosecond, const diplomat::capi::Calendar* calendar); + typedef struct icu4x_DateTime_from_codes_in_calendar_mv1_result {union {diplomat::capi::DateTime* ok; diplomat::capi::CalendarError err;}; bool is_ok;} icu4x_DateTime_from_codes_in_calendar_mv1_result; + icu4x_DateTime_from_codes_in_calendar_mv1_result icu4x_DateTime_from_codes_in_calendar_mv1(const char* era_code_data, size_t era_code_len, int32_t year, const char* month_code_data, size_t month_code_len, uint8_t day, uint8_t hour, uint8_t minute, uint8_t second, uint32_t nanosecond, const diplomat::capi::Calendar* calendar); - diplomat::capi::DateTime* icu4x_DateTime_create_from_date_and_time_mv1(const diplomat::capi::Date* date, const diplomat::capi::Time* time); + diplomat::capi::DateTime* icu4x_DateTime_from_date_and_time_mv1(const diplomat::capi::Date* date, const diplomat::capi::Time* time); diplomat::capi::Date* icu4x_DateTime_date_mv1(const diplomat::capi::DateTime* self); @@ -81,8 +81,8 @@ namespace capi { } // namespace capi } // namespace -inline diplomat::result, CalendarError> DateTime::create_from_iso_in_calendar(int32_t year, uint8_t month, uint8_t day, uint8_t hour, uint8_t minute, uint8_t second, uint32_t nanosecond, const Calendar& calendar) { - auto result = diplomat::capi::icu4x_DateTime_create_from_iso_in_calendar_mv1(year, +inline diplomat::result, CalendarError> DateTime::from_iso_in_calendar(int32_t year, uint8_t month, uint8_t day, uint8_t hour, uint8_t minute, uint8_t second, uint32_t nanosecond, const Calendar& calendar) { + auto result = diplomat::capi::icu4x_DateTime_from_iso_in_calendar_mv1(year, month, day, hour, @@ -93,8 +93,8 @@ inline diplomat::result, CalendarError> DateTime::crea return result.is_ok ? diplomat::result, CalendarError>(diplomat::Ok>(std::unique_ptr(DateTime::FromFFI(result.ok)))) : diplomat::result, CalendarError>(diplomat::Err(CalendarError::FromFFI(result.err))); } -inline diplomat::result, CalendarError> DateTime::create_from_codes_in_calendar(std::string_view era_code, int32_t year, std::string_view month_code, uint8_t day, uint8_t hour, uint8_t minute, uint8_t second, uint32_t nanosecond, const Calendar& calendar) { - auto result = diplomat::capi::icu4x_DateTime_create_from_codes_in_calendar_mv1(era_code.data(), +inline diplomat::result, CalendarError> DateTime::from_codes_in_calendar(std::string_view era_code, int32_t year, std::string_view month_code, uint8_t day, uint8_t hour, uint8_t minute, uint8_t second, uint32_t nanosecond, const Calendar& calendar) { + auto result = diplomat::capi::icu4x_DateTime_from_codes_in_calendar_mv1(era_code.data(), era_code.size(), year, month_code.data(), @@ -108,8 +108,8 @@ inline diplomat::result, CalendarError> DateTime::crea return result.is_ok ? diplomat::result, CalendarError>(diplomat::Ok>(std::unique_ptr(DateTime::FromFFI(result.ok)))) : diplomat::result, CalendarError>(diplomat::Err(CalendarError::FromFFI(result.err))); } -inline std::unique_ptr DateTime::create_from_date_and_time(const Date& date, const Time& time) { - auto result = diplomat::capi::icu4x_DateTime_create_from_date_and_time_mv1(date.AsFFI(), +inline std::unique_ptr DateTime::from_date_and_time(const Date& date, const Time& time) { + auto result = diplomat::capi::icu4x_DateTime_from_date_and_time_mv1(date.AsFFI(), time.AsFFI()); return std::unique_ptr(DateTime::FromFFI(result)); } diff --git a/ffi/capi/bindings/cpp/FixedDecimal.d.hpp b/ffi/capi/bindings/cpp/FixedDecimal.d.hpp index 777b3a41a05..7ffa99a185b 100644 --- a/ffi/capi/bindings/cpp/FixedDecimal.d.hpp +++ b/ffi/capi/bindings/cpp/FixedDecimal.d.hpp @@ -26,23 +26,23 @@ namespace capi { class FixedDecimal { public: - inline static std::unique_ptr create_from_i32(int32_t v); + inline static std::unique_ptr from(int32_t v); - inline static std::unique_ptr create_from_u32(uint32_t v); + inline static std::unique_ptr from(uint32_t v); - inline static std::unique_ptr create_from_i64(int64_t v); + inline static std::unique_ptr from(int64_t v); - inline static std::unique_ptr create_from_u64(uint64_t v); + inline static std::unique_ptr from(uint64_t v); - inline static diplomat::result, FixedDecimalLimitError> create_from_f64_with_integer_precision(double f); + inline static diplomat::result, FixedDecimalLimitError> from_double_with_integer_precision(double f); - inline static diplomat::result, FixedDecimalLimitError> create_from_f64_with_lower_magnitude(double f, int16_t magnitude); + inline static diplomat::result, FixedDecimalLimitError> from_double_with_lower_magnitude(double f, int16_t magnitude); - inline static diplomat::result, FixedDecimalLimitError> create_from_f64_with_significant_digits(double f, uint8_t digits); + inline static diplomat::result, FixedDecimalLimitError> from_double_with_significant_digits(double f, uint8_t digits); - inline static diplomat::result, FixedDecimalLimitError> create_from_f64_with_floating_precision(double f); + inline static diplomat::result, FixedDecimalLimitError> from_double_with_floating_precision(double f); - inline static diplomat::result, FixedDecimalParseError> create_from_string(std::string_view v); + inline static diplomat::result, FixedDecimalParseError> from_string(std::string_view v); inline uint8_t digit_at(int16_t magnitude) const; diff --git a/ffi/capi/bindings/cpp/FixedDecimal.hpp b/ffi/capi/bindings/cpp/FixedDecimal.hpp index e203eacf9a4..bc9af281d04 100644 --- a/ffi/capi/bindings/cpp/FixedDecimal.hpp +++ b/ffi/capi/bindings/cpp/FixedDecimal.hpp @@ -22,28 +22,28 @@ namespace diplomat { namespace capi { extern "C" { - diplomat::capi::FixedDecimal* icu4x_FixedDecimal_create_from_i32_mv1(int32_t v); + diplomat::capi::FixedDecimal* icu4x_FixedDecimal_from_int32_mv1(int32_t v); - diplomat::capi::FixedDecimal* icu4x_FixedDecimal_create_from_u32_mv1(uint32_t v); + diplomat::capi::FixedDecimal* icu4x_FixedDecimal_from_uint32_mv1(uint32_t v); - diplomat::capi::FixedDecimal* icu4x_FixedDecimal_create_from_i64_mv1(int64_t v); + diplomat::capi::FixedDecimal* icu4x_FixedDecimal_from_int64_mv1(int64_t v); - diplomat::capi::FixedDecimal* icu4x_FixedDecimal_create_from_u64_mv1(uint64_t v); + diplomat::capi::FixedDecimal* icu4x_FixedDecimal_from_uint64_mv1(uint64_t v); - typedef struct icu4x_FixedDecimal_create_from_f64_with_integer_precision_mv1_result {union {diplomat::capi::FixedDecimal* ok; diplomat::capi::FixedDecimalLimitError err;}; bool is_ok;} icu4x_FixedDecimal_create_from_f64_with_integer_precision_mv1_result; - icu4x_FixedDecimal_create_from_f64_with_integer_precision_mv1_result icu4x_FixedDecimal_create_from_f64_with_integer_precision_mv1(double f); + typedef struct icu4x_FixedDecimal_from_double_with_integer_precision_mv1_result {union {diplomat::capi::FixedDecimal* ok; diplomat::capi::FixedDecimalLimitError err;}; bool is_ok;} icu4x_FixedDecimal_from_double_with_integer_precision_mv1_result; + icu4x_FixedDecimal_from_double_with_integer_precision_mv1_result icu4x_FixedDecimal_from_double_with_integer_precision_mv1(double f); - typedef struct icu4x_FixedDecimal_create_from_f64_with_lower_magnitude_mv1_result {union {diplomat::capi::FixedDecimal* ok; diplomat::capi::FixedDecimalLimitError err;}; bool is_ok;} icu4x_FixedDecimal_create_from_f64_with_lower_magnitude_mv1_result; - icu4x_FixedDecimal_create_from_f64_with_lower_magnitude_mv1_result icu4x_FixedDecimal_create_from_f64_with_lower_magnitude_mv1(double f, int16_t magnitude); + typedef struct icu4x_FixedDecimal_from_double_with_lower_magnitude_mv1_result {union {diplomat::capi::FixedDecimal* ok; diplomat::capi::FixedDecimalLimitError err;}; bool is_ok;} icu4x_FixedDecimal_from_double_with_lower_magnitude_mv1_result; + icu4x_FixedDecimal_from_double_with_lower_magnitude_mv1_result icu4x_FixedDecimal_from_double_with_lower_magnitude_mv1(double f, int16_t magnitude); - typedef struct icu4x_FixedDecimal_create_from_f64_with_significant_digits_mv1_result {union {diplomat::capi::FixedDecimal* ok; diplomat::capi::FixedDecimalLimitError err;}; bool is_ok;} icu4x_FixedDecimal_create_from_f64_with_significant_digits_mv1_result; - icu4x_FixedDecimal_create_from_f64_with_significant_digits_mv1_result icu4x_FixedDecimal_create_from_f64_with_significant_digits_mv1(double f, uint8_t digits); + typedef struct icu4x_FixedDecimal_from_double_with_significant_digits_mv1_result {union {diplomat::capi::FixedDecimal* ok; diplomat::capi::FixedDecimalLimitError err;}; bool is_ok;} icu4x_FixedDecimal_from_double_with_significant_digits_mv1_result; + icu4x_FixedDecimal_from_double_with_significant_digits_mv1_result icu4x_FixedDecimal_from_double_with_significant_digits_mv1(double f, uint8_t digits); - typedef struct icu4x_FixedDecimal_create_from_f64_with_floating_precision_mv1_result {union {diplomat::capi::FixedDecimal* ok; diplomat::capi::FixedDecimalLimitError err;}; bool is_ok;} icu4x_FixedDecimal_create_from_f64_with_floating_precision_mv1_result; - icu4x_FixedDecimal_create_from_f64_with_floating_precision_mv1_result icu4x_FixedDecimal_create_from_f64_with_floating_precision_mv1(double f); + typedef struct icu4x_FixedDecimal_from_double_with_floating_precision_mv1_result {union {diplomat::capi::FixedDecimal* ok; diplomat::capi::FixedDecimalLimitError err;}; bool is_ok;} icu4x_FixedDecimal_from_double_with_floating_precision_mv1_result; + icu4x_FixedDecimal_from_double_with_floating_precision_mv1_result icu4x_FixedDecimal_from_double_with_floating_precision_mv1(double f); - typedef struct icu4x_FixedDecimal_create_from_string_mv1_result {union {diplomat::capi::FixedDecimal* ok; diplomat::capi::FixedDecimalParseError err;}; bool is_ok;} icu4x_FixedDecimal_create_from_string_mv1_result; - icu4x_FixedDecimal_create_from_string_mv1_result icu4x_FixedDecimal_create_from_string_mv1(const char* v_data, size_t v_len); + typedef struct icu4x_FixedDecimal_from_string_mv1_result {union {diplomat::capi::FixedDecimal* ok; diplomat::capi::FixedDecimalParseError err;}; bool is_ok;} icu4x_FixedDecimal_from_string_mv1_result; + icu4x_FixedDecimal_from_string_mv1_result icu4x_FixedDecimal_from_string_mv1(const char* v_data, size_t v_len); uint8_t icu4x_FixedDecimal_digit_at_mv1(const diplomat::capi::FixedDecimal* self, int16_t magnitude); @@ -101,50 +101,50 @@ namespace capi { } // namespace capi } // namespace -inline std::unique_ptr FixedDecimal::create_from_i32(int32_t v) { - auto result = diplomat::capi::icu4x_FixedDecimal_create_from_i32_mv1(v); +inline std::unique_ptr FixedDecimal::from(int32_t v) { + auto result = diplomat::capi::icu4x_FixedDecimal_from_int32_mv1(v); return std::unique_ptr(FixedDecimal::FromFFI(result)); } -inline std::unique_ptr FixedDecimal::create_from_u32(uint32_t v) { - auto result = diplomat::capi::icu4x_FixedDecimal_create_from_u32_mv1(v); +inline std::unique_ptr FixedDecimal::from(uint32_t v) { + auto result = diplomat::capi::icu4x_FixedDecimal_from_uint32_mv1(v); return std::unique_ptr(FixedDecimal::FromFFI(result)); } -inline std::unique_ptr FixedDecimal::create_from_i64(int64_t v) { - auto result = diplomat::capi::icu4x_FixedDecimal_create_from_i64_mv1(v); +inline std::unique_ptr FixedDecimal::from(int64_t v) { + auto result = diplomat::capi::icu4x_FixedDecimal_from_int64_mv1(v); return std::unique_ptr(FixedDecimal::FromFFI(result)); } -inline std::unique_ptr FixedDecimal::create_from_u64(uint64_t v) { - auto result = diplomat::capi::icu4x_FixedDecimal_create_from_u64_mv1(v); +inline std::unique_ptr FixedDecimal::from(uint64_t v) { + auto result = diplomat::capi::icu4x_FixedDecimal_from_uint64_mv1(v); return std::unique_ptr(FixedDecimal::FromFFI(result)); } -inline diplomat::result, FixedDecimalLimitError> FixedDecimal::create_from_f64_with_integer_precision(double f) { - auto result = diplomat::capi::icu4x_FixedDecimal_create_from_f64_with_integer_precision_mv1(f); +inline diplomat::result, FixedDecimalLimitError> FixedDecimal::from_double_with_integer_precision(double f) { + auto result = diplomat::capi::icu4x_FixedDecimal_from_double_with_integer_precision_mv1(f); return result.is_ok ? diplomat::result, FixedDecimalLimitError>(diplomat::Ok>(std::unique_ptr(FixedDecimal::FromFFI(result.ok)))) : diplomat::result, FixedDecimalLimitError>(diplomat::Err(FixedDecimalLimitError::FromFFI(result.err))); } -inline diplomat::result, FixedDecimalLimitError> FixedDecimal::create_from_f64_with_lower_magnitude(double f, int16_t magnitude) { - auto result = diplomat::capi::icu4x_FixedDecimal_create_from_f64_with_lower_magnitude_mv1(f, +inline diplomat::result, FixedDecimalLimitError> FixedDecimal::from_double_with_lower_magnitude(double f, int16_t magnitude) { + auto result = diplomat::capi::icu4x_FixedDecimal_from_double_with_lower_magnitude_mv1(f, magnitude); return result.is_ok ? diplomat::result, FixedDecimalLimitError>(diplomat::Ok>(std::unique_ptr(FixedDecimal::FromFFI(result.ok)))) : diplomat::result, FixedDecimalLimitError>(diplomat::Err(FixedDecimalLimitError::FromFFI(result.err))); } -inline diplomat::result, FixedDecimalLimitError> FixedDecimal::create_from_f64_with_significant_digits(double f, uint8_t digits) { - auto result = diplomat::capi::icu4x_FixedDecimal_create_from_f64_with_significant_digits_mv1(f, +inline diplomat::result, FixedDecimalLimitError> FixedDecimal::from_double_with_significant_digits(double f, uint8_t digits) { + auto result = diplomat::capi::icu4x_FixedDecimal_from_double_with_significant_digits_mv1(f, digits); return result.is_ok ? diplomat::result, FixedDecimalLimitError>(diplomat::Ok>(std::unique_ptr(FixedDecimal::FromFFI(result.ok)))) : diplomat::result, FixedDecimalLimitError>(diplomat::Err(FixedDecimalLimitError::FromFFI(result.err))); } -inline diplomat::result, FixedDecimalLimitError> FixedDecimal::create_from_f64_with_floating_precision(double f) { - auto result = diplomat::capi::icu4x_FixedDecimal_create_from_f64_with_floating_precision_mv1(f); +inline diplomat::result, FixedDecimalLimitError> FixedDecimal::from_double_with_floating_precision(double f) { + auto result = diplomat::capi::icu4x_FixedDecimal_from_double_with_floating_precision_mv1(f); return result.is_ok ? diplomat::result, FixedDecimalLimitError>(diplomat::Ok>(std::unique_ptr(FixedDecimal::FromFFI(result.ok)))) : diplomat::result, FixedDecimalLimitError>(diplomat::Err(FixedDecimalLimitError::FromFFI(result.err))); } -inline diplomat::result, FixedDecimalParseError> FixedDecimal::create_from_string(std::string_view v) { - auto result = diplomat::capi::icu4x_FixedDecimal_create_from_string_mv1(v.data(), +inline diplomat::result, FixedDecimalParseError> FixedDecimal::from_string(std::string_view v) { + auto result = diplomat::capi::icu4x_FixedDecimal_from_string_mv1(v.data(), v.size()); return result.is_ok ? diplomat::result, FixedDecimalParseError>(diplomat::Ok>(std::unique_ptr(FixedDecimal::FromFFI(result.ok)))) : diplomat::result, FixedDecimalParseError>(diplomat::Err(FixedDecimalParseError::FromFFI(result.err))); } diff --git a/ffi/capi/bindings/cpp/IsoDate.d.hpp b/ffi/capi/bindings/cpp/IsoDate.d.hpp index aa5af5ed107..b15db7e0c0d 100644 --- a/ffi/capi/bindings/cpp/IsoDate.d.hpp +++ b/ffi/capi/bindings/cpp/IsoDate.d.hpp @@ -31,7 +31,7 @@ class IsoDate { inline static diplomat::result, CalendarError> create(int32_t year, uint8_t month, uint8_t day); - inline static std::unique_ptr create_for_unix_epoch(); + inline static std::unique_ptr unix_epoch(); inline std::unique_ptr to_calendar(const Calendar& calendar) const; diff --git a/ffi/capi/bindings/cpp/IsoDate.hpp b/ffi/capi/bindings/cpp/IsoDate.hpp index 00c1d98f850..7a330413d95 100644 --- a/ffi/capi/bindings/cpp/IsoDate.hpp +++ b/ffi/capi/bindings/cpp/IsoDate.hpp @@ -25,7 +25,7 @@ namespace capi { typedef struct icu4x_IsoDate_create_mv1_result {union {diplomat::capi::IsoDate* ok; diplomat::capi::CalendarError err;}; bool is_ok;} icu4x_IsoDate_create_mv1_result; icu4x_IsoDate_create_mv1_result icu4x_IsoDate_create_mv1(int32_t year, uint8_t month, uint8_t day); - diplomat::capi::IsoDate* icu4x_IsoDate_create_for_unix_epoch_mv1(); + diplomat::capi::IsoDate* icu4x_IsoDate_unix_epoch_mv1(); diplomat::capi::Date* icu4x_IsoDate_to_calendar_mv1(const diplomat::capi::IsoDate* self, const diplomat::capi::Calendar* calendar); @@ -67,8 +67,8 @@ inline diplomat::result, CalendarError> IsoDate::create return result.is_ok ? diplomat::result, CalendarError>(diplomat::Ok>(std::unique_ptr(IsoDate::FromFFI(result.ok)))) : diplomat::result, CalendarError>(diplomat::Err(CalendarError::FromFFI(result.err))); } -inline std::unique_ptr IsoDate::create_for_unix_epoch() { - auto result = diplomat::capi::icu4x_IsoDate_create_for_unix_epoch_mv1(); +inline std::unique_ptr IsoDate::unix_epoch() { + auto result = diplomat::capi::icu4x_IsoDate_unix_epoch_mv1(); return std::unique_ptr(IsoDate::FromFFI(result)); } diff --git a/ffi/capi/bindings/cpp/IsoDateTime.d.hpp b/ffi/capi/bindings/cpp/IsoDateTime.d.hpp index 897e01c18a8..09d292c60d3 100644 --- a/ffi/capi/bindings/cpp/IsoDateTime.d.hpp +++ b/ffi/capi/bindings/cpp/IsoDateTime.d.hpp @@ -35,11 +35,11 @@ class IsoDateTime { inline static diplomat::result, CalendarError> create(int32_t year, uint8_t month, uint8_t day, uint8_t hour, uint8_t minute, uint8_t second, uint32_t nanosecond); - inline static std::unique_ptr crate_from_date_and_time(const IsoDate& date, const Time& time); + inline static std::unique_ptr from_date_and_time(const IsoDate& date, const Time& time); inline static std::unique_ptr local_unix_epoch(); - inline static std::unique_ptr create_from_minutes_since_local_unix_epoch(int32_t minutes); + inline static std::unique_ptr from_minutes_since_local_unix_epoch(int32_t minutes); inline std::unique_ptr date() const; diff --git a/ffi/capi/bindings/cpp/IsoDateTime.hpp b/ffi/capi/bindings/cpp/IsoDateTime.hpp index 422c05c9691..77c79ec98e6 100644 --- a/ffi/capi/bindings/cpp/IsoDateTime.hpp +++ b/ffi/capi/bindings/cpp/IsoDateTime.hpp @@ -27,11 +27,11 @@ namespace capi { typedef struct icu4x_IsoDateTime_create_mv1_result {union {diplomat::capi::IsoDateTime* ok; diplomat::capi::CalendarError err;}; bool is_ok;} icu4x_IsoDateTime_create_mv1_result; icu4x_IsoDateTime_create_mv1_result icu4x_IsoDateTime_create_mv1(int32_t year, uint8_t month, uint8_t day, uint8_t hour, uint8_t minute, uint8_t second, uint32_t nanosecond); - diplomat::capi::IsoDateTime* icu4x_IsoDateTime_crate_from_date_and_time_mv1(const diplomat::capi::IsoDate* date, const diplomat::capi::Time* time); + diplomat::capi::IsoDateTime* icu4x_IsoDateTime_from_date_and_time_mv1(const diplomat::capi::IsoDate* date, const diplomat::capi::Time* time); diplomat::capi::IsoDateTime* icu4x_IsoDateTime_local_unix_epoch_mv1(); - diplomat::capi::IsoDateTime* icu4x_IsoDateTime_create_from_minutes_since_local_unix_epoch_mv1(int32_t minutes); + diplomat::capi::IsoDateTime* icu4x_IsoDateTime_from_minutes_since_local_unix_epoch_mv1(int32_t minutes); diplomat::capi::IsoDate* icu4x_IsoDateTime_date_mv1(const diplomat::capi::IsoDateTime* self); @@ -91,8 +91,8 @@ inline diplomat::result, CalendarError> IsoDateTime return result.is_ok ? diplomat::result, CalendarError>(diplomat::Ok>(std::unique_ptr(IsoDateTime::FromFFI(result.ok)))) : diplomat::result, CalendarError>(diplomat::Err(CalendarError::FromFFI(result.err))); } -inline std::unique_ptr IsoDateTime::crate_from_date_and_time(const IsoDate& date, const Time& time) { - auto result = diplomat::capi::icu4x_IsoDateTime_crate_from_date_and_time_mv1(date.AsFFI(), +inline std::unique_ptr IsoDateTime::from_date_and_time(const IsoDate& date, const Time& time) { + auto result = diplomat::capi::icu4x_IsoDateTime_from_date_and_time_mv1(date.AsFFI(), time.AsFFI()); return std::unique_ptr(IsoDateTime::FromFFI(result)); } @@ -102,8 +102,8 @@ inline std::unique_ptr IsoDateTime::local_unix_epoch() { return std::unique_ptr(IsoDateTime::FromFFI(result)); } -inline std::unique_ptr IsoDateTime::create_from_minutes_since_local_unix_epoch(int32_t minutes) { - auto result = diplomat::capi::icu4x_IsoDateTime_create_from_minutes_since_local_unix_epoch_mv1(minutes); +inline std::unique_ptr IsoDateTime::from_minutes_since_local_unix_epoch(int32_t minutes) { + auto result = diplomat::capi::icu4x_IsoDateTime_from_minutes_since_local_unix_epoch_mv1(minutes); return std::unique_ptr(IsoDateTime::FromFFI(result)); } diff --git a/ffi/capi/bindings/cpp/Locale.d.hpp b/ffi/capi/bindings/cpp/Locale.d.hpp index 103c9e5f81e..d672ddae4c8 100644 --- a/ffi/capi/bindings/cpp/Locale.d.hpp +++ b/ffi/capi/bindings/cpp/Locale.d.hpp @@ -21,9 +21,9 @@ namespace capi { class Locale { public: - inline static diplomat::result, LocaleParseError> create_from_string(std::string_view name); + inline static diplomat::result, LocaleParseError> from_string(std::string_view name); - inline static std::unique_ptr create_und(); + inline static std::unique_ptr und(); inline std::unique_ptr clone() const; diff --git a/ffi/capi/bindings/cpp/Locale.hpp b/ffi/capi/bindings/cpp/Locale.hpp index 6475bc35775..fb9a6e29ff5 100644 --- a/ffi/capi/bindings/cpp/Locale.hpp +++ b/ffi/capi/bindings/cpp/Locale.hpp @@ -17,10 +17,10 @@ namespace diplomat { namespace capi { extern "C" { - typedef struct icu4x_Locale_create_from_string_mv1_result {union {diplomat::capi::Locale* ok; diplomat::capi::LocaleParseError err;}; bool is_ok;} icu4x_Locale_create_from_string_mv1_result; - icu4x_Locale_create_from_string_mv1_result icu4x_Locale_create_from_string_mv1(const char* name_data, size_t name_len); + typedef struct icu4x_Locale_from_string_mv1_result {union {diplomat::capi::Locale* ok; diplomat::capi::LocaleParseError err;}; bool is_ok;} icu4x_Locale_from_string_mv1_result; + icu4x_Locale_from_string_mv1_result icu4x_Locale_from_string_mv1(const char* name_data, size_t name_len); - diplomat::capi::Locale* icu4x_Locale_create_und_mv1(); + diplomat::capi::Locale* icu4x_Locale_und_mv1(); diplomat::capi::Locale* icu4x_Locale_clone_mv1(const diplomat::capi::Locale* self); @@ -64,14 +64,14 @@ namespace capi { } // namespace capi } // namespace -inline diplomat::result, LocaleParseError> Locale::create_from_string(std::string_view name) { - auto result = diplomat::capi::icu4x_Locale_create_from_string_mv1(name.data(), +inline diplomat::result, LocaleParseError> Locale::from_string(std::string_view name) { + auto result = diplomat::capi::icu4x_Locale_from_string_mv1(name.data(), name.size()); return result.is_ok ? diplomat::result, LocaleParseError>(diplomat::Ok>(std::unique_ptr(Locale::FromFFI(result.ok)))) : diplomat::result, LocaleParseError>(diplomat::Err(LocaleParseError::FromFFI(result.err))); } -inline std::unique_ptr Locale::create_und() { - auto result = diplomat::capi::icu4x_Locale_create_und_mv1(); +inline std::unique_ptr Locale::und() { + auto result = diplomat::capi::icu4x_Locale_und_mv1(); return std::unique_ptr(Locale::FromFFI(result)); } diff --git a/ffi/capi/bindings/cpp/LocaleDisplayNamesFormatter.d.hpp b/ffi/capi/bindings/cpp/LocaleDisplayNamesFormatter.d.hpp index f469b27fec2..8ebafd683e0 100644 --- a/ffi/capi/bindings/cpp/LocaleDisplayNamesFormatter.d.hpp +++ b/ffi/capi/bindings/cpp/LocaleDisplayNamesFormatter.d.hpp @@ -26,7 +26,7 @@ namespace capi { class LocaleDisplayNamesFormatter { public: - inline static diplomat::result, DataError> create(const DataProvider& provider, const Locale& locale, DisplayNamesOptionsV1 options); + inline static diplomat::result, DataError> create_v1(const DataProvider& provider, const Locale& locale, DisplayNamesOptionsV1 options); inline std::string of(const Locale& locale) const; diff --git a/ffi/capi/bindings/cpp/LocaleDisplayNamesFormatter.hpp b/ffi/capi/bindings/cpp/LocaleDisplayNamesFormatter.hpp index e1bb4fd9e27..6f49aa1f58d 100644 --- a/ffi/capi/bindings/cpp/LocaleDisplayNamesFormatter.hpp +++ b/ffi/capi/bindings/cpp/LocaleDisplayNamesFormatter.hpp @@ -20,8 +20,8 @@ namespace diplomat { namespace capi { extern "C" { - typedef struct icu4x_LocaleDisplayNamesFormatter_create_mv1_result {union {diplomat::capi::LocaleDisplayNamesFormatter* ok; diplomat::capi::DataError err;}; bool is_ok;} icu4x_LocaleDisplayNamesFormatter_create_mv1_result; - icu4x_LocaleDisplayNamesFormatter_create_mv1_result icu4x_LocaleDisplayNamesFormatter_create_mv1(const diplomat::capi::DataProvider* provider, const diplomat::capi::Locale* locale, diplomat::capi::DisplayNamesOptionsV1 options); + typedef struct icu4x_LocaleDisplayNamesFormatter_create_v1_mv1_result {union {diplomat::capi::LocaleDisplayNamesFormatter* ok; diplomat::capi::DataError err;}; bool is_ok;} icu4x_LocaleDisplayNamesFormatter_create_v1_mv1_result; + icu4x_LocaleDisplayNamesFormatter_create_v1_mv1_result icu4x_LocaleDisplayNamesFormatter_create_v1_mv1(const diplomat::capi::DataProvider* provider, const diplomat::capi::Locale* locale, diplomat::capi::DisplayNamesOptionsV1 options); void icu4x_LocaleDisplayNamesFormatter_of_mv1(const diplomat::capi::LocaleDisplayNamesFormatter* self, const diplomat::capi::Locale* locale, diplomat::capi::DiplomatWrite* write); @@ -32,8 +32,8 @@ namespace capi { } // namespace capi } // namespace -inline diplomat::result, DataError> LocaleDisplayNamesFormatter::create(const DataProvider& provider, const Locale& locale, DisplayNamesOptionsV1 options) { - auto result = diplomat::capi::icu4x_LocaleDisplayNamesFormatter_create_mv1(provider.AsFFI(), +inline diplomat::result, DataError> LocaleDisplayNamesFormatter::create_v1(const DataProvider& provider, const Locale& locale, DisplayNamesOptionsV1 options) { + auto result = diplomat::capi::icu4x_LocaleDisplayNamesFormatter_create_v1_mv1(provider.AsFFI(), locale.AsFFI(), options.AsFFI()); return result.is_ok ? diplomat::result, DataError>(diplomat::Ok>(std::unique_ptr(LocaleDisplayNamesFormatter::FromFFI(result.ok)))) : diplomat::result, DataError>(diplomat::Err(DataError::FromFFI(result.err))); diff --git a/ffi/capi/bindings/cpp/LocaleFallbacker.d.hpp b/ffi/capi/bindings/cpp/LocaleFallbacker.d.hpp index 0922020fa22..7457c7ab6b8 100644 --- a/ffi/capi/bindings/cpp/LocaleFallbacker.d.hpp +++ b/ffi/capi/bindings/cpp/LocaleFallbacker.d.hpp @@ -29,7 +29,7 @@ class LocaleFallbacker { inline static diplomat::result, DataError> create(const DataProvider& provider); - inline static std::unique_ptr create_without_data(); + inline static std::unique_ptr without_data(); inline diplomat::result, LocaleParseError> for_config(LocaleFallbackConfig config) const; diff --git a/ffi/capi/bindings/cpp/LocaleFallbacker.hpp b/ffi/capi/bindings/cpp/LocaleFallbacker.hpp index bb16b9b9ad3..8a61f2d9980 100644 --- a/ffi/capi/bindings/cpp/LocaleFallbacker.hpp +++ b/ffi/capi/bindings/cpp/LocaleFallbacker.hpp @@ -24,7 +24,7 @@ namespace capi { typedef struct icu4x_LocaleFallbacker_create_mv1_result {union {diplomat::capi::LocaleFallbacker* ok; diplomat::capi::DataError err;}; bool is_ok;} icu4x_LocaleFallbacker_create_mv1_result; icu4x_LocaleFallbacker_create_mv1_result icu4x_LocaleFallbacker_create_mv1(const diplomat::capi::DataProvider* provider); - diplomat::capi::LocaleFallbacker* icu4x_LocaleFallbacker_create_without_data_mv1(); + diplomat::capi::LocaleFallbacker* icu4x_LocaleFallbacker_without_data_mv1(); typedef struct icu4x_LocaleFallbacker_for_config_mv1_result {union {diplomat::capi::LocaleFallbackerWithConfig* ok; diplomat::capi::LocaleParseError err;}; bool is_ok;} icu4x_LocaleFallbacker_for_config_mv1_result; icu4x_LocaleFallbacker_for_config_mv1_result icu4x_LocaleFallbacker_for_config_mv1(const diplomat::capi::LocaleFallbacker* self, diplomat::capi::LocaleFallbackConfig config); @@ -41,8 +41,8 @@ inline diplomat::result, DataError> LocaleFall return result.is_ok ? diplomat::result, DataError>(diplomat::Ok>(std::unique_ptr(LocaleFallbacker::FromFFI(result.ok)))) : diplomat::result, DataError>(diplomat::Err(DataError::FromFFI(result.err))); } -inline std::unique_ptr LocaleFallbacker::create_without_data() { - auto result = diplomat::capi::icu4x_LocaleFallbacker_create_without_data_mv1(); +inline std::unique_ptr LocaleFallbacker::without_data() { + auto result = diplomat::capi::icu4x_LocaleFallbacker_without_data_mv1(); return std::unique_ptr(LocaleFallbacker::FromFFI(result)); } diff --git a/ffi/capi/bindings/cpp/PluralOperands.d.hpp b/ffi/capi/bindings/cpp/PluralOperands.d.hpp index f8b0f01acea..88cd6767f49 100644 --- a/ffi/capi/bindings/cpp/PluralOperands.d.hpp +++ b/ffi/capi/bindings/cpp/PluralOperands.d.hpp @@ -23,9 +23,9 @@ namespace capi { class PluralOperands { public: - inline static diplomat::result, FixedDecimalParseError> create_from_string(std::string_view s); + inline static diplomat::result, FixedDecimalParseError> from_string(std::string_view s); - inline static std::unique_ptr create_from_fixed_decimal(const FixedDecimal& x); + inline static std::unique_ptr from_fixed_decimal(const FixedDecimal& x); inline const diplomat::capi::PluralOperands* AsFFI() const; inline diplomat::capi::PluralOperands* AsFFI(); diff --git a/ffi/capi/bindings/cpp/PluralOperands.hpp b/ffi/capi/bindings/cpp/PluralOperands.hpp index 85806e62e59..16cb80df185 100644 --- a/ffi/capi/bindings/cpp/PluralOperands.hpp +++ b/ffi/capi/bindings/cpp/PluralOperands.hpp @@ -18,10 +18,10 @@ namespace diplomat { namespace capi { extern "C" { - typedef struct icu4x_PluralOperands_create_from_string_mv1_result {union {diplomat::capi::PluralOperands* ok; diplomat::capi::FixedDecimalParseError err;}; bool is_ok;} icu4x_PluralOperands_create_from_string_mv1_result; - icu4x_PluralOperands_create_from_string_mv1_result icu4x_PluralOperands_create_from_string_mv1(const char* s_data, size_t s_len); + typedef struct icu4x_PluralOperands_from_string_mv1_result {union {diplomat::capi::PluralOperands* ok; diplomat::capi::FixedDecimalParseError err;}; bool is_ok;} icu4x_PluralOperands_from_string_mv1_result; + icu4x_PluralOperands_from_string_mv1_result icu4x_PluralOperands_from_string_mv1(const char* s_data, size_t s_len); - diplomat::capi::PluralOperands* icu4x_PluralOperands_create_from_fixed_decimal_mv1(const diplomat::capi::FixedDecimal* x); + diplomat::capi::PluralOperands* icu4x_PluralOperands_from_fixed_decimal_mv1(const diplomat::capi::FixedDecimal* x); void icu4x_PluralOperands_destroy_mv1(PluralOperands* self); @@ -30,14 +30,14 @@ namespace capi { } // namespace capi } // namespace -inline diplomat::result, FixedDecimalParseError> PluralOperands::create_from_string(std::string_view s) { - auto result = diplomat::capi::icu4x_PluralOperands_create_from_string_mv1(s.data(), +inline diplomat::result, FixedDecimalParseError> PluralOperands::from_string(std::string_view s) { + auto result = diplomat::capi::icu4x_PluralOperands_from_string_mv1(s.data(), s.size()); return result.is_ok ? diplomat::result, FixedDecimalParseError>(diplomat::Ok>(std::unique_ptr(PluralOperands::FromFFI(result.ok)))) : diplomat::result, FixedDecimalParseError>(diplomat::Err(FixedDecimalParseError::FromFFI(result.err))); } -inline std::unique_ptr PluralOperands::create_from_fixed_decimal(const FixedDecimal& x) { - auto result = diplomat::capi::icu4x_PluralOperands_create_from_fixed_decimal_mv1(x.AsFFI()); +inline std::unique_ptr PluralOperands::from_fixed_decimal(const FixedDecimal& x) { + auto result = diplomat::capi::icu4x_PluralOperands_from_fixed_decimal_mv1(x.AsFFI()); return std::unique_ptr(PluralOperands::FromFFI(result)); } diff --git a/ffi/capi/bindings/cpp/Time.d.hpp b/ffi/capi/bindings/cpp/Time.d.hpp index 3800584e473..d16a8ba65ee 100644 --- a/ffi/capi/bindings/cpp/Time.d.hpp +++ b/ffi/capi/bindings/cpp/Time.d.hpp @@ -23,7 +23,7 @@ class Time { inline static diplomat::result, CalendarError> create(uint8_t hour, uint8_t minute, uint8_t second, uint32_t nanosecond); - inline static diplomat::result, CalendarError> create_midnight(); + inline static diplomat::result, CalendarError> midnight(); inline uint8_t hour() const; diff --git a/ffi/capi/bindings/cpp/Time.hpp b/ffi/capi/bindings/cpp/Time.hpp index d2edd085905..f16eac0646b 100644 --- a/ffi/capi/bindings/cpp/Time.hpp +++ b/ffi/capi/bindings/cpp/Time.hpp @@ -20,8 +20,8 @@ namespace capi { typedef struct icu4x_Time_create_mv1_result {union {diplomat::capi::Time* ok; diplomat::capi::CalendarError err;}; bool is_ok;} icu4x_Time_create_mv1_result; icu4x_Time_create_mv1_result icu4x_Time_create_mv1(uint8_t hour, uint8_t minute, uint8_t second, uint32_t nanosecond); - typedef struct icu4x_Time_create_midnight_mv1_result {union {diplomat::capi::Time* ok; diplomat::capi::CalendarError err;}; bool is_ok;} icu4x_Time_create_midnight_mv1_result; - icu4x_Time_create_midnight_mv1_result icu4x_Time_create_midnight_mv1(); + typedef struct icu4x_Time_midnight_mv1_result {union {diplomat::capi::Time* ok; diplomat::capi::CalendarError err;}; bool is_ok;} icu4x_Time_midnight_mv1_result; + icu4x_Time_midnight_mv1_result icu4x_Time_midnight_mv1(); uint8_t icu4x_Time_hour_mv1(const diplomat::capi::Time* self); @@ -46,8 +46,8 @@ inline diplomat::result, CalendarError> Time::create(uint8 return result.is_ok ? diplomat::result, CalendarError>(diplomat::Ok>(std::unique_ptr