From 0aae9623a5a048650c436fe60bdc5318c34f0a3f Mon Sep 17 00:00:00 2001
From: Natsu Kagami <nki@nkagami.me>
Date: Mon, 22 Jul 2024 20:02:45 +0200
Subject: [PATCH] Update rosu-v2

---
 Cargo.lock                      | 60 +++++++++++++++++++++++----------
 youmubot-osu/src/models/rosu.rs |  3 +-
 2 files changed, 44 insertions(+), 19 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 761789c..4922e85 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -489,6 +489,20 @@ dependencies = [
  "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]]
 name = "data-encoding"
 version = "2.5.0"
@@ -1258,7 +1272,7 @@ checksum = "c325dfab65f261f386debee8b0969da215b3fa0037e74c8a1234db7ba986d803"
 dependencies = [
  "crossbeam-channel",
  "crossbeam-utils",
- "dashmap",
+ "dashmap 5.5.3",
  "skeptic",
  "smallvec",
  "tagptr",
@@ -1497,9 +1511,9 @@ dependencies = [
 
 [[package]]
 name = "paste"
-version = "1.0.14"
+version = "1.0.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c"
+checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a"
 
 [[package]]
 name = "pbkdf2"
@@ -1792,6 +1806,16 @@ version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 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]]
 name = "rosu-pp"
 version = "1.0.0"
@@ -1803,18 +1827,17 @@ dependencies = [
 
 [[package]]
 name = "rosu-v2"
-version = "0.8.0"
-source = "git+https://github.com/MaxOhn/rosu-v2?branch=lazer#184a4f40ad17678fe53ada16fb0307ba9e6f7ad8"
+version = "0.9.0"
+source = "git+https://github.com/MaxOhn/rosu-v2?branch=lazer#04744c606962f21824d7398f1c15c34fe7fa9eef"
 dependencies = [
  "bytes",
- "dashmap",
+ "dashmap 6.0.1",
  "futures",
  "hyper",
  "hyper-rustls",
  "itoa",
  "leaky-bucket-lite",
- "log",
- "paste",
+ "rosu-mods",
  "serde",
  "serde_json",
  "serde_urlencoded",
@@ -1822,6 +1845,7 @@ dependencies = [
  "thiserror",
  "time",
  "tokio",
+ "tracing",
  "url",
 ]
 
@@ -2003,18 +2027,18 @@ dependencies = [
 
 [[package]]
 name = "serde"
-version = "1.0.196"
+version = "1.0.204"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "870026e60fa08c69f064aa766c10f10b1d62db9ccd4d0abb206472bee0ce3b32"
+checksum = "bc76f558e0cbb2a839d37354c575f1dc3fdc6546b5be373ba43d95f231bf7c12"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.196"
+version = "1.0.204"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33c85360c95e7d137454dc81d9a4ed2b8efd8fbe19cee57357b32b9771fccb67"
+checksum = "e0cd7e117be63d3c3678776753929474f3b04a43a080c744d6b0ae2a8c28e222"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2069,7 +2093,7 @@ dependencies = [
  "bytes",
  "chrono",
  "command_attr",
- "dashmap",
+ "dashmap 5.5.3",
  "flate2",
  "futures",
  "fxhash",
@@ -2759,7 +2783,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "36924509726e38224322c8c90ddfbf4317324338327b7c11b7cf8672cb786da1"
 dependencies = [
  "chrono",
- "dashmap",
+ "dashmap 5.5.3",
  "hashbrown 0.14.3",
  "mini-moka",
  "parking_lot",
@@ -3221,7 +3245,7 @@ dependencies = [
  "Inflector",
  "chrono",
  "codeforces",
- "dashmap",
+ "dashmap 5.5.3",
  "lazy_static",
  "log",
  "regex",
@@ -3238,7 +3262,7 @@ name = "youmubot-core"
 version = "0.1.0"
 dependencies = [
  "chrono",
- "dashmap",
+ "dashmap 5.5.3",
  "flume 0.10.14",
  "futures-util",
  "rand",
@@ -3279,7 +3303,7 @@ dependencies = [
  "bincode",
  "bitflags 1.3.2",
  "chrono",
- "dashmap",
+ "dashmap 5.5.3",
  "futures-util",
  "lazy_static",
  "rand",
@@ -3305,7 +3329,7 @@ dependencies = [
  "anyhow",
  "async-trait",
  "chrono",
- "dashmap",
+ "dashmap 5.5.3",
  "flume 0.10.14",
  "futures-util",
  "poise",
diff --git a/youmubot-osu/src/models/rosu.rs b/youmubot-osu/src/models/rosu.rs
index 3f0db98..dec8256 100644
--- a/youmubot-osu/src/models/rosu.rs
+++ b/youmubot-osu/src/models/rosu.rs
@@ -330,7 +330,8 @@ impl From<rosu::mods::GameModsIntermode> for Mods {
 
 impl From<rosu::mods::GameMods> for Mods {
     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
             .iter()
             .cloned()