Skip to content

Commit 20873f3

Browse files
CopilotCopilot
authored
fix(jieba): compile error: adapt to jieba-rs 0.10.1 Token API (#1152)
* fix: adapt jieba bindings to jieba-rs 0.10.1 Token API changes * chore: update yarn.lock --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
1 parent 6ebb41e commit 20873f3

2 files changed

Lines changed: 116 additions & 101 deletions

File tree

‎packages/jieba/src/lib.rs‎

Lines changed: 34 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -228,13 +228,18 @@ impl Jieba {
228228
hmm: Option<bool>,
229229
) -> Result<Array<'a>> {
230230
let hmm = hmm.unwrap_or(false);
231-
let cutted = self.0.cut(
232-
match &sentence {
233-
Either::A(s) => s.as_str(),
234-
Either::B(b) => str::from_utf8(b).map_err(|_| Error::from_status(Status::InvalidArg))?,
235-
},
236-
hmm,
237-
);
231+
let cutted: Vec<&str> = self
232+
.0
233+
.cut(
234+
match &sentence {
235+
Either::A(s) => s.as_str(),
236+
Either::B(b) => str::from_utf8(b).map_err(|_| Error::from_status(Status::InvalidArg))?,
237+
},
238+
hmm,
239+
)
240+
.into_iter()
241+
.map(|t| t.word)
242+
.collect();
238243
Array::from_vec(env, cutted)
239244
}
240245

@@ -263,10 +268,15 @@ impl Jieba {
263268
///
264269
/// `sentence`: input text
265270
pub fn cut_all<'a>(&self, env: &'a Env, sentence: Either<String, &[u8]>) -> Result<Array<'a>> {
266-
let cutted = self.0.cut_all(match &sentence {
267-
Either::A(s) => s.as_str(),
268-
Either::B(b) => str::from_utf8(b).map_err(|_| Error::from_status(Status::InvalidArg))?,
269-
});
271+
let cutted: Vec<&str> = self
272+
.0
273+
.cut_all(match &sentence {
274+
Either::A(s) => s.as_str(),
275+
Either::B(b) => str::from_utf8(b).map_err(|_| Error::from_status(Status::InvalidArg))?,
276+
})
277+
.into_iter()
278+
.map(|t| t.word)
279+
.collect();
270280

271281
Array::from_vec(env, cutted)
272282
}
@@ -286,13 +296,18 @@ impl Jieba {
286296
hmm: Option<bool>,
287297
) -> Result<Array<'a>> {
288298
let hmm = hmm.unwrap_or(false);
289-
let cutted = self.0.cut_for_search(
290-
match &sentence {
291-
Either::A(s) => s.as_str(),
292-
Either::B(b) => str::from_utf8(b).map_err(|_| Error::from_status(Status::InvalidArg))?,
293-
},
294-
hmm,
295-
);
299+
let cutted: Vec<&str> = self
300+
.0
301+
.cut_for_search(
302+
match &sentence {
303+
Either::A(s) => s.as_str(),
304+
Either::B(b) => str::from_utf8(b).map_err(|_| Error::from_status(Status::InvalidArg))?,
305+
},
306+
hmm,
307+
)
308+
.into_iter()
309+
.map(|t| t.word)
310+
.collect();
296311

297312
Array::from_vec(env, cutted)
298313
}
@@ -350,7 +365,7 @@ impl Task for CutTask {
350365
hmm,
351366
)
352367
.iter()
353-
.map(|s| s.to_string())
368+
.map(|t| t.word.to_string())
354369
.collect(),
355370
)
356371
}

‎yarn.lock‎

Lines changed: 82 additions & 82 deletions
Original file line numberDiff line numberDiff line change
@@ -2225,135 +2225,135 @@ __metadata:
22252225
languageName: node
22262226
linkType: hard
22272227

