Skip to content

Commit 9b1aa16

Browse files
committed
fix json/yaml serializer
1 parent 6d84c2d commit 9b1aa16

File tree

1 file changed

+6
-20
lines changed

1 file changed

+6
-20
lines changed

src/info/mod.rs

+6-20
Original file line numberDiff line numberDiff line change
@@ -431,39 +431,25 @@ impl Serialize for Info {
431431
where
432432
S: serde::Serializer,
433433
{
434-
let mut state = serializer.serialize_struct("Info", 20)?;
435-
436-
// Only collect the version number
437-
let git_version = if !self.git_version.is_empty() {
438-
self.git_version.split(' ').collect::<Vec<_>>()[2]
439-
} else {
440-
""
441-
};
442-
443-
state.serialize_field("gitVersion", &git_version)?;
444-
state.serialize_field("gitUsername", &self.git_username)?;
434+
let mut state = serializer.serialize_struct("Info", 15)?;
435+
let langs: Vec<String> = self.languages.iter().map(|(l, _)| format!("{}", l)).collect();
436+
let auths: Vec<String> = self.authors.iter().map(|(l, _, _, _)| format!("{}", l)).collect();
445437
state.serialize_field("repoName", &self.repo_name)?;
446438
state.serialize_field("numberOfTags", &self.number_of_tags)?;
447439
state.serialize_field("numberOfBranches", &self.number_of_branches)?;
448440
state.serialize_field("headRefs", &self.head_refs)?;
449-
state.serialize_field("pendingChanges", &self.pending_changes)?;
450441
state.serialize_field("version", &self.version)?;
451442
state.serialize_field("creationDate", &self.creation_date)?;
452-
state.serialize_field("languages", &self.languages)?;
453-
454-
let dependencies_split: Vec<String> =
455-
self.dependencies.split(' ').map(|s| s.to_string()).collect();
456-
457-
state.serialize_field("dependencies", &dependencies_split[0])?;
458-
state.serialize_field("authors", &self.authors)?;
443+
state.serialize_field("languages", &langs)?;
444+
state.serialize_field("authors", &auths)?;
459445
state.serialize_field("lastChange", &self.last_change)?;
460446
state.serialize_field("repoUrl", &self.repo_url)?;
461447
state.serialize_field("numberOfCommits", &self.number_of_commits)?;
462448
state.serialize_field("linesOfCode", &self.lines_of_code)?;
463449
state.serialize_field("repoSize", &self.repo_size)?;
464450
state.serialize_field("filesCount", &self.file_count)?;
465451
state.serialize_field("license", &self.license)?;
466-
state.serialize_field("dominantLanguage", &self.dominant_language)?;
452+
467453
state.end()
468454
}
469455
}

0 commit comments

Comments
 (0)