From 4e2bffcd8abdfb5c658a5303e09ec0db318c95a7 Mon Sep 17 00:00:00 2001 From: Vitaly Slobodin Date: Thu, 26 Jun 2025 21:43:05 +0200 Subject: [PATCH] chore: modernize string formatting with string interpolation --- src/bundler.rs | 7 +++---- src/gemset.rs | 15 +++++++-------- src/language_servers/language_server.rs | 4 ++-- 3 files changed, 12 insertions(+), 14 deletions(-) diff --git a/src/bundler.rs b/src/bundler.rs index cfd8747..ed95a60 100644 --- a/src/bundler.rs +++ b/src/bundler.rs @@ -63,13 +63,12 @@ impl Bundler { Some(status) => { let stderr = String::from_utf8_lossy(&output.stderr).to_string(); Err(format!( - "'bundle' command failed (status: {})\nError: {}", - status, stderr + "'bundle' command failed (status: {status})\nError: {stderr}", )) } None => { let stderr = String::from_utf8_lossy(&output.stderr).to_string(); - Err(format!("Failed to execute 'bundle' command: {}", stderr)) + Err(format!("Failed to execute 'bundle' command: {stderr}")) } }) } @@ -156,7 +155,7 @@ mod tests { gem: &str, ) -> MockCommandExecutor { let mock = MockCommandExecutor::new(); - let gemfile_path = format!("{}/Gemfile", dir); + let gemfile_path = format!("{dir}/Gemfile"); mock.expect( "bundle", &["info", "--version", gem], diff --git a/src/gemset.rs b/src/gemset.rs index 066899d..d8d6a96 100644 --- a/src/gemset.rs +++ b/src/gemset.rs @@ -24,7 +24,7 @@ impl Gemset { path.to_str() .map(ToString::to_string) - .ok_or_else(|| format!("Failed to convert path for '{}'", bin_name)) + .ok_or_else(|| format!("Failed to convert path for '{bin_name}'")) } pub fn gem_path_env(&self) -> Vec<(String, String)> { @@ -43,20 +43,20 @@ impl Gemset { ]; self.execute_gem_command("install".into(), args) - .map_err(|e| format!("Failed to install gem '{}': {}", name, e))?; + .map_err(|e| format!("Failed to install gem '{name}': {e}"))?; Ok(()) } pub fn update_gem(&self, name: &str) -> Result<(), String> { self.execute_gem_command("update".into(), vec![name.into()]) - .map_err(|e| format!("Failed to update gem '{}': {}", name, e))?; + .map_err(|e| format!("Failed to update gem '{name}': {e}"))?; Ok(()) } pub fn installed_gem_version(&self, name: &str) -> Result, String> { - let re = Regex::new(r"^(\S+) \((.+)\)$") - .map_err(|e| format!("Failed to compile regex: {}", e))?; + let re = + Regex::new(r"^(\S+) \((.+)\)$").map_err(|e| format!("Failed to compile regex: {e}"))?; let args = vec!["--exact".to_string(), name.into()]; let output_str = self.execute_gem_command("list".into(), args)?; @@ -100,13 +100,12 @@ impl Gemset { Some(status) => { let stderr = String::from_utf8_lossy(&output.stderr).to_string(); Err(format!( - "Gem command failed (status: {})\nError: {}", - status, stderr + "Gem command failed (status: {status})\nError: {stderr}", )) } None => { let stderr = String::from_utf8_lossy(&output.stderr).to_string(); - Err(format!("Failed to execute gem command: {}", stderr)) + Err(format!("Failed to execute gem command: {stderr}")) } }) } diff --git a/src/language_servers/language_server.rs b/src/language_servers/language_server.rs index 05cbac1..4c65b59 100644 --- a/src/language_servers/language_server.rs +++ b/src/language_servers/language_server.rs @@ -97,7 +97,7 @@ impl WorktreeLike for FakeWorktree { self.files .get(path) .cloned() - .unwrap_or_else(|| Err(format!("File not found in mock: {}", path))) + .unwrap_or_else(|| Err(format!("File not found in mock: {path}"))) } fn lsp_binary_settings(&self, server_id: &str) -> Result, String> { @@ -212,7 +212,7 @@ pub trait LanguageServer { worktree: &zed::Worktree, ) -> zed::Result { let gem_home = std::env::current_dir() - .map_err(|e| format!("Failed to get extension directory: {}", e))? + .map_err(|e| format!("Failed to get extension directory: {e}"))? .to_string_lossy() .to_string();