2228-
"@oxfmt/binding-android-arm-eabi@npm:0.53.0":
2229-
version: 0.53.0
2230-
resolution: "@oxfmt/binding-android-arm-eabi@npm:0.53.0"
2228+
"@oxfmt/binding-android-arm-eabi@npm:0.54.0":
2229+
version: 0.54.0
2230+
resolution: "@oxfmt/binding-android-arm-eabi@npm:0.54.0"
22312231
conditions: os=android & cpu=arm
22322232
languageName: node
22332233
linkType: hard
22342234

2235-
"@oxfmt/binding-android-arm64@npm:0.53.0":
2236-
version: 0.53.0
2237-
resolution: "@oxfmt/binding-android-arm64@npm:0.53.0"
2235+
"@oxfmt/binding-android-arm64@npm:0.54.0":
2236+
version: 0.54.0
2237+
resolution: "@oxfmt/binding-android-arm64@npm:0.54.0"
22382238
conditions: os=android & cpu=arm64
22392239
languageName: node
22402240
linkType: hard
22412241

2242-
"@oxfmt/binding-darwin-arm64@npm:0.53.0":
2243-
version: 0.53.0
2244-
resolution: "@oxfmt/binding-darwin-arm64@npm:0.53.0"
2242+
"@oxfmt/binding-darwin-arm64@npm:0.54.0":
2243+
version: 0.54.0
2244+
resolution: "@oxfmt/binding-darwin-arm64@npm:0.54.0"
22452245
conditions: os=darwin & cpu=arm64
22462246
languageName: node
22472247
linkType: hard
22482248

2249-
"@oxfmt/binding-darwin-x64@npm:0.53.0":
2250-
version: 0.53.0
2251-
resolution: "@oxfmt/binding-darwin-x64@npm:0.53.0"
2249+
"@oxfmt/binding-darwin-x64@npm:0.54.0":
2250+
version: 0.54.0
2251+
resolution: "@oxfmt/binding-darwin-x64@npm:0.54.0"
22522252
conditions: os=darwin & cpu=x64
22532253
languageName: node
22542254
linkType: hard
22552255

2256-
"@oxfmt/binding-freebsd-x64@npm:0.53.0":
2257-
version: 0.53.0
2258-
resolution: "@oxfmt/binding-freebsd-x64@npm:0.53.0"
2256+
"@oxfmt/binding-freebsd-x64@npm:0.54.0":
2257+
version: 0.54.0
2258+
resolution: "@oxfmt/binding-freebsd-x64@npm:0.54.0"
22592259
conditions: os=freebsd & cpu=x64
22602260
languageName: node
22612261
linkType: hard
22622262

2263-
"@oxfmt/binding-linux-arm-gnueabihf@npm:0.53.0":
2264-
version: 0.53.0
2265-
resolution: "@oxfmt/binding-linux-arm-gnueabihf@npm:0.53.0"
2263+
"@oxfmt/binding-linux-arm-gnueabihf@npm:0.54.0":
2264+
version: 0.54.0
2265+
resolution: "@oxfmt/binding-linux-arm-gnueabihf@npm:0.54.0"
22662266
conditions: os=linux & cpu=arm
22672267
languageName: node
22682268
linkType: hard
22692269

2270-
"@oxfmt/binding-linux-arm-musleabihf@npm:0.53.0":
2271-
version: 0.53.0
2272-
resolution: "@oxfmt/binding-linux-arm-musleabihf@npm:0.53.0"
2270+
"@oxfmt/binding-linux-arm-musleabihf@npm:0.54.0":
2271+
version: 0.54.0
2272+
resolution: "@oxfmt/binding-linux-arm-musleabihf@npm:0.54.0"
22732273
conditions: os=linux & cpu=arm
22742274
languageName: node
22752275
linkType: hard
22762276

