From e3993964d13d4e824086842d0d1e09de5bc35da4 Mon Sep 17 00:00:00 2001 From: Master-Hash Date: Wed, 8 Jul 2026 17:44:44 +0800 Subject: [PATCH 1/2] =?UTF-8?q?build:=20=E6=91=86=E8=84=B1=20vcruntime140?= =?UTF-8?q?=20(=3F)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Cargo.lock | 20 ++++++++++++++++++-- Cargo.toml | 4 +++- 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 7331971..fe1484a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -106,9 +106,16 @@ dependencies = [ "libc_alloc", "rust_icu_sys", "rust_icu_ubrk", + "ucrtbase", "windows", ] +[[package]] +name = "find-msvc-tools" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5baebc0774151f905a1a2cc41989300b1e6fbb29aff0ceffa1064fdd3088d582" + [[package]] name = "glob" version = "0.3.3" @@ -269,9 +276,9 @@ checksum = "0ceec5bc11778974d1bcb055b18002eba7f4b3518b6a0081b3af5f21666da9ad" [[package]] name = "memchr" -version = "2.8.2" +version = "2.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88904434abc2901f197fe8cc55f0445e7ded921dba5911dad2e2b39b48e663c4" +checksum = "cf8baf1c55e62ffcace7a9f06f4bd9cd3f0c4beb022d3b367256b91b87513d98" [[package]] name = "minimal-lexical" @@ -519,6 +526,15 @@ dependencies = [ "zerovec", ] +[[package]] +name = "ucrtbase" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f42efc675d365ee861a397f90fa160a8ae9f89cece77fa55e1bf0bb297eeeb30" +dependencies = [ + "find-msvc-tools", +] + [[package]] name = "unicode-ident" version = "1.0.24" diff --git a/Cargo.toml b/Cargo.toml index 9a8dbcb..b97b5c9 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -19,6 +19,9 @@ libc_alloc = "1.0.7" rust_icu_sys = { version = "5.6.0", optional = true } rust_icu_ubrk = { version = "5.6.0", optional = true } +[target.'cfg(target_env = "msvc")'.dependencies] +ucrtbase = "0.1.0" + [build-dependencies] bindgen = "0.72.1" @@ -40,4 +43,3 @@ rust_icu_sys = { git = "https://github.com/Master-Hash/rust_icu.git", rev = "0b2 rust_icu_ubrk = { git = "https://github.com/Master-Hash/rust_icu.git", rev = "0b2ad7d" } # rust_icu_sys = { path = "../rust_icu/rust_icu_sys" } # rust_icu_ubrk = { path = "../rust_icu/rust_icu_ubrk" } - From 2bf482fdb0713e9e4b5520aa6218dbc7af61c104 Mon Sep 17 00:00:00 2001 From: Master-Hash Date: Wed, 8 Jul 2026 18:01:56 +0800 Subject: [PATCH 2/2] fix --- Cargo.lock | 91 ++++++++++++++++++++++++++++++++++++++++++++++++++++-- Cargo.toml | 2 +- 2 files changed, 89 insertions(+), 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index fe1484a..88e285f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2,6 +2,12 @@ # It is not intended for manual editing. version = 4 +[[package]] +name = "adler2" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "320119579fcad9c21884f5c4861d16174d0e06250625266f50fe6898340abefa" + [[package]] name = "aho-corasick" version = "1.1.4" @@ -33,7 +39,7 @@ dependencies = [ "quote", "regex", "rustc-hash", - "shlex", + "shlex 1.3.0", "syn", ] @@ -43,6 +49,16 @@ version = "2.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b4388bee8683e3d04af747c73422af53102d2bd24d9eadb6cbc100baef4b43f8" +[[package]] +name = "cc" +version = "1.2.66" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f5d6cac793997bd970000024b2934968efe83b382de4fdcf4fcb46b6ee4ad996" +dependencies = [ + "find-msvc-tools", + "shlex 2.0.1", +] + [[package]] name = "cexpr" version = "0.6.0" @@ -78,6 +94,15 @@ dependencies = [ "libm", ] +[[package]] +name = "crc32fast" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9481c1c90cbf2ac953f07c8d4a58aa3945c425b7185c9154d67a65e4230da511" +dependencies = [ + "cfg-if", +] + [[package]] name = "displaydoc" version = "0.2.6" @@ -116,6 +141,16 @@ version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5baebc0774151f905a1a2cc41989300b1e6fbb29aff0ceffa1064fdd3088d582" +[[package]] +name = "flate2" +version = "1.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "843fba2746e448b37e26a819579957415c8cef339bf08564fe8b7ddbd959573c" +dependencies = [ + "crc32fast", + "miniz_oxide", +] + [[package]] name = "glob" version = "0.3.3" @@ -286,6 +321,16 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" +[[package]] +name = "miniz_oxide" +version = "0.8.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fa76a2c86f704bdb222d66965fb3d63269ce38518b83cb0575fca855ebb6316" +dependencies = [ + "adler2", + "simd-adler32", +] + [[package]] name = "nom" version = "7.1.3" @@ -296,6 +341,17 @@ dependencies = [ "minimal-lexical", ] +[[package]] +name = "object" +version = "0.39.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2e5a6c098c7a3b6547378093f5cc30bc54fd361ce711e05293a5cc589562739b" +dependencies = [ + "flate2", + "memchr", + "ruzstd", +] + [[package]] name = "paste" version = "1.0.15" @@ -431,6 +487,15 @@ version = "2.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6b1e7f9a428571be2dc5bc0505c13fb6bf936822b894ec87abf8a08a4e51742d" +[[package]] +name = "ruzstd" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7c1c839d570d835527c9a5e4db7cb2198683a988cb9d7293fc8674e6bd58fc8" +dependencies = [ + "twox-hash", +] + [[package]] name = "serde" version = "1.0.228" @@ -467,6 +532,18 @@ version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" +[[package]] +name = "shlex" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8fadd59c855ef2080decdef8ff161eb6661b86933c9d82e5ba29dc602a55aba" + +[[package]] +name = "simd-adler32" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "703d5c7ef118737c72f1af64ad2f6f8c5e1921f818cdcb97b8fe6fc69bf66214" + [[package]] name = "stable_deref_trait" version = "1.2.1" @@ -526,13 +603,21 @@ dependencies = [ "zerovec", ] +[[package]] +name = "twox-hash" +version = "2.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ea3136b675547379c4bd395ca6b938e5ad3c3d20fad76e7fe85f9e0d011419c" + [[package]] name = "ucrtbase" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f42efc675d365ee861a397f90fa160a8ae9f89cece77fa55e1bf0bb297eeeb30" +checksum = "f735933136494c88431bd3b9c05541bc5b2e6d9e59498005707b6cebeb7f9cf0" dependencies = [ + "cc", "find-msvc-tools", + "object", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index b97b5c9..9ce0578 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -20,7 +20,7 @@ rust_icu_sys = { version = "5.6.0", optional = true } rust_icu_ubrk = { version = "5.6.0", optional = true } [target.'cfg(target_env = "msvc")'.dependencies] -ucrtbase = "0.1.0" +ucrtbase = "0.1.1" [build-dependencies] bindgen = "0.72.1"