eightequal/AstralRinth
1
0
Fork 0
forked from didirus/AstralRinth
Code Pull Requests Activity

Fix clippy issues

Browse Source
This commit is contained in:
Jai A
2023-03-30 15:18:57 -07:00
parent 80e1ae4553
commit 4875ed4359
16 changed files with 114 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
theseus/src/state/projects.rs
View File

@@ -52,7 +52,7 @@ pub struct ModrinthProject {
#[derive(Serialize, Deserialize, Clone, Debug)]
#[serde(tag = "type", rename_all = "snake_case")]
pub enum ProjectMetadata {
Modrinth(ModrinthProject),
Modrinth(Box<ModrinthProject>),
Inferred {
title: Option<String>,
description: Option<String>,
@@ -126,7 +126,9 @@ pub async fn infer_data_from_files(
Project {
sha512: hash,
disabled: false,
metadata: ProjectMetadata::Modrinth(project.clone()),
metadata: ProjectMetadata::Modrinth(Box::new(
project.clone(),
)),
},
);
continue;
@@ -342,10 +344,7 @@ pub async fn infer_data_from_files(
if file.read_to_string(&mut file_str).is_ok() {
if let Ok(pack) = serde_json::from_str::<QuiltMod>(&file_str) {
let icon = read_icon_from_file(
pack.metadata
.as_ref()
.map(|x| x.icon.clone())
.flatten(),
pack.metadata.as_ref().and_then(|x| x.icon.clone()),
)?;
return_projects.insert(
@@ -357,15 +356,13 @@ pub async fn infer_data_from_files(
title: Some(
pack.metadata
.as_ref()
.map(|x| x.name.clone())
.flatten()
.and_then(|x| x.name.clone())
.unwrap_or(pack.id),
),
description: pack
.metadata
.as_ref()
.map(|x| x.description.clone())
.flatten(),
.and_then(|x| x.description.clone()),
authors: pack
.metadata
.map(|x| {