Skip to content

Commit 22866d3

Browse files
authored
Remove serde dependency from segmenter with lstm feature. (#2904)
1 parent 40e68fb commit 22866d3

File tree

6 files changed

+7
-74
lines changed

6 files changed

+7
-74
lines changed

Cargo.lock

Lines changed: 0 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

experimental/segmenter/Cargo.toml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,9 @@ skip_optional_dependencies = true
3131
icu_collections = { version = "1.0.0", path = "../../components/collections" }
3232
icu_provider = { version = "1.0.0", path = "../../provider/core", features = ["macros"] }
3333
serde = { version = "1.0", default-features = false, features = ["derive", "alloc"], optional = true }
34-
serde_json = { version = "1.0", default-features = false, features = ["alloc"] }
3534
zerovec = { version = "0.9", path = "../../utils/zerovec", features = ["yoke"] }
3635
databake = { version = "0.1.0", path = "../../utils/databake", optional = true, features = ["derive"] }
37-
ndarray = { version = "0.15.5", default-features = false, optional = true, features = ["serde"] }
36+
ndarray = { version = "0.15.5", default-features = false, optional = true }
3837
num-traits = { version = "0.2", default-features = false, optional = true, features = ["libm"] }
3938
icu_locid = { version = "1.0.0", path = "../../components/locid" }
4039
utf8_iter = "1.0.3"
@@ -43,7 +42,8 @@ displaydoc = { version = "0.2.3", default-features = false }
4342
[dev-dependencies]
4443
criterion = "0.3"
4544
icu_testdata = { path = "../../provider/testdata", default-features = false, features = ["buffer", "icu_segmenter"] }
46-
serde-json-core = { version = "0.4", features = ["std"] }
45+
serde = { version = "1.0", default-features = false, features = ["derive"] }
46+
serde_json = "1.0"
4747
icu = { path = "../../components/icu", features = ["experimental"]}
4848

4949
[lib]
@@ -61,6 +61,6 @@ required-features = ["lstm"]
6161
[features]
6262
default = []
6363
std = []
64-
lstm = ["ndarray", "num-traits", "serde"]
64+
lstm = ["ndarray", "num-traits"]
6565
serde = ["dep:serde", "zerovec/serde", "icu_collections/serde", "icu_provider/serde"]
6666
datagen = ["serde", "databake", "zerovec/databake", "icu_collections/databake"]

experimental/segmenter/src/lstm_bies.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -238,22 +238,22 @@ mod tests {
238238
use super::*;
239239
use crate::provider::GraphemeClusterBreakDataV1Marker;
240240
use icu_provider::prelude::*;
241-
use serde::{Deserialize, Serialize};
241+
use serde::Deserialize;
242242
use std::fs::File;
243243
use std::io::BufReader;
244244

245245
/// `TestCase` is a struct used to store a single test case.
246246
/// Each test case has two attributs: `unseg` which denots the unsegmented line, and `true_bies` which indicates the Bies
247247
/// sequence representing the true segmentation.
248-
#[derive(PartialEq, Debug, Serialize, Deserialize)]
248+
#[derive(PartialEq, Debug, Deserialize)]
249249
pub struct TestCase {
250250
pub unseg: String,
251251
pub expected_bies: String,
252252
pub true_bies: String,
253253
}
254254

255255
/// `TestTextData` is a struct to store a vector of `TestCase` that represents a test text.
256-
#[derive(PartialEq, Debug, Serialize, Deserialize)]
256+
#[derive(PartialEq, Debug, Deserialize)]
257257
pub struct TestTextData {
258258
pub testcases: Vec<TestCase>,
259259
}

ffi/gn/Cargo.lock

Lines changed: 0 additions & 18 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ffi/gn/Cargo.toml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,5 @@ rustflags = ["--cfg=ops_bound", "--cfg=core_reverse", "--cfg=de_boxed_c_str", "-
5353
[gn.package.serde_derive."1.0.130"]
5454
rustflags = ["--cfg=underscore_consts", "--cfg=ptr_addr_of"]
5555

56-
# TODO: Determine the correct rustflags for serde_json
57-
[gn.package.serde_json."1.0.69"]
58-
rustflags = []
59-
6056
[gn.package.syn."1.0.81"]
6157
rustflags = []

ffi/gn/icu4x/BUILD.gn

Lines changed: 0 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -627,7 +627,6 @@ rust_library("icu_segmenter-v0_7_0") {
627627
deps += [ ":icu_collections-v1_0_0" ]
628628
deps += [ ":icu_locid-v1_0_0" ]
629629
deps += [ ":icu_provider-v1_0_1" ]
630-
deps += [ ":serde_json-v1_0_69" ]
631630
deps += [ ":utf8_iter-v1_0_3" ]
632631
deps += [ ":zerovec-v0_9_1" ]
633632

@@ -669,25 +668,6 @@ rust_library("icu_timezone-v1_0_0") {
669668
visibility = [ ":*" ]
670669
}
671670

672-
rust_library("itoa-v0_4_8") {
673-
crate_name = "itoa"
674-
crate_root = "//ffi/gn/vendor/itoa/src/lib.rs"
675-
output_name = "itoa-9e27afdde10ba0b5"
676-
677-
deps = []
678-
679-
rustenv = []
680-
681-
rustflags = [
682-
"--cap-lints=allow",
683-
"--edition=2015",
684-
"-Cmetadata=9e27afdde10ba0b5",
685-
"-Cextra-filename=-9e27afdde10ba0b5",
686-
]
687-
688-
visibility = [ ":*" ]
689-
}
690-
691671
rust_library("lazy_static-v1_4_0") {
692672
crate_name = "lazy_static"
693673
crate_root = "//ffi/gn/vendor/lazy_static/src/lib.rs"
@@ -928,29 +908,6 @@ rust_proc_macro("serde_derive-v1_0_130") {
928908
visibility = [ ":*" ]
929909
}
930910

931-
rust_library("serde_json-v1_0_69") {
932-
crate_name = "serde_json"
933-
crate_root = "//ffi/gn/vendor/serde_json/src/lib.rs"
934-
output_name = "serde_json-3a9f5b638834f68f"
935-
936-
deps = []
937-
deps += [ ":itoa-v0_4_8" ]
938-
deps += [ ":ryu-v1_0_5" ]
939-
deps += [ ":serde-v1_0_130" ]
940-
941-
rustenv = []
942-
943-
rustflags = [
944-
"--cap-lints=allow",
945-
"--edition=2018",
946-
"-Cmetadata=3a9f5b638834f68f",
947-
"-Cextra-filename=-3a9f5b638834f68f",
948-
"--cfg=feature=\"alloc\"",
949-
]
950-
951-
visibility = [ ":*" ]
952-
}
953-
954911
rust_library("smallvec-v1_10_0") {
955912
crate_name = "smallvec"
956913
crate_root = "//ffi/gn/vendor/smallvec/src/lib.rs"

0 commit comments

Comments
 (0)