Skip to content

Commit f4aa662

Browse files
ManishearthManishearth
committed
Update diplomat
1 parent 245eb95 commit f4aa662

11 files changed

+23
-33
lines changed

‎.github/workflows/build-test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ jobs:
150150
with:
151151
command: install
152152
# Keep this in sync with ffi/capi/Cargo.toml
153-
args: --git https://github.com/rust-diplomat/diplomat.git --rev 3ac8c3e8e31353a2f3eb02d015eb23a1feb84b4d diplomat-tool
153+
args: --git https://github.com/rust-diplomat/diplomat.git --rev 38cffa9bc2ef21d0aba89ed7d76236de4153248a diplomat-tool
154154

155155
- name: Build
156156
uses: actions-rs/[email protected]

‎Cargo.lock

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎ffi/capi/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,8 @@ tinystr = { version = "0.4.10", features = ["alloc"], default-features = false }
6767
writeable = { path = "../../utils/writeable/" }
6868

6969
# make sure to update GitHub actions to use the appropriate revision
70-
diplomat = { git = "https://github.com/rust-diplomat/diplomat", rev = "3ac8c3e8e31353a2f3eb02d015eb23a1feb84b4d" }
71-
diplomat-runtime = { git = "https://github.com/rust-diplomat/diplomat", rev = "3ac8c3e8e31353a2f3eb02d015eb23a1feb84b4d" }
70+
diplomat = { git = "https://github.com/rust-diplomat/diplomat", rev = "38cffa9bc2ef21d0aba89ed7d76236de4153248a" }
71+
diplomat-runtime = { git = "https://github.com/rust-diplomat/diplomat", rev = "38cffa9bc2ef21d0aba89ed7d76236de4153248a" }
7272
icu_testdata = { version = "0.3", path = "../../provider/testdata", default-features = false, features = ["static"], optional = true }
7373

7474
# This cfg originates in dlmalloc/lib.rs

