use published rosu-pp

MaxOhn · Apr 2, 2024 · abd77a3 · abd77a3
1 parent e8e395c
commit abd77a3
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -14,7 +14,7 @@ crate-type = ["cdylib"]
 
 [dependencies]
 pyo3 = { version = "0.21", features = ["extension-module", "macros"] }
-rosu-pp = { git = "https://github.com/MaxOhn/rosu-pp", branch = "next", features = ["sync"] }
+rosu-pp = { version = "1.0.0", features = ["sync"] }
 
 [profile.release]
 lto = true

diff --git a/src/performance.rs b/src/performance.rs
@@ -205,16 +205,16 @@ impl PyPerformance {
     }
 
     fn calculate(&self, args: &Bound<'_, PyAny>) -> PyResult<PyPerformanceAttributes> {
-        let _map;
+        let map;
 
         let mut perf = if let Ok(attrs) = args.extract::<PyPerformanceAttributes>() {
-            Performance::from_attributes(DifficultyAttributes::try_from(attrs.difficulty)?)
+            Performance::new(DifficultyAttributes::try_from(attrs.difficulty)?)
         } else if let Ok(attrs) = args.extract::<PyDifficultyAttributes>() {
-            Performance::from_attributes(DifficultyAttributes::try_from(attrs)?)
-        } else if let Ok(map) = args.extract::<PyRef<'_, PyBeatmap>>() {
-            _map = map;
+            Performance::new(DifficultyAttributes::try_from(attrs)?)
+        } else if let Ok(map_) = args.extract::<PyRef<'_, PyBeatmap>>() {
+            map = map_;
 
-            Performance::from_map(&_map.inner)
+            Performance::new(&map.inner)
         } else {
             return Err(ArgsError::new_err(
                 "argument must be DifficultyAttributes, PerformanceAttributes, or a Beatmap",