Update rosu-v2

This commit is contained in:
Natsu Kagami 2024-07-22 20:02:45 +02:00
parent dc02b4b7e2
commit 0aae9623a5
Signed by: nki
GPG key ID: 55A032EB38B49ADB
2 changed files with 44 additions and 19 deletions

60
Cargo.lock generated
View file

@ -489,6 +489,20 @@ dependencies = [
"serde", "serde",
] ]
[[package]]
name = "dashmap"
version = "6.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "804c8821570c3f8b70230c2ba75ffa5c0f9a4189b9a432b6656c536712acae28"
dependencies = [
"cfg-if",
"crossbeam-utils",
"hashbrown 0.14.3",
"lock_api",
"once_cell",
"parking_lot_core",
]
[[package]] [[package]]
name = "data-encoding" name = "data-encoding"
version = "2.5.0" version = "2.5.0"
@ -1258,7 +1272,7 @@ checksum = "c325dfab65f261f386debee8b0969da215b3fa0037e74c8a1234db7ba986d803"
dependencies = [ dependencies = [
"crossbeam-channel", "crossbeam-channel",
"crossbeam-utils", "crossbeam-utils",
"dashmap", "dashmap 5.5.3",
"skeptic", "skeptic",
"smallvec", "smallvec",
"tagptr", "tagptr",
@ -1497,9 +1511,9 @@ dependencies = [
[[package]] [[package]]
name = "paste" name = "paste"
version = "1.0.14" version = "1.0.15"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a"
[[package]] [[package]]
name = "pbkdf2" name = "pbkdf2"
@ -1792,6 +1806,16 @@ version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3c55926c8f0fed1db12fbe96f7a6083a2c4186443dd32532ab34e6902467a4f3" checksum = "3c55926c8f0fed1db12fbe96f7a6083a2c4186443dd32532ab34e6902467a4f3"
[[package]]
name = "rosu-mods"
version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d69daf02885f7477085403a6eada6215f44333c7b54355ea1c4e276a02263bde"
dependencies = [
"paste",
"serde",
]
[[package]] [[package]]
name = "rosu-pp" name = "rosu-pp"
version = "1.0.0" version = "1.0.0"
@ -1803,18 +1827,17 @@ dependencies = [
[[package]] [[package]]
name = "rosu-v2" name = "rosu-v2"
version = "0.8.0" version = "0.9.0"
source = "git+https://github.com/MaxOhn/rosu-v2?branch=lazer#184a4f40ad17678fe53ada16fb0307ba9e6f7ad8" source = "git+https://github.com/MaxOhn/rosu-v2?branch=lazer#04744c606962f21824d7398f1c15c34fe7fa9eef"
dependencies = [ dependencies = [
"bytes", "bytes",
"dashmap", "dashmap 6.0.1",
"futures", "futures",
"hyper", "hyper",
"hyper-rustls", "hyper-rustls",
"itoa", "itoa",
"leaky-bucket-lite", "leaky-bucket-lite",
"log", "rosu-mods",
"paste",
"serde", "serde",
"serde_json", "serde_json",
"serde_urlencoded", "serde_urlencoded",
@ -1822,6 +1845,7 @@ dependencies = [
"thiserror", "thiserror",
"time", "time",
"tokio", "tokio",
"tracing",
"url", "url",
] ]
@ -2003,18 +2027,18 @@ dependencies = [
[[package]] [[package]]
name = "serde" name = "serde"
version = "1.0.196" version = "1.0.204"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "870026e60fa08c69f064aa766c10f10b1d62db9ccd4d0abb206472bee0ce3b32" checksum = "bc76f558e0cbb2a839d37354c575f1dc3fdc6546b5be373ba43d95f231bf7c12"
dependencies = [ dependencies = [
"serde_derive", "serde_derive",
] ]
[[package]] [[package]]
name = "serde_derive" name = "serde_derive"
version = "1.0.196" version = "1.0.204"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "33c85360c95e7d137454dc81d9a4ed2b8efd8fbe19cee57357b32b9771fccb67" checksum = "e0cd7e117be63d3c3678776753929474f3b04a43a080c744d6b0ae2a8c28e222"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
@ -2069,7 +2093,7 @@ dependencies = [
"bytes", "bytes",
"chrono", "chrono",
"command_attr", "command_attr",
"dashmap", "dashmap 5.5.3",
"flate2", "flate2",
"futures", "futures",
"fxhash", "fxhash",
@ -2759,7 +2783,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "36924509726e38224322c8c90ddfbf4317324338327b7c11b7cf8672cb786da1" checksum = "36924509726e38224322c8c90ddfbf4317324338327b7c11b7cf8672cb786da1"
dependencies = [ dependencies = [
"chrono", "chrono",
"dashmap", "dashmap 5.5.3",
"hashbrown 0.14.3", "hashbrown 0.14.3",
"mini-moka", "mini-moka",
"parking_lot", "parking_lot",
@ -3221,7 +3245,7 @@ dependencies = [
"Inflector", "Inflector",
"chrono", "chrono",
"codeforces", "codeforces",
"dashmap", "dashmap 5.5.3",
"lazy_static", "lazy_static",
"log", "log",
"regex", "regex",
@ -3238,7 +3262,7 @@ name = "youmubot-core"
version = "0.1.0" version = "0.1.0"
dependencies = [ dependencies = [
"chrono", "chrono",
"dashmap", "dashmap 5.5.3",
"flume 0.10.14", "flume 0.10.14",
"futures-util", "futures-util",
"rand", "rand",
@ -3279,7 +3303,7 @@ dependencies = [
"bincode", "bincode",
"bitflags 1.3.2", "bitflags 1.3.2",
"chrono", "chrono",
"dashmap", "dashmap 5.5.3",
"futures-util", "futures-util",
"lazy_static", "lazy_static",
"rand", "rand",
@ -3305,7 +3329,7 @@ dependencies = [
"anyhow", "anyhow",
"async-trait", "async-trait",
"chrono", "chrono",
"dashmap", "dashmap 5.5.3",
"flume 0.10.14", "flume 0.10.14",
"futures-util", "futures-util",
"poise", "poise",

View file

@ -330,7 +330,8 @@ impl From<rosu::mods::GameModsIntermode> for Mods {
impl From<rosu::mods::GameMods> for Mods { impl From<rosu::mods::GameMods> for Mods {
fn from(value: rosu::mods::GameMods) -> Self { fn from(value: rosu::mods::GameMods) -> Self {
let unknown = rosu::mods::GameModIntermode::Unknown(rosu::mods::UnknownMod::default()); let unknown =
rosu::mods::GameModIntermode::Unknown(rosu_v2::prelude::UnknownMod::default());
value value
.iter() .iter()
.cloned() .cloned()