Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move the baked exporter into its own crate #5009

Merged
merged 1 commit into from
Jun 11, 2024
Merged

Move the baked exporter into its own crate #5009

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ To build all code paths, improve build times in VSCode, and prevent locking the
}
```

Note: the path in `ICU4X_DATA_DIR` is relative to `provider/baked/*/src/lib.rs` and it causes VSCode to build ICU4X with only the `und` locale. This reduces build times but also makes some tests fail; to run them normally, run `cargo test --all-features` on the command line.
Note: the path in `ICU4X_DATA_DIR` is relative to `provider/data/*/src/lib.rs` and it causes VSCode to build ICU4X with only the `und` locale. This reduces build times but also makes some tests fail; to run them normally, run `cargo test --all-features` on the command line.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thought: This rename is going to cause annoying conflicts

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ack. icu_provider_baked should have the provider/baked directory though, and I'd rather not sprinkle the data crates in there as well.


## Contributing a Pull Request

Expand Down
18 changes: 15 additions & 3 deletions Cargo.lock
View file
Open in desktop

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

52 changes: 27 additions & 25 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ members = [

# Provider
"provider/adapters",
"provider/baked",
"provider/blob",
"provider/core",
"provider/core/macros",
Expand All @@ -42,18 +43,18 @@ members = [
"provider/registry",

# Baked data
"provider/baked/calendar",
"provider/baked/casemap",
"provider/baked/collator",
"provider/baked/datetime",
"provider/baked/decimal",
"provider/baked/list",
"provider/baked/locale",
"provider/baked/normalizer",
"provider/baked/plurals",
"provider/baked/properties",
"provider/baked/segmenter",
"provider/baked/timezone",
"provider/data/calendar",
"provider/data/casemap",
"provider/data/collator",
"provider/data/datetime",
"provider/data/decimal",
"provider/data/list",
"provider/data/locale",
"provider/data/normalizer",
"provider/data/plurals",
"provider/data/properties",
"provider/data/segmenter",
"provider/data/timezone",

# Utils
"utils/bies",
Expand Down Expand Up @@ -150,24 +151,25 @@ icu_datagen = { version = "~1.5.0", path = "provider/datagen", default-features
icu_provider = { version = "~1.5.0", path = "provider/core", default-features = false }
icu_provider_macros = { version = "~1.5.0", path = "provider/core/macros", default-features = false }
icu_provider_adapters = { version = "~1.5.0", path = "provider/adapters", default-features = false }
icu_provider_baked = { version = "~1.5.0", path = "provider/baked", default-features = false }
icu_provider_blob = { version = "~1.5.0", path = "provider/blob", default-features = false }
icu_provider_fs = { version = "~1.5.0", path = "provider/fs/", default-features = false }
icu_registry = { version = "~1.5.0", path = "provider/registry/", default-features = false }

# Baked data
icu_calendar_data = { version = "~1.5.0", path = "provider/baked/calendar", default-features = false }
icu_casemap_data = { version = "~1.5.0", path = "provider/baked/casemap", default-features = false }
icu_collator_data = { version = "~1.5.0", path = "provider/baked/collator", default-features = false }
icu_datetime_data = { version = "~1.5.0", path = "provider/baked/datetime", default-features = false }
icu_decimal_data = { version = "~1.5.0", path = "provider/baked/decimal", default-features = false }
icu_list_data = { version = "~1.5.0", path = "provider/baked/list", default-features = false }
icu_locale_data = { version = "~1.5.0", path = "provider/baked/locale", default-features = false }
icu_normalizer_data = { version = "~1.5.0", path = "provider/baked/normalizer", default-features = false }
icu_plurals_data = { version = "~1.5.0", path = "provider/baked/plurals", default-features = false }
icu_properties_data = { version = "~1.5.0", path = "provider/baked/properties", default-features = false }
icu_segmenter_data = { version = "~1.5.0", path = "provider/baked/segmenter", default-features = false }
icu_timezone_data = { version = "~1.5.0", path = "provider/baked/timezone", default-features = false }
icu_experimental_data = { version = "~0.1.0", path = "provider/baked/experimental", default-features = false }
icu_calendar_data = { version = "~1.5.0", path = "provider/data/calendar", default-features = false }
icu_casemap_data = { version = "~1.5.0", path = "provider/data/casemap", default-features = false }
icu_collator_data = { version = "~1.5.0", path = "provider/data/collator", default-features = false }
icu_datetime_data = { version = "~1.5.0", path = "provider/data/datetime", default-features = false }
icu_decimal_data = { version = "~1.5.0", path = "provider/data/decimal", default-features = false }
icu_list_data = { version = "~1.5.0", path = "provider/data/list", default-features = false }
icu_locale_data = { version = "~1.5.0", path = "provider/data/locale", default-features = false }
icu_normalizer_data = { version = "~1.5.0", path = "provider/data/normalizer", default-features = false }
icu_plurals_data = { version = "~1.5.0", path = "provider/data/plurals", default-features = false }
icu_properties_data = { version = "~1.5.0", path = "provider/data/properties", default-features = false }
icu_segmenter_data = { version = "~1.5.0", path = "provider/data/segmenter", default-features = false }
icu_timezone_data = { version = "~1.5.0", path = "provider/data/timezone", default-features = false }
icu_experimental_data = { version = "~0.1.0", path = "provider/data/experimental", default-features = false }

# Utils
bies = { version = "0.2.2", path = "utils/bies", default-features = false }
Expand Down
33 changes: 33 additions & 0 deletions provider/baked/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
# This file is part of ICU4X. For terms of use, please see the file
# called LICENSE at the top level of the ICU4X source tree
# (online at: https://github.com/unicode-org/icu4x/blob/main/LICENSE ).

[package]
name = "icu_provider_baked"

version.workspace = true
rust-version.workspace = true
authors.workspace = true
edition.workspace = true
repository.workspace = true
homepage.workspace = true
license.workspace = true
categories.workspace = true
include.workspace = true

[dependencies]
icu_provider = { workspace = true }

crlify = { workspace = true, optional = true }
databake = { workspace = true, optional = true}
icu_registry = { workspace = true, optional = true }
itertools = { workspace = true, optional = true }
log = { workspace = true, optional = true }
proc-macro2 = { workspace = true, optional = true }

[dev-dependencies]
icu_provider = { path = "../core", features = ["datagen"] }
icu_datagen = { path = "../datagen" }

[features]
export = ["dep:icu_registry", "dep:databake", "dep:proc-macro2", "dep:itertools", "dep:crlify", "dep:log", "icu_provider/datagen"]
0 provider/baked/calendar/LICENSE → provider/baked/LICENSE
View file
Open in desktop
File renamed without changes.
11 changes: 11 additions & 0 deletions provider/baked/README.md
View file
Open in desktop

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

42 changes: 0 additions & 42 deletions provider/baked/calendar/data/macros/calendar_chinesecache_v1.rs.data
View file
Open in desktop

This file was deleted.

42 changes: 0 additions & 42 deletions provider/baked/calendar/data/macros/calendar_dangicache_v1.rs.data
View file
Open in desktop

This file was deleted.

42 changes: 0 additions & 42 deletions provider/baked/calendar/data/macros/calendar_islamicobservationalcache_v1.rs.data
View file
Open in desktop

This file was deleted.

Loading
Loading