Skip to content

Commit bde7fa2

Browse files
committed
Minor semantic changes
1 parent 28106d4 commit bde7fa2

File tree

3 files changed

+10
-9
lines changed

3 files changed

+10
-9
lines changed

src/cli.rs

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -113,12 +113,13 @@ pub enum Source {
113113
Github,
114114
}
115115

116-
impl ToString for Source {
117-
fn to_string(&self) -> String {
118-
match self {
116+
impl Display for Source {
117+
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
118+
let text = match self {
119119
Source::Modrinth => "modrinth".to_string(),
120120
Source::Github => "github".to_string(),
121-
}
121+
};
122+
write!(f, "{}", text)
122123
}
123124
}
124125

src/metadata.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ impl Metadata {
3434
let mut buffer = Vec::new();
3535
file.read_to_end(&mut buffer)?;
3636
let mut zip = zip::ZipArchive::new(Cursor::new(buffer))?;
37-
let metadata = format!("source: {}\n{}: {}", source.to_string(), key, value);
37+
let metadata = format!("source: {}\n{}: {}", source, key, value);
3838
let tmp_file_path = temp_dir().join("temp.jar");
3939
let mut tmp_file = File::create(tmp_file_path.clone())?;
4040
let mut zipwriter = ZipWriter::new(&mut tmp_file);

src/modrinth_wrapper/modrinth.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ impl GetProject {
143143
let res = res.unwrap();
144144
let text = res.text().await.unwrap();
145145
debug!(text);
146-
let res: Result<GetProject> = serde_json::from_str(&text).map_err(|e| Error::SerdeErr(e));
146+
let res: Result<GetProject> = serde_json::from_str(&text).map_err(Error::SerdeErr);
147147
if res.is_err() {
148148
error!("Error parsing project: {}", res.err().unwrap());
149149
return None;
@@ -174,7 +174,7 @@ impl Modrinth {
174174
.expect("Failed to get versions");
175175

176176
let versions = versions.text().await.unwrap();
177-
serde_json::from_str(&versions).map_err(|e| Error::SerdeErr(e))
177+
serde_json::from_str(&versions).map_err(Error::SerdeErr)
178178
}
179179
pub async fn search_mods(query: &str, limit: u16, offset: u16) -> ProjectSearch {
180180
let client = reqwest::Client::new();
@@ -381,10 +381,10 @@ impl VersionData {
381381
.await
382382
.unwrap();
383383
let res = res.text().await.unwrap();
384-
let res: Result<VersionData> = serde_json::from_str(&res).map_err(|e| Error::SerdeErr(e));
384+
let res: Result<VersionData> = serde_json::from_str(&res).map_err(Error::SerdeErr);
385385
res
386386
}
387-
pub fn format_verbose(&self, mod_name: &str, categories: &Vec<String>) -> String {
387+
pub fn format_verbose(&self, mod_name: &str, categories: &[String]) -> String {
388388
let mut output = String::new();
389389
let url = format!("https://modrinth.com/mod/{}", self.project_id);
390390
let link = Link::new(url.clone(), url);

0 commit comments

Comments
 (0)