‎ffi/capi/include/result_void_ICU4XLocaleError.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ extern "C" {
1212
#include "ICU4XLocaleError.h"
1313
typedef struct locale_ffi_result_void_ICU4XLocaleError {
1414
union {
15-
uint8_t ok[0];
1615
ICU4XLocaleError err;
1716
};
1817
bool is_ok;

‎ffi/capi/include/result_void_void.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,6 @@
1010
extern "C" {
1111
#endif
1212
typedef struct decimal_ffi_result_void_void {
13-
union {
14-
uint8_t ok[0];
15-
uint8_t err[0];
16-
};
1713
bool is_ok;
1814
} decimal_ffi_result_void_void;
1915
#ifdef __cplusplus

‎ffi/cpp/include/ICU4XFixedDecimalFormatOptions.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,6 @@ struct ICU4XFixedDecimalFormatOptions {
3232

3333
inline ICU4XFixedDecimalFormatOptions ICU4XFixedDecimalFormatOptions::default_() {
3434
capi::ICU4XFixedDecimalFormatOptions diplomat_raw_struct_out_value = capi::ICU4XFixedDecimalFormatOptions_default();
35-
return ICU4XFixedDecimalFormatOptions{ .grouping_strategy = std::move(ICU4XFixedDecimalGroupingStrategy{ diplomat_raw_struct_out_value.grouping_strategy }), .sign_display = std::move(ICU4XFixedDecimalSignDisplay{ diplomat_raw_struct_out_value.sign_display }) };
35+
return ICU4XFixedDecimalFormatOptions{ .grouping_strategy = std::move(static_cast<ICU4XFixedDecimalGroupingStrategy>(diplomat_raw_struct_out_value.grouping_strategy)), .sign_display = std::move(static_cast<ICU4XFixedDecimalSignDisplay>(diplomat_raw_struct_out_value.sign_display)) };
3636
}
3737
#endif

‎ffi/cpp/include/ICU4XLocale.hpp

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ template<typename W> inline diplomat::result<std::monostate, ICU4XLocaleError> I
6464
diplomat::result<std::monostate, ICU4XLocaleError> diplomat_result_out_value(diplomat_result_raw_out_value.is_ok);
6565
if (diplomat_result_raw_out_value.is_ok) {
6666
} else {
67-
diplomat_result_out_value.set_err((std::move(ICU4XLocaleError{ diplomat_result_raw_out_value.err })));
67+
diplomat_result_out_value.set_err((std::move(static_cast<ICU4XLocaleError>(diplomat_result_raw_out_value.err))));
6868
}
6969
return diplomat_result_out_value;
7070
}
@@ -75,7 +75,7 @@ inline diplomat::result<std::string, ICU4XLocaleError> ICU4XLocale::basename() {
7575
diplomat::result<std::monostate, ICU4XLocaleError> diplomat_result_out_value(diplomat_result_raw_out_value.is_ok);
7676
if (diplomat_result_raw_out_value.is_ok) {
7777
} else {
78-
diplomat_result_out_value.set_err((std::move(ICU4XLocaleError{ diplomat_result_raw_out_value.err })));
78+
diplomat_result_out_value.set_err((std::move(static_cast<ICU4XLocaleError>(diplomat_result_raw_out_value.err))));
7979
}
8080
return diplomat_result_out_value.replace_ok(std::move(diplomat_writeable_string));
8181
}
@@ -85,7 +85,7 @@ template<typename W> inline diplomat::result<std::monostate, ICU4XLocaleError> I
8585
diplomat::result<std::monostate, ICU4XLocaleError> diplomat_result_out_value(diplomat_result_raw_out_value.is_ok);
8686
if (diplomat_result_raw_out_value.is_ok) {
8787
} else {
88-
diplomat_result_out_value.set_err((std::move(ICU4XLocaleError{ diplomat_result_raw_out_value.err })));
88+
diplomat_result_out_value.set_err((std::move(static_cast<ICU4XLocaleError>(diplomat_result_raw_out_value.err))));
8989
}
9090
return diplomat_result_out_value;
9191
}
@@ -96,7 +96,7 @@ inline diplomat::result<std::string, ICU4XLocaleError> ICU4XLocale::get_unicode_
9696
diplomat::result<std::monostate, ICU4XLocaleError> diplomat_result_out_value(diplomat_result_raw_out_value.is_ok);
9797
if (diplomat_result_raw_out_value.is_ok) {
9898
} else {
99-
diplomat_result_out_value.set_err((std::move(ICU4XLocaleError{ diplomat_result_raw_out_value.err })));
99+
diplomat_result_out_value.set_err((std::move(static_cast<ICU4XLocaleError>(diplomat_result_raw_out_value.err))));
100100
}
101101
return diplomat_result_out_value.replace_ok(std::move(diplomat_writeable_string));
102102
}
@@ -106,7 +106,7 @@ template<typename W> inline diplomat::result<std::monostate, ICU4XLocaleError> I
106106
diplomat::result<std::monostate, ICU4XLocaleError> diplomat_result_out_value(diplomat_result_raw_out_value.is_ok);
107107
if (diplomat_result_raw_out_value.is_ok) {
108108
} else {
109-
diplomat_result_out_value.set_err((std::move(ICU4XLocaleError{ diplomat_result_raw_out_value.err })));
109+
diplomat_result_out_value.set_err((std::move(static_cast<ICU4XLocaleError>(diplomat_result_raw_out_value.err))));
110110
}
111111
return diplomat_result_out_value;
112112
}
@@ -117,7 +117,7 @@ inline diplomat::result<std::string, ICU4XLocaleError> ICU4XLocale::language() {
117117
diplomat::result<std::monostate, ICU4XLocaleError> diplomat_result_out_value(diplomat_result_raw_out_value.is_ok);
118118
if (diplomat_result_raw_out_value.is_ok) {
119119
} else {
120-
diplomat_result_out_value.set_err((std::move(ICU4XLocaleError{ diplomat_result_raw_out_value.err })));
120+
diplomat_result_out_value.set_err((std::move(static_cast<ICU4XLocaleError>(diplomat_result_raw_out_value.err))));
121121
}
122122
return diplomat_result_out_value.replace_ok(std::move(diplomat_writeable_string));
123123
}
@@ -127,7 +127,7 @@ template<typename W> inline diplomat::result<std::monostate, ICU4XLocaleError> I
127127
diplomat::result<std::monostate, ICU4XLocaleError> diplomat_result_out_value(diplomat_result_raw_out_value.is_ok);
128128
if (diplomat_result_raw_out_value.is_ok) {
129129
} else {
130-
diplomat_result_out_value.set_err((std::move(ICU4XLocaleError{ diplomat_result_raw_out_value.err })));
130+
diplomat_result_out_value.set_err((std::move(static_cast<ICU4XLocaleError>(diplomat_result_raw_out_value.err))));
131131
}
132132
return diplomat_result_out_value;
133133
}
@@ -138,7 +138,7 @@ inline diplomat::result<std::string, ICU4XLocaleError> ICU4XLocale::region() {
138138
diplomat::result<std::monostate, ICU4XLocaleError> diplomat_result_out_value(diplomat_result_raw_out_value.is_ok);
139139
if (diplomat_result_raw_out_value.is_ok) {
140140
} else {
141-
diplomat_result_out_value.set_err((std::move(ICU4XLocaleError{ diplomat_result_raw_out_value.err })));
141+
diplomat_result_out_value.set_err((std::move(static_cast<ICU4XLocaleError>(diplomat_result_raw_out_value.err))));
142142
}
143143
return diplomat_result_out_value.replace_ok(std::move(diplomat_writeable_string));
144144
}
@@ -148,7 +148,7 @@ template<typename W> inline diplomat::result<std::monostate, ICU4XLocaleError> I
148148
diplomat::result<std::monostate, ICU4XLocaleError> diplomat_result_out_value(diplomat_result_raw_out_value.is_ok);
149149
if (diplomat_result_raw_out_value.is_ok) {
150150
} else {
151-
diplomat_result_out_value.set_err((std::move(ICU4XLocaleError{ diplomat_result_raw_out_value.err })));
151+
diplomat_result_out_value.set_err((std::move(static_cast<ICU4XLocaleError>(diplomat_result_raw_out_value.err))));
152152
}
153153
return diplomat_result_out_value;
154154
}
@@ -159,7 +159,7 @@ inline diplomat::result<std::string, ICU4XLocaleError> ICU4XLocale::script() {
159159
diplomat::result<std::monostate, ICU4XLocaleError> diplomat_result_out_value(diplomat_result_raw_out_value.is_ok);
160160
if (diplomat_result_raw_out_value.is_ok) {
161161
} else {
162-
diplomat_result_out_value.set_err((std::move(ICU4XLocaleError{ diplomat_result_raw_out_value.err })));
162+
diplomat_result_out_value.set_err((std::move(static_cast<ICU4XLocaleError>(diplomat_result_raw_out_value.err))));
163163
}
164164
return diplomat_result_out_value.replace_ok(std::move(diplomat_writeable_string));
165165
}
@@ -169,7 +169,7 @@ template<typename W> inline diplomat::result<std::monostate, ICU4XLocaleError> I
169169
diplomat::result<std::monostate, ICU4XLocaleError> diplomat_result_out_value(diplomat_result_raw_out_value.is_ok);
170170
if (diplomat_result_raw_out_value.is_ok) {
171171
} else {
172-
diplomat_result_out_value.set_err((std::move(ICU4XLocaleError{ diplomat_result_raw_out_value.err })));
172+
diplomat_result_out_value.set_err((std::move(static_cast<ICU4XLocaleError>(diplomat_result_raw_out_value.err))));
173173
}
174174
return diplomat_result_out_value;
175175
}
@@ -180,7 +180,7 @@ inline diplomat::result<std::string, ICU4XLocaleError> ICU4XLocale::tostring() {
180180
diplomat::result<std::monostate, ICU4XLocaleError> diplomat_result_out_value(diplomat_result_raw_out_value.is_ok);
181181
if (diplomat_result_raw_out_value.is_ok) {
182182
} else {
183-
diplomat_result_out_value.set_err((std::move(ICU4XLocaleError{ diplomat_result_raw_out_value.err })));
183+
diplomat_result_out_value.set_err((std::move(static_cast<ICU4XLocaleError>(diplomat_result_raw_out_value.err))));
184184
}
185185
return diplomat_result_out_value.replace_ok(std::move(diplomat_writeable_string));
186186
}

