From ea3545ccc073cc890f4e8859d110f3d2c24b2728 Mon Sep 17 00:00:00 2001 From: Robert Bastian Date: Mon, 21 Aug 2023 18:47:58 +0200 Subject: [PATCH] Decentralize `.gitattributes`, moving `locales.rs.data` and `segmenter_rules` out of generated directories (#3889) --- .gitattributes | 12 ------------ .gitignore | 5 ----- components/calendar/data/.gitattributes | 1 + components/casemap/.gitattributes | 1 + components/casemap/data/.gitattributes | 1 + components/collator/data/.gitattributes | 1 + components/datetime/data/.gitattributes | 1 + components/decimal/data/.gitattributes | 1 + components/list/data/.gitattributes | 1 + components/locid_transform/data/.gitattributes | 1 + components/normalizer/data/.gitattributes | 1 + components/plurals/data/.gitattributes | 1 + components/properties/data/.gitattributes | 1 + components/segmenter/data/.gitattributes | 1 + components/timezone/data/.gitattributes | 1 + experimental/compactdecimal/data/.gitattributes | 1 + experimental/displaynames/data/.gitattributes | 1 + experimental/relativetime/data/.gitattributes | 1 + .../single_number_formatter/data/.gitattributes | 1 + ffi/diplomat/.gitattributes | 2 ++ provider/datagen/.gitattributes | 2 ++ provider/datagen/src/transform/segmenter/mod.rs | 2 +- .../transform/segmenter/rules}/grapheme.toml | 0 .../transform/segmenter/rules}/line.toml | 0 .../transform/segmenter/rules}/sentence.toml | 0 .../transform/segmenter/rules}/word.toml | 0 provider/datagen/tests/{data => }/locales.rs.data | 0 provider/datagen/tests/make-testdata.rs | 2 +- .../src/bin/download-repo-sources.rs | 2 +- .../testdata-scripts/src/bin/make-testdata-legacy.rs | 2 +- 30 files changed, 25 insertions(+), 21 deletions(-) create mode 100644 components/calendar/data/.gitattributes create mode 100644 components/casemap/.gitattributes create mode 100644 components/casemap/data/.gitattributes create mode 100644 components/collator/data/.gitattributes create mode 100644 components/datetime/data/.gitattributes create mode 100644 components/decimal/data/.gitattributes create mode 100644 components/list/data/.gitattributes create mode 100644 components/locid_transform/data/.gitattributes create mode 100644 components/normalizer/data/.gitattributes create mode 100644 components/plurals/data/.gitattributes create mode 100644 components/properties/data/.gitattributes create mode 100644 components/segmenter/data/.gitattributes create mode 100644 components/timezone/data/.gitattributes create mode 100644 experimental/compactdecimal/data/.gitattributes create mode 100644 experimental/displaynames/data/.gitattributes create mode 100644 experimental/relativetime/data/.gitattributes create mode 100644 experimental/single_number_formatter/data/.gitattributes create mode 100644 ffi/diplomat/.gitattributes create mode 100644 provider/datagen/.gitattributes rename provider/datagen/{data/segmenter_rules => src/transform/segmenter/rules}/grapheme.toml (100%) rename provider/datagen/{data/segmenter_rules => src/transform/segmenter/rules}/line.toml (100%) rename provider/datagen/{data/segmenter_rules => src/transform/segmenter/rules}/sentence.toml (100%) rename provider/datagen/{data/segmenter_rules => src/transform/segmenter/rules}/word.toml (100%) rename provider/datagen/tests/{data => }/locales.rs.data (100%) diff --git a/.gitattributes b/.gitattributes index 436e69bd4b5..ac832ef8136 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,14 +1,2 @@ *.postcard binary -provider/datagen/data/** linguist-generated=true -provider/datagen/tests/data/json/** linguist-generated=true -provider/datagen/tests/data/cldr/** linguist-generated=true -provider/datagen/tests/data/icuexport/** linguist-generated=true -ffi/diplomat/c/include/** linguist-generated=true -ffi/diplomat/cpp/include/** linguist-generated=true -ffi/diplomat/cpp/docs/** linguist-generated=true -ffi/diplomat/js/include/** linguist-generated=true -ffi/diplomat/js/docs/** linguist-generated=true -*.rs.data linguist-language=Rust */**/README.md linguist-generated=true -**/data/data/** linguist-generated=true -experimental/casemap/src/greek_to_me/data.rs linguist-generated=true diff --git a/.gitignore b/.gitignore index 3be6cc47cbf..f1463071175 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,5 @@ # Generated by Cargo # will have compiled files and executables -/target/ **/target/ # Remove Cargo.lock from gitignore if creating an executable, leave it for libraries @@ -22,10 +21,6 @@ wasmpkg/ dhat-heap.json /benchmarks -# Do not check-in binary file tree test data -provider/datagen/tests/data/postcard/* -!provider/datagen/tests/data/postcard/fingerprints.csv - # Ignore irrelevant files that get generated on macOS **/.DS_Store diff --git a/components/calendar/data/.gitattributes b/components/calendar/data/.gitattributes new file mode 100644 index 00000000000..3e27901b0aa --- /dev/null +++ b/components/calendar/data/.gitattributes @@ -0,0 +1 @@ +data/** linguist-generated=true diff --git a/components/casemap/.gitattributes b/components/casemap/.gitattributes new file mode 100644 index 00000000000..5583e1770d5 --- /dev/null +++ b/components/casemap/.gitattributes @@ -0,0 +1 @@ +src/greek_to_me/data.rs linguist-generated=true diff --git a/components/casemap/data/.gitattributes b/components/casemap/data/.gitattributes new file mode 100644 index 00000000000..3e27901b0aa --- /dev/null +++ b/components/casemap/data/.gitattributes @@ -0,0 +1 @@ +data/** linguist-generated=true diff --git a/components/collator/data/.gitattributes b/components/collator/data/.gitattributes new file mode 100644 index 00000000000..3e27901b0aa --- /dev/null +++ b/components/collator/data/.gitattributes @@ -0,0 +1 @@ +data/** linguist-generated=true diff --git a/components/datetime/data/.gitattributes b/components/datetime/data/.gitattributes new file mode 100644 index 00000000000..3e27901b0aa --- /dev/null +++ b/components/datetime/data/.gitattributes @@ -0,0 +1 @@ +data/** linguist-generated=true diff --git a/components/decimal/data/.gitattributes b/components/decimal/data/.gitattributes new file mode 100644 index 00000000000..3e27901b0aa --- /dev/null +++ b/components/decimal/data/.gitattributes @@ -0,0 +1 @@ +data/** linguist-generated=true diff --git a/components/list/data/.gitattributes b/components/list/data/.gitattributes new file mode 100644 index 00000000000..3e27901b0aa --- /dev/null +++ b/components/list/data/.gitattributes @@ -0,0 +1 @@ +data/** linguist-generated=true diff --git a/components/locid_transform/data/.gitattributes b/components/locid_transform/data/.gitattributes new file mode 100644 index 00000000000..3e27901b0aa --- /dev/null +++ b/components/locid_transform/data/.gitattributes @@ -0,0 +1 @@ +data/** linguist-generated=true diff --git a/components/normalizer/data/.gitattributes b/components/normalizer/data/.gitattributes new file mode 100644 index 00000000000..3e27901b0aa --- /dev/null +++ b/components/normalizer/data/.gitattributes @@ -0,0 +1 @@ +data/** linguist-generated=true diff --git a/components/plurals/data/.gitattributes b/components/plurals/data/.gitattributes new file mode 100644 index 00000000000..3e27901b0aa --- /dev/null +++ b/components/plurals/data/.gitattributes @@ -0,0 +1 @@ +data/** linguist-generated=true diff --git a/components/properties/data/.gitattributes b/components/properties/data/.gitattributes new file mode 100644 index 00000000000..3e27901b0aa --- /dev/null +++ b/components/properties/data/.gitattributes @@ -0,0 +1 @@ +data/** linguist-generated=true diff --git a/components/segmenter/data/.gitattributes b/components/segmenter/data/.gitattributes new file mode 100644 index 00000000000..3e27901b0aa --- /dev/null +++ b/components/segmenter/data/.gitattributes @@ -0,0 +1 @@ +data/** linguist-generated=true diff --git a/components/timezone/data/.gitattributes b/components/timezone/data/.gitattributes new file mode 100644 index 00000000000..3e27901b0aa --- /dev/null +++ b/components/timezone/data/.gitattributes @@ -0,0 +1 @@ +data/** linguist-generated=true diff --git a/experimental/compactdecimal/data/.gitattributes b/experimental/compactdecimal/data/.gitattributes new file mode 100644 index 00000000000..3e27901b0aa --- /dev/null +++ b/experimental/compactdecimal/data/.gitattributes @@ -0,0 +1 @@ +data/** linguist-generated=true diff --git a/experimental/displaynames/data/.gitattributes b/experimental/displaynames/data/.gitattributes new file mode 100644 index 00000000000..3e27901b0aa --- /dev/null +++ b/experimental/displaynames/data/.gitattributes @@ -0,0 +1 @@ +data/** linguist-generated=true diff --git a/experimental/relativetime/data/.gitattributes b/experimental/relativetime/data/.gitattributes new file mode 100644 index 00000000000..3e27901b0aa --- /dev/null +++ b/experimental/relativetime/data/.gitattributes @@ -0,0 +1 @@ +data/** linguist-generated=true diff --git a/experimental/single_number_formatter/data/.gitattributes b/experimental/single_number_formatter/data/.gitattributes new file mode 100644 index 00000000000..3e27901b0aa --- /dev/null +++ b/experimental/single_number_formatter/data/.gitattributes @@ -0,0 +1 @@ +data/** linguist-generated=true diff --git a/ffi/diplomat/.gitattributes b/ffi/diplomat/.gitattributes new file mode 100644 index 00000000000..b3086d0e61c --- /dev/null +++ b/ffi/diplomat/.gitattributes @@ -0,0 +1,2 @@ +*/include/** linguist-generated=true +*/docs/** linguist-generated=true \ No newline at end of file diff --git a/provider/datagen/.gitattributes b/provider/datagen/.gitattributes new file mode 100644 index 00000000000..90adf76a947 --- /dev/null +++ b/provider/datagen/.gitattributes @@ -0,0 +1,2 @@ +data/** linguist-generated=true +tests/data/** linguist-generated=true \ No newline at end of file diff --git a/provider/datagen/src/transform/segmenter/mod.rs b/provider/datagen/src/transform/segmenter/mod.rs index 317a0dab42d..7d43bc35697 100644 --- a/provider/datagen/src/transform/segmenter/mod.rs +++ b/provider/datagen/src/transform/segmenter/mod.rs @@ -654,7 +654,7 @@ macro_rules! implement { return Ok(DataResponse { metadata: DataResponseMetadata::default(), payload: Some(DataPayload::from_owned( - self.generate_rule_break_data(include_str!(concat!("../../../data/segmenter_rules/", $rules))), + self.generate_rule_break_data(include_str!(concat!("rules/", $rules))), )), }); } diff --git a/provider/datagen/data/segmenter_rules/grapheme.toml b/provider/datagen/src/transform/segmenter/rules/grapheme.toml similarity index 100% rename from provider/datagen/data/segmenter_rules/grapheme.toml rename to provider/datagen/src/transform/segmenter/rules/grapheme.toml diff --git a/provider/datagen/data/segmenter_rules/line.toml b/provider/datagen/src/transform/segmenter/rules/line.toml similarity index 100% rename from provider/datagen/data/segmenter_rules/line.toml rename to provider/datagen/src/transform/segmenter/rules/line.toml diff --git a/provider/datagen/data/segmenter_rules/sentence.toml b/provider/datagen/src/transform/segmenter/rules/sentence.toml similarity index 100% rename from provider/datagen/data/segmenter_rules/sentence.toml rename to provider/datagen/src/transform/segmenter/rules/sentence.toml diff --git a/provider/datagen/data/segmenter_rules/word.toml b/provider/datagen/src/transform/segmenter/rules/word.toml similarity index 100% rename from provider/datagen/data/segmenter_rules/word.toml rename to provider/datagen/src/transform/segmenter/rules/word.toml diff --git a/provider/datagen/tests/data/locales.rs.data b/provider/datagen/tests/locales.rs.data similarity index 100% rename from provider/datagen/tests/data/locales.rs.data rename to provider/datagen/tests/locales.rs.data diff --git a/provider/datagen/tests/make-testdata.rs b/provider/datagen/tests/make-testdata.rs index 4356b98aa6e..89e21933f8a 100644 --- a/provider/datagen/tests/make-testdata.rs +++ b/provider/datagen/tests/make-testdata.rs @@ -16,7 +16,7 @@ use std::io::Write; use std::path::Path; use std::sync::Mutex; -include!("data/locales.rs.data"); +include!("locales.rs.data"); #[test] fn generate_json_and_verify_postcard() { diff --git a/tools/testdata-scripts/src/bin/download-repo-sources.rs b/tools/testdata-scripts/src/bin/download-repo-sources.rs index 9485560c6a9..1f1ac187ebc 100644 --- a/tools/testdata-scripts/src/bin/download-repo-sources.rs +++ b/tools/testdata-scripts/src/bin/download-repo-sources.rs @@ -14,7 +14,7 @@ use std::path::PathBuf; use zip::ZipArchive; include!("../../globs.rs.data"); -include!("../../../../provider/datagen/tests/data/locales.rs.data"); +include!("../../../../provider/datagen/tests/locales.rs.data"); #[derive(Parser)] #[command( diff --git a/tools/testdata-scripts/src/bin/make-testdata-legacy.rs b/tools/testdata-scripts/src/bin/make-testdata-legacy.rs index eb97bfbf109..46685caccf3 100644 --- a/tools/testdata-scripts/src/bin/make-testdata-legacy.rs +++ b/tools/testdata-scripts/src/bin/make-testdata-legacy.rs @@ -7,7 +7,7 @@ use std::fs::File; use std::io::Write; use std::path::Path; -include!("../../../../provider/datagen/tests/data/locales.rs.data"); +include!("../../../../provider/datagen/tests/locales.rs.data"); fn main() { #![allow(deprecated)] // want to keep old datagen code path covered