Bump diplomat (unicode-org#4477)

hsivonen · Dec 20, 2023 · 49a57c1 · 49a57c1
1 parent 9c72095
commit 49a57c1
Show file tree

Hide file tree

Showing 192 changed files with 204 additions and 200 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -14,6 +14,10 @@
       - Correctly handle chars (https://github.com/unicode-org/icu4x/pull/4349)
     - JS
       - Fixed a bug where slice length is computed incorrectly (https://github.com/rust-diplomat/diplomat/pull/372)
+      - Changed file extensions for better compatibility with nodejs modules (https://github.com/rust-diplomat/diplomat/pull/387)
+    - C++
+      - Fixed a bug where a result header defines a struct that shadows the class' name  (https://github.com/rust-diplomat/diplomat/pull/394)
+      - Add `expclicit` keyword to internal constructors (https://github.com/rust-diplomat/diplomat/pull/386)
 - Utilities
     - `yoke`
         - Remove `StableDeref` bound from `Yoke<Y, Option<C>>` methods (https://github.com/unicode-org/icu4x/pull/4457)

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -228,10 +228,10 @@ icu_benchmark_macros = { path = "tools/benchmark/macros" }
 
 # The version here can either be a `version = ".."` spec or `git = "https://github.com/rust-diplomat/diplomat", rev = ".."`
 # Diplomat must be published preceding a new ICU4X release but may use git versions in between
-diplomat = { git = "https://github.com/rust-diplomat/diplomat.git", rev = "60851360a4b6f163fe493ca117d0552905c54a38" }
-diplomat-runtime = { git = "https://github.com/rust-diplomat/diplomat.git", rev = "60851360a4b6f163fe493ca117d0552905c54a38" }
-diplomat_core = { git = "https://github.com/rust-diplomat/diplomat.git", rev = "60851360a4b6f163fe493ca117d0552905c54a38" }
-diplomat-tool = { git = "https://github.com/rust-diplomat/diplomat.git", rev = "60851360a4b6f163fe493ca117d0552905c54a38" }
+diplomat = { git = "https://github.com/rust-diplomat/diplomat.git", rev = "4bb7d034730b00bbb4bbb36e30fdc02c6481a667" }
+diplomat-runtime = { git = "https://github.com/rust-diplomat/diplomat.git", rev = "4bb7d034730b00bbb4bbb36e30fdc02c6481a667" }
+diplomat_core = { git = "https://github.com/rust-diplomat/diplomat.git", rev = "4bb7d034730b00bbb4bbb36e30fdc02c6481a667" }
+diplomat-tool = { git = "https://github.com/rust-diplomat/diplomat.git", rev = "4bb7d034730b00bbb4bbb36e30fdc02c6481a667" }
 
 # Size optimized builds
 [profile.release-opt-size]

diff --git a/ffi/capi/bindings/c/diplomat_result_box_ICU4XBcp47ToIanaMapper_ICU4XError.h b/ffi/capi/bindings/c/diplomat_result_box_ICU4XBcp47ToIanaMapper_ICU4XError.h
diff --git a/ffi/capi/bindings/c/diplomat_result_box_ICU4XBidi_ICU4XError.h b/ffi/capi/bindings/c/diplomat_result_box_ICU4XBidi_ICU4XError.h
diff --git a/ffi/capi/bindings/c/diplomat_result_box_ICU4XCalendar_ICU4XError.h b/ffi/capi/bindings/c/diplomat_result_box_ICU4XCalendar_ICU4XError.h
diff --git a/ffi/capi/bindings/c/diplomat_result_box_ICU4XCanonicalCombiningClassMap_ICU4XError.h b/ffi/capi/bindings/c/diplomat_result_box_ICU4XCanonicalCombiningClassMap_ICU4XError.h
diff --git a/ffi/capi/bindings/c/diplomat_result_box_ICU4XCanonicalComposition_ICU4XError.h b/ffi/capi/bindings/c/diplomat_result_box_ICU4XCanonicalComposition_ICU4XError.h
diff --git a/ffi/capi/bindings/c/diplomat_result_box_ICU4XCanonicalDecomposition_ICU4XError.h b/ffi/capi/bindings/c/diplomat_result_box_ICU4XCanonicalDecomposition_ICU4XError.h
diff --git a/ffi/capi/bindings/c/diplomat_result_box_ICU4XCaseMapCloser_ICU4XError.h b/ffi/capi/bindings/c/diplomat_result_box_ICU4XCaseMapCloser_ICU4XError.h
diff --git a/ffi/capi/bindings/c/diplomat_result_box_ICU4XCaseMapper_ICU4XError.h b/ffi/capi/bindings/c/diplomat_result_box_ICU4XCaseMapper_ICU4XError.h
diff --git a/ffi/capi/bindings/c/diplomat_result_box_ICU4XCodePointMapData16_ICU4XError.h b/ffi/capi/bindings/c/diplomat_result_box_ICU4XCodePointMapData16_ICU4XError.h
diff --git a/ffi/capi/bindings/c/diplomat_result_box_ICU4XCodePointMapData8_ICU4XError.h b/ffi/capi/bindings/c/diplomat_result_box_ICU4XCodePointMapData8_ICU4XError.h
diff --git a/ffi/capi/bindings/c/diplomat_result_box_ICU4XCodePointSetData_ICU4XError.h b/ffi/capi/bindings/c/diplomat_result_box_ICU4XCodePointSetData_ICU4XError.h
diff --git a/ffi/capi/bindings/c/diplomat_result_box_ICU4XCollator_ICU4XError.h b/ffi/capi/bindings/c/diplomat_result_box_ICU4XCollator_ICU4XError.h
diff --git a/ffi/capi/bindings/c/diplomat_result_box_ICU4XComposingNormalizer_ICU4XError.h b/ffi/capi/bindings/c/diplomat_result_box_ICU4XComposingNormalizer_ICU4XError.h
diff --git a/ffi/capi/bindings/c/diplomat_result_box_ICU4XCustomTimeZone_ICU4XError.h b/ffi/capi/bindings/c/diplomat_result_box_ICU4XCustomTimeZone_ICU4XError.h
diff --git a/ffi/capi/bindings/c/diplomat_result_box_ICU4XDataProvider_ICU4XError.h b/ffi/capi/bindings/c/diplomat_result_box_ICU4XDataProvider_ICU4XError.h
diff --git a/ffi/capi/bindings/c/diplomat_result_box_ICU4XDataStruct_ICU4XError.h b/ffi/capi/bindings/c/diplomat_result_box_ICU4XDataStruct_ICU4XError.h
diff --git a/ffi/capi/bindings/c/diplomat_result_box_ICU4XDateFormatter_ICU4XError.h b/ffi/capi/bindings/c/diplomat_result_box_ICU4XDateFormatter_ICU4XError.h
diff --git a/ffi/capi/bindings/c/diplomat_result_box_ICU4XDateTimeFormatter_ICU4XError.h b/ffi/capi/bindings/c/diplomat_result_box_ICU4XDateTimeFormatter_ICU4XError.h
diff --git a/ffi/capi/bindings/c/diplomat_result_box_ICU4XDateTime_ICU4XError.h b/ffi/capi/bindings/c/diplomat_result_box_ICU4XDateTime_ICU4XError.h
diff --git a/ffi/capi/bindings/c/diplomat_result_box_ICU4XDate_ICU4XError.h b/ffi/capi/bindings/c/diplomat_result_box_ICU4XDate_ICU4XError.h
diff --git a/ffi/capi/bindings/c/diplomat_result_box_ICU4XDecomposingNormalizer_ICU4XError.h b/ffi/capi/bindings/c/diplomat_result_box_ICU4XDecomposingNormalizer_ICU4XError.h
diff --git a/ffi/capi/bindings/c/diplomat_result_box_ICU4XFixedDecimalFormatter_ICU4XError.h b/ffi/capi/bindings/c/diplomat_result_box_ICU4XFixedDecimalFormatter_ICU4XError.h
diff --git a/ffi/capi/bindings/c/diplomat_result_box_ICU4XFixedDecimal_ICU4XError.h b/ffi/capi/bindings/c/diplomat_result_box_ICU4XFixedDecimal_ICU4XError.h
diff --git a/ffi/capi/bindings/c/diplomat_result_box_ICU4XGeneralCategoryNameToMaskMapper_ICU4XError.h b/ffi/capi/bindings/c/diplomat_result_box_ICU4XGeneralCategoryNameToMaskMapper_ICU4XError.h
diff --git a/ffi/capi/bindings/c/diplomat_result_box_ICU4XGraphemeClusterSegmenter_ICU4XError.h b/ffi/capi/bindings/c/diplomat_result_box_ICU4XGraphemeClusterSegmenter_ICU4XError.h
diff --git a/ffi/capi/bindings/c/diplomat_result_box_ICU4XGregorianDateFormatter_ICU4XError.h b/ffi/capi/bindings/c/diplomat_result_box_ICU4XGregorianDateFormatter_ICU4XError.h
diff --git a/ffi/capi/bindings/c/diplomat_result_box_ICU4XGregorianDateTimeFormatter_ICU4XError.h b/ffi/capi/bindings/c/diplomat_result_box_ICU4XGregorianDateTimeFormatter_ICU4XError.h
diff --git a/ffi/capi/bindings/c/diplomat_result_box_ICU4XGregorianZonedDateTimeFormatter_ICU4XError.h b/ffi/capi/bindings/c/diplomat_result_box_ICU4XGregorianZonedDateTimeFormatter_ICU4XError.h
diff --git a/ffi/capi/bindings/c/diplomat_result_box_ICU4XIanaToBcp47Mapper_ICU4XError.h b/ffi/capi/bindings/c/diplomat_result_box_ICU4XIanaToBcp47Mapper_ICU4XError.h
diff --git a/ffi/capi/bindings/c/diplomat_result_box_ICU4XIsoDateTime_ICU4XError.h b/ffi/capi/bindings/c/diplomat_result_box_ICU4XIsoDateTime_ICU4XError.h
diff --git a/ffi/capi/bindings/c/diplomat_result_box_ICU4XIsoDate_ICU4XError.h b/ffi/capi/bindings/c/diplomat_result_box_ICU4XIsoDate_ICU4XError.h
diff --git a/ffi/capi/bindings/c/diplomat_result_box_ICU4XLineSegmenter_ICU4XError.h b/ffi/capi/bindings/c/diplomat_result_box_ICU4XLineSegmenter_ICU4XError.h
diff --git a/ffi/capi/bindings/c/diplomat_result_box_ICU4XListFormatter_ICU4XError.h b/ffi/capi/bindings/c/diplomat_result_box_ICU4XListFormatter_ICU4XError.h
diff --git a/ffi/capi/bindings/c/diplomat_result_box_ICU4XLocaleCanonicalizer_ICU4XError.h b/ffi/capi/bindings/c/diplomat_result_box_ICU4XLocaleCanonicalizer_ICU4XError.h
diff --git a/ffi/capi/bindings/c/diplomat_result_box_ICU4XLocaleDirectionality_ICU4XError.h b/ffi/capi/bindings/c/diplomat_result_box_ICU4XLocaleDirectionality_ICU4XError.h
diff --git a/ffi/capi/bindings/c/diplomat_result_box_ICU4XLocaleDisplayNamesFormatter_ICU4XError.h b/ffi/capi/bindings/c/diplomat_result_box_ICU4XLocaleDisplayNamesFormatter_ICU4XError.h
diff --git a/ffi/capi/bindings/c/diplomat_result_box_ICU4XLocaleExpander_ICU4XError.h b/ffi/capi/bindings/c/diplomat_result_box_ICU4XLocaleExpander_ICU4XError.h