Merging upstream version 1.75.0+dfsg1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 3 insertions, 7 deletions

diff --git a/vendor/icu_provider/src/datagen/data_conversion.rs b/vendor/icu_provider/src/datagen/data_conversion.rs
index 59146352a..f3ca948e1 100644
--- a/vendor/icu_provider/src/datagen/data_conversion.rs
+++ b/vendor/icu_provider/src/datagen/data_conversion.rs
@@ -9,16 +9,12 @@ use alloc::boxed::Box;
 /// A trait that allows for converting between data payloads of different types.
 ///
 /// These payloads will typically be some kind of erased payload, either with
-/// AnyMarker, BufferMarker, or SerializeMarker, where converting requires reifying the type.
+/// [`AnyMarker`], [`BufferMarker`], or [`ExportMarker`](crate::datagen::ExportMarker), where converting
+/// requires reifying the type.
+///
 /// A type implementing [`DataConverter`] will essentially have a "registry" mapping keys to
 /// concrete marker types M, and reifying the input to a `DataPayload<M>`, performing some conversion
 /// or computation, and erasing the result to `DataPayload<MTo>`.
-///
-/// It will typically be implemented on data providers used in datagen.
-///
-/// The [`make_exportable_provider!`] macro is able to automatically implement this trait.
-///
-/// [`make_exportable_provider!`]: crate::make_exportable_provider
 pub trait DataConverter<MFrom: DataMarker, MTo: DataMarker> {
     /// Attempt to convert a payload corresponding to the given data key
     /// from one marker type to another marker type.