‎ffi/cpp/include/ICU4XLocaleCanonicalizer.hpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,12 +50,12 @@ inline std::optional<ICU4XLocaleCanonicalizer> ICU4XLocaleCanonicalizer::create(
5050
return diplomat_optional_out_value;
5151
}
5252
inline ICU4XCanonicalizationResult ICU4XLocaleCanonicalizer::canonicalize(ICU4XLocale& locale) {
53-
return ICU4XCanonicalizationResult{ capi::ICU4XLocaleCanonicalizer_canonicalize(this->inner.get(), locale.AsFFIMut()) };
53+
return static_cast<ICU4XCanonicalizationResult>(capi::ICU4XLocaleCanonicalizer_canonicalize(this->inner.get(), locale.AsFFIMut()));
5454
}
5555
inline ICU4XCanonicalizationResult ICU4XLocaleCanonicalizer::maximize(ICU4XLocale& locale) {
56-
return ICU4XCanonicalizationResult{ capi::ICU4XLocaleCanonicalizer_maximize(this->inner.get(), locale.AsFFIMut()) };
56+
return static_cast<ICU4XCanonicalizationResult>(capi::ICU4XLocaleCanonicalizer_maximize(this->inner.get(), locale.AsFFIMut()));
5757
}
5858
inline ICU4XCanonicalizationResult ICU4XLocaleCanonicalizer::minimize(ICU4XLocale& locale) {
59-
return ICU4XCanonicalizationResult{ capi::ICU4XLocaleCanonicalizer_minimize(this->inner.get(), locale.AsFFIMut()) };
59+
return static_cast<ICU4XCanonicalizationResult>(capi::ICU4XLocaleCanonicalizer_minimize(this->inner.get(), locale.AsFFIMut()));
6060
}
6161
#endif

