From 9835e2ae736235810b4ea1c162ca5e65c547e770 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sat, 18 May 2024 04:49:50 +0200 Subject: Merging upstream version 1.71.1+dfsg1. Signed-off-by: Daniel Baumann --- vendor/icu_provider_adapters/src/filter/impls.rs | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'vendor/icu_provider_adapters/src/filter/impls.rs') 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 bool + Sync + 'a>>; + impl RequestFilterDataProvider 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 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 bool + Sync + 'a>> + ) -> RequestFilterDataProviderOutput<'a, D> where F: 'a, { @@ -194,9 +197,7 @@ where /// }) /// )); /// ``` - pub fn require_langid<'a>( - self, - ) -> RequestFilterDataProvider bool + Sync + 'a>> + pub fn require_langid<'a>(self) -> RequestFilterDataProviderOutput<'a, D> where F: 'a, { -- cgit v1.2.3