cleanup format strings (#2765)

Author: extrawurst

asyncgit/src/asyncjob/mod.rs

@@ -130,7 +130,7 @@ impl<J: 'static + AsyncJob> AsyncSingleJob<J> {
 			let self_clone = (*self).clone();
 			rayon_core::spawn(move || {
 				if let Err(e) = self_clone.run_job(task) {
-					log::error!("async job error: {}", e);
+					log::error!("async job error: {e}");
 				}
 			});
 

asyncgit/src/blame.rs

@@ -116,7 +116,7 @@ impl AsyncBlame {
 
 			let notify = match notify {
 				Err(err) => {
-					log::error!("get_blame_helper error: {}", err);
+					log::error!("get_blame_helper error: {err}");
 					true
 				}
 				Ok(notify) => notify,

asyncgit/src/commit_files.rs

@@ -89,7 +89,7 @@ impl AsyncCommitFiles {
 			return Ok(());
 		}
 
-		log::trace!("request: {:?}", params);
+		log::trace!("request: {params:?}");
 
 		{
 			let current = self.current.lock()?;

asyncgit/src/diff.rs

@@ -98,7 +98,7 @@ impl AsyncDiff {
 		&self,
 		params: DiffParams,
 	) -> Result<Option<FileDiff>> {
-		log::trace!("request {:?}", params);
+		log::trace!("request {params:?}");
 
 		let hash = hash(&params);
 
@@ -131,8 +131,8 @@ impl AsyncDiff {
 			);
 
 			let notify = match notify {
-				Err(err) => {
-					log::error!("get_diff_helper error: {}", err);
+				Err(e) => {
+					log::error!("get_diff_helper error: {e}");
 					true
 				}
 				Ok(notify) => notify,

asyncgit/src/pull.rs

@@ -153,7 +153,7 @@ impl AsyncPull {
 		*last_res = match res {
 			Ok(bytes) => Some((bytes, String::new())),
 			Err(e) => {
-				log::error!("fetch error: {}", e);
+				log::error!("fetch error: {e}");
 				Some((0, e.to_string()))
 			}
 		};

asyncgit/src/push.rs

@@ -164,7 +164,7 @@ impl AsyncPush {
 		*last_res = match res {
 			Ok(()) => None,
 			Err(e) => {
-				log::error!("push error: {}", e);
+				log::error!("push error: {e}",);
 				Some(e.to_string())
 			}
 		};

asyncgit/src/push_tags.rs

@@ -147,7 +147,7 @@ impl AsyncPushTags {
 		*last_res = match res {
 			Ok(()) => None,
 			Err(e) => {
-				log::error!("push error: {}", e);
+				log::error!("push error: {e}");
 				Some(e.to_string())
 			}
 		};

asyncgit/src/remote_progress.rs

@@ -96,8 +96,7 @@ impl RemoteProgress {
 				}
 				Err(e) => {
 					log::error!(
-						"remote progress receiver error: {}",
-						e
+						"remote progress receiver error: {e}",
 					);
 					break;
 				}

asyncgit/src/status.rs

@@ -135,7 +135,7 @@ impl AsyncStatus {
 				&arc_current,
 				&arc_last,
 			) {
-				log::error!("fetch_helper: {}", e);
+				log::error!("fetch_helper: {e}");
 			}
 
 			arc_pending.fetch_sub(1, Ordering::Relaxed);
@@ -158,9 +158,7 @@ impl AsyncStatus {
 	) -> Result<()> {
 		let res = Self::get_status(repo, status_type, config)?;
 		log::trace!(
-			"status fetched: {} (type: {:?})",
-			hash_request,
-			status_type,
+			"status fetched: {hash_request} (type: {status_type:?})",
 		);
 
 		{

asyncgit/src/sync/remotes/callbacks.rs

@@ -107,11 +107,7 @@ impl Callbacks {
 		reference: &str,
 		msg: Option<&str>,
 	) {
-		log::debug!(
-			"push_update_reference: '{}' {:?}",
-			reference,
-			msg
-		);
+		log::debug!("push_update_reference: '{reference}' {msg:?}",);
 
 		if let Ok(mut stats) = self.stats.lock() {
 			stats.push_rejected_msg = msg
@@ -125,7 +121,7 @@ impl Callbacks {
 		total: usize,
 		current: usize,
 	) {
-		log::debug!("packing: {:?} - {}/{}", stage, current, total);
+		log::debug!("packing: {stage:?} - {current}/{total}");
 		self.sender.clone().map(|sender| {
 			sender.send(ProgressNotification::Packing {
 				stage,
@@ -150,7 +146,7 @@ impl Callbacks {
 	}
 
 	fn update_tips(&self, name: &str, a: git2::Oid, b: git2::Oid) {
-		log::debug!("update tips: '{}' [{}] [{}]", name, a, b);
+		log::debug!("update tips: '{name}' [{a}] [{b}]");
 		self.sender.clone().map(|sender| {
 			sender.send(ProgressNotification::UpdateTips {
 				name: name.to_string(),
@@ -166,7 +162,7 @@ impl Callbacks {
 		total: usize,
 		bytes: usize,
 	) {
-		log::debug!("progress: {}/{} ({} B)", current, total, bytes,);
+		log::debug!("progress: {current}/{total} ({bytes} B)",);
 		self.sender.clone().map(|sender| {
 			sender.send(ProgressNotification::PushTransfer {
 				current,
@@ -187,10 +183,7 @@ impl Callbacks {
 		allowed_types: git2::CredentialType,
 	) -> std::result::Result<Cred, GitError> {
 		log::debug!(
-			"creds: '{}' {:?} ({:?})",
-			url,
-			username_from_url,
-			allowed_types
+			"creds: '{url}' {username_from_url:?} ({allowed_types:?})",
 		);
 
 		// This boolean is used to avoid multiple calls to credentials callback.