Skip to content

Commit ea3545c

Browse files
robertbastianrobertbastian
authored
Decentralize .gitattributes, moving locales.rs.data and segmenter_rules out of generated directories (#3889)
1 parent b9419ce commit ea3545c

File tree

30 files changed

+25
-21
lines changed

30 files changed

+25
-21
lines changed

‎.gitattributes

-12
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,2 @@
11
*.postcard binary
2-
provider/datagen/data/** linguist-generated=true
3-
provider/datagen/tests/data/json/** linguist-generated=true
4-
provider/datagen/tests/data/cldr/** linguist-generated=true
5-
provider/datagen/tests/data/icuexport/** linguist-generated=true
6-
ffi/diplomat/c/include/** linguist-generated=true
7-
ffi/diplomat/cpp/include/** linguist-generated=true
8-
ffi/diplomat/cpp/docs/** linguist-generated=true
9-
ffi/diplomat/js/include/** linguist-generated=true
10-
ffi/diplomat/js/docs/** linguist-generated=true
11-
*.rs.data linguist-language=Rust
122
*/**/README.md linguist-generated=true
13-
**/data/data/** linguist-generated=true
14-
experimental/casemap/src/greek_to_me/data.rs linguist-generated=true

‎.gitignore

-5
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
# Generated by Cargo
22
# will have compiled files and executables
3-
/target/
43
**/target/
54

65
# Remove Cargo.lock from gitignore if creating an executable, leave it for libraries
@@ -22,10 +21,6 @@ wasmpkg/
2221
dhat-heap.json
2322
/benchmarks
2423

25-
# Do not check-in binary file tree test data
26-
provider/datagen/tests/data/postcard/*
27-
!provider/datagen/tests/data/postcard/fingerprints.csv
28-
2924
# Ignore irrelevant files that get generated on macOS
3025
**/.DS_Store
3126

‎components/calendar/data/.gitattributes

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
data/** linguist-generated=true

‎components/casemap/.gitattributes

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
src/greek_to_me/data.rs linguist-generated=true

‎components/casemap/data/.gitattributes

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
data/** linguist-generated=true

‎components/collator/data/.gitattributes

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
data/** linguist-generated=true

‎components/datetime/data/.gitattributes

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
data/** linguist-generated=true

‎components/decimal/data/.gitattributes

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
data/** linguist-generated=true

‎components/list/data/.gitattributes

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
data/** linguist-generated=true

‎components/locid_transform/data/.gitattributes

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
data/** linguist-generated=true

‎components/normalizer/data/.gitattributes

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
data/** linguist-generated=true

‎components/plurals/data/.gitattributes

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
data/** linguist-generated=true

‎components/properties/data/.gitattributes

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
data/** linguist-generated=true

‎components/segmenter/data/.gitattributes

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
data/** linguist-generated=true

‎components/timezone/data/.gitattributes

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
data/** linguist-generated=true

‎experimental/compactdecimal/data/.gitattributes

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
data/** linguist-generated=true

‎experimental/displaynames/data/.gitattributes

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
data/** linguist-generated=true

‎experimental/relativetime/data/.gitattributes

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
data/** linguist-generated=true

‎experimental/single_number_formatter/data/.gitattributes

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
data/** linguist-generated=true

‎ffi/diplomat/.gitattributes

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
*/include/** linguist-generated=true
2+
*/docs/** linguist-generated=true

‎provider/datagen/.gitattributes

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
data/** linguist-generated=true
2+
tests/data/** linguist-generated=true

‎provider/datagen/src/transform/segmenter/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -654,7 +654,7 @@ macro_rules! implement {
654654
return Ok(DataResponse {
655655
metadata: DataResponseMetadata::default(),
656656
payload: Some(DataPayload::from_owned(
657-
self.generate_rule_break_data(include_str!(concat!("../../../data/segmenter_rules/", $rules))),
657+
self.generate_rule_break_data(include_str!(concat!("rules/", $rules))),
658658
)),
659659
});
660660
}

‎provider/datagen/data/segmenter_rules/grapheme.toml ‎provider/datagen/src/transform/segmenter/rules/grapheme.toml

File renamed without changes.

‎provider/datagen/data/segmenter_rules/line.toml ‎provider/datagen/src/transform/segmenter/rules/line.toml

File renamed without changes.

‎provider/datagen/data/segmenter_rules/sentence.toml ‎provider/datagen/src/transform/segmenter/rules/sentence.toml

File renamed without changes.

‎provider/datagen/data/segmenter_rules/word.toml ‎provider/datagen/src/transform/segmenter/rules/word.toml

File renamed without changes.

‎provider/datagen/tests/data/locales.rs.data ‎provider/datagen/tests/locales.rs.data

File renamed without changes.

‎provider/datagen/tests/make-testdata.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ use std::io::Write;
1616
use std::path::Path;
1717
use std::sync::Mutex;
1818

19-
include!("data/locales.rs.data");
19+
include!("locales.rs.data");
2020

2121
#[test]
2222
fn generate_json_and_verify_postcard() {

‎tools/testdata-scripts/src/bin/download-repo-sources.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ use std::path::PathBuf;
1414
use zip::ZipArchive;
1515

1616
include!("../../globs.rs.data");
17-
include!("../../../../provider/datagen/tests/data/locales.rs.data");
17+
include!("../../../../provider/datagen/tests/locales.rs.data");
1818

1919
#[derive(Parser)]
2020
#[command(

‎tools/testdata-scripts/src/bin/make-testdata-legacy.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ use std::fs::File;
77
use std::io::Write;
88
use std::path::Path;
99

10-
include!("../../../../provider/datagen/tests/data/locales.rs.data");
10+
include!("../../../../provider/datagen/tests/locales.rs.data");
1111

1212
fn main() {
1313
#![allow(deprecated)] // want to keep old datagen code path covered

0 commit comments

Comments
 (0)