‎ffi/cpp/include/ICU4XPluralRules.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ inline ICU4XCreatePluralRulesResult ICU4XPluralRules::create(const ICU4XLocale&
5656
return ICU4XCreatePluralRulesResult{ .rules = std::move(diplomat_optional_out_value_rules), .success = std::move(diplomat_raw_struct_out_value.success) };
5757
}
5858
inline ICU4XPluralCategory ICU4XPluralRules::select(const ICU4XPluralOperands& op) {
59-
return ICU4XPluralCategory{ capi::ICU4XPluralRules_select(this->inner.get(), (capi::ICU4XPluralOperands*) &op) };
59+
return static_cast<ICU4XPluralCategory>(capi::ICU4XPluralRules_select(this->inner.get(), (capi::ICU4XPluralOperands*) &op));
6060
}
6161
inline ICU4XPluralCategories ICU4XPluralRules::categories() {
6262
capi::ICU4XPluralCategories diplomat_raw_struct_out_value = capi::ICU4XPluralRules_categories(this->inner.get());

‎ffi/cpp/include/result_void_ICU4XLocaleError.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ extern "C" {
1212
#include "ICU4XLocaleError.h"
1313
typedef struct locale_ffi_result_void_ICU4XLocaleError {
1414
union {
15-
uint8_t ok[0];
1615
ICU4XLocaleError err;
1716
};
1817
bool is_ok;

‎ffi/cpp/include/result_void_void.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,6 @@
1010
extern "C" {
1111
#endif
1212
typedef struct decimal_ffi_result_void_void {
13-
union {
14-
uint8_t ok[0];
15-
uint8_t err[0];
16-
};
1713
bool is_ok;
1814
} decimal_ffi_result_void_void;
1915
#ifdef __cplusplus

0 commit comments

Comments
 (0)