Skip to content

Commit c6cf7fa

Browse files
committed
dict-to-mozc v0.6.13
added mimalloc-rust unstable features - unstable-mimalloc - unstable for arm build - patch - cc 1.2.8 - patch - kanaria 0.2.1
1 parent ec2cb2a commit c6cf7fa

File tree

5 files changed

+22
-13
lines changed

5 files changed

+22
-13
lines changed

.github/setup.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,8 @@
3838
shell: bash
3939
run: |
4040
sed -i -e 's|channel.*=.*|channel = "nightly"|' rust-toolchain.toml
41+
sed -i -e 's|features =.*$|features = [ "use-mimalloc-rs", "unstable" ]|' dist-workspace.toml
42+
4143
#rust-toolchain.tomlに記載しているので、cargoコマンドで自動で追加インストールされるため不要
4244
#rustup update nightly
4345
#rustup component add rust-src --toolchain nightly

.github/workflows/release.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -163,6 +163,8 @@ jobs:
163163
- name: "Install rust and rust-src"
164164
run: |
165165
sed -i -e 's|channel.*=.*|channel = "nightly"|' rust-toolchain.toml
166+
sed -i -e 's|features =.*$|features = [ "use-mimalloc-rs", "unstable" ]|' dist-workspace.toml
167+
166168
#rust-toolchain.tomlに記載しているので、cargoコマンドで自動で追加インストールされるため不要
167169
#rustup update nightly
168170
#rustup component add rust-src --toolchain nightly

Cargo.lock

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

Cargo.toml

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
#![target.'cfg_attr(feature = "unstable", feature(unstable))']
12
#cargo-features = ["profile-rustflags"]
23

34
[workspace]
@@ -7,7 +8,7 @@ members = [
78
resolver = "3"
89

910
[workspace.package]
10-
version = "0.6.13-pre"
11+
version = "0.6.13"
1112
authors = ["Masato TOYOSHIMA", "phoepsilonix <phoepsilonix@gmail.com>"]
1213
edition = "2021"
1314
rust-version = "1.84"
@@ -20,18 +21,15 @@ license = "MIT"
2021
lib-dict-to-mozc = { path = "./crates/dict-to-mozc" }
2122
argh = { version = "0.1.13", default-features = false, features = [ "help" ] }
2223
csv = { version = "1.3.1", default-features = true }
23-
kanaria = { git = "https://github.com/phoepsilonix/kanaria.git", rev = "18ca812a1fe8c7f30a753aecc2681db1f18031e8", version = "0.2.1", default-features = false }
24+
kanaria = { version = "0.2.0", default-features = false }
2425
lazy-regex = { version = "3.4.1", default-features = false, features = [ "perf-dfa", "unicode" ] }
2526
indexmap = { version = "2.7.0", default-features = false, features = [] }
2627
hashbrown = { version = "0.15.2", default-features = false, features = [ "allocator-api2", "default-hasher", "equivalent", "inline-more", "raw-entry"] }
27-
mimalloc-rust = { version = "0.2.1" }
28+
mimalloc-rust = { version = "0.2.1", default-features = false }
2829

2930
mimalloc = { version = "0.1.43" }
3031
snmalloc-rs = { version = "0.3.7", features = ["lto"] }
3132
tcmalloc = { version = "0.3.0" }
32-
#allocator-api2 = { version = "0.2.21", default-features = false, features = [] }
33-
#foldhash = "0.1.3"
34-
#fxhash = "0.2.1"
3533

3634
[profile.release]
3735
debug = true
@@ -62,6 +60,10 @@ repository.workspace = true
6260
license.workspace = true
6361
version.workspace = true
6462

63+
[patch.crates-io]
64+
cc = { git = "https://github.com/rust-lang/cc-rs.git", rev = "2e74353eb1d021ed272bc606242b2c700de9cbaa" }
65+
kanaria = { git = "https://github.com/samunohito/kanaria.git", rev = "18ca812a1fe8c7f30a753aecc2681db1f18031e8" }
66+
6567
[dependencies]
6668
argh.workspace = true
6769
csv.workspace = true
@@ -70,9 +72,10 @@ indexmap.workspace = true
7072
kanaria.workspace = true
7173
lazy-regex.workspace = true
7274
lib-dict-to-mozc = { workspace = true }
73-
mimalloc-rust = { workspace = true , optional = true }
7475

75-
#[target.'cfg(any(not(any(target_arch = "arm", target_arch = "aarch64")),all(target_arch = "aarch64", not(target_os = "windows"))))'.dependencies]
76+
mimalloc-rust = { workspace = true, optional = true, features = [] , default-features = false }
77+
78+
[target.'cfg(any(not(any(target_arch = "arm", target_arch = "aarch64")),all(target_arch = "aarch64", not(target_os = "windows"))))'.dependencies]
7679
mimalloc = { workspace = true , optional = true }
7780
snmalloc-rs = { workspace = true , optional = true }
7881
tcmalloc = { workspace = true , optional = true }
@@ -86,6 +89,8 @@ name = "dict-to-mozc"
8689

8790
[features]
8891
default = []
92+
unstable = [ "unstable-mimalloc" ]
93+
unstable-mimalloc = [ "mimalloc-rust/unstable" ]
8994
use-mimalloc-rs = ["dep:mimalloc-rust"]
9095

9196
use-mimalloc = ["dep:mimalloc"]

dist-workspace.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ members = ["cargo:."]
33

44
# Config for 'dist'
55
[dist]
6+
build-command = ["cargo", "build"]
67
# Features to pass to cargo build
78
features = ["use-mimalloc-rs"]
89
# The preferred dist version to use in CI (Cargo.toml SemVer syntax)

0 commit comments

Comments
 (0)