Merging upstream version 1.71.1+dfsg1.

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

1 files changed, 6 insertions, 5 deletions

diff --git a/vendor/icu_provider_adapters/src/filter/impls.rs b/vendor/icu_provider_adapters/src/filter/impls.rs
index af8ea7adf..df18cf72c 100644
--- a/vendor/icu_provider_adapters/src/filter/impls.rs
+++ b/vendor/icu_provider_adapters/src/filter/impls.rs
@@ -8,6 +8,9 @@ use icu_provider::prelude::*;
 
 use icu_locid::LanguageIdentifier;
 
+type RequestFilterDataProviderOutput<'a, D> =
+    RequestFilterDataProvider<D, Box<dyn Fn(DataRequest) -> bool + Sync + 'a>>;
+
 impl<D, F> RequestFilterDataProvider<D, F>
 where
     F: Fn(DataRequest) -> bool + Sync,
@@ -69,7 +72,7 @@ where
     pub fn filter_by_langid<'a>(
         self,
         predicate: impl Fn(&LanguageIdentifier) -> bool + Sync + 'a,
-    ) -> RequestFilterDataProvider<D, Box<dyn Fn(DataRequest) -> bool + Sync + 'a>>
+    ) -> RequestFilterDataProviderOutput<'a, D>
     where
         F: 'a,
     {
@@ -139,7 +142,7 @@ where
     pub fn filter_by_langid_allowlist_strict<'a>(
         self,
         allowlist: &'a [LanguageIdentifier],
-    ) -> RequestFilterDataProvider<D, Box<dyn Fn(DataRequest) -> bool + Sync + 'a>>
+    ) -> RequestFilterDataProviderOutput<'a, D>
     where
         F: 'a,
     {
@@ -194,9 +197,7 @@ where
     ///     })
     /// ));
     /// ```
-    pub fn require_langid<'a>(
-        self,
-    ) -> RequestFilterDataProvider<D, Box<dyn Fn(DataRequest) -> bool + Sync + 'a>>
+    pub fn require_langid<'a>(self) -> RequestFilterDataProviderOutput<'a, D>
     where
         F: 'a,
     {