update and cleanup.

Author: derspyy

Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "velvet-minecraft"
 version = "1.0.0"
-edition = "2021"
+edition = "2024"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 

src/get_minecraft_dir.rs

@@ -1,5 +1,5 @@
 #[allow(unused_imports)]
-use anyhow::{anyhow, Result};
+use anyhow::{Result, anyhow};
 use async_std::path::PathBuf;
 use home::home_dir;
 

src/get_mods.rs

@@ -1,4 +1,4 @@
-use anyhow::{anyhow, Result};
+use anyhow::{Result, anyhow};
 use async_std::fs::remove_file;
 use async_std::{fs::File, path::PathBuf};
 use async_std::{prelude::*, task};
@@ -107,7 +107,7 @@ pub async fn run(
             Ok(Status::Found(name, url, hash)) => {
                 match existing_mods.get(name) {
                     Some(x) if x == &hash => {
-                        println!("Already found \x1b[35m{}\x1b[39m.", name)
+                        println!("Already found \x1b[35m{name}\x1b[39m.")
                     }
                     _ => download_mods.push(task::spawn(download_mod(
                         url,
@@ -123,7 +123,7 @@ pub async fn run(
 
     for (name, hash) in existing_mods {
         if new_mods.get(name.as_str()) != Some(&hash) {
-            println!("Removing \x1b[35m{}\x1b[39m.", name);
+            println!("Removing \x1b[35m{name}\x1b[39m.");
             remove_file(path_mods.join(name).with_extension("jar")).await?
         }
     }
@@ -140,26 +140,25 @@ pub async fn run(
 }
 
 async fn download_mod(url: String, file_name: &str, path: PathBuf, client: Client) -> Result<()> {
-    println!("Downloading \x1b[35m{}\x1b[39m.", file_name);
+    println!("Downloading \x1b[35m{file_name}\x1b[39m.");
     let path = path.join(file_name).with_extension("jar");
     let download = client.get(url).send().await?.bytes().await?;
     let mut mod_file = File::create(path).await?;
     mod_file.write(&download).await?;
-    println!("Finished downloading \x1b[35m{}\x1b[39m.", file_name);
+    println!("Finished downloading \x1b[35m{file_name}\x1b[39m.");
     Ok(())
 }
 
 async fn check_latest(x: &'static str, client: Client, mc_version: String) -> Result<Status> {
-    let mut modrinth_url = format!("{}/{}", MODRINTH_SERVER, x);
+    let mut modrinth_url = format!("{MODRINTH_SERVER}/{x}");
     let name_response: Value = client.get(&modrinth_url).send().await?.json().await?;
     let name = name_response["slug"]
         .as_str()
         .ok_or_else(|| anyhow!("Couldn't get project name!"))?
         .to_owned();
 
     modrinth_url = format!(
-        "{}/version?loaders=[\"fabric\", \"quilt\"]&game_versions=[{:?}]",
-        modrinth_url, mc_version
+        "{modrinth_url}/version?loaders=[\"fabric\", \"quilt\"]&game_versions=[{mc_version:?}]"
     );
 
     let version_response: Value = client.get(&modrinth_url).send().await?.json().await?;

src/install_velvet.rs

@@ -1,5 +1,5 @@
 use crate::{get_minecraft_dir, write_json};
-use anyhow::{anyhow, Result};
+use anyhow::{Result, anyhow};
 use async_std::fs::File;
 use async_std::fs::{self, create_dir_all};
 use async_std::path::PathBuf;
@@ -23,7 +23,7 @@ pub async fn run(mc_version: &String, quilt_version: &String) -> Result<(PathBuf
 
     let mut path_versions: PathBuf = PathBuf::from(&velvet_path).join("versions");
     let parent_dir = path_versions.clone();
-    path_versions.push(format!("{}.json", mc_version));
+    path_versions.push(format!("{mc_version}.json"));
     if !path_versions.exists().await {
         create_dir_all(parent_dir).await?;
         File::create(&path_versions).await?;
@@ -37,7 +37,7 @@ pub async fn run(mc_version: &String, quilt_version: &String) -> Result<(PathBuf
         .join("versions")
         .join(&version_folder_name);
     fs::create_dir_all(&path_version).await?;
-    path_version.push(format!("{}.jar", version_folder_name));
+    path_version.push(format!("{version_folder_name}.jar"));
     fs::File::create(&path_version).await?; // dummy jar required by the launcher.
 
     path_version.set_extension("json");

src/main.rs

@@ -10,9 +10,9 @@ mod get_mods;
 mod install_velvet;
 pub mod write_json;
 
-use iced::widget::{button, checkbox, column, pick_list, text, Column, Space};
+use iced::widget::{Column, Space, button, checkbox, column, pick_list, text};
 use iced::{
-    application, theme::Palette, window, Alignment, Color, Element, Length, Size, Task, Theme,
+    Alignment, Color, Element, Length, Size, Task, Theme, application, theme::Palette, window,
 };
 
 #[derive(Deserialize)]
@@ -180,7 +180,8 @@ impl Velvet {
                 self.version_list.clone(),
                 self.version.clone(),
                 Message::Update
-            ).placeholder("Loading...")
+            )
+            .placeholder("Loading...")
             .width(Length::Fixed(200.0)),
             Space::with_height(Length::Fixed(5.0)),
             checkbox("Show snapshots", self.snapshot).on_toggle(Message::Snapshot),