Merge branch 'imbris/fix' into 'master'

Fix crash with unicode characters

See merge request veloren/veloren!1452
This commit is contained in:
Imbris 2020-10-24 21:41:52 +00:00
commit 4a7eb7f786
2 changed files with 2 additions and 3 deletions

3
Cargo.lock generated
View File

@ -3565,8 +3565,7 @@ dependencies = [
[[package]]
name = "scan_fmt"
version = "0.2.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "248286eec0f55678879ef1caec3d76276643ebcb5460d8cb6e732ef40f50aabe"
source = "git+https://github.com/Imberflur/scan_fmt#5f9e8eed73e93e8d19fa864d76e75bb4984cffe7"
dependencies = [
"regex",
]

View File

@ -25,7 +25,7 @@ futures-timer = "2.0"
futures-channel = "0.3"
itertools = "0.9"
lazy_static = "1.4.0"
scan_fmt = "0.2.4"
scan_fmt = { git = "https://github.com/Imberflur/scan_fmt" }
ron = { version = "0.6", default-features = false }
serde = { version = "1.0.110", features = ["derive"] }
serde_json = "1.0.50"