2277-
"@oxfmt/binding-linux-arm64-gnu@npm:0.53.0":
2278-
version: 0.53.0
2279-
resolution: "@oxfmt/binding-linux-arm64-gnu@npm:0.53.0"
2277+
"@oxfmt/binding-linux-arm64-gnu@npm:0.54.0":
2278+
version: 0.54.0
2279+
resolution: "@oxfmt/binding-linux-arm64-gnu@npm:0.54.0"
22802280
conditions: os=linux & cpu=arm64 & libc=glibc
22812281
languageName: node
22822282
linkType: hard
22832283

2284-
"@oxfmt/binding-linux-arm64-musl@npm:0.53.0":
2285-
version: 0.53.0
2286-
resolution: "@oxfmt/binding-linux-arm64-musl@npm:0.53.0"
2284+
"@oxfmt/binding-linux-arm64-musl@npm:0.54.0":
2285+
version: 0.54.0
2286+
resolution: "@oxfmt/binding-linux-arm64-musl@npm:0.54.0"
22872287
conditions: os=linux & cpu=arm64 & libc=musl
22882288
languageName: node
22892289
linkType: hard
22902290

2291-
"@oxfmt/binding-linux-ppc64-gnu@npm:0.53.0":
2292-
version: 0.53.0
2293-
resolution: "@oxfmt/binding-linux-ppc64-gnu@npm:0.53.0"
2291+
"@oxfmt/binding-linux-ppc64-gnu@npm:0.54.0":
2292+
version: 0.54.0
2293+
resolution: "@oxfmt/binding-linux-ppc64-gnu@npm:0.54.0"
22942294
conditions: os=linux & cpu=ppc64 & libc=glibc
22952295
languageName: node
22962296
linkType: hard
22972297

2298-
"@oxfmt/binding-linux-riscv64-gnu@npm:0.53.0":
2299-
version: 0.53.0
2300-
resolution: "@oxfmt/binding-linux-riscv64-gnu@npm:0.53.0"
2298+
"@oxfmt/binding-linux-riscv64-gnu@npm:0.54.0":
2299+
version: 0.54.0
2300+
resolution: "@oxfmt/binding-linux-riscv64-gnu@npm:0.54.0"
23012301
conditions: os=linux & cpu=riscv64 & libc=glibc
23022302
languageName: node
23032303
linkType: hard
23042304

2305-
"@oxfmt/binding-linux-riscv64-musl@npm:0.53.0":
2306-
version: 0.53.0
2307-
resolution: "@oxfmt/binding-linux-riscv64-musl@npm:0.53.0"
2305+
"@oxfmt/binding-linux-riscv64-musl@npm:0.54.0":
2306+
version: 0.54.0
2307+
resolution: "@oxfmt/binding-linux-riscv64-musl@npm:0.54.0"
23082308
conditions: os=linux & cpu=riscv64 & libc=musl
23092309
languageName: node
23102310
linkType: hard
23112311

2312-
"@oxfmt/binding-linux-s390x-gnu@npm:0.53.0":
2313-
version: 0.53.0
2314-
resolution: "@oxfmt/binding-linux-s390x-gnu@npm:0.53.0"
2312+
"@oxfmt/binding-linux-s390x-gnu@npm:0.54.0":
2313+
version: 0.54.0
2314+
resolution: "@oxfmt/binding-linux-s390x-gnu@npm:0.54.0"
23152315
conditions: os=linux & cpu=s390x & libc=glibc
23162316
languageName: node
23172317
linkType: hard
23182318

2319-
"@oxfmt/binding-linux-x64-gnu@npm:0.53.0":
2320-
version: 0.53.0
2321-
resolution: "@oxfmt/binding-linux-x64-gnu@npm:0.53.0"
2319+
"@oxfmt/binding-linux-x64-gnu@npm:0.54.0":
2320+
version: 0.54.0
2321+
resolution: "@oxfmt/binding-linux-x64-gnu@npm:0.54.0"
23222322
conditions: os=linux & cpu=x64 & libc=glibc
23232323
languageName: node
23242324
linkType: hard
23252325

