Skip to content

Commit 2480e06

Browse files
authored
Refactor ICU4X code to allow configured code by version (#377)
1 parent 5b47f49 commit 2480e06

36 files changed

+284
-1166
lines changed

.github/workflows/run-rust.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
- uses: actions/checkout@v2
1919
- uses: actions-rs/toolchain@v1
2020
with:
21-
toolchain: 1.73
21+
toolchain: "1.80"
2222
components: rustfmt, clippy
2323
default: true
2424
- uses: actions-rs/cargo@v1
@@ -31,4 +31,8 @@ jobs:
3131
with:
3232
command: fmt
3333
args: --manifest-path executors/rust/${{ matrix.icu4x-version }}/Cargo.toml -- --check
34+
- name: "Run Rustfmt (executor code)"
35+
run: rustfmt executors/rust/src/** --check
36+
- name: "Run Rustfmt (common code)"
37+
run: rustfmt executors/rust/common/** --check
3438

executors/rust/1.3/build.rs

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
1-
// Getting the version of ICU4X
2-
31
#[path = "../common/print_icu4x_versions_1_3.rs"]
42
mod print_icu4x_versions_1_3;
53

6-
fn main() {
7-
print_icu4x_versions_1_3::print();
8-
}
4+
use print_icu4x_versions_1_3::main;

executors/rust/1.3/src/collator.rs

Lines changed: 0 additions & 47 deletions
This file was deleted.

executors/rust/1.3/src/decimalfmt.rs

Lines changed: 0 additions & 38 deletions
This file was deleted.

executors/rust/1.3/src/displaynames.rs

Lines changed: 0 additions & 27 deletions
This file was deleted.

executors/rust/1.3/src/likelysubtags.rs

Lines changed: 0 additions & 50 deletions
This file was deleted.

executors/rust/1.3/src/listfmt.rs

Lines changed: 0 additions & 94 deletions
This file was deleted.

executors/rust/1.3/src/main.rs

Lines changed: 1 addition & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,4 @@
1-
// Read JSON test case from standard in.
2-
// Parse to get test and parameters
3-
// Run test
4-
// Return results
5-
6-
use std::io;
7-
8-
mod icu {
9-
pub use ::icu::compactdecimal;
10-
pub use ::icu::displaynames;
11-
pub use ::icu::relativetime;
12-
}
13-
14-
mod collator;
15-
mod datetimefmt;
16-
mod decimalfmt;
17-
mod displaynames;
18-
mod likelysubtags;
19-
mod listfmt;
20-
mod localenames;
21-
mod numberfmt;
22-
mod pluralrules;
23-
mod relativedatetime_fmt;
24-
251
#[path = "../../common/run_all_tests.rs"]
262
mod run_all_tests;
273

28-
fn main() -> io::Result<()> {
29-
let executor_fns = run_all_tests::ExecutorFns {
30-
run_collation_test: collator::run_collation_test,
31-
run_datetimeformat_test: datetimefmt::run_datetimeformat_test,
32-
run_likelysubtags_test: likelysubtags::run_likelysubtags_test,
33-
run_list_fmt_test: listfmt::run_list_fmt_test,
34-
run_locale_name_test: localenames::run_locale_name_test,
35-
run_numberformat_test: numberfmt::run_numberformat_test,
36-
run_plural_rules_test: pluralrules::run_plural_rules_test,
37-
run_relativedatetimeformat_test: relativedatetime_fmt::run_relativedatetimeformat_test,
38-
};
39-
run_all_tests::main(executor_fns)
40-
}
4+
use run_all_tests::main;

0 commit comments

Comments
 (0)