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 'xMAC/remove_fehler' into 'master'

Browse Source 
remove unmaintained fehler crate by updating lz-fear and zwitch to culpa

See merge request veloren/veloren!4315
This commit is contained in:
Marcel 2024-02-10 11:01:33 +00:00
commit ce1d46830a
3 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
Cargo.lock generated
View File

@ -1562,6 +1562,26 @@ version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b365fabc795046672053e29c954733ec3b05e4be654ab130fe8f1f94d7051f35"
[[package]]
name = "culpa"
version = "1.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5ae0bfe9317b1cb4ff5a56d766ee4b157b3e1f47f11979253570e88d10fd1fd3"
dependencies = [
"culpa-macros",
]
[[package]]
name = "culpa-macros"
version = "1.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1234e1717066d3c71dcf89b75e7b586299e41204d361db56ec51e6ded5014279"
dependencies = [
"proc-macro2 1.0.78",
"quote 1.0.35",
"syn 2.0.48",
]
[[package]]
name = "d3d12"
version = "0.7.0"
@ -2116,26 +2136,6 @@ dependencies = [
"simd-adler32",
]
[[package]]
name = "fehler"
version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d5729fe49ba028cd550747b6e62cd3d841beccab5390aa398538c31a2d983635"
dependencies = [
"fehler-macros",
]
[[package]]
name = "fehler-macros"
version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ccb5acb1045ebbfa222e2c50679e392a71dd77030b78fb0189f2d9c5974400f9"
dependencies = [
"proc-macro2 1.0.78",
"quote 1.0.35",
"syn 1.0.109",
]
[[package]]
name = "filetime"
version = "0.2.23"
@ -3619,13 +3619,13 @@ dependencies = [
[[package]]
name = "lz-fear"
version = "0.1.1"
version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "06aad1ce45e4ccf7a8d7d43e0c3ad38dc5d2255174a5f29a3c39d961fbc6181d"
checksum = "26a280471e5ff9dda51cf34863c338ffde7df78139210f9c819943b29cdb091d"
dependencies = [
"bitflags 1.3.2",
"bitflags 2.4.2",
"byteorder",
"fehler",
"culpa",
"thiserror",
"twox-hash",
]

2
network/Cargo.toml
View File

@ -38,7 +38,7 @@ rand = { workspace = true }
#quic support
quinn = { version = "0.10", optional = true }
rustls = "0.21"
lz-fear = { version = "0.1.1", optional = true }
lz-fear = { version = "0.2", optional = true }
# async traits
async-trait = { workspace = true }
bytes = "^1"

2
world/Cargo.toml
View File

@ -44,7 +44,7 @@ kiddo = "0.2"
strum = { workspace = true }
# compression benchmarks
lz-fear = { version = "0.1.1", optional = true }
lz-fear = { version = "0.2", optional = true }
deflate = { version = "1.0.0", optional = true }
flate2 = { version = "1.0.20", optional = true }
num-traits = { workspace = true, optional = true }