2326-
"@oxfmt/binding-linux-x64-musl@npm:0.53.0":
2327-
version: 0.53.0
2328-
resolution: "@oxfmt/binding-linux-x64-musl@npm:0.53.0"
2326+
"@oxfmt/binding-linux-x64-musl@npm:0.54.0":
2327+
version: 0.54.0
2328+
resolution: "@oxfmt/binding-linux-x64-musl@npm:0.54.0"
23292329
conditions: os=linux & cpu=x64 & libc=musl
23302330
languageName: node
23312331
linkType: hard
23322332

2333-
"@oxfmt/binding-openharmony-arm64@npm:0.53.0":
2334-
version: 0.53.0
2335-
resolution: "@oxfmt/binding-openharmony-arm64@npm:0.53.0"
2333+
"@oxfmt/binding-openharmony-arm64@npm:0.54.0":
2334+
version: 0.54.0
2335+
resolution: "@oxfmt/binding-openharmony-arm64@npm:0.54.0"
23362336
conditions: os=openharmony & cpu=arm64
23372337
languageName: node
23382338
linkType: hard
23392339

2340-
"@oxfmt/binding-win32-arm64-msvc@npm:0.53.0":
2341-
version: 0.53.0
2342-
resolution: "@oxfmt/binding-win32-arm64-msvc@npm:0.53.0"
2340+
"@oxfmt/binding-win32-arm64-msvc@npm:0.54.0":
2341+
version: 0.54.0
2342+
resolution: "@oxfmt/binding-win32-arm64-msvc@npm:0.54.0"
23432343
conditions: os=win32 & cpu=arm64
23442344
languageName: node
23452345
linkType: hard
23462346

2347-
"@oxfmt/binding-win32-ia32-msvc@npm:0.53.0":
2348-
version: 0.53.0
2349-
resolution: "@oxfmt/binding-win32-ia32-msvc@npm:0.53.0"
2347+
"@oxfmt/binding-win32-ia32-msvc@npm:0.54.0":
2348+
version: 0.54.0
2349+
resolution: "@oxfmt/binding-win32-ia32-msvc@npm:0.54.0"
23502350
conditions: os=win32 & cpu=ia32
23512351
languageName: node
23522352
linkType: hard
23532353

2354-
"@oxfmt/binding-win32-x64-msvc@npm:0.53.0":
2355-
version: 0.53.0
2356-
resolution: "@oxfmt/binding-win32-x64-msvc@npm:0.53.0"
2354+
"@oxfmt/binding-win32-x64-msvc@npm:0.54.0":
2355+
version: 0.54.0
2356+
resolution: "@oxfmt/binding-win32-x64-msvc@npm:0.54.0"
23572357
conditions: os=win32 & cpu=x64
23582358
languageName: node
23592359
linkType: hard
@@ -6508,7 +6508,7 @@ __metadata:
65086508
lerna: "npm:^9.0.3"
65096509
lint-staged: "npm:^17.0.0"
65106510
npm-run-all2: "npm:^8.0.4"
6511-
oxfmt: "npm:^0.53.0"
6511+
oxfmt: "npm:^0.54.0"
65126512
oxlint: "npm:^1.38.0"
65136513
prettier: "npm:^3.7.4"
65146514
tslib: "npm:^2.8.1"
@@ -6975,29 +6975,29 @@ __metadata:
69756975
languageName: node
69766976
linkType: hard
69776977

