chore(format): format module imports for readability (#1183)

Author: joshka

git-cliff-core/src/changelog.rs

@@ -1,16 +1,11 @@
+use std::collections::HashMap;
+use std::io::{Read, Write};
+use std::time::{SystemTime, UNIX_EPOCH};
+
 use crate::commit::Commit;
-use crate::config::{
-	Config,
-	GitConfig,
-};
-use crate::error::{
-	Error,
-	Result,
-};
-use crate::release::{
-	Release,
-	Releases,
-};
+use crate::config::{Config, GitConfig};
+use crate::error::{Error, Result};
+use crate::release::{Release, Releases};
 #[cfg(feature = "bitbucket")]
 use crate::remote::bitbucket::BitbucketClient;
 #[cfg(feature = "gitea")]
@@ -20,15 +15,6 @@ use crate::remote::github::GitHubClient;
 #[cfg(feature = "gitlab")]
 use crate::remote::gitlab::GitLabClient;
 use crate::template::Template;
-use std::collections::HashMap;
-use std::io::{
-	Read,
-	Write,
-};
-use std::time::{
-	SystemTime,
-	UNIX_EPOCH,
-};
 
 /// Changelog generator.
 #[derive(Debug)]
@@ -697,18 +683,15 @@ fn get_body_template(config: &Config, trim: bool) -> Result<Template> {
 
 #[cfg(test)]
 mod test {
+	use std::str;
+
+	use pretty_assertions::assert_eq;
+	use regex::Regex;
+
 	use super::*;
 	use crate::config::{
-		Bump,
-		ChangelogConfig,
-		CommitParser,
-		Remote,
-		RemoteConfig,
-		TextProcessor,
+		Bump, ChangelogConfig, CommitParser, Remote, RemoteConfig, TextProcessor,
 	};
-	use pretty_assertions::assert_eq;
-	use regex::Regex;
-	use std::str;
 
 	fn get_test_data() -> (Config, Vec<Release<'static>>) {
 		let config = Config {

git-cliff-core/src/command.rs

@@ -1,17 +1,8 @@
+use std::io::{Error as IoError, Write};
+use std::process::{Command, Stdio};
+use std::{env, str, thread};
+
 use crate::error::Result;
-use std::io::{
-	Error as IoError,
-	Write,
-};
-use std::process::{
-	Command,
-	Stdio,
-};
-use std::thread;
-use std::{
-	env,
-	str,
-};
 
 /// Runs the given OS command and returns the output as string.
 ///

git-cliff-core/src/commit.rs

@@ -1,38 +1,14 @@
-use crate::config::{
-	CommitParser,
-	GitConfig,
-	LinkParser,
-	TextProcessor,
-};
-use crate::error::{
-	Error as AppError,
-	Result,
-};
-use git_conventional::{
-	Commit as ConventionalCommit,
-	Footer as ConventionalFooter,
-};
+use git_conventional::{Commit as ConventionalCommit, Footer as ConventionalFooter};
 #[cfg(feature = "repo")]
-use git2::{
-	Commit as GitCommit,
-	Signature as CommitSignature,
-};
-use lazy_regex::{
-	Lazy,
-	Regex,
-	lazy_regex,
-};
-use serde::ser::{
-	SerializeStruct,
-	Serializer,
-};
-use serde::{
-	Deserialize,
-	Deserializer,
-	Serialize,
-};
+use git2::{Commit as GitCommit, Signature as CommitSignature};
+use lazy_regex::{Lazy, Regex, lazy_regex};
+use serde::ser::{SerializeStruct, Serializer};
+use serde::{Deserialize, Deserializer, Serialize};
 use serde_json::value::Value;
 
+use crate::config::{CommitParser, GitConfig, LinkParser, TextProcessor};
+use crate::error::{Error as AppError, Result};
+
 /// Regular expression for matching SHA1 and a following commit message
 /// separated by a whitespace.
 static SHA1_REGEX: Lazy<Regex> = lazy_regex!(r#"^\b([a-f0-9]{40})\b (.*)$"#);

git-cliff-core/src/config.rs

@@ -1,26 +1,15 @@
-use crate::embed::EmbeddedConfig;
-use crate::error::Result;
-use crate::{
-	command,
-	error,
-};
+use std::path::{Path, PathBuf};
+use std::str::FromStr;
+use std::{fmt, fs};
+
 use glob::Pattern;
-use regex::{
-	Regex,
-	RegexBuilder,
-};
+use regex::{Regex, RegexBuilder};
 use secrecy::SecretString;
-use serde::{
-	Deserialize,
-	Serialize,
-};
-use std::fs;
-use std::path::Path;
-use std::path::PathBuf;
-use std::{
-	fmt,
-	str::FromStr,
-};
+use serde::{Deserialize, Serialize};
+
+use crate::embed::EmbeddedConfig;
+use crate::error::Result;
+use crate::{command, error};
 
 /// Default initial tag.
 const DEFAULT_INITIAL_TAG: &str = "0.1.0";
@@ -525,9 +514,11 @@ impl FromStr for Config {
 
 #[cfg(test)]
 mod test {
-	use super::*;
-	use pretty_assertions::assert_eq;
 	use std::env;
+
+	use pretty_assertions::assert_eq;
+
+	use super::*;
 	#[test]
 	fn load() -> Result<()> {
 		let path = PathBuf::from(env!("CARGO_MANIFEST_DIR"))

git-cliff-core/src/contributor.rs

@@ -1,11 +1,6 @@
-use serde::{
-	Deserialize,
-	Serialize,
-};
-use std::hash::{
-	Hash,
-	Hasher,
-};
+use std::hash::{Hash, Hasher};
+
+use serde::{Deserialize, Serialize};
 
 /// Representation of a remote contributor.
 #[derive(Debug, Default, Clone, Eq, PartialEq, Deserialize, Serialize)]

git-cliff-core/src/embed.rs

@@ -1,12 +1,11 @@
-use crate::config::Config;
-use crate::error::{
-	Error,
-	Result,
-};
-use rust_embed::RustEmbed;
 use std::path::Path;
 use std::str;
 
+use rust_embed::RustEmbed;
+
+use crate::config::Config;
+use crate::error::{Error, Result};
+
 /// Default configuration file embedder/extractor.
 ///
 /// Embeds `config/`[`DEFAULT_CONFIG`] into the binary.

git-cliff-core/src/error.rs

@@ -125,11 +125,9 @@ pub type Result<T> = core::result::Result<T, Error>;
 
 #[cfg(test)]
 mod test {
+	use git_conventional::{Commit, ErrorKind};
+
 	use super::*;
-	use git_conventional::{
-		Commit,
-		ErrorKind,
-	};
 	fn mock_function() -> super::Result<Commit<'static>> {
 		Ok(Commit::parse("test")?)
 	}

git-cliff-core/src/release.rs

@@ -1,35 +1,18 @@
 use std::collections::HashMap;
 
-use crate::commit::commits_to_conventional_commits;
+use next_version::{NextVersion, VersionUpdater};
+use semver::Version;
+use serde::{Deserialize, Serialize};
+use serde_json::value::Value;
+
+use crate::commit::{Commit, Range, commits_to_conventional_commits};
+use crate::config::{Bump, BumpType};
 use crate::error::Result;
-use crate::{
-	commit::{
-		Commit,
-		Range,
-	},
-	config::Bump,
-	config::BumpType,
-};
 #[cfg(feature = "remote")]
 use crate::{
 	contributor::RemoteContributor,
-	remote::{
-		RemoteCommit,
-		RemotePullRequest,
-		RemoteReleaseMetadata,
-	},
-};
-
-use next_version::{
-	NextVersion,
-	VersionUpdater,
+	remote::{RemoteCommit, RemotePullRequest, RemoteReleaseMetadata},
 };
-use semver::Version;
-use serde::{
-	Deserialize,
-	Serialize,
-};
-use serde_json::value::Value;
 
 /// Representation of a release.
 #[derive(Default, Debug, Clone, PartialEq, Serialize, Deserialize)]
@@ -195,8 +178,9 @@ impl Releases<'_> {
 
 #[cfg(test)]
 mod test {
-	use super::*;
 	use pretty_assertions::assert_eq;
+
+	use super::*;
 	#[test]
 	fn bump_version() -> Result<()> {
 		fn build_release<'a>(version: &str, commits: &'a [&str]) -> Release<'a> {
@@ -392,12 +376,8 @@ mod test {
 	#[test]
 	fn update_github_metadata() -> Result<()> {
 		use crate::remote::github::{
-			GitHubCommit,
-			GitHubCommitAuthor,
-			GitHubCommitDetails,
-			GitHubCommitDetailsAuthor,
-			GitHubPullRequest,
-			PullRequestLabel,
+			GitHubCommit, GitHubCommitAuthor, GitHubCommitDetails,
+			GitHubCommitDetailsAuthor, GitHubPullRequest, PullRequestLabel,
 		};
 
 		let mut release = Release {
@@ -764,11 +744,7 @@ mod test {
 	#[cfg(feature = "gitlab")]
 	#[test]
 	fn update_gitlab_metadata() -> Result<()> {
-		use crate::remote::gitlab::{
-			GitLabCommit,
-			GitLabMergeRequest,
-			GitLabUser,
-		};
+		use crate::remote::gitlab::{GitLabCommit, GitLabMergeRequest, GitLabUser};
 
 		let mut release = Release {
 			version: None,
@@ -1156,10 +1132,7 @@ mod test {
 	#[test]
 	fn update_gitea_metadata() -> Result<()> {
 		use crate::remote::gitea::{
-			GiteaCommit,
-			GiteaCommitAuthor,
-			GiteaPullRequest,
-			PullRequestLabel,
+			GiteaCommit, GiteaCommitAuthor, GiteaPullRequest, PullRequestLabel,
 		};
 
 		let mut release = Release {
@@ -1516,9 +1489,7 @@ mod test {
 	#[test]
 	fn update_bitbucket_metadata() -> Result<()> {
 		use crate::remote::bitbucket::{
-			BitbucketCommit,
-			BitbucketCommitAuthor,
-			BitbucketPullRequest,
+			BitbucketCommit, BitbucketCommitAuthor, BitbucketPullRequest,
 			BitbucketPullRequestMergeCommit,
 		};
 

git-cliff-core/src/remote/bitbucket.rs

@@ -1,12 +1,9 @@
-use crate::config::Remote;
-use crate::error::*;
 use reqwest_middleware::ClientWithMiddleware;
-use serde::{
-	Deserialize,
-	Serialize,
-};
+use serde::{Deserialize, Serialize};
 
 use super::*;
+use crate::config::Remote;
+use crate::error::*;
 
 /// Log message to show while fetching data from Bitbucket.
 pub const START_FETCHING_MSG: &str = "Retrieving data from Bitbucket...";
@@ -246,9 +243,10 @@ impl BitbucketClient {
 
 #[cfg(test)]
 mod test {
+	use pretty_assertions::assert_eq;
+
 	use super::*;
 	use crate::remote::RemoteCommit;
-	use pretty_assertions::assert_eq;
 
 	#[test]
 	fn timestamp() {

git-cliff-core/src/remote/gitea.rs

@@ -1,12 +1,9 @@
-use crate::config::Remote;
-use crate::error::*;
 use reqwest_middleware::ClientWithMiddleware;
-use serde::{
-	Deserialize,
-	Serialize,
-};
+use serde::{Deserialize, Serialize};
 
 use super::*;
+use crate::config::Remote;
+use crate::error::*;
 
 /// Log message to show while fetching data from Gitea.
 pub const START_FETCHING_MSG: &str = "Retrieving data from Gitea...";
@@ -205,9 +202,10 @@ impl GiteaClient {
 
 #[cfg(test)]
 mod test {
+	use pretty_assertions::assert_eq;
+
 	use super::*;
 	use crate::remote::RemoteCommit;
-	use pretty_assertions::assert_eq;
 
 	#[test]
 	fn timestamp() {