From 7987bef3849e12557a533f69c1bc1f151021d0eb Mon Sep 17 00:00:00 2001 From: Jef Roosens Date: Tue, 14 Apr 2026 21:04:57 +0200 Subject: [PATCH] refactor(papermc_api): fix Clippy diagnostics --- papermc-api/src/lib.rs | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/papermc-api/src/lib.rs b/papermc-api/src/lib.rs index d9881c8..1de90b5 100644 --- a/papermc-api/src/lib.rs +++ b/papermc-api/src/lib.rs @@ -13,6 +13,12 @@ pub struct Client { pub const BASE_URL: &str = "https://fill.papermc.io/v3"; +impl Default for Client { + fn default() -> Self { + Self::new() + } +} + impl Client { pub fn new() -> Self { Self { @@ -25,14 +31,14 @@ impl Client { let body_json: Value = res.body_mut().read_json()?; let projects = body_json["projects"].as_array().ok_or(Error::BadBody)?; - projects.into_iter().map(parse_project_json).collect() + projects.iter().map(parse_project_json).collect() } pub fn project<'a>(&'a self, project: &'a str) -> ProjectQuery<'a> { - return ProjectQuery { + ProjectQuery { agent: &self.agent, project, - }; + } } } @@ -60,7 +66,7 @@ impl<'a> ProjectQuery<'a> { let body_json: Value = res.body_mut().read_json()?; let versions = body_json["versions"].as_array().ok_or(Error::BadBody)?; - versions.into_iter().map(parse_version_json).collect() + versions.iter().map(parse_version_json).collect() } pub fn version(&self, version: &'a str) -> VersionQuery<'a> { @@ -105,7 +111,7 @@ impl<'a> VersionQuery<'a> { body_json .as_array() .ok_or(Error::BadBody)? - .into_iter() + .iter() .map(parse_build_json) .collect() } @@ -124,7 +130,7 @@ impl<'a> VersionQuery<'a> { } pub fn latest(&self) -> Result { - return self.build("latest"); + self.build("latest") } } @@ -142,7 +148,7 @@ fn parse_project_json(value: &Value) -> Result { versions: value["versions"] .as_object() .ok_or(Error::BadBody)? - .into_iter() + .iter() .map(|(_, versions)| versions.as_array().ok_or(Error::BadBody)) // Collect into error to propagate error of any of the versions .collect::, _>>()? @@ -171,14 +177,14 @@ fn parse_version_json(value: &Value) -> Result { recommended_flags: value["version"]["java"]["flags"]["recommended"] .as_array() .ok_or(Error::BadBody)? - .into_iter() + .iter() .map(|v| v.as_str().map(String::from).ok_or(Error::BadBody)) .collect::>()?, }, builds: value["builds"] .as_array() .ok_or(Error::BadBody)? - .into_iter() + .iter() .map(|v| v.as_u64().ok_or(Error::BadBody)) .collect::>()?, }) @@ -198,7 +204,7 @@ fn parse_build_json(value: &Value) -> Result { commits: value["commits"] .as_array() .ok_or(Error::BadBody)? - .into_iter() + .iter() .map(|build| { Ok(BuildCommit { sha: build["sha"].as_str().ok_or(Error::BadBody)?.to_string(), @@ -214,7 +220,7 @@ fn parse_build_json(value: &Value) -> Result { downloads: value["downloads"] .as_object() .ok_or(Error::BadBody)? - .into_iter() + .iter() .map(|(key, build)| { Ok(( key.to_string(),