Skip to content

Commit

Permalink
Update diplomat
Browse files Browse the repository at this point in the history
  • Loading branch information
@Manishearth
Manishearth committed Aug 18, 2021
1 parent 245eb95 commit f4aa662
Show file tree
Hide file tree
Showing 11 changed files with 23 additions and 33 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build-test.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ jobs:
with:
command: install
# Keep this in sync with ffi/capi/Cargo.toml
args: --git https://github.com/rust-diplomat/diplomat.git --rev 3ac8c3e8e31353a2f3eb02d015eb23a1feb84b4d diplomat-tool
args: --git https://github.com/rust-diplomat/diplomat.git --rev 38cffa9bc2ef21d0aba89ed7d76236de4153248a diplomat-tool

- name: Build
uses: actions-rs/cargo@v1.0.1
Expand Down
6 changes: 3 additions & 3 deletions Cargo.lock
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions ffi/capi/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,8 @@ tinystr = { version = "0.4.10", features = ["alloc"], default-features = false }
writeable = { path = "../../utils/writeable/" }

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

# This cfg originates in dlmalloc/lib.rs
Expand Down
1 change: 0 additions & 1 deletion ffi/capi/include/result_void_ICU4XLocaleError.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ extern "C" {
#include "ICU4XLocaleError.h"
typedef struct locale_ffi_result_void_ICU4XLocaleError {
union {
uint8_t ok[0];
ICU4XLocaleError err;
};
bool is_ok;
Expand Down
4 changes: 0 additions & 4 deletions ffi/capi/include/result_void_void.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,6 @@
extern "C" {
#endif
typedef struct decimal_ffi_result_void_void {
union {
uint8_t ok[0];
uint8_t err[0];
};
bool is_ok;
} decimal_ffi_result_void_void;
#ifdef __cplusplus
Expand Down
2 changes: 1 addition & 1 deletion ffi/cpp/include/ICU4XFixedDecimalFormatOptions.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,6 @@ struct ICU4XFixedDecimalFormatOptions {

inline ICU4XFixedDecimalFormatOptions ICU4XFixedDecimalFormatOptions::default_() {
capi::ICU4XFixedDecimalFormatOptions diplomat_raw_struct_out_value = capi::ICU4XFixedDecimalFormatOptions_default();
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 }) };
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)) };
}
#endif
24 changes: 12 additions & 12 deletions ffi/cpp/include/ICU4XLocale.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ template<typename W> inline diplomat::result<std::monostate, ICU4XLocaleError> I
diplomat::result<std::monostate, ICU4XLocaleError> diplomat_result_out_value(diplomat_result_raw_out_value.is_ok);
if (diplomat_result_raw_out_value.is_ok) {
} else {
diplomat_result_out_value.set_err((std::move(ICU4XLocaleError{ diplomat_result_raw_out_value.err })));
diplomat_result_out_value.set_err((std::move(static_cast<ICU4XLocaleError>(diplomat_result_raw_out_value.err))));
}
return diplomat_result_out_value;
}
Expand All @@ -75,7 +75,7 @@ inline diplomat::result<std::string, ICU4XLocaleError> ICU4XLocale::basename() {
diplomat::result<std::monostate, ICU4XLocaleError> diplomat_result_out_value(diplomat_result_raw_out_value.is_ok);
if (diplomat_result_raw_out_value.is_ok) {
} else {
diplomat_result_out_value.set_err((std::move(ICU4XLocaleError{ diplomat_result_raw_out_value.err })));
diplomat_result_out_value.set_err((std::move(static_cast<ICU4XLocaleError>(diplomat_result_raw_out_value.err))));
}
return diplomat_result_out_value.replace_ok(std::move(diplomat_writeable_string));
}
Expand All @@ -85,7 +85,7 @@ template<typename W> inline diplomat::result<std::monostate, ICU4XLocaleError> I
diplomat::result<std::monostate, ICU4XLocaleError> diplomat_result_out_value(diplomat_result_raw_out_value.is_ok);
if (diplomat_result_raw_out_value.is_ok) {
} else {
diplomat_result_out_value.set_err((std::move(ICU4XLocaleError{ diplomat_result_raw_out_value.err })));
diplomat_result_out_value.set_err((std::move(static_cast<ICU4XLocaleError>(diplomat_result_raw_out_value.err))));
}
return diplomat_result_out_value;
}
Expand All @@ -96,7 +96,7 @@ inline diplomat::result<std::string, ICU4XLocaleError> ICU4XLocale::get_unicode_
diplomat::result<std::monostate, ICU4XLocaleError> diplomat_result_out_value(diplomat_result_raw_out_value.is_ok);
if (diplomat_result_raw_out_value.is_ok) {
} else {
diplomat_result_out_value.set_err((std::move(ICU4XLocaleError{ diplomat_result_raw_out_value.err })));
diplomat_result_out_value.set_err((std::move(static_cast<ICU4XLocaleError>(diplomat_result_raw_out_value.err))));
}
return diplomat_result_out_value.replace_ok(std::move(diplomat_writeable_string));
}
Expand All @@ -106,7 +106,7 @@ template<typename W> inline diplomat::result<std::monostate, ICU4XLocaleError> I
diplomat::result<std::monostate, ICU4XLocaleError> diplomat_result_out_value(diplomat_result_raw_out_value.is_ok);
if (diplomat_result_raw_out_value.is_ok) {
} else {
diplomat_result_out_value.set_err((std::move(ICU4XLocaleError{ diplomat_result_raw_out_value.err })));
diplomat_result_out_value.set_err((std::move(static_cast<ICU4XLocaleError>(diplomat_result_raw_out_value.err))));
}
return diplomat_result_out_value;
}
Expand All @@ -117,7 +117,7 @@ inline diplomat::result<std::string, ICU4XLocaleError> ICU4XLocale::language() {
diplomat::result<std::monostate, ICU4XLocaleError> diplomat_result_out_value(diplomat_result_raw_out_value.is_ok);
if (diplomat_result_raw_out_value.is_ok) {
} else {
diplomat_result_out_value.set_err((std::move(ICU4XLocaleError{ diplomat_result_raw_out_value.err })));
diplomat_result_out_value.set_err((std::move(static_cast<ICU4XLocaleError>(diplomat_result_raw_out_value.err))));
}
return diplomat_result_out_value.replace_ok(std::move(diplomat_writeable_string));
}
Expand All @@ -127,7 +127,7 @@ template<typename W> inline diplomat::result<std::monostate, ICU4XLocaleError> I
diplomat::result<std::monostate, ICU4XLocaleError> diplomat_result_out_value(diplomat_result_raw_out_value.is_ok);
if (diplomat_result_raw_out_value.is_ok) {
} else {
diplomat_result_out_value.set_err((std::move(ICU4XLocaleError{ diplomat_result_raw_out_value.err })));
diplomat_result_out_value.set_err((std::move(static_cast<ICU4XLocaleError>(diplomat_result_raw_out_value.err))));
}
return diplomat_result_out_value;
}
Expand All @@ -138,7 +138,7 @@ inline diplomat::result<std::string, ICU4XLocaleError> ICU4XLocale::region() {
diplomat::result<std::monostate, ICU4XLocaleError> diplomat_result_out_value(diplomat_result_raw_out_value.is_ok);
if (diplomat_result_raw_out_value.is_ok) {
} else {
diplomat_result_out_value.set_err((std::move(ICU4XLocaleError{ diplomat_result_raw_out_value.err })));
diplomat_result_out_value.set_err((std::move(static_cast<ICU4XLocaleError>(diplomat_result_raw_out_value.err))));
}
return diplomat_result_out_value.replace_ok(std::move(diplomat_writeable_string));
}
Expand All @@ -148,7 +148,7 @@ template<typename W> inline diplomat::result<std::monostate, ICU4XLocaleError> I
diplomat::result<std::monostate, ICU4XLocaleError> diplomat_result_out_value(diplomat_result_raw_out_value.is_ok);
if (diplomat_result_raw_out_value.is_ok) {
} else {
diplomat_result_out_value.set_err((std::move(ICU4XLocaleError{ diplomat_result_raw_out_value.err })));
diplomat_result_out_value.set_err((std::move(static_cast<ICU4XLocaleError>(diplomat_result_raw_out_value.err))));
}
return diplomat_result_out_value;
}
Expand All @@ -159,7 +159,7 @@ inline diplomat::result<std::string, ICU4XLocaleError> ICU4XLocale::script() {
diplomat::result<std::monostate, ICU4XLocaleError> diplomat_result_out_value(diplomat_result_raw_out_value.is_ok);
if (diplomat_result_raw_out_value.is_ok) {
} else {
diplomat_result_out_value.set_err((std::move(ICU4XLocaleError{ diplomat_result_raw_out_value.err })));
diplomat_result_out_value.set_err((std::move(static_cast<ICU4XLocaleError>(diplomat_result_raw_out_value.err))));
}
return diplomat_result_out_value.replace_ok(std::move(diplomat_writeable_string));
}
Expand All @@ -169,7 +169,7 @@ template<typename W> inline diplomat::result<std::monostate, ICU4XLocaleError> I
diplomat::result<std::monostate, ICU4XLocaleError> diplomat_result_out_value(diplomat_result_raw_out_value.is_ok);
if (diplomat_result_raw_out_value.is_ok) {
} else {
diplomat_result_out_value.set_err((std::move(ICU4XLocaleError{ diplomat_result_raw_out_value.err })));
diplomat_result_out_value.set_err((std::move(static_cast<ICU4XLocaleError>(diplomat_result_raw_out_value.err))));
}
return diplomat_result_out_value;
}
Expand All @@ -180,7 +180,7 @@ inline diplomat::result<std::string, ICU4XLocaleError> ICU4XLocale::tostring() {
diplomat::result<std::monostate, ICU4XLocaleError> diplomat_result_out_value(diplomat_result_raw_out_value.is_ok);
if (diplomat_result_raw_out_value.is_ok) {
} else {
diplomat_result_out_value.set_err((std::move(ICU4XLocaleError{ diplomat_result_raw_out_value.err })));
diplomat_result_out_value.set_err((std::move(static_cast<ICU4XLocaleError>(diplomat_result_raw_out_value.err))));
}
return diplomat_result_out_value.replace_ok(std::move(diplomat_writeable_string));
}
Expand Down
6 changes: 3 additions & 3 deletions ffi/cpp/include/ICU4XLocaleCanonicalizer.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,12 +50,12 @@ inline std::optional<ICU4XLocaleCanonicalizer> ICU4XLocaleCanonicalizer::create(
return diplomat_optional_out_value;
}
inline ICU4XCanonicalizationResult ICU4XLocaleCanonicalizer::canonicalize(ICU4XLocale& locale) {
return ICU4XCanonicalizationResult{ capi::ICU4XLocaleCanonicalizer_canonicalize(this->inner.get(), locale.AsFFIMut()) };
return static_cast<ICU4XCanonicalizationResult>(capi::ICU4XLocaleCanonicalizer_canonicalize(this->inner.get(), locale.AsFFIMut()));
}
inline ICU4XCanonicalizationResult ICU4XLocaleCanonicalizer::maximize(ICU4XLocale& locale) {
return ICU4XCanonicalizationResult{ capi::ICU4XLocaleCanonicalizer_maximize(this->inner.get(), locale.AsFFIMut()) };
return static_cast<ICU4XCanonicalizationResult>(capi::ICU4XLocaleCanonicalizer_maximize(this->inner.get(), locale.AsFFIMut()));
}
inline ICU4XCanonicalizationResult ICU4XLocaleCanonicalizer::minimize(ICU4XLocale& locale) {
return ICU4XCanonicalizationResult{ capi::ICU4XLocaleCanonicalizer_minimize(this->inner.get(), locale.AsFFIMut()) };
return static_cast<ICU4XCanonicalizationResult>(capi::ICU4XLocaleCanonicalizer_minimize(this->inner.get(), locale.AsFFIMut()));
}
#endif
2 changes: 1 addition & 1 deletion ffi/cpp/include/ICU4XPluralRules.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ inline ICU4XCreatePluralRulesResult ICU4XPluralRules::create(const ICU4XLocale&
return ICU4XCreatePluralRulesResult{ .rules = std::move(diplomat_optional_out_value_rules), .success = std::move(diplomat_raw_struct_out_value.success) };
}
inline ICU4XPluralCategory ICU4XPluralRules::select(const ICU4XPluralOperands& op) {
return ICU4XPluralCategory{ capi::ICU4XPluralRules_select(this->inner.get(), (capi::ICU4XPluralOperands*) &op) };
return static_cast<ICU4XPluralCategory>(capi::ICU4XPluralRules_select(this->inner.get(), (capi::ICU4XPluralOperands*) &op));
}
inline ICU4XPluralCategories ICU4XPluralRules::categories() {
capi::ICU4XPluralCategories diplomat_raw_struct_out_value = capi::ICU4XPluralRules_categories(this->inner.get());
Expand Down
1 change: 0 additions & 1 deletion ffi/cpp/include/result_void_ICU4XLocaleError.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ extern "C" {
#include "ICU4XLocaleError.h"
typedef struct locale_ffi_result_void_ICU4XLocaleError {
union {
uint8_t ok[0];
ICU4XLocaleError err;
};
bool is_ok;
Expand Down
4 changes: 0 additions & 4 deletions ffi/cpp/include/result_void_void.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,6 @@
extern "C" {
#endif
typedef struct decimal_ffi_result_void_void {
union {
uint8_t ok[0];
uint8_t err[0];
};
bool is_ok;
} decimal_ffi_result_void_void;
#ifdef __cplusplus
Expand Down

0 comments on commit f4aa662

Please sign in to comment.