Merge pull request 'multithreaded' (#6) from multithreaded into master

Reviewed-on: http://raspberrypi.fritz.box:7920/fx/modlist/pulls/6

1 files changed, 14 insertions, 5 deletions

diff --git a/src/apis/modrinth.rs b/src/apis/modrinth.rs
index 525cc0d..9a22633 100644
--- a/src/apis/modrinth.rs
+++ b/src/apis/modrinth.rs
@@ -127,10 +127,13 @@ pub enum GameVersionType {
     release,
     snapshot,
     alpha,
-    beta
+    beta,
 }
 
-async fn get(api: &str, path: &str) -> Result<Option<Vec<u8>>, Box<dyn std::error::Error>> {
+async fn get(
+    api: &str,
+    path: &str,
+) -> Result<Option<Vec<u8>>, Box<dyn std::error::Error>> {
     let url = format!(r#"{}{}"#, api, path);
 
     let client = Client::builder()
@@ -170,7 +173,7 @@ pub async fn projects(api: &str, ids: Vec<String>) -> Vec<Project> {
 pub async fn versions(api: &str, id: String, list: List) -> Vec<Version> {
     let url = format!(
         r#"project/{}/version?loaders=["{}"]&game_versions=["{}"]"#,
-        id, list.modloader.to_string(), list.mc_version
+        id, list.modloader, list.mc_version
     );
 
     let data = get(api, &url).await.unwrap();
@@ -182,7 +185,10 @@ pub async fn versions(api: &str, id: String, list: List) -> Vec<Version> {
 }
 
 ///Get version with the version ids
-pub async fn get_raw_versions(api: &str, versions: Vec<String>) -> Vec<Version> {
+pub async fn get_raw_versions(
+    api: &str,
+    versions: Vec<String>,
+) -> Vec<Version> {
     let url = format!(r#"versions?ids=["{}"]"#, versions.join(r#"",""#));
 
     let data = get(api, &url).await.unwrap().unwrap();
@@ -208,7 +214,10 @@ pub fn extract_current_version(versions: Vec<Version>) -> MLE<String> {
 }
 
 pub async fn get_game_versions() -> Vec<GameVersion> {
-    let data = get("https://api.modrinth.com/v2/", "tag/game_version").await.unwrap().unwrap();
+    let data = get("https://api.modrinth.com/v2/", "tag/game_version")
+        .await
+        .unwrap()
+        .unwrap();
 
     serde_json::from_slice(&data).unwrap()
 }