6978-
"oxfmt@npm:^0.53.0":
6979-
version: 0.53.0
6980-
resolution: "oxfmt@npm:0.53.0"
6981-
dependencies:
6982-
"@oxfmt/binding-android-arm-eabi": "npm:0.53.0"
6983-
"@oxfmt/binding-android-arm64": "npm:0.53.0"
6984-
"@oxfmt/binding-darwin-arm64": "npm:0.53.0"
6985-
"@oxfmt/binding-darwin-x64": "npm:0.53.0"
6986-
"@oxfmt/binding-freebsd-x64": "npm:0.53.0"
6987-
"@oxfmt/binding-linux-arm-gnueabihf": "npm:0.53.0"
6988-
"@oxfmt/binding-linux-arm-musleabihf": "npm:0.53.0"
6989-
"@oxfmt/binding-linux-arm64-gnu": "npm:0.53.0"
6990-
"@oxfmt/binding-linux-arm64-musl": "npm:0.53.0"
6991-
"@oxfmt/binding-linux-ppc64-gnu": "npm:0.53.0"
6992-
"@oxfmt/binding-linux-riscv64-gnu": "npm:0.53.0"
6993-
"@oxfmt/binding-linux-riscv64-musl": "npm:0.53.0"
6994-
"@oxfmt/binding-linux-s390x-gnu": "npm:0.53.0"
6995-
"@oxfmt/binding-linux-x64-gnu": "npm:0.53.0"
6996-
"@oxfmt/binding-linux-x64-musl": "npm:0.53.0"
6997-
"@oxfmt/binding-openharmony-arm64": "npm:0.53.0"
6998-
"@oxfmt/binding-win32-arm64-msvc": "npm:0.53.0"
6999-
"@oxfmt/binding-win32-ia32-msvc": "npm:0.53.0"
7000-
"@oxfmt/binding-win32-x64-msvc": "npm:0.53.0"
6978+
"oxfmt@npm:^0.54.0":
6979+
version: 0.54.0
6980+
resolution: "oxfmt@npm:0.54.0"
6981+
dependencies:
6982+
"@oxfmt/binding-android-arm-eabi": "npm:0.54.0"
6983+
"@oxfmt/binding-android-arm64": "npm:0.54.0"
6984+
"@oxfmt/binding-darwin-arm64": "npm:0.54.0"
6985+
"@oxfmt/binding-darwin-x64": "npm:0.54.0"
6986+
"@oxfmt/binding-freebsd-x64": "npm:0.54.0"
6987+
"@oxfmt/binding-linux-arm-gnueabihf": "npm:0.54.0"
6988+
"@oxfmt/binding-linux-arm-musleabihf": "npm:0.54.0"
6989+
"@oxfmt/binding-linux-arm64-gnu": "npm:0.54.0"
6990+
"@oxfmt/binding-linux-arm64-musl": "npm:0.54.0"
6991+
"@oxfmt/binding-linux-ppc64-gnu": "npm:0.54.0"
6992+
"@oxfmt/binding-linux-riscv64-gnu": "npm:0.54.0"
6993+
"@oxfmt/binding-linux-riscv64-musl": "npm:0.54.0"
6994+
"@oxfmt/binding-linux-s390x-gnu": "npm:0.54.0"
6995+
"@oxfmt/binding-linux-x64-gnu": "npm:0.54.0"
6996+
"@oxfmt/binding-linux-x64-musl": "npm:0.54.0"
6997+
"@oxfmt/binding-openharmony-arm64": "npm:0.54.0"
6998+
"@oxfmt/binding-win32-arm64-msvc": "npm:0.54.0"
6999+
"@oxfmt/binding-win32-ia32-msvc": "npm:0.54.0"
7000+
"@oxfmt/binding-win32-x64-msvc": "npm:0.54.0"
70017001
tinypool: "npm:2.1.0"
70027002
peerDependencies:
70037003
svelte: ^5.0.0
@@ -7048,7 +7048,7 @@ __metadata:
70487048
optional: true
70497049
bin:
70507050
oxfmt: bin/oxfmt
7051-
checksum: 10c0/a34f1a9e6655bd89cdb031daf3a80540d1dc304d70454f8abecc2cc11ceaa8d5ce34663ff08d503fd790cface4c8565a061eda5b19d11639a60627333705dd66
7051+
checksum: 10c0/e8e321c206ab952db58519a164f98cfec21fa14742e4e81046dc389a25c550285c7f998403f8b0a03f335070a477fccc281f3fc500f37883473a41ade2df0635
70527052
languageName: node
70537053
linkType: hard
70547054

0 commit comments

Comments
 (0)