From 18c806f7bec9c70118fc45735822b730abde3b8f Mon Sep 17 00:00:00 2001 From: "Shane F. Carr" Date: Wed, 5 Feb 2025 15:34:44 +0100 Subject: [PATCH] Remove neo prefixes --- .../bindings/c/DateTimeFieldSetBuilder.d.h | 4 +- ffi/capi/bindings/c/DateTimeFormatter.d.h | 19 +++ ffi/capi/bindings/c/DateTimeFormatter.h | 61 +++++++ ffi/capi/bindings/c/NeoDateTimeFormatter.d.h | 19 --- ffi/capi/bindings/c/NeoDateTimeFormatter.h | 61 ------- ffi/capi/bindings/c/NeoDateTimeLength.d.h | 24 --- ffi/capi/bindings/c/NeoDateTimeLength.h | 23 --- .../cpp/icu4x/DateTimeFieldSetBuilder.d.hpp | 8 +- .../cpp/icu4x/DateTimeFieldSetBuilder.hpp | 6 +- .../cpp/icu4x/DateTimeFormatter.d.hpp | 74 +++++++++ .../bindings/cpp/icu4x/DateTimeFormatter.hpp | 157 ++++++++++++++++++ .../cpp/icu4x/NeoDateTimeFormatter.d.hpp | 74 --------- .../cpp/icu4x/NeoDateTimeFormatter.hpp | 157 ------------------ .../cpp/icu4x/NeoDateTimeLength.d.hpp | 48 ------ .../bindings/cpp/icu4x/NeoDateTimeLength.hpp | 38 ----- .../dart/DateTimeFieldSetBuilder.g.dart | 6 +- ...matter.g.dart => DateTimeFormatter.g.dart} | 96 +++++------ .../bindings/dart/NeoDateTimeLength.g.dart | 12 -- ffi/capi/bindings/dart/lib.g.dart | 3 +- .../bindings/demo_gen/DateTimeFormatter.d.ts | 6 + ...imeFormatter.mjs => DateTimeFormatter.mjs} | 4 +- .../demo_gen/NeoDateTimeFormatter.d.ts | 6 - ffi/capi/bindings/demo_gen/index.mjs | 12 +- .../bindings/js/DateTimeFieldSetBuilder.d.ts | 8 +- .../bindings/js/DateTimeFieldSetBuilder.mjs | 4 +- ffi/capi/bindings/js/DateTimeFormatter.d.ts | 41 +++++ ...imeFormatter.mjs => DateTimeFormatter.mjs} | 46 ++--- .../bindings/js/NeoDateTimeFormatter.d.ts | 41 ----- ffi/capi/bindings/js/NeoDateTimeLength.d.ts | 23 --- ffi/capi/bindings/js/NeoDateTimeLength.mjs | 73 -------- ffi/capi/bindings/js/index.d.ts | 4 +- ffi/capi/bindings/js/index.mjs | 4 +- ffi/capi/src/neo_datetime.rs | 62 +++---- 33 files changed, 485 insertions(+), 739 deletions(-) create mode 100644 ffi/capi/bindings/c/DateTimeFormatter.d.h create mode 100644 ffi/capi/bindings/c/DateTimeFormatter.h delete mode 100644 ffi/capi/bindings/c/NeoDateTimeFormatter.d.h delete mode 100644 ffi/capi/bindings/c/NeoDateTimeFormatter.h delete mode 100644 ffi/capi/bindings/c/NeoDateTimeLength.d.h delete mode 100644 ffi/capi/bindings/c/NeoDateTimeLength.h create mode 100644 ffi/capi/bindings/cpp/icu4x/DateTimeFormatter.d.hpp create mode 100644 ffi/capi/bindings/cpp/icu4x/DateTimeFormatter.hpp delete mode 100644 ffi/capi/bindings/cpp/icu4x/NeoDateTimeFormatter.d.hpp delete mode 100644 ffi/capi/bindings/cpp/icu4x/NeoDateTimeFormatter.hpp delete mode 100644 ffi/capi/bindings/cpp/icu4x/NeoDateTimeLength.d.hpp delete mode 100644 ffi/capi/bindings/cpp/icu4x/NeoDateTimeLength.hpp rename ffi/capi/bindings/dart/{NeoDateTimeFormatter.g.dart => DateTimeFormatter.g.dart} (53%) delete mode 100644 ffi/capi/bindings/dart/NeoDateTimeLength.g.dart create mode 100644 ffi/capi/bindings/demo_gen/DateTimeFormatter.d.ts rename ffi/capi/bindings/demo_gen/{NeoDateTimeFormatter.mjs => DateTimeFormatter.mjs} (94%) delete mode 100644 ffi/capi/bindings/demo_gen/NeoDateTimeFormatter.d.ts create mode 100644 ffi/capi/bindings/js/DateTimeFormatter.d.ts rename ffi/capi/bindings/js/{NeoDateTimeFormatter.mjs => DateTimeFormatter.mjs} (68%) delete mode 100644 ffi/capi/bindings/js/NeoDateTimeFormatter.d.ts delete mode 100644 ffi/capi/bindings/js/NeoDateTimeLength.d.ts delete mode 100644 ffi/capi/bindings/js/NeoDateTimeLength.mjs diff --git a/ffi/capi/bindings/c/DateTimeFieldSetBuilder.d.h b/ffi/capi/bindings/c/DateTimeFieldSetBuilder.d.h index 63b7dcf3027..ddc6a4ee3f6 100644 --- a/ffi/capi/bindings/c/DateTimeFieldSetBuilder.d.h +++ b/ffi/capi/bindings/c/DateTimeFieldSetBuilder.d.h @@ -9,7 +9,7 @@ #include "DateFields.d.h" #include "DateTimeAlignment.d.h" -#include "NeoDateTimeLength.d.h" +#include "DateTimeLength.d.h" #include "TimePrecision.d.h" #include "YearStyle.d.h" #include "ZoneStyle.d.h" @@ -18,7 +18,7 @@ typedef struct DateTimeFieldSetBuilder { - NeoDateTimeLength_option length; + DateTimeLength_option length; DateFields_option date_fields; TimePrecision_option time_precision; ZoneStyle_option zone_style; diff --git a/ffi/capi/bindings/c/DateTimeFormatter.d.h b/ffi/capi/bindings/c/DateTimeFormatter.d.h new file mode 100644 index 00000000000..50486dcc1d9 --- /dev/null +++ b/ffi/capi/bindings/c/DateTimeFormatter.d.h @@ -0,0 +1,19 @@ +#ifndef DateTimeFormatter_D_H +#define DateTimeFormatter_D_H + +#include +#include +#include +#include +#include "diplomat_runtime.h" + + + + + +typedef struct DateTimeFormatter DateTimeFormatter; + + + + +#endif // DateTimeFormatter_D_H diff --git a/ffi/capi/bindings/c/DateTimeFormatter.h b/ffi/capi/bindings/c/DateTimeFormatter.h new file mode 100644 index 00000000000..5f89b5450d3 --- /dev/null +++ b/ffi/capi/bindings/c/DateTimeFormatter.h @@ -0,0 +1,61 @@ +#ifndef DateTimeFormatter_H +#define DateTimeFormatter_H + +#include +#include +#include +#include +#include "diplomat_runtime.h" + +#include "DateTimeAlignment.d.h" +#include "DateTimeFieldSetBuilder.d.h" +#include "DateTimeFormatterBuildOrLoadError.d.h" +#include "DateTimeFormatterLoadError.d.h" +#include "DateTimeLength.d.h" +#include "IsoDate.d.h" +#include "Locale.d.h" +#include "Time.d.h" +#include "TimePrecision.d.h" +#include "YearStyle.d.h" + +#include "DateTimeFormatter.d.h" + + + + + + +typedef struct icu4x_DateTimeFormatter_create_from_builder_mv1_result {union {DateTimeFormatter* ok; DateTimeFormatterBuildOrLoadError err;}; bool is_ok;} icu4x_DateTimeFormatter_create_from_builder_mv1_result; +icu4x_DateTimeFormatter_create_from_builder_mv1_result icu4x_DateTimeFormatter_create_from_builder_mv1(const Locale* locale, DateTimeFieldSetBuilder builder); + +typedef struct icu4x_DateTimeFormatter_create_dt_mv1_result {union {DateTimeFormatter* ok; DateTimeFormatterLoadError err;}; bool is_ok;} icu4x_DateTimeFormatter_create_dt_mv1_result; +icu4x_DateTimeFormatter_create_dt_mv1_result icu4x_DateTimeFormatter_create_dt_mv1(const Locale* locale, DateTimeLength length, TimePrecision time_precision, DateTimeAlignment alignment); + +typedef struct icu4x_DateTimeFormatter_create_mdt_mv1_result {union {DateTimeFormatter* ok; DateTimeFormatterLoadError err;}; bool is_ok;} icu4x_DateTimeFormatter_create_mdt_mv1_result; +icu4x_DateTimeFormatter_create_mdt_mv1_result icu4x_DateTimeFormatter_create_mdt_mv1(const Locale* locale, DateTimeLength length, TimePrecision time_precision, DateTimeAlignment alignment); + +typedef struct icu4x_DateTimeFormatter_create_ymdt_mv1_result {union {DateTimeFormatter* ok; DateTimeFormatterLoadError err;}; bool is_ok;} icu4x_DateTimeFormatter_create_ymdt_mv1_result; +icu4x_DateTimeFormatter_create_ymdt_mv1_result icu4x_DateTimeFormatter_create_ymdt_mv1(const Locale* locale, DateTimeLength length, TimePrecision time_precision, DateTimeAlignment alignment, YearStyle year_style); + +typedef struct icu4x_DateTimeFormatter_create_det_mv1_result {union {DateTimeFormatter* ok; DateTimeFormatterLoadError err;}; bool is_ok;} icu4x_DateTimeFormatter_create_det_mv1_result; +icu4x_DateTimeFormatter_create_det_mv1_result icu4x_DateTimeFormatter_create_det_mv1(const Locale* locale, DateTimeLength length, TimePrecision time_precision, DateTimeAlignment alignment); + +typedef struct icu4x_DateTimeFormatter_create_mdet_mv1_result {union {DateTimeFormatter* ok; DateTimeFormatterLoadError err;}; bool is_ok;} icu4x_DateTimeFormatter_create_mdet_mv1_result; +icu4x_DateTimeFormatter_create_mdet_mv1_result icu4x_DateTimeFormatter_create_mdet_mv1(const Locale* locale, DateTimeLength length, TimePrecision time_precision, DateTimeAlignment alignment); + +typedef struct icu4x_DateTimeFormatter_create_ymdet_mv1_result {union {DateTimeFormatter* ok; DateTimeFormatterLoadError err;}; bool is_ok;} icu4x_DateTimeFormatter_create_ymdet_mv1_result; +icu4x_DateTimeFormatter_create_ymdet_mv1_result icu4x_DateTimeFormatter_create_ymdet_mv1(const Locale* locale, DateTimeLength length, TimePrecision time_precision, DateTimeAlignment alignment, YearStyle year_style); + +typedef struct icu4x_DateTimeFormatter_create_et_mv1_result {union {DateTimeFormatter* ok; DateTimeFormatterLoadError err;}; bool is_ok;} icu4x_DateTimeFormatter_create_et_mv1_result; +icu4x_DateTimeFormatter_create_et_mv1_result icu4x_DateTimeFormatter_create_et_mv1(const Locale* locale, DateTimeLength length, TimePrecision time_precision, DateTimeAlignment alignment); + +void icu4x_DateTimeFormatter_format_iso_mv1(const DateTimeFormatter* self, const IsoDate* date, const Time* time, DiplomatWrite* write); + + +void icu4x_DateTimeFormatter_destroy_mv1(DateTimeFormatter* self); + + + + + +#endif // DateTimeFormatter_H diff --git a/ffi/capi/bindings/c/NeoDateTimeFormatter.d.h b/ffi/capi/bindings/c/NeoDateTimeFormatter.d.h deleted file mode 100644 index 51254a4150d..00000000000 --- a/ffi/capi/bindings/c/NeoDateTimeFormatter.d.h +++ /dev/null @@ -1,19 +0,0 @@ -#ifndef NeoDateTimeFormatter_D_H -#define NeoDateTimeFormatter_D_H - -#include -#include -#include -#include -#include "diplomat_runtime.h" - - - - - -typedef struct NeoDateTimeFormatter NeoDateTimeFormatter; - - - - -#endif // NeoDateTimeFormatter_D_H diff --git a/ffi/capi/bindings/c/NeoDateTimeFormatter.h b/ffi/capi/bindings/c/NeoDateTimeFormatter.h deleted file mode 100644 index f17922ac810..00000000000 --- a/ffi/capi/bindings/c/NeoDateTimeFormatter.h +++ /dev/null @@ -1,61 +0,0 @@ -#ifndef NeoDateTimeFormatter_H -#define NeoDateTimeFormatter_H - -#include -#include -#include -#include -#include "diplomat_runtime.h" - -#include "DateTimeAlignment.d.h" -#include "DateTimeFieldSetBuilder.d.h" -#include "DateTimeFormatterBuildOrLoadError.d.h" -#include "DateTimeFormatterLoadError.d.h" -#include "IsoDate.d.h" -#include "Locale.d.h" -#include "NeoDateTimeLength.d.h" -#include "Time.d.h" -#include "TimePrecision.d.h" -#include "YearStyle.d.h" - -#include "NeoDateTimeFormatter.d.h" - - - - - - -typedef struct icu4x_NeoDateTimeFormatter_create_from_builder_mv1_result {union {NeoDateTimeFormatter* ok; DateTimeFormatterBuildOrLoadError err;}; bool is_ok;} icu4x_NeoDateTimeFormatter_create_from_builder_mv1_result; -icu4x_NeoDateTimeFormatter_create_from_builder_mv1_result icu4x_NeoDateTimeFormatter_create_from_builder_mv1(const Locale* locale, DateTimeFieldSetBuilder builder); - -typedef struct icu4x_NeoDateTimeFormatter_create_dt_mv1_result {union {NeoDateTimeFormatter* ok; DateTimeFormatterLoadError err;}; bool is_ok;} icu4x_NeoDateTimeFormatter_create_dt_mv1_result; -icu4x_NeoDateTimeFormatter_create_dt_mv1_result icu4x_NeoDateTimeFormatter_create_dt_mv1(const Locale* locale, NeoDateTimeLength length, TimePrecision time_precision, DateTimeAlignment alignment); - -typedef struct icu4x_NeoDateTimeFormatter_create_mdt_mv1_result {union {NeoDateTimeFormatter* ok; DateTimeFormatterLoadError err;}; bool is_ok;} icu4x_NeoDateTimeFormatter_create_mdt_mv1_result; -icu4x_NeoDateTimeFormatter_create_mdt_mv1_result icu4x_NeoDateTimeFormatter_create_mdt_mv1(const Locale* locale, NeoDateTimeLength length, TimePrecision time_precision, DateTimeAlignment alignment); - -typedef struct icu4x_NeoDateTimeFormatter_create_ymdt_mv1_result {union {NeoDateTimeFormatter* ok; DateTimeFormatterLoadError err;}; bool is_ok;} icu4x_NeoDateTimeFormatter_create_ymdt_mv1_result; -icu4x_NeoDateTimeFormatter_create_ymdt_mv1_result icu4x_NeoDateTimeFormatter_create_ymdt_mv1(const Locale* locale, NeoDateTimeLength length, TimePrecision time_precision, DateTimeAlignment alignment, YearStyle year_style); - -typedef struct icu4x_NeoDateTimeFormatter_create_det_mv1_result {union {NeoDateTimeFormatter* ok; DateTimeFormatterLoadError err;}; bool is_ok;} icu4x_NeoDateTimeFormatter_create_det_mv1_result; -icu4x_NeoDateTimeFormatter_create_det_mv1_result icu4x_NeoDateTimeFormatter_create_det_mv1(const Locale* locale, NeoDateTimeLength length, TimePrecision time_precision, DateTimeAlignment alignment); - -typedef struct icu4x_NeoDateTimeFormatter_create_mdet_mv1_result {union {NeoDateTimeFormatter* ok; DateTimeFormatterLoadError err;}; bool is_ok;} icu4x_NeoDateTimeFormatter_create_mdet_mv1_result; -icu4x_NeoDateTimeFormatter_create_mdet_mv1_result icu4x_NeoDateTimeFormatter_create_mdet_mv1(const Locale* locale, NeoDateTimeLength length, TimePrecision time_precision, DateTimeAlignment alignment); - -typedef struct icu4x_NeoDateTimeFormatter_create_ymdet_mv1_result {union {NeoDateTimeFormatter* ok; DateTimeFormatterLoadError err;}; bool is_ok;} icu4x_NeoDateTimeFormatter_create_ymdet_mv1_result; -icu4x_NeoDateTimeFormatter_create_ymdet_mv1_result icu4x_NeoDateTimeFormatter_create_ymdet_mv1(const Locale* locale, NeoDateTimeLength length, TimePrecision time_precision, DateTimeAlignment alignment, YearStyle year_style); - -typedef struct icu4x_NeoDateTimeFormatter_create_et_mv1_result {union {NeoDateTimeFormatter* ok; DateTimeFormatterLoadError err;}; bool is_ok;} icu4x_NeoDateTimeFormatter_create_et_mv1_result; -icu4x_NeoDateTimeFormatter_create_et_mv1_result icu4x_NeoDateTimeFormatter_create_et_mv1(const Locale* locale, NeoDateTimeLength length, TimePrecision time_precision, DateTimeAlignment alignment); - -void icu4x_NeoDateTimeFormatter_format_iso_mv1(const NeoDateTimeFormatter* self, const IsoDate* date, const Time* time, DiplomatWrite* write); - - -void icu4x_NeoDateTimeFormatter_destroy_mv1(NeoDateTimeFormatter* self); - - - - - -#endif // NeoDateTimeFormatter_H diff --git a/ffi/capi/bindings/c/NeoDateTimeLength.d.h b/ffi/capi/bindings/c/NeoDateTimeLength.d.h deleted file mode 100644 index 92915c70db5..00000000000 --- a/ffi/capi/bindings/c/NeoDateTimeLength.d.h +++ /dev/null @@ -1,24 +0,0 @@ -#ifndef NeoDateTimeLength_D_H -#define NeoDateTimeLength_D_H - -#include -#include -#include -#include -#include "diplomat_runtime.h" - - - - - -typedef enum NeoDateTimeLength { - NeoDateTimeLength_Long = 0, - NeoDateTimeLength_Medium = 1, - NeoDateTimeLength_Short = 2, -} NeoDateTimeLength; - -typedef struct NeoDateTimeLength_option {union { NeoDateTimeLength ok; }; bool is_ok; } NeoDateTimeLength_option; - - - -#endif // NeoDateTimeLength_D_H diff --git a/ffi/capi/bindings/c/NeoDateTimeLength.h b/ffi/capi/bindings/c/NeoDateTimeLength.h deleted file mode 100644 index f8738b7cc65..00000000000 --- a/ffi/capi/bindings/c/NeoDateTimeLength.h +++ /dev/null @@ -1,23 +0,0 @@ -#ifndef NeoDateTimeLength_H -#define NeoDateTimeLength_H - -#include -#include -#include -#include -#include "diplomat_runtime.h" - - -#include "NeoDateTimeLength.d.h" - - - - - - - - - - - -#endif // NeoDateTimeLength_H diff --git a/ffi/capi/bindings/cpp/icu4x/DateTimeFieldSetBuilder.d.hpp b/ffi/capi/bindings/cpp/icu4x/DateTimeFieldSetBuilder.d.hpp index 4360c13bb1f..379de8c2004 100644 --- a/ffi/capi/bindings/cpp/icu4x/DateTimeFieldSetBuilder.d.hpp +++ b/ffi/capi/bindings/cpp/icu4x/DateTimeFieldSetBuilder.d.hpp @@ -10,7 +10,7 @@ #include "../diplomat_runtime.hpp" #include "DateFields.d.hpp" #include "DateTimeAlignment.d.hpp" -#include "NeoDateTimeLength.d.hpp" +#include "DateTimeLength.d.hpp" #include "TimePrecision.d.hpp" #include "YearStyle.d.hpp" #include "ZoneStyle.d.hpp" @@ -18,7 +18,7 @@ namespace icu4x { class DateFields; class DateTimeAlignment; -class NeoDateTimeLength; +class DateTimeLength; class TimePrecision; class YearStyle; class ZoneStyle; @@ -28,7 +28,7 @@ class ZoneStyle; namespace icu4x { namespace capi { struct DateTimeFieldSetBuilder { - icu4x::capi::NeoDateTimeLength_option length; + icu4x::capi::DateTimeLength_option length; icu4x::capi::DateFields_option date_fields; icu4x::capi::TimePrecision_option time_precision; icu4x::capi::ZoneStyle_option zone_style; @@ -43,7 +43,7 @@ namespace capi { namespace icu4x { struct DateTimeFieldSetBuilder { - std::optional length; + std::optional length; std::optional date_fields; std::optional time_precision; std::optional zone_style; diff --git a/ffi/capi/bindings/cpp/icu4x/DateTimeFieldSetBuilder.hpp b/ffi/capi/bindings/cpp/icu4x/DateTimeFieldSetBuilder.hpp index 21e7ae11aed..74ce94fce0d 100644 --- a/ffi/capi/bindings/cpp/icu4x/DateTimeFieldSetBuilder.hpp +++ b/ffi/capi/bindings/cpp/icu4x/DateTimeFieldSetBuilder.hpp @@ -12,7 +12,7 @@ #include "../diplomat_runtime.hpp" #include "DateFields.hpp" #include "DateTimeAlignment.hpp" -#include "NeoDateTimeLength.hpp" +#include "DateTimeLength.hpp" #include "TimePrecision.hpp" #include "YearStyle.hpp" #include "ZoneStyle.hpp" @@ -30,7 +30,7 @@ namespace capi { inline icu4x::capi::DateTimeFieldSetBuilder icu4x::DateTimeFieldSetBuilder::AsFFI() const { return icu4x::capi::DateTimeFieldSetBuilder { - /* .length = */ length.has_value() ? (icu4x::capi::NeoDateTimeLength_option{ { length.value().AsFFI() }, true }) : (icu4x::capi::NeoDateTimeLength_option{ {}, false }), + /* .length = */ length.has_value() ? (icu4x::capi::DateTimeLength_option{ { length.value().AsFFI() }, true }) : (icu4x::capi::DateTimeLength_option{ {}, false }), /* .date_fields = */ date_fields.has_value() ? (icu4x::capi::DateFields_option{ { date_fields.value().AsFFI() }, true }) : (icu4x::capi::DateFields_option{ {}, false }), /* .time_precision = */ time_precision.has_value() ? (icu4x::capi::TimePrecision_option{ { time_precision.value().AsFFI() }, true }) : (icu4x::capi::TimePrecision_option{ {}, false }), /* .zone_style = */ zone_style.has_value() ? (icu4x::capi::ZoneStyle_option{ { zone_style.value().AsFFI() }, true }) : (icu4x::capi::ZoneStyle_option{ {}, false }), @@ -41,7 +41,7 @@ inline icu4x::capi::DateTimeFieldSetBuilder icu4x::DateTimeFieldSetBuilder::AsFF inline icu4x::DateTimeFieldSetBuilder icu4x::DateTimeFieldSetBuilder::FromFFI(icu4x::capi::DateTimeFieldSetBuilder c_struct) { return icu4x::DateTimeFieldSetBuilder { - /* .length = */ c_struct.length.is_ok ? std::optional(icu4x::NeoDateTimeLength::FromFFI(c_struct.length.ok)) : std::nullopt, + /* .length = */ c_struct.length.is_ok ? std::optional(icu4x::DateTimeLength::FromFFI(c_struct.length.ok)) : std::nullopt, /* .date_fields = */ c_struct.date_fields.is_ok ? std::optional(icu4x::DateFields::FromFFI(c_struct.date_fields.ok)) : std::nullopt, /* .time_precision = */ c_struct.time_precision.is_ok ? std::optional(icu4x::TimePrecision::FromFFI(c_struct.time_precision.ok)) : std::nullopt, /* .zone_style = */ c_struct.zone_style.is_ok ? std::optional(icu4x::ZoneStyle::FromFFI(c_struct.zone_style.ok)) : std::nullopt, diff --git a/ffi/capi/bindings/cpp/icu4x/DateTimeFormatter.d.hpp b/ffi/capi/bindings/cpp/icu4x/DateTimeFormatter.d.hpp new file mode 100644 index 00000000000..6804fe1aae1 --- /dev/null +++ b/ffi/capi/bindings/cpp/icu4x/DateTimeFormatter.d.hpp @@ -0,0 +1,74 @@ +#ifndef icu4x_DateTimeFormatter_D_HPP +#define icu4x_DateTimeFormatter_D_HPP + +#include +#include +#include +#include +#include +#include +#include "../diplomat_runtime.hpp" + +namespace icu4x { +namespace capi { struct DateTimeFormatter; } +class DateTimeFormatter; +namespace capi { struct IsoDate; } +class IsoDate; +namespace capi { struct Locale; } +class Locale; +namespace capi { struct Time; } +class Time; +struct DateTimeFieldSetBuilder; +class DateTimeAlignment; +class DateTimeFormatterBuildOrLoadError; +class DateTimeFormatterLoadError; +class DateTimeLength; +class TimePrecision; +class YearStyle; +} + + +namespace icu4x { +namespace capi { + struct DateTimeFormatter; +} // namespace capi +} // namespace + +namespace icu4x { +class DateTimeFormatter { +public: + + inline static diplomat::result, icu4x::DateTimeFormatterBuildOrLoadError> create_from_builder(const icu4x::Locale& locale, icu4x::DateTimeFieldSetBuilder builder); + + inline static diplomat::result, icu4x::DateTimeFormatterLoadError> create_dt(const icu4x::Locale& locale, icu4x::DateTimeLength length, icu4x::TimePrecision time_precision, icu4x::DateTimeAlignment alignment); + + inline static diplomat::result, icu4x::DateTimeFormatterLoadError> create_mdt(const icu4x::Locale& locale, icu4x::DateTimeLength length, icu4x::TimePrecision time_precision, icu4x::DateTimeAlignment alignment); + + inline static diplomat::result, icu4x::DateTimeFormatterLoadError> create_ymdt(const icu4x::Locale& locale, icu4x::DateTimeLength length, icu4x::TimePrecision time_precision, icu4x::DateTimeAlignment alignment, icu4x::YearStyle year_style); + + inline static diplomat::result, icu4x::DateTimeFormatterLoadError> create_det(const icu4x::Locale& locale, icu4x::DateTimeLength length, icu4x::TimePrecision time_precision, icu4x::DateTimeAlignment alignment); + + inline static diplomat::result, icu4x::DateTimeFormatterLoadError> create_mdet(const icu4x::Locale& locale, icu4x::DateTimeLength length, icu4x::TimePrecision time_precision, icu4x::DateTimeAlignment alignment); + + inline static diplomat::result, icu4x::DateTimeFormatterLoadError> create_ymdet(const icu4x::Locale& locale, icu4x::DateTimeLength length, icu4x::TimePrecision time_precision, icu4x::DateTimeAlignment alignment, icu4x::YearStyle year_style); + + inline static diplomat::result, icu4x::DateTimeFormatterLoadError> create_et(const icu4x::Locale& locale, icu4x::DateTimeLength length, icu4x::TimePrecision time_precision, icu4x::DateTimeAlignment alignment); + + inline std::string format_iso(const icu4x::IsoDate& date, const icu4x::Time& time) const; + + inline const icu4x::capi::DateTimeFormatter* AsFFI() const; + inline icu4x::capi::DateTimeFormatter* AsFFI(); + inline static const icu4x::DateTimeFormatter* FromFFI(const icu4x::capi::DateTimeFormatter* ptr); + inline static icu4x::DateTimeFormatter* FromFFI(icu4x::capi::DateTimeFormatter* ptr); + inline static void operator delete(void* ptr); +private: + DateTimeFormatter() = delete; + DateTimeFormatter(const icu4x::DateTimeFormatter&) = delete; + DateTimeFormatter(icu4x::DateTimeFormatter&&) noexcept = delete; + DateTimeFormatter operator=(const icu4x::DateTimeFormatter&) = delete; + DateTimeFormatter operator=(icu4x::DateTimeFormatter&&) noexcept = delete; + static void operator delete[](void*, size_t) = delete; +}; + +} // namespace +#endif // icu4x_DateTimeFormatter_D_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/DateTimeFormatter.hpp b/ffi/capi/bindings/cpp/icu4x/DateTimeFormatter.hpp new file mode 100644 index 00000000000..0a3a7d90f6a --- /dev/null +++ b/ffi/capi/bindings/cpp/icu4x/DateTimeFormatter.hpp @@ -0,0 +1,157 @@ +#ifndef icu4x_DateTimeFormatter_HPP +#define icu4x_DateTimeFormatter_HPP + +#include "DateTimeFormatter.d.hpp" + +#include +#include +#include +#include +#include +#include +#include "../diplomat_runtime.hpp" +#include "DateTimeAlignment.hpp" +#include "DateTimeFieldSetBuilder.hpp" +#include "DateTimeFormatterBuildOrLoadError.hpp" +#include "DateTimeFormatterLoadError.hpp" +#include "DateTimeLength.hpp" +#include "IsoDate.hpp" +#include "Locale.hpp" +#include "Time.hpp" +#include "TimePrecision.hpp" +#include "YearStyle.hpp" + + +namespace icu4x { +namespace capi { + extern "C" { + + typedef struct icu4x_DateTimeFormatter_create_from_builder_mv1_result {union {icu4x::capi::DateTimeFormatter* ok; icu4x::capi::DateTimeFormatterBuildOrLoadError err;}; bool is_ok;} icu4x_DateTimeFormatter_create_from_builder_mv1_result; + icu4x_DateTimeFormatter_create_from_builder_mv1_result icu4x_DateTimeFormatter_create_from_builder_mv1(const icu4x::capi::Locale* locale, icu4x::capi::DateTimeFieldSetBuilder builder); + + typedef struct icu4x_DateTimeFormatter_create_dt_mv1_result {union {icu4x::capi::DateTimeFormatter* ok; icu4x::capi::DateTimeFormatterLoadError err;}; bool is_ok;} icu4x_DateTimeFormatter_create_dt_mv1_result; + icu4x_DateTimeFormatter_create_dt_mv1_result icu4x_DateTimeFormatter_create_dt_mv1(const icu4x::capi::Locale* locale, icu4x::capi::DateTimeLength length, icu4x::capi::TimePrecision time_precision, icu4x::capi::DateTimeAlignment alignment); + + typedef struct icu4x_DateTimeFormatter_create_mdt_mv1_result {union {icu4x::capi::DateTimeFormatter* ok; icu4x::capi::DateTimeFormatterLoadError err;}; bool is_ok;} icu4x_DateTimeFormatter_create_mdt_mv1_result; + icu4x_DateTimeFormatter_create_mdt_mv1_result icu4x_DateTimeFormatter_create_mdt_mv1(const icu4x::capi::Locale* locale, icu4x::capi::DateTimeLength length, icu4x::capi::TimePrecision time_precision, icu4x::capi::DateTimeAlignment alignment); + + typedef struct icu4x_DateTimeFormatter_create_ymdt_mv1_result {union {icu4x::capi::DateTimeFormatter* ok; icu4x::capi::DateTimeFormatterLoadError err;}; bool is_ok;} icu4x_DateTimeFormatter_create_ymdt_mv1_result; + icu4x_DateTimeFormatter_create_ymdt_mv1_result icu4x_DateTimeFormatter_create_ymdt_mv1(const icu4x::capi::Locale* locale, icu4x::capi::DateTimeLength length, icu4x::capi::TimePrecision time_precision, icu4x::capi::DateTimeAlignment alignment, icu4x::capi::YearStyle year_style); + + typedef struct icu4x_DateTimeFormatter_create_det_mv1_result {union {icu4x::capi::DateTimeFormatter* ok; icu4x::capi::DateTimeFormatterLoadError err;}; bool is_ok;} icu4x_DateTimeFormatter_create_det_mv1_result; + icu4x_DateTimeFormatter_create_det_mv1_result icu4x_DateTimeFormatter_create_det_mv1(const icu4x::capi::Locale* locale, icu4x::capi::DateTimeLength length, icu4x::capi::TimePrecision time_precision, icu4x::capi::DateTimeAlignment alignment); + + typedef struct icu4x_DateTimeFormatter_create_mdet_mv1_result {union {icu4x::capi::DateTimeFormatter* ok; icu4x::capi::DateTimeFormatterLoadError err;}; bool is_ok;} icu4x_DateTimeFormatter_create_mdet_mv1_result; + icu4x_DateTimeFormatter_create_mdet_mv1_result icu4x_DateTimeFormatter_create_mdet_mv1(const icu4x::capi::Locale* locale, icu4x::capi::DateTimeLength length, icu4x::capi::TimePrecision time_precision, icu4x::capi::DateTimeAlignment alignment); + + typedef struct icu4x_DateTimeFormatter_create_ymdet_mv1_result {union {icu4x::capi::DateTimeFormatter* ok; icu4x::capi::DateTimeFormatterLoadError err;}; bool is_ok;} icu4x_DateTimeFormatter_create_ymdet_mv1_result; + icu4x_DateTimeFormatter_create_ymdet_mv1_result icu4x_DateTimeFormatter_create_ymdet_mv1(const icu4x::capi::Locale* locale, icu4x::capi::DateTimeLength length, icu4x::capi::TimePrecision time_precision, icu4x::capi::DateTimeAlignment alignment, icu4x::capi::YearStyle year_style); + + typedef struct icu4x_DateTimeFormatter_create_et_mv1_result {union {icu4x::capi::DateTimeFormatter* ok; icu4x::capi::DateTimeFormatterLoadError err;}; bool is_ok;} icu4x_DateTimeFormatter_create_et_mv1_result; + icu4x_DateTimeFormatter_create_et_mv1_result icu4x_DateTimeFormatter_create_et_mv1(const icu4x::capi::Locale* locale, icu4x::capi::DateTimeLength length, icu4x::capi::TimePrecision time_precision, icu4x::capi::DateTimeAlignment alignment); + + void icu4x_DateTimeFormatter_format_iso_mv1(const icu4x::capi::DateTimeFormatter* self, const icu4x::capi::IsoDate* date, const icu4x::capi::Time* time, diplomat::capi::DiplomatWrite* write); + + + void icu4x_DateTimeFormatter_destroy_mv1(DateTimeFormatter* self); + + } // extern "C" +} // namespace capi +} // namespace + +inline diplomat::result, icu4x::DateTimeFormatterBuildOrLoadError> icu4x::DateTimeFormatter::create_from_builder(const icu4x::Locale& locale, icu4x::DateTimeFieldSetBuilder builder) { + auto result = icu4x::capi::icu4x_DateTimeFormatter_create_from_builder_mv1(locale.AsFFI(), + builder.AsFFI()); + return result.is_ok ? diplomat::result, icu4x::DateTimeFormatterBuildOrLoadError>(diplomat::Ok>(std::unique_ptr(icu4x::DateTimeFormatter::FromFFI(result.ok)))) : diplomat::result, icu4x::DateTimeFormatterBuildOrLoadError>(diplomat::Err(icu4x::DateTimeFormatterBuildOrLoadError::FromFFI(result.err))); +} + +inline diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::DateTimeFormatter::create_dt(const icu4x::Locale& locale, icu4x::DateTimeLength length, icu4x::TimePrecision time_precision, icu4x::DateTimeAlignment alignment) { + auto result = icu4x::capi::icu4x_DateTimeFormatter_create_dt_mv1(locale.AsFFI(), + length.AsFFI(), + time_precision.AsFFI(), + alignment.AsFFI()); + 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))); +} + +inline diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::DateTimeFormatter::create_mdt(const icu4x::Locale& locale, icu4x::DateTimeLength length, icu4x::TimePrecision time_precision, icu4x::DateTimeAlignment alignment) { + auto result = icu4x::capi::icu4x_DateTimeFormatter_create_mdt_mv1(locale.AsFFI(), + length.AsFFI(), + time_precision.AsFFI(), + alignment.AsFFI()); + 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))); +} + +inline diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::DateTimeFormatter::create_ymdt(const icu4x::Locale& locale, icu4x::DateTimeLength length, icu4x::TimePrecision time_precision, icu4x::DateTimeAlignment alignment, icu4x::YearStyle year_style) { + auto result = icu4x::capi::icu4x_DateTimeFormatter_create_ymdt_mv1(locale.AsFFI(), + length.AsFFI(), + time_precision.AsFFI(), + alignment.AsFFI(), + year_style.AsFFI()); + 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))); +} + +inline diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::DateTimeFormatter::create_det(const icu4x::Locale& locale, icu4x::DateTimeLength length, icu4x::TimePrecision time_precision, icu4x::DateTimeAlignment alignment) { + auto result = icu4x::capi::icu4x_DateTimeFormatter_create_det_mv1(locale.AsFFI(), + length.AsFFI(), + time_precision.AsFFI(), + alignment.AsFFI()); + 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))); +} + +inline diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::DateTimeFormatter::create_mdet(const icu4x::Locale& locale, icu4x::DateTimeLength length, icu4x::TimePrecision time_precision, icu4x::DateTimeAlignment alignment) { + auto result = icu4x::capi::icu4x_DateTimeFormatter_create_mdet_mv1(locale.AsFFI(), + length.AsFFI(), + time_precision.AsFFI(), + alignment.AsFFI()); + 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))); +} + +inline diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::DateTimeFormatter::create_ymdet(const icu4x::Locale& locale, icu4x::DateTimeLength length, icu4x::TimePrecision time_precision, icu4x::DateTimeAlignment alignment, icu4x::YearStyle year_style) { + auto result = icu4x::capi::icu4x_DateTimeFormatter_create_ymdet_mv1(locale.AsFFI(), + length.AsFFI(), + time_precision.AsFFI(), + alignment.AsFFI(), + year_style.AsFFI()); + 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))); +} + +inline diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::DateTimeFormatter::create_et(const icu4x::Locale& locale, icu4x::DateTimeLength length, icu4x::TimePrecision time_precision, icu4x::DateTimeAlignment alignment) { + auto result = icu4x::capi::icu4x_DateTimeFormatter_create_et_mv1(locale.AsFFI(), + length.AsFFI(), + time_precision.AsFFI(), + alignment.AsFFI()); + 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))); +} + +inline std::string icu4x::DateTimeFormatter::format_iso(const icu4x::IsoDate& date, const icu4x::Time& time) const { + std::string output; + diplomat::capi::DiplomatWrite write = diplomat::WriteFromString(output); + icu4x::capi::icu4x_DateTimeFormatter_format_iso_mv1(this->AsFFI(), + date.AsFFI(), + time.AsFFI(), + &write); + return output; +} + +inline const icu4x::capi::DateTimeFormatter* icu4x::DateTimeFormatter::AsFFI() const { + return reinterpret_cast(this); +} + +inline icu4x::capi::DateTimeFormatter* icu4x::DateTimeFormatter::AsFFI() { + return reinterpret_cast(this); +} + +inline const icu4x::DateTimeFormatter* icu4x::DateTimeFormatter::FromFFI(const icu4x::capi::DateTimeFormatter* ptr) { + return reinterpret_cast(ptr); +} + +inline icu4x::DateTimeFormatter* icu4x::DateTimeFormatter::FromFFI(icu4x::capi::DateTimeFormatter* ptr) { + return reinterpret_cast(ptr); +} + +inline void icu4x::DateTimeFormatter::operator delete(void* ptr) { + icu4x::capi::icu4x_DateTimeFormatter_destroy_mv1(reinterpret_cast(ptr)); +} + + +#endif // icu4x_DateTimeFormatter_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/NeoDateTimeFormatter.d.hpp b/ffi/capi/bindings/cpp/icu4x/NeoDateTimeFormatter.d.hpp deleted file mode 100644 index 49bcb71d4ea..00000000000 --- a/ffi/capi/bindings/cpp/icu4x/NeoDateTimeFormatter.d.hpp +++ /dev/null @@ -1,74 +0,0 @@ -#ifndef icu4x_NeoDateTimeFormatter_D_HPP -#define icu4x_NeoDateTimeFormatter_D_HPP - -#include -#include -#include -#include -#include -#include -#include "../diplomat_runtime.hpp" - -namespace icu4x { -namespace capi { struct IsoDate; } -class IsoDate; -namespace capi { struct Locale; } -class Locale; -namespace capi { struct NeoDateTimeFormatter; } -class NeoDateTimeFormatter; -namespace capi { struct Time; } -class Time; -struct DateTimeFieldSetBuilder; -class DateTimeAlignment; -class DateTimeFormatterBuildOrLoadError; -class DateTimeFormatterLoadError; -class NeoDateTimeLength; -class TimePrecision; -class YearStyle; -} - - -namespace icu4x { -namespace capi { - struct NeoDateTimeFormatter; -} // namespace capi -} // namespace - -namespace icu4x { -class NeoDateTimeFormatter { -public: - - inline static diplomat::result, icu4x::DateTimeFormatterBuildOrLoadError> create_from_builder(const icu4x::Locale& locale, icu4x::DateTimeFieldSetBuilder builder); - - inline static diplomat::result, icu4x::DateTimeFormatterLoadError> create_dt(const icu4x::Locale& locale, icu4x::NeoDateTimeLength length, icu4x::TimePrecision time_precision, icu4x::DateTimeAlignment alignment); - - inline static diplomat::result, icu4x::DateTimeFormatterLoadError> create_mdt(const icu4x::Locale& locale, icu4x::NeoDateTimeLength length, icu4x::TimePrecision time_precision, icu4x::DateTimeAlignment alignment); - - inline static diplomat::result, icu4x::DateTimeFormatterLoadError> create_ymdt(const icu4x::Locale& locale, icu4x::NeoDateTimeLength length, icu4x::TimePrecision time_precision, icu4x::DateTimeAlignment alignment, icu4x::YearStyle year_style); - - inline static diplomat::result, icu4x::DateTimeFormatterLoadError> create_det(const icu4x::Locale& locale, icu4x::NeoDateTimeLength length, icu4x::TimePrecision time_precision, icu4x::DateTimeAlignment alignment); - - inline static diplomat::result, icu4x::DateTimeFormatterLoadError> create_mdet(const icu4x::Locale& locale, icu4x::NeoDateTimeLength length, icu4x::TimePrecision time_precision, icu4x::DateTimeAlignment alignment); - - inline static diplomat::result, icu4x::DateTimeFormatterLoadError> create_ymdet(const icu4x::Locale& locale, icu4x::NeoDateTimeLength length, icu4x::TimePrecision time_precision, icu4x::DateTimeAlignment alignment, icu4x::YearStyle year_style); - - inline static diplomat::result, icu4x::DateTimeFormatterLoadError> create_et(const icu4x::Locale& locale, icu4x::NeoDateTimeLength length, icu4x::TimePrecision time_precision, icu4x::DateTimeAlignment alignment); - - inline std::string format_iso(const icu4x::IsoDate& date, const icu4x::Time& time) const; - - inline const icu4x::capi::NeoDateTimeFormatter* AsFFI() const; - inline icu4x::capi::NeoDateTimeFormatter* AsFFI(); - inline static const icu4x::NeoDateTimeFormatter* FromFFI(const icu4x::capi::NeoDateTimeFormatter* ptr); - inline static icu4x::NeoDateTimeFormatter* FromFFI(icu4x::capi::NeoDateTimeFormatter* ptr); - inline static void operator delete(void* ptr); -private: - NeoDateTimeFormatter() = delete; - NeoDateTimeFormatter(const icu4x::NeoDateTimeFormatter&) = delete; - NeoDateTimeFormatter(icu4x::NeoDateTimeFormatter&&) noexcept = delete; - NeoDateTimeFormatter operator=(const icu4x::NeoDateTimeFormatter&) = delete; - NeoDateTimeFormatter operator=(icu4x::NeoDateTimeFormatter&&) noexcept = delete; - static void operator delete[](void*, size_t) = delete; -}; - -} // namespace -#endif // icu4x_NeoDateTimeFormatter_D_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/NeoDateTimeFormatter.hpp b/ffi/capi/bindings/cpp/icu4x/NeoDateTimeFormatter.hpp deleted file mode 100644 index 68793c5ac02..00000000000 --- a/ffi/capi/bindings/cpp/icu4x/NeoDateTimeFormatter.hpp +++ /dev/null @@ -1,157 +0,0 @@ -#ifndef icu4x_NeoDateTimeFormatter_HPP -#define icu4x_NeoDateTimeFormatter_HPP - -#include "NeoDateTimeFormatter.d.hpp" - -#include -#include -#include -#include -#include -#include -#include "../diplomat_runtime.hpp" -#include "DateTimeAlignment.hpp" -#include "DateTimeFieldSetBuilder.hpp" -#include "DateTimeFormatterBuildOrLoadError.hpp" -#include "DateTimeFormatterLoadError.hpp" -#include "IsoDate.hpp" -#include "Locale.hpp" -#include "NeoDateTimeLength.hpp" -#include "Time.hpp" -#include "TimePrecision.hpp" -#include "YearStyle.hpp" - - -namespace icu4x { -namespace capi { - extern "C" { - - typedef struct icu4x_NeoDateTimeFormatter_create_from_builder_mv1_result {union {icu4x::capi::NeoDateTimeFormatter* ok; icu4x::capi::DateTimeFormatterBuildOrLoadError err;}; bool is_ok;} icu4x_NeoDateTimeFormatter_create_from_builder_mv1_result; - icu4x_NeoDateTimeFormatter_create_from_builder_mv1_result icu4x_NeoDateTimeFormatter_create_from_builder_mv1(const icu4x::capi::Locale* locale, icu4x::capi::DateTimeFieldSetBuilder builder); - - typedef struct icu4x_NeoDateTimeFormatter_create_dt_mv1_result {union {icu4x::capi::NeoDateTimeFormatter* ok; icu4x::capi::DateTimeFormatterLoadError err;}; bool is_ok;} icu4x_NeoDateTimeFormatter_create_dt_mv1_result; - icu4x_NeoDateTimeFormatter_create_dt_mv1_result icu4x_NeoDateTimeFormatter_create_dt_mv1(const icu4x::capi::Locale* locale, icu4x::capi::NeoDateTimeLength length, icu4x::capi::TimePrecision time_precision, icu4x::capi::DateTimeAlignment alignment); - - typedef struct icu4x_NeoDateTimeFormatter_create_mdt_mv1_result {union {icu4x::capi::NeoDateTimeFormatter* ok; icu4x::capi::DateTimeFormatterLoadError err;}; bool is_ok;} icu4x_NeoDateTimeFormatter_create_mdt_mv1_result; - icu4x_NeoDateTimeFormatter_create_mdt_mv1_result icu4x_NeoDateTimeFormatter_create_mdt_mv1(const icu4x::capi::Locale* locale, icu4x::capi::NeoDateTimeLength length, icu4x::capi::TimePrecision time_precision, icu4x::capi::DateTimeAlignment alignment); - - typedef struct icu4x_NeoDateTimeFormatter_create_ymdt_mv1_result {union {icu4x::capi::NeoDateTimeFormatter* ok; icu4x::capi::DateTimeFormatterLoadError err;}; bool is_ok;} icu4x_NeoDateTimeFormatter_create_ymdt_mv1_result; - icu4x_NeoDateTimeFormatter_create_ymdt_mv1_result icu4x_NeoDateTimeFormatter_create_ymdt_mv1(const icu4x::capi::Locale* locale, icu4x::capi::NeoDateTimeLength length, icu4x::capi::TimePrecision time_precision, icu4x::capi::DateTimeAlignment alignment, icu4x::capi::YearStyle year_style); - - typedef struct icu4x_NeoDateTimeFormatter_create_det_mv1_result {union {icu4x::capi::NeoDateTimeFormatter* ok; icu4x::capi::DateTimeFormatterLoadError err;}; bool is_ok;} icu4x_NeoDateTimeFormatter_create_det_mv1_result; - icu4x_NeoDateTimeFormatter_create_det_mv1_result icu4x_NeoDateTimeFormatter_create_det_mv1(const icu4x::capi::Locale* locale, icu4x::capi::NeoDateTimeLength length, icu4x::capi::TimePrecision time_precision, icu4x::capi::DateTimeAlignment alignment); - - typedef struct icu4x_NeoDateTimeFormatter_create_mdet_mv1_result {union {icu4x::capi::NeoDateTimeFormatter* ok; icu4x::capi::DateTimeFormatterLoadError err;}; bool is_ok;} icu4x_NeoDateTimeFormatter_create_mdet_mv1_result; - icu4x_NeoDateTimeFormatter_create_mdet_mv1_result icu4x_NeoDateTimeFormatter_create_mdet_mv1(const icu4x::capi::Locale* locale, icu4x::capi::NeoDateTimeLength length, icu4x::capi::TimePrecision time_precision, icu4x::capi::DateTimeAlignment alignment); - - typedef struct icu4x_NeoDateTimeFormatter_create_ymdet_mv1_result {union {icu4x::capi::NeoDateTimeFormatter* ok; icu4x::capi::DateTimeFormatterLoadError err;}; bool is_ok;} icu4x_NeoDateTimeFormatter_create_ymdet_mv1_result; - icu4x_NeoDateTimeFormatter_create_ymdet_mv1_result icu4x_NeoDateTimeFormatter_create_ymdet_mv1(const icu4x::capi::Locale* locale, icu4x::capi::NeoDateTimeLength length, icu4x::capi::TimePrecision time_precision, icu4x::capi::DateTimeAlignment alignment, icu4x::capi::YearStyle year_style); - - typedef struct icu4x_NeoDateTimeFormatter_create_et_mv1_result {union {icu4x::capi::NeoDateTimeFormatter* ok; icu4x::capi::DateTimeFormatterLoadError err;}; bool is_ok;} icu4x_NeoDateTimeFormatter_create_et_mv1_result; - icu4x_NeoDateTimeFormatter_create_et_mv1_result icu4x_NeoDateTimeFormatter_create_et_mv1(const icu4x::capi::Locale* locale, icu4x::capi::NeoDateTimeLength length, icu4x::capi::TimePrecision time_precision, icu4x::capi::DateTimeAlignment alignment); - - void icu4x_NeoDateTimeFormatter_format_iso_mv1(const icu4x::capi::NeoDateTimeFormatter* self, const icu4x::capi::IsoDate* date, const icu4x::capi::Time* time, diplomat::capi::DiplomatWrite* write); - - - void icu4x_NeoDateTimeFormatter_destroy_mv1(NeoDateTimeFormatter* self); - - } // extern "C" -} // namespace capi -} // namespace - -inline diplomat::result, icu4x::DateTimeFormatterBuildOrLoadError> icu4x::NeoDateTimeFormatter::create_from_builder(const icu4x::Locale& locale, icu4x::DateTimeFieldSetBuilder builder) { - auto result = icu4x::capi::icu4x_NeoDateTimeFormatter_create_from_builder_mv1(locale.AsFFI(), - builder.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DateTimeFormatterBuildOrLoadError>(diplomat::Ok>(std::unique_ptr(icu4x::NeoDateTimeFormatter::FromFFI(result.ok)))) : diplomat::result, icu4x::DateTimeFormatterBuildOrLoadError>(diplomat::Err(icu4x::DateTimeFormatterBuildOrLoadError::FromFFI(result.err))); -} - -inline diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::NeoDateTimeFormatter::create_dt(const icu4x::Locale& locale, icu4x::NeoDateTimeLength length, icu4x::TimePrecision time_precision, icu4x::DateTimeAlignment alignment) { - auto result = icu4x::capi::icu4x_NeoDateTimeFormatter_create_dt_mv1(locale.AsFFI(), - length.AsFFI(), - time_precision.AsFFI(), - alignment.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Ok>(std::unique_ptr(icu4x::NeoDateTimeFormatter::FromFFI(result.ok)))) : diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); -} - -inline diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::NeoDateTimeFormatter::create_mdt(const icu4x::Locale& locale, icu4x::NeoDateTimeLength length, icu4x::TimePrecision time_precision, icu4x::DateTimeAlignment alignment) { - auto result = icu4x::capi::icu4x_NeoDateTimeFormatter_create_mdt_mv1(locale.AsFFI(), - length.AsFFI(), - time_precision.AsFFI(), - alignment.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Ok>(std::unique_ptr(icu4x::NeoDateTimeFormatter::FromFFI(result.ok)))) : diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); -} - -inline diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::NeoDateTimeFormatter::create_ymdt(const icu4x::Locale& locale, icu4x::NeoDateTimeLength length, icu4x::TimePrecision time_precision, icu4x::DateTimeAlignment alignment, icu4x::YearStyle year_style) { - auto result = icu4x::capi::icu4x_NeoDateTimeFormatter_create_ymdt_mv1(locale.AsFFI(), - length.AsFFI(), - time_precision.AsFFI(), - alignment.AsFFI(), - year_style.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Ok>(std::unique_ptr(icu4x::NeoDateTimeFormatter::FromFFI(result.ok)))) : diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); -} - -inline diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::NeoDateTimeFormatter::create_det(const icu4x::Locale& locale, icu4x::NeoDateTimeLength length, icu4x::TimePrecision time_precision, icu4x::DateTimeAlignment alignment) { - auto result = icu4x::capi::icu4x_NeoDateTimeFormatter_create_det_mv1(locale.AsFFI(), - length.AsFFI(), - time_precision.AsFFI(), - alignment.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Ok>(std::unique_ptr(icu4x::NeoDateTimeFormatter::FromFFI(result.ok)))) : diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); -} - -inline diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::NeoDateTimeFormatter::create_mdet(const icu4x::Locale& locale, icu4x::NeoDateTimeLength length, icu4x::TimePrecision time_precision, icu4x::DateTimeAlignment alignment) { - auto result = icu4x::capi::icu4x_NeoDateTimeFormatter_create_mdet_mv1(locale.AsFFI(), - length.AsFFI(), - time_precision.AsFFI(), - alignment.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Ok>(std::unique_ptr(icu4x::NeoDateTimeFormatter::FromFFI(result.ok)))) : diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); -} - -inline diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::NeoDateTimeFormatter::create_ymdet(const icu4x::Locale& locale, icu4x::NeoDateTimeLength length, icu4x::TimePrecision time_precision, icu4x::DateTimeAlignment alignment, icu4x::YearStyle year_style) { - auto result = icu4x::capi::icu4x_NeoDateTimeFormatter_create_ymdet_mv1(locale.AsFFI(), - length.AsFFI(), - time_precision.AsFFI(), - alignment.AsFFI(), - year_style.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Ok>(std::unique_ptr(icu4x::NeoDateTimeFormatter::FromFFI(result.ok)))) : diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); -} - -inline diplomat::result, icu4x::DateTimeFormatterLoadError> icu4x::NeoDateTimeFormatter::create_et(const icu4x::Locale& locale, icu4x::NeoDateTimeLength length, icu4x::TimePrecision time_precision, icu4x::DateTimeAlignment alignment) { - auto result = icu4x::capi::icu4x_NeoDateTimeFormatter_create_et_mv1(locale.AsFFI(), - length.AsFFI(), - time_precision.AsFFI(), - alignment.AsFFI()); - return result.is_ok ? diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Ok>(std::unique_ptr(icu4x::NeoDateTimeFormatter::FromFFI(result.ok)))) : diplomat::result, icu4x::DateTimeFormatterLoadError>(diplomat::Err(icu4x::DateTimeFormatterLoadError::FromFFI(result.err))); -} - -inline std::string icu4x::NeoDateTimeFormatter::format_iso(const icu4x::IsoDate& date, const icu4x::Time& time) const { - std::string output; - diplomat::capi::DiplomatWrite write = diplomat::WriteFromString(output); - icu4x::capi::icu4x_NeoDateTimeFormatter_format_iso_mv1(this->AsFFI(), - date.AsFFI(), - time.AsFFI(), - &write); - return output; -} - -inline const icu4x::capi::NeoDateTimeFormatter* icu4x::NeoDateTimeFormatter::AsFFI() const { - return reinterpret_cast(this); -} - -inline icu4x::capi::NeoDateTimeFormatter* icu4x::NeoDateTimeFormatter::AsFFI() { - return reinterpret_cast(this); -} - -inline const icu4x::NeoDateTimeFormatter* icu4x::NeoDateTimeFormatter::FromFFI(const icu4x::capi::NeoDateTimeFormatter* ptr) { - return reinterpret_cast(ptr); -} - -inline icu4x::NeoDateTimeFormatter* icu4x::NeoDateTimeFormatter::FromFFI(icu4x::capi::NeoDateTimeFormatter* ptr) { - return reinterpret_cast(ptr); -} - -inline void icu4x::NeoDateTimeFormatter::operator delete(void* ptr) { - icu4x::capi::icu4x_NeoDateTimeFormatter_destroy_mv1(reinterpret_cast(ptr)); -} - - -#endif // icu4x_NeoDateTimeFormatter_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/NeoDateTimeLength.d.hpp b/ffi/capi/bindings/cpp/icu4x/NeoDateTimeLength.d.hpp deleted file mode 100644 index 26fda837ad8..00000000000 --- a/ffi/capi/bindings/cpp/icu4x/NeoDateTimeLength.d.hpp +++ /dev/null @@ -1,48 +0,0 @@ -#ifndef icu4x_NeoDateTimeLength_D_HPP -#define icu4x_NeoDateTimeLength_D_HPP - -#include -#include -#include -#include -#include -#include -#include "../diplomat_runtime.hpp" - - -namespace icu4x { -namespace capi { - enum NeoDateTimeLength { - NeoDateTimeLength_Long = 0, - NeoDateTimeLength_Medium = 1, - NeoDateTimeLength_Short = 2, - }; - - typedef struct NeoDateTimeLength_option {union { NeoDateTimeLength ok; }; bool is_ok; } NeoDateTimeLength_option; -} // namespace capi -} // namespace - -namespace icu4x { -class NeoDateTimeLength { -public: - enum Value { - Long = 0, - Medium = 1, - Short = 2, - }; - - NeoDateTimeLength() = default; - // Implicit conversions between enum and ::Value - constexpr NeoDateTimeLength(Value v) : value(v) {} - constexpr operator Value() const { return value; } - // Prevent usage as boolean value - explicit operator bool() const = delete; - - inline icu4x::capi::NeoDateTimeLength AsFFI() const; - inline static icu4x::NeoDateTimeLength FromFFI(icu4x::capi::NeoDateTimeLength c_enum); -private: - Value value; -}; - -} // namespace -#endif // icu4x_NeoDateTimeLength_D_HPP diff --git a/ffi/capi/bindings/cpp/icu4x/NeoDateTimeLength.hpp b/ffi/capi/bindings/cpp/icu4x/NeoDateTimeLength.hpp deleted file mode 100644 index abb544f6d26..00000000000 --- a/ffi/capi/bindings/cpp/icu4x/NeoDateTimeLength.hpp +++ /dev/null @@ -1,38 +0,0 @@ -#ifndef icu4x_NeoDateTimeLength_HPP -#define icu4x_NeoDateTimeLength_HPP - -#include "NeoDateTimeLength.d.hpp" - -#include -#include -#include -#include -#include -#include -#include "../diplomat_runtime.hpp" - - -namespace icu4x { -namespace capi { - extern "C" { - - - } // extern "C" -} // namespace capi -} // namespace - -inline icu4x::capi::NeoDateTimeLength icu4x::NeoDateTimeLength::AsFFI() const { - return static_cast(value); -} - -inline icu4x::NeoDateTimeLength icu4x::NeoDateTimeLength::FromFFI(icu4x::capi::NeoDateTimeLength c_enum) { - switch (c_enum) { - case icu4x::capi::NeoDateTimeLength_Long: - case icu4x::capi::NeoDateTimeLength_Medium: - case icu4x::capi::NeoDateTimeLength_Short: - return static_cast(c_enum); - default: - abort(); - } -} -#endif // icu4x_NeoDateTimeLength_HPP diff --git a/ffi/capi/bindings/dart/DateTimeFieldSetBuilder.g.dart b/ffi/capi/bindings/dart/DateTimeFieldSetBuilder.g.dart index 303e0dcaf6b..f809e2fd8bb 100644 --- a/ffi/capi/bindings/dart/DateTimeFieldSetBuilder.g.dart +++ b/ffi/capi/bindings/dart/DateTimeFieldSetBuilder.g.dart @@ -13,7 +13,7 @@ final class _DateTimeFieldSetBuilderFfi extends ffi.Struct { /// See the [Rust documentation for `FieldSetBuilder`](https://docs.rs/icu/latest/icu/datetime/builder/enum.FieldSetBuilder.html) for more information. final class DateTimeFieldSetBuilder { - NeoDateTimeLength? length; + DateTimeLength? length; DateFields? dateFields; TimePrecision? timePrecision; ZoneStyle? zoneStyle; @@ -29,7 +29,7 @@ final class DateTimeFieldSetBuilder { // should handle this when constructing edge arrays. // ignore: unused_element DateTimeFieldSetBuilder._fromFfi(_DateTimeFieldSetBuilderFfi ffi) : - length = ffi.length.isOk ? NeoDateTimeLength.values[ffi.length.union.ok] : null, + length = ffi.length.isOk ? DateTimeLength.values[ffi.length.union.ok] : null, dateFields = ffi.dateFields.isOk ? DateFields.values[ffi.dateFields.union.ok] : null, timePrecision = ffi.timePrecision.isOk ? TimePrecision.values[ffi.timePrecision.union.ok] : null, zoneStyle = ffi.zoneStyle.isOk ? ZoneStyle.values[ffi.zoneStyle.union.ok] : null, @@ -39,7 +39,7 @@ final class DateTimeFieldSetBuilder { // ignore: unused_element _DateTimeFieldSetBuilderFfi _toFfi(ffi.Allocator temp) { final struct = ffi.Struct.create<_DateTimeFieldSetBuilderFfi>(); - NeoDateTimeLength? length = this.length; + DateTimeLength? length = this.length; struct.length = length != null ? _ResultInt32Void.ok(length.index) : _ResultInt32Void.err(); DateFields? dateFields = this.dateFields; struct.dateFields = dateFields != null ? _ResultInt32Void.ok(dateFields.index) : _ResultInt32Void.err(); diff --git a/ffi/capi/bindings/dart/NeoDateTimeFormatter.g.dart b/ffi/capi/bindings/dart/DateTimeFormatter.g.dart similarity index 53% rename from ffi/capi/bindings/dart/NeoDateTimeFormatter.g.dart rename to ffi/capi/bindings/dart/DateTimeFormatter.g.dart index 549a456c1ac..6ffa2c690a1 100644 --- a/ffi/capi/bindings/dart/NeoDateTimeFormatter.g.dart +++ b/ffi/capi/bindings/dart/DateTimeFormatter.g.dart @@ -3,7 +3,7 @@ part of 'lib.g.dart'; /// See the [Rust documentation for `DateTimeFormatter`](https://docs.rs/icu/latest/icu/datetime/type.DateTimeFormatter.html) for more information. -final class NeoDateTimeFormatter implements ffi.Finalizable { +final class DateTimeFormatter implements ffi.Finalizable { final ffi.Pointer _ffi; // These are "used" in the sense that they keep dependencies alive @@ -14,157 +14,157 @@ final class NeoDateTimeFormatter implements ffi.Finalizable { // corresponding to data this may borrow from. These should be flat arrays containing // references to objects, and this object will hold on to them to keep them alive and // maintain borrow validity. - NeoDateTimeFormatter._fromFfi(this._ffi, this._selfEdge) { + DateTimeFormatter._fromFfi(this._ffi, this._selfEdge) { if (_selfEdge.isEmpty) { _finalizer.attach(this, _ffi.cast()); } } - static final _finalizer = ffi.NativeFinalizer(ffi.Native.addressOf(_icu4x_NeoDateTimeFormatter_destroy_mv1)); + static final _finalizer = ffi.NativeFinalizer(ffi.Native.addressOf(_icu4x_DateTimeFormatter_destroy_mv1)); /// See the [Rust documentation for `try_new`](https://docs.rs/icu/latest/icu/datetime/fieldsets/struct.DateTimeFormatter.html#method.try_new) for more information. /// /// Throws [DateTimeFormatterBuildOrLoadError] on failure. - factory NeoDateTimeFormatter.dt(Locale locale, DateTimeFieldSetBuilder builder) { + factory DateTimeFormatter.dt(Locale locale, DateTimeFieldSetBuilder builder) { final temp = _FinalizedArena(); - final result = _icu4x_NeoDateTimeFormatter_create_from_builder_mv1(locale._ffi, builder._toFfi(temp.arena)); + final result = _icu4x_DateTimeFormatter_create_from_builder_mv1(locale._ffi, builder._toFfi(temp.arena)); if (!result.isOk) { throw DateTimeFormatterBuildOrLoadError.values.firstWhere((v) => v._ffi == result.union.err); } - return NeoDateTimeFormatter._fromFfi(result.union.ok, []); + return DateTimeFormatter._fromFfi(result.union.ok, []); } /// See the [Rust documentation for `DT`](https://docs.rs/icu/latest/icu/datetime/fieldsets/struct.DT.html) for more information. /// /// Throws [DateTimeFormatterLoadError] on failure. - factory NeoDateTimeFormatter.dt(Locale locale, NeoDateTimeLength length, TimePrecision timePrecision, DateTimeAlignment alignment) { - final result = _icu4x_NeoDateTimeFormatter_create_dt_mv1(locale._ffi, length.index, timePrecision.index, alignment.index); + factory DateTimeFormatter.dt(Locale locale, DateTimeLength length, TimePrecision timePrecision, DateTimeAlignment alignment) { + final result = _icu4x_DateTimeFormatter_create_dt_mv1(locale._ffi, length.index, timePrecision.index, alignment.index); if (!result.isOk) { throw DateTimeFormatterLoadError.values.firstWhere((v) => v._ffi == result.union.err); } - return NeoDateTimeFormatter._fromFfi(result.union.ok, []); + return DateTimeFormatter._fromFfi(result.union.ok, []); } /// See the [Rust documentation for `MDT`](https://docs.rs/icu/latest/icu/datetime/fieldsets/struct.MDT.html) for more information. /// /// Throws [DateTimeFormatterLoadError] on failure. - factory NeoDateTimeFormatter.mdt(Locale locale, NeoDateTimeLength length, TimePrecision timePrecision, DateTimeAlignment alignment) { - final result = _icu4x_NeoDateTimeFormatter_create_mdt_mv1(locale._ffi, length.index, timePrecision.index, alignment.index); + factory DateTimeFormatter.mdt(Locale locale, DateTimeLength length, TimePrecision timePrecision, DateTimeAlignment alignment) { + final result = _icu4x_DateTimeFormatter_create_mdt_mv1(locale._ffi, length.index, timePrecision.index, alignment.index); if (!result.isOk) { throw DateTimeFormatterLoadError.values.firstWhere((v) => v._ffi == result.union.err); } - return NeoDateTimeFormatter._fromFfi(result.union.ok, []); + return DateTimeFormatter._fromFfi(result.union.ok, []); } /// See the [Rust documentation for `YMDT`](https://docs.rs/icu/latest/icu/datetime/fieldsets/struct.YMDT.html) for more information. /// /// Throws [DateTimeFormatterLoadError] on failure. - factory NeoDateTimeFormatter.ymdt(Locale locale, NeoDateTimeLength length, TimePrecision timePrecision, DateTimeAlignment alignment, YearStyle yearStyle) { - final result = _icu4x_NeoDateTimeFormatter_create_ymdt_mv1(locale._ffi, length.index, timePrecision.index, alignment.index, yearStyle.index); + factory DateTimeFormatter.ymdt(Locale locale, DateTimeLength length, TimePrecision timePrecision, DateTimeAlignment alignment, YearStyle yearStyle) { + final result = _icu4x_DateTimeFormatter_create_ymdt_mv1(locale._ffi, length.index, timePrecision.index, alignment.index, yearStyle.index); if (!result.isOk) { throw DateTimeFormatterLoadError.values.firstWhere((v) => v._ffi == result.union.err); } - return NeoDateTimeFormatter._fromFfi(result.union.ok, []); + return DateTimeFormatter._fromFfi(result.union.ok, []); } /// See the [Rust documentation for `DET`](https://docs.rs/icu/latest/icu/datetime/fieldsets/struct.DET.html) for more information. /// /// Throws [DateTimeFormatterLoadError] on failure. - factory NeoDateTimeFormatter.det(Locale locale, NeoDateTimeLength length, TimePrecision timePrecision, DateTimeAlignment alignment) { - final result = _icu4x_NeoDateTimeFormatter_create_det_mv1(locale._ffi, length.index, timePrecision.index, alignment.index); + factory DateTimeFormatter.det(Locale locale, DateTimeLength length, TimePrecision timePrecision, DateTimeAlignment alignment) { + final result = _icu4x_DateTimeFormatter_create_det_mv1(locale._ffi, length.index, timePrecision.index, alignment.index); if (!result.isOk) { throw DateTimeFormatterLoadError.values.firstWhere((v) => v._ffi == result.union.err); } - return NeoDateTimeFormatter._fromFfi(result.union.ok, []); + return DateTimeFormatter._fromFfi(result.union.ok, []); } /// See the [Rust documentation for `MDET`](https://docs.rs/icu/latest/icu/datetime/fieldsets/struct.MDET.html) for more information. /// /// Throws [DateTimeFormatterLoadError] on failure. - factory NeoDateTimeFormatter.mdet(Locale locale, NeoDateTimeLength length, TimePrecision timePrecision, DateTimeAlignment alignment) { - final result = _icu4x_NeoDateTimeFormatter_create_mdet_mv1(locale._ffi, length.index, timePrecision.index, alignment.index); + factory DateTimeFormatter.mdet(Locale locale, DateTimeLength length, TimePrecision timePrecision, DateTimeAlignment alignment) { + final result = _icu4x_DateTimeFormatter_create_mdet_mv1(locale._ffi, length.index, timePrecision.index, alignment.index); if (!result.isOk) { throw DateTimeFormatterLoadError.values.firstWhere((v) => v._ffi == result.union.err); } - return NeoDateTimeFormatter._fromFfi(result.union.ok, []); + return DateTimeFormatter._fromFfi(result.union.ok, []); } /// See the [Rust documentation for `YMDET`](https://docs.rs/icu/latest/icu/datetime/fieldsets/struct.YMDET.html) for more information. /// /// Throws [DateTimeFormatterLoadError] on failure. - factory NeoDateTimeFormatter.ymdet(Locale locale, NeoDateTimeLength length, TimePrecision timePrecision, DateTimeAlignment alignment, YearStyle yearStyle) { - final result = _icu4x_NeoDateTimeFormatter_create_ymdet_mv1(locale._ffi, length.index, timePrecision.index, alignment.index, yearStyle.index); + factory DateTimeFormatter.ymdet(Locale locale, DateTimeLength length, TimePrecision timePrecision, DateTimeAlignment alignment, YearStyle yearStyle) { + final result = _icu4x_DateTimeFormatter_create_ymdet_mv1(locale._ffi, length.index, timePrecision.index, alignment.index, yearStyle.index); if (!result.isOk) { throw DateTimeFormatterLoadError.values.firstWhere((v) => v._ffi == result.union.err); } - return NeoDateTimeFormatter._fromFfi(result.union.ok, []); + return DateTimeFormatter._fromFfi(result.union.ok, []); } /// See the [Rust documentation for `ET`](https://docs.rs/icu/latest/icu/datetime/fieldsets/struct.ET.html) for more information. /// /// Throws [DateTimeFormatterLoadError] on failure. - factory NeoDateTimeFormatter.et(Locale locale, NeoDateTimeLength length, TimePrecision timePrecision, DateTimeAlignment alignment) { - final result = _icu4x_NeoDateTimeFormatter_create_et_mv1(locale._ffi, length.index, timePrecision.index, alignment.index); + factory DateTimeFormatter.et(Locale locale, DateTimeLength length, TimePrecision timePrecision, DateTimeAlignment alignment) { + final result = _icu4x_DateTimeFormatter_create_et_mv1(locale._ffi, length.index, timePrecision.index, alignment.index); if (!result.isOk) { throw DateTimeFormatterLoadError.values.firstWhere((v) => v._ffi == result.union.err); } - return NeoDateTimeFormatter._fromFfi(result.union.ok, []); + return DateTimeFormatter._fromFfi(result.union.ok, []); } /// See the [Rust documentation for `format`](https://docs.rs/icu/latest/icu/datetime/struct.DateTimeFormatter.html#method.format) for more information. String formatIso(IsoDate date, Time time) { final write = _Write(); - _icu4x_NeoDateTimeFormatter_format_iso_mv1(_ffi, date._ffi, time._ffi, write._ffi); + _icu4x_DateTimeFormatter_format_iso_mv1(_ffi, date._ffi, time._ffi, write._ffi); return write.finalize(); } } @meta.RecordUse() -@ffi.Native)>(isLeaf: true, symbol: 'icu4x_NeoDateTimeFormatter_destroy_mv1') +@ffi.Native)>(isLeaf: true, symbol: 'icu4x_DateTimeFormatter_destroy_mv1') // ignore: non_constant_identifier_names -external void _icu4x_NeoDateTimeFormatter_destroy_mv1(ffi.Pointer self); +external void _icu4x_DateTimeFormatter_destroy_mv1(ffi.Pointer self); @meta.RecordUse() -@ffi.Native<_ResultOpaqueInt32 Function(ffi.Pointer, _DateTimeFieldSetBuilderFfi)>(isLeaf: true, symbol: 'icu4x_NeoDateTimeFormatter_create_from_builder_mv1') +@ffi.Native<_ResultOpaqueInt32 Function(ffi.Pointer, _DateTimeFieldSetBuilderFfi)>(isLeaf: true, symbol: 'icu4x_DateTimeFormatter_create_from_builder_mv1') // ignore: non_constant_identifier_names -external _ResultOpaqueInt32 _icu4x_NeoDateTimeFormatter_create_from_builder_mv1(ffi.Pointer locale, _DateTimeFieldSetBuilderFfi builder); +external _ResultOpaqueInt32 _icu4x_DateTimeFormatter_create_from_builder_mv1(ffi.Pointer locale, _DateTimeFieldSetBuilderFfi builder); @meta.RecordUse() -@ffi.Native<_ResultOpaqueInt32 Function(ffi.Pointer, ffi.Int32, ffi.Int32, ffi.Int32)>(isLeaf: true, symbol: 'icu4x_NeoDateTimeFormatter_create_dt_mv1') +@ffi.Native<_ResultOpaqueInt32 Function(ffi.Pointer, ffi.Int32, ffi.Int32, ffi.Int32)>(isLeaf: true, symbol: 'icu4x_DateTimeFormatter_create_dt_mv1') // ignore: non_constant_identifier_names -external _ResultOpaqueInt32 _icu4x_NeoDateTimeFormatter_create_dt_mv1(ffi.Pointer locale, int length, int timePrecision, int alignment); +external _ResultOpaqueInt32 _icu4x_DateTimeFormatter_create_dt_mv1(ffi.Pointer locale, int length, int timePrecision, int alignment); @meta.RecordUse() -@ffi.Native<_ResultOpaqueInt32 Function(ffi.Pointer, ffi.Int32, ffi.Int32, ffi.Int32)>(isLeaf: true, symbol: 'icu4x_NeoDateTimeFormatter_create_mdt_mv1') +@ffi.Native<_ResultOpaqueInt32 Function(ffi.Pointer, ffi.Int32, ffi.Int32, ffi.Int32)>(isLeaf: true, symbol: 'icu4x_DateTimeFormatter_create_mdt_mv1') // ignore: non_constant_identifier_names -external _ResultOpaqueInt32 _icu4x_NeoDateTimeFormatter_create_mdt_mv1(ffi.Pointer locale, int length, int timePrecision, int alignment); +external _ResultOpaqueInt32 _icu4x_DateTimeFormatter_create_mdt_mv1(ffi.Pointer locale, int length, int timePrecision, int alignment); @meta.RecordUse() -@ffi.Native<_ResultOpaqueInt32 Function(ffi.Pointer, ffi.Int32, ffi.Int32, ffi.Int32, ffi.Int32)>(isLeaf: true, symbol: 'icu4x_NeoDateTimeFormatter_create_ymdt_mv1') +@ffi.Native<_ResultOpaqueInt32 Function(ffi.Pointer, ffi.Int32, ffi.Int32, ffi.Int32, ffi.Int32)>(isLeaf: true, symbol: 'icu4x_DateTimeFormatter_create_ymdt_mv1') // ignore: non_constant_identifier_names -external _ResultOpaqueInt32 _icu4x_NeoDateTimeFormatter_create_ymdt_mv1(ffi.Pointer locale, int length, int timePrecision, int alignment, int yearStyle); +external _ResultOpaqueInt32 _icu4x_DateTimeFormatter_create_ymdt_mv1(ffi.Pointer locale, int length, int timePrecision, int alignment, int yearStyle); @meta.RecordUse() -@ffi.Native<_ResultOpaqueInt32 Function(ffi.Pointer, ffi.Int32, ffi.Int32, ffi.Int32)>(isLeaf: true, symbol: 'icu4x_NeoDateTimeFormatter_create_det_mv1') +@ffi.Native<_ResultOpaqueInt32 Function(ffi.Pointer, ffi.Int32, ffi.Int32, ffi.Int32)>(isLeaf: true, symbol: 'icu4x_DateTimeFormatter_create_det_mv1') // ignore: non_constant_identifier_names -external _ResultOpaqueInt32 _icu4x_NeoDateTimeFormatter_create_det_mv1(ffi.Pointer locale, int length, int timePrecision, int alignment); +external _ResultOpaqueInt32 _icu4x_DateTimeFormatter_create_det_mv1(ffi.Pointer locale, int length, int timePrecision, int alignment); @meta.RecordUse() -@ffi.Native<_ResultOpaqueInt32 Function(ffi.Pointer, ffi.Int32, ffi.Int32, ffi.Int32)>(isLeaf: true, symbol: 'icu4x_NeoDateTimeFormatter_create_mdet_mv1') +@ffi.Native<_ResultOpaqueInt32 Function(ffi.Pointer, ffi.Int32, ffi.Int32, ffi.Int32)>(isLeaf: true, symbol: 'icu4x_DateTimeFormatter_create_mdet_mv1') // ignore: non_constant_identifier_names -external _ResultOpaqueInt32 _icu4x_NeoDateTimeFormatter_create_mdet_mv1(ffi.Pointer locale, int length, int timePrecision, int alignment); +external _ResultOpaqueInt32 _icu4x_DateTimeFormatter_create_mdet_mv1(ffi.Pointer locale, int length, int timePrecision, int alignment); @meta.RecordUse() -@ffi.Native<_ResultOpaqueInt32 Function(ffi.Pointer, ffi.Int32, ffi.Int32, ffi.Int32, ffi.Int32)>(isLeaf: true, symbol: 'icu4x_NeoDateTimeFormatter_create_ymdet_mv1') +@ffi.Native<_ResultOpaqueInt32 Function(ffi.Pointer, ffi.Int32, ffi.Int32, ffi.Int32, ffi.Int32)>(isLeaf: true, symbol: 'icu4x_DateTimeFormatter_create_ymdet_mv1') // ignore: non_constant_identifier_names -external _ResultOpaqueInt32 _icu4x_NeoDateTimeFormatter_create_ymdet_mv1(ffi.Pointer locale, int length, int timePrecision, int alignment, int yearStyle); +external _ResultOpaqueInt32 _icu4x_DateTimeFormatter_create_ymdet_mv1(ffi.Pointer locale, int length, int timePrecision, int alignment, int yearStyle); @meta.RecordUse() -@ffi.Native<_ResultOpaqueInt32 Function(ffi.Pointer, ffi.Int32, ffi.Int32, ffi.Int32)>(isLeaf: true, symbol: 'icu4x_NeoDateTimeFormatter_create_et_mv1') +@ffi.Native<_ResultOpaqueInt32 Function(ffi.Pointer, ffi.Int32, ffi.Int32, ffi.Int32)>(isLeaf: true, symbol: 'icu4x_DateTimeFormatter_create_et_mv1') // ignore: non_constant_identifier_names -external _ResultOpaqueInt32 _icu4x_NeoDateTimeFormatter_create_et_mv1(ffi.Pointer locale, int length, int timePrecision, int alignment); +external _ResultOpaqueInt32 _icu4x_DateTimeFormatter_create_et_mv1(ffi.Pointer locale, int length, int timePrecision, int alignment); @meta.RecordUse() -@ffi.Native, ffi.Pointer, ffi.Pointer, ffi.Pointer)>(isLeaf: true, symbol: 'icu4x_NeoDateTimeFormatter_format_iso_mv1') +@ffi.Native, ffi.Pointer, ffi.Pointer, ffi.Pointer)>(isLeaf: true, symbol: 'icu4x_DateTimeFormatter_format_iso_mv1') // ignore: non_constant_identifier_names -external void _icu4x_NeoDateTimeFormatter_format_iso_mv1(ffi.Pointer self, ffi.Pointer date, ffi.Pointer time, ffi.Pointer write); +external void _icu4x_DateTimeFormatter_format_iso_mv1(ffi.Pointer self, ffi.Pointer date, ffi.Pointer time, ffi.Pointer write); diff --git a/ffi/capi/bindings/dart/NeoDateTimeLength.g.dart b/ffi/capi/bindings/dart/NeoDateTimeLength.g.dart deleted file mode 100644 index 18669489cd9..00000000000 --- a/ffi/capi/bindings/dart/NeoDateTimeLength.g.dart +++ /dev/null @@ -1,12 +0,0 @@ -// generated by diplomat-tool - -part of 'lib.g.dart'; - -/// See the [Rust documentation for `Length`](https://docs.rs/icu/latest/icu/datetime/enum.Length.html) for more information. -enum NeoDateTimeLength { - long, - - medium, - - short; -} diff --git a/ffi/capi/bindings/dart/lib.g.dart b/ffi/capi/bindings/dart/lib.g.dart index e9bfc51b87a..241627fdd76 100644 --- a/ffi/capi/bindings/dart/lib.g.dart +++ b/ffi/capi/bindings/dart/lib.g.dart @@ -51,6 +51,7 @@ part 'DateTime.g.dart'; part 'DateTimeAlignment.g.dart'; part 'DateTimeFieldSetBuilder.g.dart'; part 'DateTimeFormatError.g.dart'; +part 'DateTimeFormatter.g.dart'; part 'DateTimeFormatterBuildOrLoadError.g.dart'; part 'DateTimeFormatterLoadError.g.dart'; part 'DateTimeLength.g.dart'; @@ -114,8 +115,6 @@ part 'LocaleParseError.g.dart'; part 'Logger.g.dart'; part 'MeasureUnit.g.dart'; part 'MeasureUnitParser.g.dart'; -part 'NeoDateTimeFormatter.g.dart'; -part 'NeoDateTimeLength.g.dart'; part 'PluralCategories.g.dart'; part 'PluralCategory.g.dart'; part 'PluralOperands.g.dart'; diff --git a/ffi/capi/bindings/demo_gen/DateTimeFormatter.d.ts b/ffi/capi/bindings/demo_gen/DateTimeFormatter.d.ts new file mode 100644 index 00000000000..7c6977ef80a --- /dev/null +++ b/ffi/capi/bindings/demo_gen/DateTimeFormatter.d.ts @@ -0,0 +1,6 @@ +import { DateTimeFieldSetBuilder } from "icu4x" +import { DateTimeFormatter } from "icu4x" +import { IsoDate } from "icu4x" +import { Locale } from "icu4x" +import { Time } from "icu4x" +export function formatIso(name: string, length: DateTimeLength, date_fields: DateFields, time_precision: TimePrecision, zone_style: ZoneStyle, alignment: DateTimeAlignment, year_style: YearStyle, year: number, month: number, day: number, hour: number, minute: number, second: number, nanosecond: number); diff --git a/ffi/capi/bindings/demo_gen/NeoDateTimeFormatter.mjs b/ffi/capi/bindings/demo_gen/DateTimeFormatter.mjs similarity index 94% rename from ffi/capi/bindings/demo_gen/NeoDateTimeFormatter.mjs rename to ffi/capi/bindings/demo_gen/DateTimeFormatter.mjs index 0af5d388c28..74a66419c23 100644 --- a/ffi/capi/bindings/demo_gen/NeoDateTimeFormatter.mjs +++ b/ffi/capi/bindings/demo_gen/DateTimeFormatter.mjs @@ -1,13 +1,13 @@ import { DateTimeFieldSetBuilder } from "icu4x" +import { DateTimeFormatter } from "icu4x" import { IsoDate } from "icu4x" import { Locale } from "icu4x" -import { NeoDateTimeFormatter } from "icu4x" import { Time } from "icu4x" export function formatIso(name, length, date_fields, time_precision, zone_style, alignment, year_style, year, month, day, hour, minute, second, nanosecond) { return (function (...args) { return args[0].formatIso(...args.slice(1)) }).apply( null, [ - NeoDateTimeFormatter.createFromBuilder.apply( + DateTimeFormatter.createFromBuilder.apply( null, [ Locale.fromString.apply( diff --git a/ffi/capi/bindings/demo_gen/NeoDateTimeFormatter.d.ts b/ffi/capi/bindings/demo_gen/NeoDateTimeFormatter.d.ts deleted file mode 100644 index 57519e6ee73..00000000000 --- a/ffi/capi/bindings/demo_gen/NeoDateTimeFormatter.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -import { DateTimeFieldSetBuilder } from "icu4x" -import { IsoDate } from "icu4x" -import { Locale } from "icu4x" -import { NeoDateTimeFormatter } from "icu4x" -import { Time } from "icu4x" -export function formatIso(name: string, length: NeoDateTimeLength, date_fields: DateFields, time_precision: TimePrecision, zone_style: ZoneStyle, alignment: DateTimeAlignment, year_style: YearStyle, year: number, month: number, day: number, hour: number, minute: number, second: number, nanosecond: number); diff --git a/ffi/capi/bindings/demo_gen/index.mjs b/ffi/capi/bindings/demo_gen/index.mjs index b04996befd1..c7cf3705e4e 100644 --- a/ffi/capi/bindings/demo_gen/index.mjs +++ b/ffi/capi/bindings/demo_gen/index.mjs @@ -21,8 +21,8 @@ import * as ListFormatterDemo from "./ListFormatter.mjs"; export * as ListFormatterDemo from "./ListFormatter.mjs"; import * as LocaleDemo from "./Locale.mjs"; export * as LocaleDemo from "./Locale.mjs"; -import * as NeoDateTimeFormatterDemo from "./NeoDateTimeFormatter.mjs"; -export * as NeoDateTimeFormatterDemo from "./NeoDateTimeFormatter.mjs"; +import * as DateTimeFormatterDemo from "./DateTimeFormatter.mjs"; +export * as DateTimeFormatterDemo from "./DateTimeFormatter.mjs"; import * as ComposingNormalizerDemo from "./ComposingNormalizer.mjs"; export * as ComposingNormalizerDemo from "./ComposingNormalizer.mjs"; import * as DecomposingNormalizerDemo from "./DecomposingNormalizer.mjs"; @@ -671,10 +671,10 @@ let termini = Object.assign({ ] }, - "NeoDateTimeFormatter.formatIso": { - func: NeoDateTimeFormatterDemo.formatIso, + "DateTimeFormatter.formatIso": { + func: DateTimeFormatterDemo.formatIso, // For avoiding webpacking minifying issues: - funcName: "NeoDateTimeFormatter.formatIso", + funcName: "DateTimeFormatter.formatIso", parameters: [ { @@ -685,7 +685,7 @@ let termini = Object.assign({ { name: "Self:Builder:Length", - type: "NeoDateTimeLength", + type: "DateTimeLength", typeUse: "enumerator" }, diff --git a/ffi/capi/bindings/js/DateTimeFieldSetBuilder.d.ts b/ffi/capi/bindings/js/DateTimeFieldSetBuilder.d.ts index c6fc4ea258d..8d92dcee7a0 100644 --- a/ffi/capi/bindings/js/DateTimeFieldSetBuilder.d.ts +++ b/ffi/capi/bindings/js/DateTimeFieldSetBuilder.d.ts @@ -1,7 +1,7 @@ // generated by diplomat-tool import type { DateFields } from "./DateFields" import type { DateTimeAlignment } from "./DateTimeAlignment" -import type { NeoDateTimeLength } from "./NeoDateTimeLength" +import type { DateTimeLength } from "./DateTimeLength" import type { TimePrecision } from "./TimePrecision" import type { YearStyle } from "./YearStyle" import type { ZoneStyle } from "./ZoneStyle" @@ -11,7 +11,7 @@ import type { pointer, codepoint } from "./diplomat-runtime.d.ts"; /** See the [Rust documentation for `FieldSetBuilder`](https://docs.rs/icu/latest/icu/datetime/builder/enum.FieldSetBuilder.html) for more information. */ type DateTimeFieldSetBuilder_obj = { - length?: NeoDateTimeLength | null; + length?: DateTimeLength | null; dateFields?: DateFields | null; timePrecision?: TimePrecision | null; zoneStyle?: ZoneStyle | null; @@ -23,8 +23,8 @@ type DateTimeFieldSetBuilder_obj = { export class DateTimeFieldSetBuilder { - get length() : NeoDateTimeLength | null; - set length(value: NeoDateTimeLength | null); + get length() : DateTimeLength | null; + set length(value: DateTimeLength | null); get dateFields() : DateFields | null; set dateFields(value: DateFields | null); diff --git a/ffi/capi/bindings/js/DateTimeFieldSetBuilder.mjs b/ffi/capi/bindings/js/DateTimeFieldSetBuilder.mjs index af965ac4fe9..0112ef1794b 100644 --- a/ffi/capi/bindings/js/DateTimeFieldSetBuilder.mjs +++ b/ffi/capi/bindings/js/DateTimeFieldSetBuilder.mjs @@ -1,7 +1,7 @@ // generated by diplomat-tool import { DateFields } from "./DateFields.mjs" import { DateTimeAlignment } from "./DateTimeAlignment.mjs" -import { NeoDateTimeLength } from "./NeoDateTimeLength.mjs" +import { DateTimeLength } from "./DateTimeLength.mjs" import { TimePrecision } from "./TimePrecision.mjs" import { YearStyle } from "./YearStyle.mjs" import { ZoneStyle } from "./ZoneStyle.mjs" @@ -167,7 +167,7 @@ export class DateTimeFieldSetBuilder { } let structObj = {}; const lengthDeref = ptr; - structObj.length = diplomatRuntime.readOption(wasm, lengthDeref, 4, (wasm, offset) => { const deref = diplomatRuntime.enumDiscriminant(wasm, offset); return new NeoDateTimeLength(diplomatRuntime.internalConstructor, deref) }); + structObj.length = diplomatRuntime.readOption(wasm, lengthDeref, 4, (wasm, offset) => { const deref = diplomatRuntime.enumDiscriminant(wasm, offset); return new DateTimeLength(diplomatRuntime.internalConstructor, deref) }); const dateFieldsDeref = ptr + 8; structObj.dateFields = diplomatRuntime.readOption(wasm, dateFieldsDeref, 4, (wasm, offset) => { const deref = diplomatRuntime.enumDiscriminant(wasm, offset); return new DateFields(diplomatRuntime.internalConstructor, deref) }); const timePrecisionDeref = ptr + 16; diff --git a/ffi/capi/bindings/js/DateTimeFormatter.d.ts b/ffi/capi/bindings/js/DateTimeFormatter.d.ts new file mode 100644 index 00000000000..ddfcbd2fd54 --- /dev/null +++ b/ffi/capi/bindings/js/DateTimeFormatter.d.ts @@ -0,0 +1,41 @@ +// generated by diplomat-tool +import type { DateTimeAlignment } from "./DateTimeAlignment" +import type { DateTimeFieldSetBuilder } from "./DateTimeFieldSetBuilder" +import type { DateTimeFieldSetBuilder_obj } from "./DateTimeFieldSetBuilder" +import type { DateTimeFormatterBuildOrLoadError } from "./DateTimeFormatterBuildOrLoadError" +import type { DateTimeFormatterLoadError } from "./DateTimeFormatterLoadError" +import type { DateTimeLength } from "./DateTimeLength" +import type { IsoDate } from "./IsoDate" +import type { Locale } from "./Locale" +import type { Time } from "./Time" +import type { TimePrecision } from "./TimePrecision" +import type { YearStyle } from "./YearStyle" +import type { pointer, codepoint } from "./diplomat-runtime.d.ts"; + + +/** See the [Rust documentation for `DateTimeFormatter`](https://docs.rs/icu/latest/icu/datetime/type.DateTimeFormatter.html) for more information. +*/ + + +export class DateTimeFormatter { + + get ffiValue(): pointer; + + static createFromBuilder(locale: Locale, builder: DateTimeFieldSetBuilder_obj): DateTimeFormatter; + + static createDt(locale: Locale, length: DateTimeLength, timePrecision: TimePrecision, alignment: DateTimeAlignment): DateTimeFormatter; + + static createMdt(locale: Locale, length: DateTimeLength, timePrecision: TimePrecision, alignment: DateTimeAlignment): DateTimeFormatter; + + static createYmdt(locale: Locale, length: DateTimeLength, timePrecision: TimePrecision, alignment: DateTimeAlignment, yearStyle: YearStyle): DateTimeFormatter; + + static createDet(locale: Locale, length: DateTimeLength, timePrecision: TimePrecision, alignment: DateTimeAlignment): DateTimeFormatter; + + static createMdet(locale: Locale, length: DateTimeLength, timePrecision: TimePrecision, alignment: DateTimeAlignment): DateTimeFormatter; + + static createYmdet(locale: Locale, length: DateTimeLength, timePrecision: TimePrecision, alignment: DateTimeAlignment, yearStyle: YearStyle): DateTimeFormatter; + + static createEt(locale: Locale, length: DateTimeLength, timePrecision: TimePrecision, alignment: DateTimeAlignment): DateTimeFormatter; + + formatIso(date: IsoDate, time: Time): string; +} \ No newline at end of file diff --git a/ffi/capi/bindings/js/NeoDateTimeFormatter.mjs b/ffi/capi/bindings/js/DateTimeFormatter.mjs similarity index 68% rename from ffi/capi/bindings/js/NeoDateTimeFormatter.mjs rename to ffi/capi/bindings/js/DateTimeFormatter.mjs index 75d24801ae4..47423e0e8f2 100644 --- a/ffi/capi/bindings/js/NeoDateTimeFormatter.mjs +++ b/ffi/capi/bindings/js/DateTimeFormatter.mjs @@ -3,9 +3,9 @@ import { DateTimeAlignment } from "./DateTimeAlignment.mjs" import { DateTimeFieldSetBuilder } from "./DateTimeFieldSetBuilder.mjs" import { DateTimeFormatterBuildOrLoadError } from "./DateTimeFormatterBuildOrLoadError.mjs" import { DateTimeFormatterLoadError } from "./DateTimeFormatterLoadError.mjs" +import { DateTimeLength } from "./DateTimeLength.mjs" import { IsoDate } from "./IsoDate.mjs" import { Locale } from "./Locale.mjs" -import { NeoDateTimeLength } from "./NeoDateTimeLength.mjs" import { Time } from "./Time.mjs" import { TimePrecision } from "./TimePrecision.mjs" import { YearStyle } from "./YearStyle.mjs" @@ -15,11 +15,11 @@ import * as diplomatRuntime from "./diplomat-runtime.mjs"; /** See the [Rust documentation for `DateTimeFormatter`](https://docs.rs/icu/latest/icu/datetime/type.DateTimeFormatter.html) for more information. */ -const NeoDateTimeFormatter_box_destroy_registry = new FinalizationRegistry((ptr) => { - wasm.icu4x_NeoDateTimeFormatter_destroy_mv1(ptr); +const DateTimeFormatter_box_destroy_registry = new FinalizationRegistry((ptr) => { + wasm.icu4x_DateTimeFormatter_destroy_mv1(ptr); }); -export class NeoDateTimeFormatter { +export class DateTimeFormatter { // Internal ptr reference: #ptr = null; @@ -30,7 +30,7 @@ export class NeoDateTimeFormatter { #internalConstructor(symbol, ptr, selfEdge) { if (symbol !== diplomatRuntime.internalConstructor) { - console.error("NeoDateTimeFormatter is an Opaque type. You cannot call its constructor."); + console.error("DateTimeFormatter is an Opaque type. You cannot call its constructor."); return; } @@ -39,7 +39,7 @@ export class NeoDateTimeFormatter { // Are we being borrowed? If not, we can register. if (this.#selfEdge.length === 0) { - NeoDateTimeFormatter_box_destroy_registry.register(this, this.#ptr); + DateTimeFormatter_box_destroy_registry.register(this, this.#ptr); } return this; @@ -53,14 +53,14 @@ export class NeoDateTimeFormatter { const diplomatReceive = new diplomatRuntime.DiplomatReceiveBuf(wasm, 5, 4, true); - const result = wasm.icu4x_NeoDateTimeFormatter_create_from_builder_mv1(diplomatReceive.buffer, locale.ffiValue, ...DateTimeFieldSetBuilder._fromSuppliedValue(diplomatRuntime.internalConstructor, builder)._intoFFI(functionCleanupArena, {})); + const result = wasm.icu4x_DateTimeFormatter_create_from_builder_mv1(diplomatReceive.buffer, locale.ffiValue, ...DateTimeFieldSetBuilder._fromSuppliedValue(diplomatRuntime.internalConstructor, builder)._intoFFI(functionCleanupArena, {})); try { if (!diplomatReceive.resultFlag) { const cause = new DateTimeFormatterBuildOrLoadError(diplomatRuntime.internalConstructor, diplomatRuntime.enumDiscriminant(wasm, diplomatReceive.buffer)); throw new globalThis.Error('DateTimeFormatterBuildOrLoadError: ' + cause.value, { cause }); } - return new NeoDateTimeFormatter(diplomatRuntime.internalConstructor, diplomatRuntime.ptrRead(wasm, diplomatReceive.buffer), []); + return new DateTimeFormatter(diplomatRuntime.internalConstructor, diplomatRuntime.ptrRead(wasm, diplomatReceive.buffer), []); } finally { @@ -73,14 +73,14 @@ export class NeoDateTimeFormatter { static createDt(locale, length, timePrecision, alignment) { const diplomatReceive = new diplomatRuntime.DiplomatReceiveBuf(wasm, 5, 4, true); - const result = wasm.icu4x_NeoDateTimeFormatter_create_dt_mv1(diplomatReceive.buffer, locale.ffiValue, length.ffiValue, timePrecision.ffiValue, alignment.ffiValue); + const result = wasm.icu4x_DateTimeFormatter_create_dt_mv1(diplomatReceive.buffer, locale.ffiValue, length.ffiValue, timePrecision.ffiValue, alignment.ffiValue); try { if (!diplomatReceive.resultFlag) { const cause = new DateTimeFormatterLoadError(diplomatRuntime.internalConstructor, diplomatRuntime.enumDiscriminant(wasm, diplomatReceive.buffer)); throw new globalThis.Error('DateTimeFormatterLoadError: ' + cause.value, { cause }); } - return new NeoDateTimeFormatter(diplomatRuntime.internalConstructor, diplomatRuntime.ptrRead(wasm, diplomatReceive.buffer), []); + return new DateTimeFormatter(diplomatRuntime.internalConstructor, diplomatRuntime.ptrRead(wasm, diplomatReceive.buffer), []); } finally { @@ -91,14 +91,14 @@ export class NeoDateTimeFormatter { static createMdt(locale, length, timePrecision, alignment) { const diplomatReceive = new diplomatRuntime.DiplomatReceiveBuf(wasm, 5, 4, true); - const result = wasm.icu4x_NeoDateTimeFormatter_create_mdt_mv1(diplomatReceive.buffer, locale.ffiValue, length.ffiValue, timePrecision.ffiValue, alignment.ffiValue); + const result = wasm.icu4x_DateTimeFormatter_create_mdt_mv1(diplomatReceive.buffer, locale.ffiValue, length.ffiValue, timePrecision.ffiValue, alignment.ffiValue); try { if (!diplomatReceive.resultFlag) { const cause = new DateTimeFormatterLoadError(diplomatRuntime.internalConstructor, diplomatRuntime.enumDiscriminant(wasm, diplomatReceive.buffer)); throw new globalThis.Error('DateTimeFormatterLoadError: ' + cause.value, { cause }); } - return new NeoDateTimeFormatter(diplomatRuntime.internalConstructor, diplomatRuntime.ptrRead(wasm, diplomatReceive.buffer), []); + return new DateTimeFormatter(diplomatRuntime.internalConstructor, diplomatRuntime.ptrRead(wasm, diplomatReceive.buffer), []); } finally { @@ -109,14 +109,14 @@ export class NeoDateTimeFormatter { static createYmdt(locale, length, timePrecision, alignment, yearStyle) { const diplomatReceive = new diplomatRuntime.DiplomatReceiveBuf(wasm, 5, 4, true); - const result = wasm.icu4x_NeoDateTimeFormatter_create_ymdt_mv1(diplomatReceive.buffer, locale.ffiValue, length.ffiValue, timePrecision.ffiValue, alignment.ffiValue, yearStyle.ffiValue); + const result = wasm.icu4x_DateTimeFormatter_create_ymdt_mv1(diplomatReceive.buffer, locale.ffiValue, length.ffiValue, timePrecision.ffiValue, alignment.ffiValue, yearStyle.ffiValue); try { if (!diplomatReceive.resultFlag) { const cause = new DateTimeFormatterLoadError(diplomatRuntime.internalConstructor, diplomatRuntime.enumDiscriminant(wasm, diplomatReceive.buffer)); throw new globalThis.Error('DateTimeFormatterLoadError: ' + cause.value, { cause }); } - return new NeoDateTimeFormatter(diplomatRuntime.internalConstructor, diplomatRuntime.ptrRead(wasm, diplomatReceive.buffer), []); + return new DateTimeFormatter(diplomatRuntime.internalConstructor, diplomatRuntime.ptrRead(wasm, diplomatReceive.buffer), []); } finally { @@ -127,14 +127,14 @@ export class NeoDateTimeFormatter { static createDet(locale, length, timePrecision, alignment) { const diplomatReceive = new diplomatRuntime.DiplomatReceiveBuf(wasm, 5, 4, true); - const result = wasm.icu4x_NeoDateTimeFormatter_create_det_mv1(diplomatReceive.buffer, locale.ffiValue, length.ffiValue, timePrecision.ffiValue, alignment.ffiValue); + const result = wasm.icu4x_DateTimeFormatter_create_det_mv1(diplomatReceive.buffer, locale.ffiValue, length.ffiValue, timePrecision.ffiValue, alignment.ffiValue); try { if (!diplomatReceive.resultFlag) { const cause = new DateTimeFormatterLoadError(diplomatRuntime.internalConstructor, diplomatRuntime.enumDiscriminant(wasm, diplomatReceive.buffer)); throw new globalThis.Error('DateTimeFormatterLoadError: ' + cause.value, { cause }); } - return new NeoDateTimeFormatter(diplomatRuntime.internalConstructor, diplomatRuntime.ptrRead(wasm, diplomatReceive.buffer), []); + return new DateTimeFormatter(diplomatRuntime.internalConstructor, diplomatRuntime.ptrRead(wasm, diplomatReceive.buffer), []); } finally { @@ -145,14 +145,14 @@ export class NeoDateTimeFormatter { static createMdet(locale, length, timePrecision, alignment) { const diplomatReceive = new diplomatRuntime.DiplomatReceiveBuf(wasm, 5, 4, true); - const result = wasm.icu4x_NeoDateTimeFormatter_create_mdet_mv1(diplomatReceive.buffer, locale.ffiValue, length.ffiValue, timePrecision.ffiValue, alignment.ffiValue); + const result = wasm.icu4x_DateTimeFormatter_create_mdet_mv1(diplomatReceive.buffer, locale.ffiValue, length.ffiValue, timePrecision.ffiValue, alignment.ffiValue); try { if (!diplomatReceive.resultFlag) { const cause = new DateTimeFormatterLoadError(diplomatRuntime.internalConstructor, diplomatRuntime.enumDiscriminant(wasm, diplomatReceive.buffer)); throw new globalThis.Error('DateTimeFormatterLoadError: ' + cause.value, { cause }); } - return new NeoDateTimeFormatter(diplomatRuntime.internalConstructor, diplomatRuntime.ptrRead(wasm, diplomatReceive.buffer), []); + return new DateTimeFormatter(diplomatRuntime.internalConstructor, diplomatRuntime.ptrRead(wasm, diplomatReceive.buffer), []); } finally { @@ -163,14 +163,14 @@ export class NeoDateTimeFormatter { static createYmdet(locale, length, timePrecision, alignment, yearStyle) { const diplomatReceive = new diplomatRuntime.DiplomatReceiveBuf(wasm, 5, 4, true); - const result = wasm.icu4x_NeoDateTimeFormatter_create_ymdet_mv1(diplomatReceive.buffer, locale.ffiValue, length.ffiValue, timePrecision.ffiValue, alignment.ffiValue, yearStyle.ffiValue); + const result = wasm.icu4x_DateTimeFormatter_create_ymdet_mv1(diplomatReceive.buffer, locale.ffiValue, length.ffiValue, timePrecision.ffiValue, alignment.ffiValue, yearStyle.ffiValue); try { if (!diplomatReceive.resultFlag) { const cause = new DateTimeFormatterLoadError(diplomatRuntime.internalConstructor, diplomatRuntime.enumDiscriminant(wasm, diplomatReceive.buffer)); throw new globalThis.Error('DateTimeFormatterLoadError: ' + cause.value, { cause }); } - return new NeoDateTimeFormatter(diplomatRuntime.internalConstructor, diplomatRuntime.ptrRead(wasm, diplomatReceive.buffer), []); + return new DateTimeFormatter(diplomatRuntime.internalConstructor, diplomatRuntime.ptrRead(wasm, diplomatReceive.buffer), []); } finally { @@ -181,14 +181,14 @@ export class NeoDateTimeFormatter { static createEt(locale, length, timePrecision, alignment) { const diplomatReceive = new diplomatRuntime.DiplomatReceiveBuf(wasm, 5, 4, true); - const result = wasm.icu4x_NeoDateTimeFormatter_create_et_mv1(diplomatReceive.buffer, locale.ffiValue, length.ffiValue, timePrecision.ffiValue, alignment.ffiValue); + const result = wasm.icu4x_DateTimeFormatter_create_et_mv1(diplomatReceive.buffer, locale.ffiValue, length.ffiValue, timePrecision.ffiValue, alignment.ffiValue); try { if (!diplomatReceive.resultFlag) { const cause = new DateTimeFormatterLoadError(diplomatRuntime.internalConstructor, diplomatRuntime.enumDiscriminant(wasm, diplomatReceive.buffer)); throw new globalThis.Error('DateTimeFormatterLoadError: ' + cause.value, { cause }); } - return new NeoDateTimeFormatter(diplomatRuntime.internalConstructor, diplomatRuntime.ptrRead(wasm, diplomatReceive.buffer), []); + return new DateTimeFormatter(diplomatRuntime.internalConstructor, diplomatRuntime.ptrRead(wasm, diplomatReceive.buffer), []); } finally { @@ -198,7 +198,7 @@ export class NeoDateTimeFormatter { formatIso(date, time) { const write = new diplomatRuntime.DiplomatWriteBuf(wasm); - wasm.icu4x_NeoDateTimeFormatter_format_iso_mv1(this.ffiValue, date.ffiValue, time.ffiValue, write.buffer); + wasm.icu4x_DateTimeFormatter_format_iso_mv1(this.ffiValue, date.ffiValue, time.ffiValue, write.buffer); try { return write.readString8(); diff --git a/ffi/capi/bindings/js/NeoDateTimeFormatter.d.ts b/ffi/capi/bindings/js/NeoDateTimeFormatter.d.ts deleted file mode 100644 index 48b3f342ae6..00000000000 --- a/ffi/capi/bindings/js/NeoDateTimeFormatter.d.ts +++ /dev/null @@ -1,41 +0,0 @@ -// generated by diplomat-tool -import type { DateTimeAlignment } from "./DateTimeAlignment" -import type { DateTimeFieldSetBuilder } from "./DateTimeFieldSetBuilder" -import type { DateTimeFieldSetBuilder_obj } from "./DateTimeFieldSetBuilder" -import type { DateTimeFormatterBuildOrLoadError } from "./DateTimeFormatterBuildOrLoadError" -import type { DateTimeFormatterLoadError } from "./DateTimeFormatterLoadError" -import type { IsoDate } from "./IsoDate" -import type { Locale } from "./Locale" -import type { NeoDateTimeLength } from "./NeoDateTimeLength" -import type { Time } from "./Time" -import type { TimePrecision } from "./TimePrecision" -import type { YearStyle } from "./YearStyle" -import type { pointer, codepoint } from "./diplomat-runtime.d.ts"; - - -/** See the [Rust documentation for `DateTimeFormatter`](https://docs.rs/icu/latest/icu/datetime/type.DateTimeFormatter.html) for more information. -*/ - - -export class NeoDateTimeFormatter { - - get ffiValue(): pointer; - - static createFromBuilder(locale: Locale, builder: DateTimeFieldSetBuilder_obj): NeoDateTimeFormatter; - - static createDt(locale: Locale, length: NeoDateTimeLength, timePrecision: TimePrecision, alignment: DateTimeAlignment): NeoDateTimeFormatter; - - static createMdt(locale: Locale, length: NeoDateTimeLength, timePrecision: TimePrecision, alignment: DateTimeAlignment): NeoDateTimeFormatter; - - static createYmdt(locale: Locale, length: NeoDateTimeLength, timePrecision: TimePrecision, alignment: DateTimeAlignment, yearStyle: YearStyle): NeoDateTimeFormatter; - - static createDet(locale: Locale, length: NeoDateTimeLength, timePrecision: TimePrecision, alignment: DateTimeAlignment): NeoDateTimeFormatter; - - static createMdet(locale: Locale, length: NeoDateTimeLength, timePrecision: TimePrecision, alignment: DateTimeAlignment): NeoDateTimeFormatter; - - static createYmdet(locale: Locale, length: NeoDateTimeLength, timePrecision: TimePrecision, alignment: DateTimeAlignment, yearStyle: YearStyle): NeoDateTimeFormatter; - - static createEt(locale: Locale, length: NeoDateTimeLength, timePrecision: TimePrecision, alignment: DateTimeAlignment): NeoDateTimeFormatter; - - formatIso(date: IsoDate, time: Time): string; -} \ No newline at end of file diff --git a/ffi/capi/bindings/js/NeoDateTimeLength.d.ts b/ffi/capi/bindings/js/NeoDateTimeLength.d.ts deleted file mode 100644 index e9b8264d899..00000000000 --- a/ffi/capi/bindings/js/NeoDateTimeLength.d.ts +++ /dev/null @@ -1,23 +0,0 @@ -// generated by diplomat-tool -import type { pointer, codepoint } from "./diplomat-runtime.d.ts"; - - -/** See the [Rust documentation for `Length`](https://docs.rs/icu/latest/icu/datetime/enum.Length.html) for more information. -*/ - - -export class NeoDateTimeLength { - - - static fromValue(value : NeoDateTimeLength | string) : NeoDateTimeLength; - - get value() : string; - - get ffiValue() : number; - - static Long : NeoDateTimeLength; - static Medium : NeoDateTimeLength; - static Short : NeoDateTimeLength; - - constructor(value: NeoDateTimeLength | string ); -} \ No newline at end of file diff --git a/ffi/capi/bindings/js/NeoDateTimeLength.mjs b/ffi/capi/bindings/js/NeoDateTimeLength.mjs deleted file mode 100644 index 067576a5636..00000000000 --- a/ffi/capi/bindings/js/NeoDateTimeLength.mjs +++ /dev/null @@ -1,73 +0,0 @@ -// generated by diplomat-tool -import wasm from "./diplomat-wasm.mjs"; -import * as diplomatRuntime from "./diplomat-runtime.mjs"; - - -/** See the [Rust documentation for `Length`](https://docs.rs/icu/latest/icu/datetime/enum.Length.html) for more information. -*/ - - -export class NeoDateTimeLength { - - #value = undefined; - - static #values = new Map([ - ["Long", 0], - ["Medium", 1], - ["Short", 2] - ]); - - static getAllEntries() { - return NeoDateTimeLength.#values.entries(); - } - - #internalConstructor(value) { - if (arguments.length > 1 && arguments[0] === diplomatRuntime.internalConstructor) { - // We pass in two internalConstructor arguments to create *new* - // instances of this type, otherwise the enums are treated as singletons. - if (arguments[1] === diplomatRuntime.internalConstructor ) { - this.#value = arguments[2]; - return this; - } - return NeoDateTimeLength.#objectValues[arguments[1]]; - } - - if (value instanceof NeoDateTimeLength) { - return value; - } - - let intVal = NeoDateTimeLength.#values.get(value); - - // Nullish check, checks for null or undefined - if (intVal != null) { - return NeoDateTimeLength.#objectValues[intVal]; - } - - throw TypeError(value + " is not a NeoDateTimeLength and does not correspond to any of its enumerator values."); - } - - static fromValue(value) { - return new NeoDateTimeLength(value); - } - - get value() { - return [...NeoDateTimeLength.#values.keys()][this.#value]; - } - - get ffiValue() { - return this.#value; - } - static #objectValues = [ - new NeoDateTimeLength(diplomatRuntime.internalConstructor, diplomatRuntime.internalConstructor, 0), - new NeoDateTimeLength(diplomatRuntime.internalConstructor, diplomatRuntime.internalConstructor, 1), - new NeoDateTimeLength(diplomatRuntime.internalConstructor, diplomatRuntime.internalConstructor, 2), - ]; - - static Long = NeoDateTimeLength.#objectValues[0]; - static Medium = NeoDateTimeLength.#objectValues[1]; - static Short = NeoDateTimeLength.#objectValues[2]; - - constructor(value) { - return this.#internalConstructor(...arguments) - } -} \ No newline at end of file diff --git a/ffi/capi/bindings/js/index.d.ts b/ffi/capi/bindings/js/index.d.ts index 2516e74dd57..1704456f27f 100644 --- a/ffi/capi/bindings/js/index.d.ts +++ b/ffi/capi/bindings/js/index.d.ts @@ -100,7 +100,7 @@ export { LocaleDirectionality } from "./LocaleDirectionality" export { Logger } from "./Logger" -export { NeoDateTimeFormatter } from "./NeoDateTimeFormatter" +export { DateTimeFormatter } from "./DateTimeFormatter" export { ComposingNormalizer } from "./ComposingNormalizer" @@ -264,8 +264,6 @@ export { DateFields } from "./DateFields" export { DateTimeAlignment } from "./DateTimeAlignment" -export { NeoDateTimeLength } from "./NeoDateTimeLength" - export { TimePrecision } from "./TimePrecision" export { YearStyle } from "./YearStyle" diff --git a/ffi/capi/bindings/js/index.mjs b/ffi/capi/bindings/js/index.mjs index 228a164ddcb..eb1d984c82d 100644 --- a/ffi/capi/bindings/js/index.mjs +++ b/ffi/capi/bindings/js/index.mjs @@ -98,7 +98,7 @@ export { LocaleDirectionality } from "./LocaleDirectionality.mjs" export { Logger } from "./Logger.mjs" -export { NeoDateTimeFormatter } from "./NeoDateTimeFormatter.mjs" +export { DateTimeFormatter } from "./DateTimeFormatter.mjs" export { ComposingNormalizer } from "./ComposingNormalizer.mjs" @@ -262,8 +262,6 @@ export { DateFields } from "./DateFields.mjs" export { DateTimeAlignment } from "./DateTimeAlignment.mjs" -export { NeoDateTimeLength } from "./NeoDateTimeLength.mjs" - export { TimePrecision } from "./TimePrecision.mjs" export { YearStyle } from "./YearStyle.mjs" diff --git a/ffi/capi/src/neo_datetime.rs b/ffi/capi/src/neo_datetime.rs index 4df4ed5e4bb..964fcf2e94f 100644 --- a/ffi/capi/src/neo_datetime.rs +++ b/ffi/capi/src/neo_datetime.rs @@ -13,7 +13,7 @@ pub mod ffi { use icu_datetime::fieldsets::enums::CompositeDateTimeFieldSet; use writeable::Writeable; - use crate::{date::ffi::IsoDate, time::ffi::Time}; + use crate::{date::ffi::IsoDate, time::ffi::Time, datetime_formatter::ffi::DateTimeLength}; #[cfg(any(feature = "compiled_data", feature = "buffer_provider"))] use crate::{ @@ -21,14 +21,6 @@ pub mod ffi { locale_core::ffi::Locale, }; - #[diplomat::enum_convert(icu_datetime::options::Length, needs_wildcard)] - #[diplomat::rust_link(icu::datetime::Length, Enum)] - pub enum NeoDateTimeLength { - Long, - Medium, - Short, - } - #[diplomat::enum_convert(icu_datetime::options::Alignment, needs_wildcard)] #[diplomat::rust_link(icu::datetime::Alignment, Enum)] pub enum DateTimeAlignment { @@ -90,7 +82,7 @@ pub mod ffi { #[diplomat::rust_link(icu::datetime::builder::FieldSetBuilder, Enum)] pub struct DateTimeFieldSetBuilder { - pub length: DiplomatOption, + pub length: DiplomatOption, pub date_fields: DiplomatOption, pub time_precision: DiplomatOption, pub zone_style: DiplomatOption, @@ -100,9 +92,9 @@ pub mod ffi { #[diplomat::opaque] #[diplomat::rust_link(icu::datetime::DateTimeFormatter, Typedef)] - pub struct NeoDateTimeFormatter(pub icu_datetime::DateTimeFormatter); + pub struct DateTimeFormatter(pub icu_datetime::DateTimeFormatter); - impl NeoDateTimeFormatter { + impl DateTimeFormatter { #[diplomat::attr(all(supports = fallible_constructors, supports = named_constructors), named_constructor = "dt")] #[diplomat::rust_link(icu::datetime::fieldsets::DateTimeFormatter::try_new, FnInStruct)] #[diplomat::demo(default_constructor)] @@ -110,11 +102,11 @@ pub mod ffi { pub fn create_from_builder( locale: &Locale, builder: DateTimeFieldSetBuilder, - ) -> Result, DateTimeFormatterBuildOrLoadError> { + ) -> Result, DateTimeFormatterBuildOrLoadError> { let prefs = (&locale.0).into(); let builder = icu_datetime::fieldsets::builder::FieldSetBuilder::from(builder); let options = builder.build_composite_datetime()?; - Ok(Box::new(NeoDateTimeFormatter( + Ok(Box::new(DateTimeFormatter( icu_datetime::DateTimeFormatter::try_new(prefs, options)?, ))) } @@ -124,15 +116,15 @@ pub mod ffi { #[cfg(feature = "compiled_data")] pub fn create_dt( locale: &Locale, - length: NeoDateTimeLength, + length: DateTimeLength, time_precision: TimePrecision, alignment: DateTimeAlignment, - ) -> Result, DateTimeFormatterLoadError> { + ) -> Result, DateTimeFormatterLoadError> { let prefs = (&locale.0).into(); let options = icu_datetime::fieldsets::DT::with_length(length.into()) .with_alignment(alignment.into()) .with_time_precision(time_precision.into()); - Ok(Box::new(NeoDateTimeFormatter( + Ok(Box::new(DateTimeFormatter( icu_datetime::DateTimeFormatter::try_new(prefs, options)?.with_fset(), ))) } @@ -142,15 +134,15 @@ pub mod ffi { #[cfg(feature = "compiled_data")] pub fn create_mdt( locale: &Locale, - length: NeoDateTimeLength, + length: DateTimeLength, time_precision: TimePrecision, alignment: DateTimeAlignment, - ) -> Result, DateTimeFormatterLoadError> { + ) -> Result, DateTimeFormatterLoadError> { let prefs = (&locale.0).into(); let options = icu_datetime::fieldsets::MDT::with_length(length.into()) .with_alignment(alignment.into()) .with_time_precision(time_precision.into()); - Ok(Box::new(NeoDateTimeFormatter( + Ok(Box::new(DateTimeFormatter( icu_datetime::DateTimeFormatter::try_new(prefs, options)?.with_fset(), ))) } @@ -160,17 +152,17 @@ pub mod ffi { #[cfg(feature = "compiled_data")] pub fn create_ymdt( locale: &Locale, - length: NeoDateTimeLength, + length: DateTimeLength, time_precision: TimePrecision, alignment: DateTimeAlignment, year_style: YearStyle, - ) -> Result, DateTimeFormatterLoadError> { + ) -> Result, DateTimeFormatterLoadError> { let prefs = (&locale.0).into(); let options = icu_datetime::fieldsets::YMDT::with_length(length.into()) .with_alignment(alignment.into()) .with_time_precision(time_precision.into()) .with_year_style(year_style.into()); - Ok(Box::new(NeoDateTimeFormatter( + Ok(Box::new(DateTimeFormatter( icu_datetime::DateTimeFormatter::try_new(prefs, options)?.with_fset(), ))) } @@ -180,15 +172,15 @@ pub mod ffi { #[cfg(feature = "compiled_data")] pub fn create_det( locale: &Locale, - length: NeoDateTimeLength, + length: DateTimeLength, time_precision: TimePrecision, alignment: DateTimeAlignment, - ) -> Result, DateTimeFormatterLoadError> { + ) -> Result, DateTimeFormatterLoadError> { let prefs = (&locale.0).into(); let options = icu_datetime::fieldsets::DET::with_length(length.into()) .with_alignment(alignment.into()) .with_time_precision(time_precision.into()); - Ok(Box::new(NeoDateTimeFormatter( + Ok(Box::new(DateTimeFormatter( icu_datetime::DateTimeFormatter::try_new(prefs, options)?.with_fset(), ))) } @@ -198,15 +190,15 @@ pub mod ffi { #[cfg(feature = "compiled_data")] pub fn create_mdet( locale: &Locale, - length: NeoDateTimeLength, + length: DateTimeLength, time_precision: TimePrecision, alignment: DateTimeAlignment, - ) -> Result, DateTimeFormatterLoadError> { + ) -> Result, DateTimeFormatterLoadError> { let prefs = (&locale.0).into(); let options = icu_datetime::fieldsets::MDET::with_length(length.into()) .with_alignment(alignment.into()) .with_time_precision(time_precision.into()); - Ok(Box::new(NeoDateTimeFormatter( + Ok(Box::new(DateTimeFormatter( icu_datetime::DateTimeFormatter::try_new(prefs, options)?.with_fset(), ))) } @@ -216,17 +208,17 @@ pub mod ffi { #[cfg(feature = "compiled_data")] pub fn create_ymdet( locale: &Locale, - length: NeoDateTimeLength, + length: DateTimeLength, time_precision: TimePrecision, alignment: DateTimeAlignment, year_style: YearStyle, - ) -> Result, DateTimeFormatterLoadError> { + ) -> Result, DateTimeFormatterLoadError> { let prefs = (&locale.0).into(); let options = icu_datetime::fieldsets::YMDET::with_length(length.into()) .with_alignment(alignment.into()) .with_time_precision(time_precision.into()) .with_year_style(year_style.into()); - Ok(Box::new(NeoDateTimeFormatter( + Ok(Box::new(DateTimeFormatter( icu_datetime::DateTimeFormatter::try_new(prefs, options)?.with_fset(), ))) } @@ -236,15 +228,15 @@ pub mod ffi { #[cfg(feature = "compiled_data")] pub fn create_et( locale: &Locale, - length: NeoDateTimeLength, + length: DateTimeLength, time_precision: TimePrecision, alignment: DateTimeAlignment, - ) -> Result, DateTimeFormatterLoadError> { + ) -> Result, DateTimeFormatterLoadError> { let prefs = (&locale.0).into(); let options = icu_datetime::fieldsets::ET::with_length(length.into()) .with_alignment(alignment.into()) .with_time_precision(time_precision.into()); - Ok(Box::new(NeoDateTimeFormatter( + Ok(Box::new(DateTimeFormatter( icu_datetime::DateTimeFormatter::try_new(prefs, options)?.with_fset(), ))) }