From 1e1f89ddc0e6e2e2b34440d7fa5f642507afa63f Mon Sep 17 00:00:00 2001 From: nyyu Date: Sat, 31 May 2025 21:12:15 +0200 Subject: [PATCH] feat: rust edition 2024 --- Cargo.toml | 3 +-- src/data_source.rs | 2 +- src/kb_data_source.rs | 4 ++-- src/main.rs | 2 +- src/ms_data_source.rs | 2 +- 5 files changed, 6 insertions(+), 7 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 25fa33e..60a948e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,7 +1,6 @@ [package] authors = ["nyyu "] -edition = "2021" -resolver = "2" +edition = "2024" name = "cggitem_sets" version = "1.0.0" include = ["src/**/*"] diff --git a/src/data_source.rs b/src/data_source.rs index a62dc38..6ad7b9b 100644 --- a/src/data_source.rs +++ b/src/data_source.rs @@ -3,7 +3,7 @@ use crate::Champion; use indexmap::IndexMap; use log::{error, info}; use serde_derive::{Deserialize, Serialize}; -use serde_json::{json, Value}; +use serde_json::{Value, json}; use std::fs; use std::path::Path; diff --git a/src/kb_data_source.rs b/src/kb_data_source.rs index 3d95cbe..8921b9f 100644 --- a/src/kb_data_source.rs +++ b/src/kb_data_source.rs @@ -1,11 +1,11 @@ -use crate::data_source::{Build, DataSource, Item, Stat}; use crate::ChampInfo; use crate::Champion as ChampionLoL; use crate::USER_AGENT_VALUE; +use crate::data_source::{Build, DataSource, Item, Stat}; use indexmap::IndexMap; use log::error; use serde_derive::Deserialize; -use serde_json::{json, Value}; +use serde_json::{Value, json}; use std::time::Duration; use ureq::Agent; diff --git a/src/main.rs b/src/main.rs index b33c033..d72ac1c 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,7 +1,7 @@ use indexmap::IndexMap; #[cfg(target_os = "windows")] use log::debug; -use log::{error, info, LevelFilter}; +use log::{LevelFilter, error, info}; use rayon::prelude::*; use serde_derive::Deserialize; use std::env; diff --git a/src/ms_data_source.rs b/src/ms_data_source.rs index 0b934bd..7db90b3 100644 --- a/src/ms_data_source.rs +++ b/src/ms_data_source.rs @@ -4,9 +4,9 @@ use regex::Regex; use serde_derive::Deserialize; use serde_json::Value; -use crate::data_source::{DataSource, Stat}; use crate::ChampInfo; use crate::Champion; +use crate::data_source::{DataSource, Stat}; pub struct MSDataSource;