Skip to content

Commit

Permalink
Decentralize .gitattributes, moving locales.rs.data and `segmente…
Browse files Browse the repository at this point in the history 
…r_rules` out of generated directories (#3889)
  • Loading branch information
@robertbastian
robertbastian authored Aug 21, 2023
1 parent b9419ce commit ea3545c
Show file tree
Hide file tree
Showing 30 changed files with 25 additions and 21 deletions.
12 changes: 0 additions & 12 deletions .gitattributes
View file
Original file line number Diff line number Diff line change
@@ -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
5 changes: 0 additions & 5 deletions .gitignore
View file
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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

Expand Down
1 change: 1 addition & 0 deletions components/calendar/data/.gitattributes
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
data/** linguist-generated=true
1 change: 1 addition & 0 deletions components/casemap/.gitattributes
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
src/greek_to_me/data.rs linguist-generated=true
1 change: 1 addition & 0 deletions components/casemap/data/.gitattributes
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
data/** linguist-generated=true
1 change: 1 addition & 0 deletions components/collator/data/.gitattributes
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
data/** linguist-generated=true
1 change: 1 addition & 0 deletions components/datetime/data/.gitattributes
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
data/** linguist-generated=true
1 change: 1 addition & 0 deletions components/decimal/data/.gitattributes
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
data/** linguist-generated=true
1 change: 1 addition & 0 deletions components/list/data/.gitattributes
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
data/** linguist-generated=true
1 change: 1 addition & 0 deletions components/locid_transform/data/.gitattributes
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
data/** linguist-generated=true
1 change: 1 addition & 0 deletions components/normalizer/data/.gitattributes
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
data/** linguist-generated=true
1 change: 1 addition & 0 deletions components/plurals/data/.gitattributes
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
data/** linguist-generated=true
1 change: 1 addition & 0 deletions components/properties/data/.gitattributes
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
data/** linguist-generated=true
1 change: 1 addition & 0 deletions components/segmenter/data/.gitattributes
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
data/** linguist-generated=true
1 change: 1 addition & 0 deletions components/timezone/data/.gitattributes
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
data/** linguist-generated=true
1 change: 1 addition & 0 deletions experimental/compactdecimal/data/.gitattributes
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
data/** linguist-generated=true
1 change: 1 addition & 0 deletions experimental/displaynames/data/.gitattributes
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
data/** linguist-generated=true
1 change: 1 addition & 0 deletions experimental/relativetime/data/.gitattributes
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
data/** linguist-generated=true
1 change: 1 addition & 0 deletions experimental/single_number_formatter/data/.gitattributes
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
data/** linguist-generated=true
2 changes: 2 additions & 0 deletions ffi/diplomat/.gitattributes
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
*/include/** linguist-generated=true
*/docs/** linguist-generated=true
2 changes: 2 additions & 0 deletions provider/datagen/.gitattributes
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
data/** linguist-generated=true
tests/data/** linguist-generated=true
2 changes: 1 addition & 1 deletion provider/datagen/src/transform/segmenter/mod.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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))),
)),
});
}
Expand Down
0 ...atagen/data/segmenter_rules/grapheme.toml → ...c/transform/segmenter/rules/grapheme.toml
View file
File renamed without changes.
0 ...er/datagen/data/segmenter_rules/line.toml → ...n/src/transform/segmenter/rules/line.toml
View file
File renamed without changes.
0 ...atagen/data/segmenter_rules/sentence.toml → ...c/transform/segmenter/rules/sentence.toml
View file
File renamed without changes.
0 ...er/datagen/data/segmenter_rules/word.toml → ...n/src/transform/segmenter/rules/word.toml
View file
File renamed without changes.
0 provider/datagen/tests/data/locales.rs.data → provider/datagen/tests/locales.rs.data
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion provider/datagen/tests/make-testdata.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
2 changes: 1 addition & 1 deletion tools/testdata-scripts/src/bin/download-repo-sources.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
2 changes: 1 addition & 1 deletion tools/testdata-scripts/src/bin/make-testdata-legacy.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit ea3545c

Please sign in to comment.