From dc7b4f912e6715a75d435f03e3eed71d7bc3fcd9 Mon Sep 17 00:00:00 2001 From: Robert Bastian Date: Wed, 21 Jun 2023 11:06:31 +0200 Subject: [PATCH 1/3] wip --- provider/blob/src/blob_schema.rs | 3 +++ provider/datagen/src/transform/cldr/fallback/mod.rs | 12 ------------ .../transform/cldr/locale_canonicalizer/aliases.rs | 6 ------ .../cldr/locale_canonicalizer/directionality.rs | 6 ------ .../cldr/locale_canonicalizer/likely_subtags.rs | 12 ------------ 5 files changed, 3 insertions(+), 36 deletions(-) diff --git a/provider/blob/src/blob_schema.rs b/provider/blob/src/blob_schema.rs index 3c98f58d56a..78d7a677501 100644 --- a/provider/blob/src/blob_schema.rs +++ b/provider/blob/src/blob_schema.rs @@ -59,6 +59,9 @@ impl<'data> BlobSchemaV1<'data> { .get0(&key.hashed()) .ok_or(DataErrorKind::MissingDataKey) .and_then(|cursor| { + if key.metadata().singleton && !req.locale.is_empty() { + return Err(DataErrorKind::ExtraneousLocale) + } cursor .get1_copied_by(|bytes| req.locale.strict_cmp(&bytes.0).reverse()) .ok_or(DataErrorKind::MissingLocale) diff --git a/provider/datagen/src/transform/cldr/fallback/mod.rs b/provider/datagen/src/transform/cldr/fallback/mod.rs index d3fbc9403a4..e07a47e481e 100644 --- a/provider/datagen/src/transform/cldr/fallback/mod.rs +++ b/provider/datagen/src/transform/cldr/fallback/mod.rs @@ -23,12 +23,6 @@ impl DataProvider for crate::DatagenProvide &self, req: DataRequest, ) -> Result, DataError> { - // We treat searching for `und` as a request for all data. Other requests - // are not currently supported. - if !req.locale.is_empty() { - return Err(DataErrorKind::ExtraneousLocale.into_error()); - } - let resources = LikelySubtagsResources::try_from_source_data(&self.source)?; let metadata = DataResponseMetadata::default(); @@ -44,12 +38,6 @@ impl DataProvider for crate::DatagenProvider { &self, req: DataRequest, ) -> Result, DataError> { - // We treat searching for `und` as a request for all data. Other requests - // are not currently supported. - if !req.locale.is_empty() { - return Err(DataErrorKind::ExtraneousLocale.into_error()); - } - let parents_data: &cldr_serde::parent_locales::Resource = self .source .cldr()? diff --git a/provider/datagen/src/transform/cldr/locale_canonicalizer/aliases.rs b/provider/datagen/src/transform/cldr/locale_canonicalizer/aliases.rs index 5480cedc4ee..3645980583b 100644 --- a/provider/datagen/src/transform/cldr/locale_canonicalizer/aliases.rs +++ b/provider/datagen/src/transform/cldr/locale_canonicalizer/aliases.rs @@ -13,12 +13,6 @@ use zerovec::ZeroSlice; impl DataProvider for crate::DatagenProvider { fn load(&self, req: DataRequest) -> Result, DataError> { - // We treat searching for `und` as a request for all data. Other requests - // are not currently supported. - if !req.locale.is_empty() { - return Err(DataErrorKind::ExtraneousLocale.into_error()); - } - let data: &cldr_serde::aliases::Resource = self .source .cldr()? diff --git a/provider/datagen/src/transform/cldr/locale_canonicalizer/directionality.rs b/provider/datagen/src/transform/cldr/locale_canonicalizer/directionality.rs index 692b89fb57b..30347e6f84c 100644 --- a/provider/datagen/src/transform/cldr/locale_canonicalizer/directionality.rs +++ b/provider/datagen/src/transform/cldr/locale_canonicalizer/directionality.rs @@ -10,12 +10,6 @@ use icu_provider::prelude::*; impl DataProvider for crate::DatagenProvider { fn load(&self, req: DataRequest) -> Result, DataError> { - // We treat searching for `und` as a request for all data. Other requests - // are not currently supported. - if !req.locale.is_empty() { - return Err(DataErrorKind::ExtraneousLocale.into_error()); - } - let data: &cldr_serde::directionality::Resource = self .source .cldr()? diff --git a/provider/datagen/src/transform/cldr/locale_canonicalizer/likely_subtags.rs b/provider/datagen/src/transform/cldr/locale_canonicalizer/likely_subtags.rs index 60de841d5d5..c593a4e85cb 100644 --- a/provider/datagen/src/transform/cldr/locale_canonicalizer/likely_subtags.rs +++ b/provider/datagen/src/transform/cldr/locale_canonicalizer/likely_subtags.rs @@ -13,12 +13,6 @@ use std::collections::{BTreeMap, HashSet}; impl DataProvider for crate::DatagenProvider { fn load(&self, req: DataRequest) -> Result, DataError> { - // We treat searching for und as a request for all data. Other requests - // are not currently supported. - if !req.locale.is_empty() { - return Err(DataErrorKind::ExtraneousLocale.into_error()); - } - let resources = LikelySubtagsResources::try_from_source_data(&self.source)?; Ok(DataResponse { @@ -39,12 +33,6 @@ impl DataProvider for crate::DatagenProvider { &self, req: DataRequest, ) -> Result, DataError> { - // We treat searching for und as a request for all data. Other requests - // are not currently supported. - if !req.locale.is_empty() { - return Err(DataErrorKind::ExtraneousLocale.into_error()); - } - let resources = LikelySubtagsResources::try_from_source_data(&self.source)?; Ok(DataResponse { From 71574722bbf0eae370ea99b66965e2d8d0c35a06 Mon Sep 17 00:00:00 2001 From: Robert Bastian Date: Thu, 22 Jun 2023 13:40:39 +0200 Subject: [PATCH 2/3] fmt --- provider/blob/src/blob_schema.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/provider/blob/src/blob_schema.rs b/provider/blob/src/blob_schema.rs index 78d7a677501..d35b99e6392 100644 --- a/provider/blob/src/blob_schema.rs +++ b/provider/blob/src/blob_schema.rs @@ -60,7 +60,7 @@ impl<'data> BlobSchemaV1<'data> { .ok_or(DataErrorKind::MissingDataKey) .and_then(|cursor| { if key.metadata().singleton && !req.locale.is_empty() { - return Err(DataErrorKind::ExtraneousLocale) + return Err(DataErrorKind::ExtraneousLocale); } cursor .get1_copied_by(|bytes| req.locale.strict_cmp(&bytes.0).reverse()) From 281b6214affa52fd2252077a77becbf2ce1140fb Mon Sep 17 00:00:00 2001 From: Robert Bastian Date: Thu, 22 Jun 2023 16:55:26 +0200 Subject: [PATCH 3/3] clippy --- provider/datagen/src/transform/cldr/fallback/mod.rs | 4 ++-- .../src/transform/cldr/locale_canonicalizer/aliases.rs | 2 +- .../src/transform/cldr/locale_canonicalizer/directionality.rs | 2 +- .../src/transform/cldr/locale_canonicalizer/likely_subtags.rs | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/provider/datagen/src/transform/cldr/fallback/mod.rs b/provider/datagen/src/transform/cldr/fallback/mod.rs index e07a47e481e..ddbbabe32f6 100644 --- a/provider/datagen/src/transform/cldr/fallback/mod.rs +++ b/provider/datagen/src/transform/cldr/fallback/mod.rs @@ -21,7 +21,7 @@ use zerovec::{maps::ZeroMap2d, ule::UnvalidatedStr}; impl DataProvider for crate::DatagenProvider { fn load( &self, - req: DataRequest, + _: DataRequest, ) -> Result, DataError> { let resources = LikelySubtagsResources::try_from_source_data(&self.source)?; @@ -36,7 +36,7 @@ impl DataProvider for crate::DatagenProvide impl DataProvider for crate::DatagenProvider { fn load( &self, - req: DataRequest, + _: DataRequest, ) -> Result, DataError> { let parents_data: &cldr_serde::parent_locales::Resource = self .source diff --git a/provider/datagen/src/transform/cldr/locale_canonicalizer/aliases.rs b/provider/datagen/src/transform/cldr/locale_canonicalizer/aliases.rs index 3645980583b..2e2bf3bc4a6 100644 --- a/provider/datagen/src/transform/cldr/locale_canonicalizer/aliases.rs +++ b/provider/datagen/src/transform/cldr/locale_canonicalizer/aliases.rs @@ -12,7 +12,7 @@ use tinystr::TinyAsciiStr; use zerovec::ZeroSlice; impl DataProvider for crate::DatagenProvider { - fn load(&self, req: DataRequest) -> Result, DataError> { + fn load(&self, _: DataRequest) -> Result, DataError> { let data: &cldr_serde::aliases::Resource = self .source .cldr()? diff --git a/provider/datagen/src/transform/cldr/locale_canonicalizer/directionality.rs b/provider/datagen/src/transform/cldr/locale_canonicalizer/directionality.rs index 30347e6f84c..99a64df58ed 100644 --- a/provider/datagen/src/transform/cldr/locale_canonicalizer/directionality.rs +++ b/provider/datagen/src/transform/cldr/locale_canonicalizer/directionality.rs @@ -9,7 +9,7 @@ use icu_provider::datagen::IterableDataProvider; use icu_provider::prelude::*; impl DataProvider for crate::DatagenProvider { - fn load(&self, req: DataRequest) -> Result, DataError> { + fn load(&self, _: DataRequest) -> Result, DataError> { let data: &cldr_serde::directionality::Resource = self .source .cldr()? diff --git a/provider/datagen/src/transform/cldr/locale_canonicalizer/likely_subtags.rs b/provider/datagen/src/transform/cldr/locale_canonicalizer/likely_subtags.rs index c593a4e85cb..7e7c979d6a5 100644 --- a/provider/datagen/src/transform/cldr/locale_canonicalizer/likely_subtags.rs +++ b/provider/datagen/src/transform/cldr/locale_canonicalizer/likely_subtags.rs @@ -12,7 +12,7 @@ use icu_provider::prelude::*; use std::collections::{BTreeMap, HashSet}; impl DataProvider for crate::DatagenProvider { - fn load(&self, req: DataRequest) -> Result, DataError> { + fn load(&self, _: DataRequest) -> Result, DataError> { let resources = LikelySubtagsResources::try_from_source_data(&self.source)?; Ok(DataResponse { @@ -31,7 +31,7 @@ impl IterableDataProvider for crate::DatagenProvider { impl DataProvider for crate::DatagenProvider { fn load( &self, - req: DataRequest, + _: DataRequest, ) -> Result, DataError> { let resources = LikelySubtagsResources::try_from_source_data(&self.source)?;