Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ubruntu/issue983' into 'master'

Browse Source 
scan_fmt -> 0.2.6

Closes #983

See merge request veloren/veloren!1911
This commit is contained in:
Marcel 2021-03-16 22:23:23 +00:00
commit cf29fba14b
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Cargo.lock generated
View File

@ -4408,8 +4408,9 @@ dependencies = [
[[package]] [[package]]
name = "scan_fmt" name = "scan_fmt"
version = "0.2.5" version = "0.2.6"
source = "git+https://github.com/Imberflur/scan_fmt#5f9e8eed73e93e8d19fa864d76e75bb4984cffe7" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0b53b0a5db882a8e2fdaae0a43f7b39e7e9082389e978398bdf223a55b581248"
dependencies = [ dependencies = [
"regex", "regex",
] ]

2
server/Cargo.toml
View File

@ -32,7 +32,7 @@ tokio = { version = "1", default-features = false, features = ["rt"] }
prometheus-hyper = "0.1.2" prometheus-hyper = "0.1.2"
itertools = "0.10" itertools = "0.10"
lazy_static = "1.4.0" lazy_static = "1.4.0"
scan_fmt = { git = "https://github.com/Imberflur/scan_fmt" } scan_fmt = "0.2.6"
ron = { version = "0.6", default-features = false } ron = { version = "0.6", default-features = false }
serde = { version = "1.0.110", features = ["derive"] } serde = { version = "1.0.110", features = ["derive"] }
serde_json = "1.0.50" serde_json = "1.0.50"