fix: upgrade locale_config to non-panic version (#3395)

This commit is contained in:
Jakub Panek 2024-08-02 06:42:38 +02:00 committed by GitHub
parent 9c5e480ce8
commit 16ebd02775
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 56 additions and 20 deletions

60
Cargo.lock generated
View File

@ -514,7 +514,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "15b55663a85f33501257357e6421bb33e769d5c9ffb5ba0921c975a123e35e68"
dependencies = [
"block-sys",
"objc2",
"objc2 0.4.1",
]
[[package]]
name = "block2"
version = "0.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2c132eebf10f5cad5289222520a4a058514204aed6d791f1cf4fe8088b82d15f"
dependencies = [
"objc2 0.5.2",
]
[[package]]
@ -1780,7 +1789,7 @@ dependencies = [
"memmap2",
"ndk",
"ndk-sys",
"objc2",
"objc2 0.4.1",
"once_cell",
"orbclient",
"percent-encoding",
@ -2514,9 +2523,9 @@ version = "0.0.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "99d3aaff8a54577104bafdf686ff18565c3b6903ca5782a2026ef06e2c7aa319"
dependencies = [
"block2",
"block2 0.3.0",
"dispatch",
"objc2",
"objc2 0.4.1",
]
[[package]]
@ -3199,13 +3208,12 @@ checksum = "b4ce301924b7887e9d637144fdade93f9dfff9b60981d4ac161db09720d39aa5"
[[package]]
name = "locale_config"
version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "08d2c35b16f4483f6c26f0e4e9550717a2f6575bcd6f12a53ff0c490a94a6934"
version = "0.3.1-alpha.0"
source = "git+https://github.com/lapce/locale_config.git?branch=lapce#54c9fe6a247c3618c224ec57e6c3a747bc3a96e4"
dependencies = [
"lazy_static",
"objc",
"objc-foundation",
"objc2 0.5.2",
"objc2-foundation",
"regex",
"winapi",
]
@ -3572,9 +3580,9 @@ dependencies = [
[[package]]
name = "objc-sys"
version = "0.3.1"
version = "0.3.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "99e1d07c6eab1ce8b6382b8e3c7246fe117ff3f8b34be065f5ebace6749fe845"
checksum = "cdb91bdd390c7ce1a8607f35f3ca7151b65afc0ff5ff3b34fa350f7d7c7e4310"
[[package]]
name = "objc2"
@ -3583,7 +3591,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "559c5a40fdd30eb5e344fbceacf7595a81e242529fb4e21cf5f43fb4f11ff98d"
dependencies = [
"objc-sys",
"objc2-encode",
"objc2-encode 3.0.0",
]
[[package]]
name = "objc2"
version = "0.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "46a785d4eeff09c14c487497c162e92766fbb3e4059a71840cecc03d9a50b804"
dependencies = [
"objc-sys",
"objc2-encode 4.0.3",
]
[[package]]
@ -3592,6 +3610,24 @@ version = "3.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d079845b37af429bfe5dfa76e6d087d788031045b25cfc6fd898486fd9847666"
[[package]]
name = "objc2-encode"
version = "4.0.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7891e71393cd1f227313c9379a26a584ff3d7e6e7159e988851f0934c993f0f8"
[[package]]
name = "objc2-foundation"
version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0ee638a5da3799329310ad4cfa62fbf045d5f56e3ef5ba4149e7452dcf89d5a8"
dependencies = [
"bitflags 2.6.0",
"block2 0.5.1",
"libc",
"objc2 0.5.2",
]
[[package]]
name = "objc_id"
version = "0.1.1"

View File

@ -40,12 +40,11 @@ floem-editor-core = { workspace = true }
# proxy specific dependencies
dyn-clone = "1.0.16"
walkdir = "2.4.0"
locale_config = "0.3.0"
jsonrpc-lite = "0.6.0"
polling = "3.5.0"
libc = "0.2"
dyn-clone = "1.0.16"
walkdir = "2.4.0"
jsonrpc-lite = "0.6.0"
polling = "3.5.0"
libc = "0.2"
# deleting files
trash = "3.0.6"
@ -65,5 +64,6 @@ wasi-common = "14.0.0"
git = "https://github.com/lapce/wasi-experimental-http"
# path = "../../wasi-experimental-http/crates/wasi-experimental-http-wasmtime"
[target.'cfg(target_os = "macos")'.dependencies]
libc = "0.2"
[target.'cfg(target_os = "macos")'.dependencies.locale_config]
git = "https://github.com/lapce/locale_config.git"
branch = "lapce"