chore: fix new clippy lints (starship#4557)

Author: davidkna

.github/config-schema.json

@@ -1613,7 +1613,7 @@
   "definitions": {
     "AwsConfig": {
       "title": "AWS",
-      "description": "The `aws` module shows the current AWS region and profile and an expiration timer when using temporary credentials. The output of the module uses the `AWS_REGION`, `AWS_DEFAULT_REGION`, and `AWS_PROFILE` env vars and the `~/.aws/config` and `~/.aws/credentials` files as required.\n\nThe module will display a profile only if its credentials are present in `~/.aws/credentials` or if a `credential_process` or `sso_start_url` are defined in `~/.aws/config`. Alternatively, having any of the `AWS_ACCESS_KEY_ID`, `AWS_SECRET_ACCESS_KEY`, or `AWS_SESSION_TOKEN` env vars defined will also suffice. If the option `force_display` is set to `true`, all available information will be displayed even if no credentials per the conditions above are detected.\n\nWhen using [aws-vault](https://github.com/99designs/aws-vault) the profile is read from the `AWS_VAULT` env var and the credentials expiration date is read from the `AWS_SESSION_EXPIRATION` env var.\n\nWhen using [awsu](https://github.com/kreuzwerker/awsu) the profile is read from the `AWSU_PROFILE` env var.\n\nWhen using [AWSume](https://awsu.me) the profile is read from the `AWSUME_PROFILE` env var and the credentials expiration date is read from the `AWSUME_EXPIRATION` env var.",
+      "description": "The `aws` module shows the current AWS region and profile and an expiration timer when using temporary credentials. The output of the module uses the `AWS_REGION`, `AWS_DEFAULT_REGION`, and `AWS_PROFILE` env vars and the `~/.aws/config` and `~/.aws/credentials` files as required.\n\nThe module will display a profile only if its credentials are present in `~/.aws/credentials` or if a `credential_process` or `sso_start_url` are defined in `~/.aws/config`. Alternatively, having any of the `AWS_ACCESS_KEY_ID`, `AWS_SECRET_ACCESS_KEY`, or `AWS_SESSION_TOKEN` env vars defined will also suffice. If the option `force_display` is set to `true`, all available information will be displayed even if no credentials per the conditions above are detected.\n\nWhen using [aws-vault](https://github.com/99designs/aws-vault) the profile is read from the `AWS_VAULT` env var and the credentials expiration date is read from the `AWS_SESSION_EXPIRATION` env var.\n\nWhen using [awsu](https://github.com/kreuzwerker/awsu) the profile is read from the `AWSU_PROFILE` env var.\n\nWhen using [`AWSume`](https://awsu.me) the profile is read from the `AWSUME_PROFILE` env var and the credentials expiration date is read from the `AWSUME_EXPIRATION` env var.",
       "type": "object",
       "properties": {
         "format": {

build.rs

@@ -33,7 +33,7 @@ fn gen_presets_hook(mut file: &File) -> SdResult<()> {
             .to_str()
             .and_then(|v| v.strip_suffix(".toml"))
             .expect("Failed to process filename");
-        presets.push_str(format!("print::Preset(\"{}\"),\n", name).as_str());
+        presets.push_str(format!("print::Preset(\"{name}\"),\n").as_str());
         match_arms.push_str(
             format!(
                 r#"

src/bug_report.rs

@@ -26,7 +26,7 @@ pub fn create() {
         println!("Click this link to create a GitHub issue populated with your configuration:\n");
     }
 
-    println!("{}", link);
+    println!("{link}");
 }
 
 const UNKNOWN_SHELL: &str = "<unknown shell>";
@@ -225,11 +225,11 @@ fn get_shell_version(shell: &str) -> String {
     let time_limit = Duration::from_millis(500);
     match shell {
         "powershell" => exec_cmd(
-            &shell,
+            shell,
             &["(Get-Host | Select Version | Format-Table -HideTableHeaders | Out-String).trim()"],
             time_limit,
         ),
-        _ => exec_cmd(&shell, &["--version"], time_limit),
+        _ => exec_cmd(shell, &["--version"], time_limit),
     }
     .map_or_else(
         || UNKNOWN_VERSION.to_string(),

src/config.rs

@@ -141,7 +141,7 @@ impl StarshipConfig {
     fn config_from_file() -> Option<Value> {
         let file_path = get_config_path()?;
 
-        let toml_content = match utils::read_file(&file_path) {
+        let toml_content = match utils::read_file(file_path) {
             Ok(content) => {
                 log::trace!("Config file content: \"\n{}\"", &content);
                 Some(content)

src/configs/aws.rs

@@ -23,7 +23,7 @@ use std::collections::HashMap;
 /// When using [awsu](https://github.com/kreuzwerker/awsu) the profile
 /// is read from the `AWSU_PROFILE` env var.
 ///
-/// When using [AWSume](https://awsu.me) the profile
+/// When using [`AWSume`](https://awsu.me) the profile
 /// is read from the `AWSUME_PROFILE` env var and the credentials expiration
 /// date is read from the `AWSUME_EXPIRATION` env var.
 pub struct AwsConfig<'a> {

src/configs/starship_root.rs

@@ -118,7 +118,7 @@ impl Default for StarshipRootConfig {
         Self {
             schema: "https://starship.rs/config-schema.json".to_string(),
             format: "$all".to_string(),
-            right_format: "".to_string(),
+            right_format: String::new(),
             continuation_prompt: "[∙](bright-black) ".to_string(),
             scan_timeout: 30,
             command_timeout: 500,

src/configure.rs

@@ -24,7 +24,7 @@ pub fn update_configuration(name: &str, value: &str) {
 
     match handle_update_configuration(&mut doc, name, value) {
         Err(e) => {
-            eprintln!("{}", e);
+            eprintln!("{e}");
             process::exit(1);
         }
         _ => write_configuration(&doc),
@@ -99,7 +99,7 @@ pub fn print_configuration(use_default: bool, paths: &[String]) {
             "# $all is shorthand for {}",
             PROMPT_ORDER
                 .iter()
-                .map(|module_name| format!("${}", module_name))
+                .map(|module_name| format!("${module_name}"))
                 .collect::<String>()
         );
 
@@ -110,7 +110,7 @@ pub fn print_configuration(use_default: bool, paths: &[String]) {
                 "# $custom (excluding any modules already listed in `format`) is shorthand for {}",
                 custom_modules
                     .keys()
-                    .map(|module_name| format!("${{custom.{}}}", module_name))
+                    .map(|module_name| format!("${{custom.{module_name}}}"))
                     .collect::<String>()
             );
         }
@@ -124,7 +124,7 @@ pub fn print_configuration(use_default: bool, paths: &[String]) {
 
     let string_config = toml::to_string_pretty(&print_config).unwrap();
 
-    println!("{}", string_config);
+    println!("{string_config}");
 }
 
 fn extract_toml_paths(mut config: toml::Value, paths: &[String]) -> toml::Value {
@@ -186,7 +186,7 @@ pub fn toggle_configuration(name: &str, key: &str) {
 
     match handle_toggle_configuration(&mut doc, name, key) {
         Err(e) => {
-            eprintln!("{}", e);
+            eprintln!("{e}");
             process::exit(1);
         }
         _ => write_configuration(&doc),
@@ -202,17 +202,17 @@ fn handle_toggle_configuration(doc: &mut Document, name: &str, key: &str) -> Res
 
     let values = table
         .get_mut(name)
-        .ok_or_else(|| format!("Given module '{}' not found in config file", name))?
+        .ok_or_else(|| format!("Given module '{name}' not found in config file"))?
         .as_table_like_mut()
-        .ok_or_else(|| format!("Given config entry '{}' is not a module", key))?;
+        .ok_or_else(|| format!("Given config entry '{key}' is not a module"))?;
 
     let old_value = values
         .get(key)
-        .ok_or_else(|| format!("Given config key '{}' must exist in config file", key))?;
+        .ok_or_else(|| format!("Given config key '{key}' must exist in config file"))?;
 
     let old = old_value
         .as_bool()
-        .ok_or_else(|| format!("Given config key '{}' must be in 'boolean' format", key))?;
+        .ok_or_else(|| format!("Given config key '{key}' must be in 'boolean' format"))?;
 
     let mut new_value = toml_edit::value(!old);
     // Above code already checks if it is a value (bool)
@@ -232,7 +232,7 @@ pub fn get_configuration() -> Value {
 
 pub fn get_configuration_edit() -> Document {
     let file_path = get_config_path();
-    let toml_content = match utils::read_file(&file_path) {
+    let toml_content = match utils::read_file(file_path) {
         Ok(content) => {
             log::trace!("Config file content: \"\n{}\"", &content);
             Some(content)
@@ -260,7 +260,7 @@ pub fn write_configuration(doc: &Document) {
 
     let config_str = doc.to_string();
 
-    File::create(&config_path)
+    File::create(config_path)
         .and_then(|mut file| file.write_all(config_str.as_ref()))
         .expect("Error writing starship config");
 }
@@ -291,7 +291,7 @@ pub fn edit_configuration(editor_override: Option<&str>) -> Result<(), Box<dyn s
         .status();
 
     if let Err(e) = res {
-        eprintln!("Unable to launch editor {:?}", editor_cmd);
+        eprintln!("Unable to launch editor {editor_cmd:?}");
         return Err(Box::new(e));
     }
 
@@ -352,17 +352,17 @@ mod tests {
 
     #[test]
     fn visual_empty_editor_set() {
-        let actual = get_editor_internal(Some("".into()), Some("bar".into()));
+        let actual = get_editor_internal(Some(String::new()), Some("bar".into()));
         assert_eq!("bar", actual);
     }
     #[test]
     fn visual_empty_editor_empty() {
-        let actual = get_editor_internal(Some("".into()), Some("".into()));
+        let actual = get_editor_internal(Some(String::new()), Some(String::new()));
         assert_eq!(STD_EDITOR, actual);
     }
     #[test]
     fn visual_empty_editor_not_set() {
-        let actual = get_editor_internal(Some("".into()), None);
+        let actual = get_editor_internal(Some(String::new()), None);
         assert_eq!(STD_EDITOR, actual);
     }
 
@@ -373,7 +373,7 @@ mod tests {
     }
     #[test]
     fn visual_not_set_editor_empty() {
-        let actual = get_editor_internal(None, Some("".into()));
+        let actual = get_editor_internal(None, Some(String::new()));
         assert_eq!(STD_EDITOR, actual);
     }
     #[test]

src/context.rs

@@ -631,7 +631,7 @@ fn get_remote_repository_info(
     let branch_name = branch_name?;
     let branch = repository
         .branch_remote_ref(branch_name)
-        .and_then(|r| r.ok())
+        .and_then(std::result::Result::ok)
         .map(|r| r.shorten().to_string());
     let name = repository
         .branch_remote_name(branch_name)
@@ -849,7 +849,7 @@ mod tests {
 
         let tmp_dir = tempfile::TempDir::new()?;
         let path = tmp_dir.path().join("a/xxx/yyy");
-        fs::create_dir_all(&path)?;
+        fs::create_dir_all(path)?;
 
         // Set up a mock symlink
         let path_actual = tmp_dir.path().join("a/xxx");

src/formatter/parser.rs

@@ -58,11 +58,13 @@ fn parse_style(style: Pair<Rule>) -> Vec<StyleElement> {
         .collect()
 }
 
-pub fn parse(format: &str) -> Result<Vec<FormatElement>, Error<Rule>> {
-    IdentParser::parse(Rule::expression, format).map(|pairs| {
-        pairs
-            .take_while(|pair| pair.as_rule() != Rule::EOI)
-            .map(parse_value)
-            .collect()
-    })
+pub fn parse(format: &str) -> Result<Vec<FormatElement>, Box<Error<Rule>>> {
+    IdentParser::parse(Rule::expression, format)
+        .map(|pairs| {
+            pairs
+                .take_while(|pair| pair.as_rule() != Rule::EOI)
+                .map(parse_value)
+                .collect()
+        })
+        .map_err(Box::new)
 }

src/formatter/string_formatter.rs

@@ -35,14 +35,14 @@ type StyleVariableMapType<'a> =
 #[derive(Debug, Clone, PartialEq, Eq)]
 pub enum StringFormatterError {
     Custom(String),
-    Parse(PestError<Rule>),
+    Parse(Box<PestError<Rule>>),
 }
 
 impl fmt::Display for StringFormatterError {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         match self {
-            Self::Custom(error) => write!(f, "{}", error),
-            Self::Parse(error) => write!(f, "{}", error),
+            Self::Custom(error) => write!(f, "{error}"),
+            Self::Parse(error) => write!(f, "{error}"),
         }
     }
 }
@@ -538,7 +538,7 @@ mod tests {
 
         let formatter = StringFormatter::new(FORMAT_STR)
             .unwrap()
-            .map(|variable| Some(Ok(format!("${{{}}}", variable))));
+            .map(|variable| Some(Ok(format!("${{{variable}}}"))));
         let result = formatter.parse(None, None).unwrap();
         let mut result_iter = result.iter();
         match_next!(result_iter, "${env:PWD}", None);

src/formatter/version.rs

@@ -71,7 +71,7 @@ impl<'a> VersionFormatter<'a> {
             Ok(formatted) => Some(formatted),
             Err(error) => {
                 log::warn!("Error formatting `{}` version:\n{}", module_name, error);
-                Some(format!("v{}", version))
+                Some(format!("v{version}"))
             }
         }
     }

src/init/mod.rs

@@ -44,11 +44,11 @@ impl StarshipPath {
     fn sprint_pwsh(&self) -> io::Result<String> {
         self.str_path()
             .map(|s| s.replace('\'', "''"))
-            .map(|s| format!("'{}'", s))
+            .map(|s| format!("'{s}'"))
     }
     /// Command Shell specific path escaping
     fn sprint_cmdexe(&self) -> io::Result<String> {
-        self.str_path().map(|s| format!("\"{}\"", s))
+        self.str_path().map(|s| format!("\"{s}\""))
     }
     fn sprint_posix(&self) -> io::Result<String> {
         // On non-Windows platform, return directly.
@@ -229,7 +229,7 @@ pub fn init_main(shell_name: &str) -> io::Result<()> {
 
 fn print_script(script: &str, path: &str) {
     let script = script.replace("::STARSHIP::", path);
-    print!("{}", script);
+    print!("{script}");
 }
 
 /* GENERAL INIT SCRIPT NOTES

src/logger.rs

@@ -29,7 +29,7 @@ impl Default for StarshipLogger {
             });
 
         fs::create_dir_all(&log_dir)
-            .unwrap_or_else(|err| panic!("Unable to create log dir {:?}: {:?}!", log_dir, err));
+            .unwrap_or_else(|err| panic!("Unable to create log dir {log_dir:?}: {err:?}!"));
         let session_log_file = log_dir.join(format!(
             "session_{}.log",
             env::var("STARSHIP_SESSION_KEY").unwrap_or_default()
@@ -96,12 +96,12 @@ impl log::Log for StarshipLogger {
                 })
                 .unwrap_or_else(|err: std::io::Error| {
                     panic!(
-                        "Unable to open session log file {:?}: {:?}!",
-                        self.log_file_path, err
+                        "Unable to open session log file {:?}: {err:?}!",
+                        self.log_file_path
                     )
                 })
                 .lock()
-                .map(|mut file| writeln!(file, "{}", to_print))
+                .map(|mut file| writeln!(file, "{to_print}"))
                 .expect("Log file writer mutex was poisoned!")
                 .expect("Unable to write to the log file!");
         }

src/modules/aws.rs

@@ -66,7 +66,7 @@ fn get_profile_config<'a>(
     profile: &Option<Profile>,
 ) -> Option<&'a ini::Properties> {
     match profile {
-        Some(profile) => config.section(Some(format!("profile {}", profile))),
+        Some(profile) => config.section(Some(format!("profile {profile}"))),
         None => config.section(Some("default")),
     }
 }
@@ -701,7 +701,7 @@ aws_secret_access_key=dummy
                 "30m2s", "30m1s", "30m", "29m59s", "29m58s", "29m57s", "29m56s", "29m55s",
             ];
             let possible_values = possible_values.map(|duration| {
-                let segment_colored = format!("☁️  astronauts (ap-northeast-2) [{}] ", duration);
+                let segment_colored = format!("☁️  astronauts (ap-northeast-2) [{duration}] ");
                 Some(format!(
                     "on {}",
                     Color::Yellow.bold().paint(segment_colored)
@@ -762,7 +762,7 @@ aws_secret_access_key=dummy
             "on {}",
             Color::Yellow
                 .bold()
-                .paint(format!("☁️  astronauts (ap-northeast-2) [{}] ", symbol))
+                .paint(format!("☁️  astronauts (ap-northeast-2) [{symbol}] "))
         ));
 
         assert_eq!(expected, actual);

src/modules/azure.rs

@@ -89,7 +89,7 @@ fn get_config_file_location(context: &Context) -> Option<PathBuf> {
 fn parse_json(json_file_path: &Path) -> Option<JValue> {
     let mut buffer: Vec<u8> = Vec::new();
 
-    let json_file = File::open(&json_file_path).ok()?;
+    let json_file = File::open(json_file_path).ok()?;
     let mut reader = BufReader::new(json_file);
     reader.read_to_end(&mut buffer).ok()?;
 

src/modules/container.rs

@@ -141,7 +141,7 @@ mod tests {
         containerenv.push(".containerenv");
         let mut file = std::fs::File::create(&containerenv)?;
         if let Some(name) = name {
-            file.write_all(format!("image=\"{}\"\n", name).as_bytes())?;
+            file.write_all(format!("image=\"{name}\"\n").as_bytes())?;
         }
 
         // The output of the module