Skip to content

Commit

Permalink
Merge remote-tracking branch 'la-vache/main' into import-monkeys
Browse files Browse the repository at this point in the history
  • Loading branch information
eggrobin committed Oct 25, 2023
2 parents 785bf07 + 8d2b944 commit 824ae44
Show file tree
Hide file tree
Showing 448 changed files with 707 additions and 1,360 deletions.
1 change: 1 addition & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
*.postcard binary
*/**/README.md linguist-generated=true
*.rs.data linguist-language=Rust
10 changes: 6 additions & 4 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

78 changes: 40 additions & 38 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -33,25 +33,6 @@ members = [
"experimental/unicodeset_parse",
"experimental/unitsconversion",

# Components data
"components/calendar/data",
"components/casemap/data",
"components/collator/data",
"components/datetime/data",
"components/decimal/data",
"components/list/data",
"components/locid_transform/data",
"components/normalizer/data",
"components/plurals/data",
"components/properties/data",
"components/segmenter/data",
"components/timezone/data",
"experimental/compactdecimal/data",
"experimental/displaynames/data",
"experimental/relativetime/data",
"experimental/single_number_formatter/data",
"experimental/unitsconversion/data",

# FFI
"ffi/capi",
"ffi/capi_cdylib",
Expand All @@ -68,6 +49,25 @@ members = [
"provider/fs",
"provider/macros",

# Baked data
"provider/baked/calendar",
"provider/baked/casemap",
"provider/baked/collator",
"provider/baked/compactdecimal",
"provider/baked/datetime",
"provider/baked/decimal",
"provider/baked/displaynames",
"provider/baked/list",
"provider/baked/locid_transform",
"provider/baked/normalizer",
"provider/baked/plurals",
"provider/baked/properties",
"provider/baked/relativetime",
"provider/baked/segmenter",
"provider/baked/singlenumberformatter",
"provider/baked/timezone",
"provider/baked/unitsconversion",

# Utils
"utils/calendrical_calculations",
"utils/crlify",
Expand Down Expand Up @@ -114,6 +114,8 @@ exclude = [
# Tutorials are tested in their own cargo workspace against released and
# local crates
"docs",
# Not a functioning crate
"provider/baked/_template_",
]

[workspace.package]
Expand Down Expand Up @@ -165,25 +167,6 @@ icu_transliterate = { version = "0.1.1", path = "experimental/transliterate", de
icu_unicodeset_parse = { version = "0.1.1", path = "experimental/unicodeset_parse", default-features = false }
icu_unitsconversion = { version = "0.0.0", path = "experimental/unitsconversion", default-features = false }

# Components data
icu_calendar_data = { version = "~1.3.2", path = "components/calendar/data", default-features = false }
icu_casemap_data = { version = "~1.3.2", path = "components/casemap/data", default-features = false }
icu_collator_data = { version = "~1.3.2", path = "components/collator/data", default-features = false }
icu_datetime_data = { version = "~1.3.2", path = "components/datetime/data", default-features = false }
icu_decimal_data = { version = "~1.3.2", path = "components/decimal/data", default-features = false }
icu_list_data = { version = "~1.3.2", path = "components/list/data", default-features = false }
icu_locid_transform_data = { version = "~1.3.2", path = "components/locid_transform/data", default-features = false }
icu_normalizer_data = { version = "~1.3.2", path = "components/normalizer/data", default-features = false }
icu_plurals_data = { version = "~1.3.2", path = "components/plurals/data", default-features = false }
icu_properties_data = { version = "~1.3.2", path = "components/properties/data", default-features = false }
icu_segmenter_data = { version = "~1.3.2", path = "components/segmenter/data", default-features = false }
icu_timezone_data = { version = "~1.3.2", path = "components/timezone/data", default-features = false }
icu_compactdecimal_data = { version = "~1.3.2", path = "experimental/compactdecimal/data", default-features = false }
icu_displaynames_data = { version = "~1.3.2", path = "experimental/displaynames/data", default-features = false }
icu_relativetime_data = { version = "~1.3.2", path = "experimental/relativetime/data", default-features = false }
icu_singlenumberformatter_data = { version = "~1.3.2", path = "experimental/single_number_formatter/data", default-features = false }
icu_unitsconversion_data = { version = "~1.3.2", path = "experimental/unitsconversion/data", default-features = false }

# FFI
icu_capi = { version = "~1.3.2", path = "ffi/capi", default-features = false }
icu_capi_cdylib = { version = "~1.3.2", path = "ffi/capi_cdylib", default-features = false }
Expand All @@ -200,6 +183,25 @@ icu_provider_blob = { version = "~1.3.2", path = "provider/blob", default-featur
icu_provider_fs = { version = "~1.3.2", path = "provider/fs/", default-features = false }
icu_provider_macros = { version = "~1.3.2", path = "provider/macros", default-features = false }

# Baked data
icu_calendar_data = { version = "~1.3.2", path = "provider/baked/calendar", default-features = false }
icu_casemap_data = { version = "~1.3.2", path = "provider/baked/casemap", default-features = false }
icu_collator_data = { version = "~1.3.2", path = "provider/baked/collator", default-features = false }
icu_compactdecimal_data = { version = "~1.3.2", path = "provider/baked/compactdecimal", default-features = false }
icu_datetime_data = { version = "~1.3.2", path = "provider/baked/datetime", default-features = false }
icu_decimal_data = { version = "~1.3.2", path = "provider/baked/decimal", default-features = false }
icu_displaynames_data = { version = "~1.3.2", path = "provider/baked/displaynames", default-features = false }
icu_list_data = { version = "~1.3.2", path = "provider/baked/list", default-features = false }
icu_locid_transform_data = { version = "~1.3.2", path = "provider/baked/locid_transform", default-features = false }
icu_normalizer_data = { version = "~1.3.2", path = "provider/baked/normalizer", default-features = false }
icu_plurals_data = { version = "~1.3.2", path = "provider/baked/plurals", default-features = false }
icu_properties_data = { version = "~1.3.2", path = "provider/baked/properties", default-features = false }
icu_relativetime_data = { version = "~1.3.2", path = "provider/baked/relativetime", default-features = false }
icu_segmenter_data = { version = "~1.3.2", path = "provider/baked/segmenter", default-features = false }
icu_singlenumberformatter_data = { version = "~1.3.2", path = "provider/baked/singlenumberformatter", default-features = false }
icu_timezone_data = { version = "~1.3.2", path = "provider/baked/timezone", default-features = false }
icu_unitsconversion_data = { version = "~1.3.2", path = "provider/baked/unitsconversion", default-features = false }

# Utils
calendrical_calculations = { version = "0.1.0", path = "utils/calendrical_calculations", default-features = false }
crlify = { version = "1.0.3", path = "utils/crlify", default-features = false }
Expand Down
1 change: 0 additions & 1 deletion components/calendar/data/.gitattributes

This file was deleted.

2 changes: 0 additions & 2 deletions components/calendar/data/data/any.rs

This file was deleted.

29 changes: 0 additions & 29 deletions components/calendar/data/data/mod.rs

This file was deleted.

1 change: 0 additions & 1 deletion components/casemap/data/.gitattributes

This file was deleted.

2 changes: 0 additions & 2 deletions components/casemap/data/data/any.rs

This file was deleted.

27 changes: 0 additions & 27 deletions components/casemap/data/data/mod.rs

This file was deleted.

1 change: 0 additions & 1 deletion components/collator/data/.gitattributes

This file was deleted.

2 changes: 0 additions & 2 deletions components/collator/data/data/any.rs

This file was deleted.

35 changes: 0 additions & 35 deletions components/collator/data/data/mod.rs

This file was deleted.

1 change: 0 additions & 1 deletion components/datetime/data/.gitattributes

This file was deleted.

2 changes: 0 additions & 2 deletions components/datetime/data/data/any.rs

This file was deleted.

Loading

0 comments on commit 824ae44

Please sign in to comment.