Skip to content

Commit

Permalink
dict-to-mozc v0.6.13
Browse files Browse the repository at this point in the history
added mimalloc-rust unstable features
  - unstable-mimalloc
  - unstable

for arm build
  - patch - cc 1.2.8

- patch - kanaria 0.2.1
  • Loading branch information
phoepsilonix committed Jan 11, 2025
1 parent ec2cb2a commit c6cf7fa
Show file tree
Hide file tree
Showing 5 changed files with 22 additions and 13 deletions.
2 changes: 2 additions & 0 deletions .github/setup.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,8 @@
shell: bash
run: |
sed -i -e 's|channel.*=.*|channel = "nightly"|' rust-toolchain.toml
sed -i -e 's|features =.*$|features = [ "use-mimalloc-rs", "unstable" ]|' dist-workspace.toml
#rust-toolchain.tomlに記載しているので、cargoコマンドで自動で追加インストールされるため不要
#rustup update nightly
#rustup component add rust-src --toolchain nightly
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,8 @@ jobs:
- name: "Install rust and rust-src"
run: |
sed -i -e 's|channel.*=.*|channel = "nightly"|' rust-toolchain.toml
sed -i -e 's|features =.*$|features = [ "use-mimalloc-rs", "unstable" ]|' dist-workspace.toml
#rust-toolchain.tomlに記載しているので、cargoコマンドで自動で追加インストールされるため不要
#rustup update nightly
#rustup component add rust-src --toolchain nightly
Expand Down
9 changes: 4 additions & 5 deletions Cargo.lock

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

21 changes: 13 additions & 8 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#![target.'cfg_attr(feature = "unstable", feature(unstable))']
#cargo-features = ["profile-rustflags"]

[workspace]
Expand All @@ -7,7 +8,7 @@ members = [
resolver = "3"

[workspace.package]
version = "0.6.13-pre"
version = "0.6.13"
authors = ["Masato TOYOSHIMA", "phoepsilonix <[email protected]>"]
edition = "2021"
rust-version = "1.84"
Expand All @@ -20,18 +21,15 @@ license = "MIT"
lib-dict-to-mozc = { path = "./crates/dict-to-mozc" }
argh = { version = "0.1.13", default-features = false, features = [ "help" ] }
csv = { version = "1.3.1", default-features = true }
kanaria = { git = "https://github.com/phoepsilonix/kanaria.git", rev = "18ca812a1fe8c7f30a753aecc2681db1f18031e8", version = "0.2.1", default-features = false }
kanaria = { version = "0.2.0", default-features = false }
lazy-regex = { version = "3.4.1", default-features = false, features = [ "perf-dfa", "unicode" ] }
indexmap = { version = "2.7.0", default-features = false, features = [] }
hashbrown = { version = "0.15.2", default-features = false, features = [ "allocator-api2", "default-hasher", "equivalent", "inline-more", "raw-entry"] }
mimalloc-rust = { version = "0.2.1" }
mimalloc-rust = { version = "0.2.1", default-features = false }

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

[profile.release]
debug = true
Expand Down Expand Up @@ -62,6 +60,10 @@ repository.workspace = true
license.workspace = true
version.workspace = true

[patch.crates-io]
cc = { git = "https://github.com/rust-lang/cc-rs.git", rev = "2e74353eb1d021ed272bc606242b2c700de9cbaa" }
kanaria = { git = "https://github.com/samunohito/kanaria.git", rev = "18ca812a1fe8c7f30a753aecc2681db1f18031e8" }

[dependencies]
argh.workspace = true
csv.workspace = true
Expand All @@ -70,9 +72,10 @@ indexmap.workspace = true
kanaria.workspace = true
lazy-regex.workspace = true
lib-dict-to-mozc = { workspace = true }
mimalloc-rust = { workspace = true , optional = true }

#[target.'cfg(any(not(any(target_arch = "arm", target_arch = "aarch64")),all(target_arch = "aarch64", not(target_os = "windows"))))'.dependencies]
mimalloc-rust = { workspace = true, optional = true, features = [] , default-features = false }

[target.'cfg(any(not(any(target_arch = "arm", target_arch = "aarch64")),all(target_arch = "aarch64", not(target_os = "windows"))))'.dependencies]
mimalloc = { workspace = true , optional = true }
snmalloc-rs = { workspace = true , optional = true }
tcmalloc = { workspace = true , optional = true }
Expand All @@ -86,6 +89,8 @@ name = "dict-to-mozc"

[features]
default = []
unstable = [ "unstable-mimalloc" ]
unstable-mimalloc = [ "mimalloc-rust/unstable" ]
use-mimalloc-rs = ["dep:mimalloc-rust"]

use-mimalloc = ["dep:mimalloc"]
Expand Down
1 change: 1 addition & 0 deletions dist-workspace.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ members = ["cargo:."]

# Config for 'dist'
[dist]
build-command = ["cargo", "build"]
# Features to pass to cargo build
features = ["use-mimalloc-rs"]
# The preferred dist version to use in CI (Cargo.toml SemVer syntax)
Expand Down

0 comments on commit c6cf7fa

Please sign in to comment.