From aa05a1e5abfebfcae64f4a2ce8d8551dabb835b5 Mon Sep 17 00:00:00 2001
From: David Knaack <davidkna@users.noreply.github.com>
Date: Sat, 22 Jun 2024 09:52:46 +0200
Subject: [PATCH] chore: fix rust 1.79 lint warnings (#6034)

* chore: fix rust 1.79 lint warnings

* chore: update config-schema
---
 .github/config-schema.json | 9 +++++++++
 src/context.rs             | 6 +++---
 src/module.rs              | 2 +-
 src/modules/username.rs    | 1 -
 src/print.rs               | 2 +-
 src/serde_utils.rs         | 4 ++--
 6 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/.github/config-schema.json b/.github/config-schema.json
index faa1fa84..4ec65c32 100644
--- a/.github/config-schema.json
+++ b/.github/config-schema.json
@@ -2095,12 +2095,14 @@
           "type": "string"
         },
         "charging_symbol": {
+          "default": null,
           "type": [
             "string",
             "null"
           ]
         },
         "discharging_symbol": {
+          "default": null,
           "type": [
             "string",
             "null"
@@ -2771,12 +2773,14 @@
           "type": "string"
         },
         "repo_root_style": {
+          "default": null,
           "type": [
             "string",
             "null"
           ]
         },
         "before_repo_root_style": {
+          "default": null,
           "type": [
             "string",
             "null"
@@ -4291,30 +4295,35 @@
           "type": "string"
         },
         "user_pattern": {
+          "default": null,
           "type": [
             "string",
             "null"
           ]
         },
         "symbol": {
+          "default": null,
           "type": [
             "string",
             "null"
           ]
         },
         "style": {
+          "default": null,
           "type": [
             "string",
             "null"
           ]
         },
         "context_alias": {
+          "default": null,
           "type": [
             "string",
             "null"
           ]
         },
         "user_alias": {
+          "default": null,
           "type": [
             "string",
             "null"
diff --git a/src/context.rs b/src/context.rs
index a24a9889..f7a7dbc1 100644
--- a/src/context.rs
+++ b/src/context.rs
@@ -86,7 +86,7 @@ impl<'a> Context<'a> {
     /// Identify the current working directory and create an instance of Context
     /// for it. "logical-path" is used when a shell allows the "current working directory"
     /// to be something other than a file system path (like powershell provider specific paths).
-    pub fn new(arguments: Properties, target: Target) -> Context<'a> {
+    pub fn new(arguments: Properties, target: Target) -> Self {
         let shell = Context::get_shell();
 
         // Retrieve the "current directory".
@@ -126,7 +126,7 @@ impl<'a> Context<'a> {
         path: PathBuf,
         logical_path: PathBuf,
         env: Env<'a>,
-    ) -> Context<'a> {
+    ) -> Self {
         let config = StarshipConfig::initialize(&get_config_path_os(&env));
 
         // If the vector is zero-length, we should pretend that we didn't get a
@@ -184,7 +184,7 @@ impl<'a> Context<'a> {
     }
 
     /// Sets the context config, overwriting the existing config
-    pub fn set_config(mut self, config: toml::Table) -> Context<'a> {
+    pub fn set_config(mut self, config: toml::Table) -> Self {
         self.root_config = StarshipRootConfig::load(&config);
         self.config = StarshipConfig {
             config: Some(config),
diff --git a/src/module.rs b/src/module.rs
index ae8babca..8f034e91 100644
--- a/src/module.rs
+++ b/src/module.rs
@@ -122,7 +122,7 @@ pub struct Module<'a> {
 
 impl<'a> Module<'a> {
     /// Creates a module with no segments.
-    pub fn new(name: &str, desc: &str, config: Option<&'a toml::Value>) -> Module<'a> {
+    pub fn new(name: &str, desc: &str, config: Option<&'a toml::Value>) -> Self {
         Module {
             config,
             name: name.to_string(),
diff --git a/src/modules/username.rs b/src/modules/username.rs
index 714eec07..f2c5164e 100644
--- a/src/modules/username.rs
+++ b/src/modules/username.rs
@@ -119,7 +119,6 @@ fn is_ssh_session(context: &Context) -> bool {
 
 #[cfg(test)]
 mod tests {
-    use gix::config::key;
 
     use crate::test::ModuleRenderer;
 
diff --git a/src/print.rs b/src/print.rs
index a39a961f..f891948d 100644
--- a/src/print.rs
+++ b/src/print.rs
@@ -125,7 +125,7 @@ pub fn get_prompt(context: Context) -> String {
     // color sequences for this specific shell
     let shell_wrapped_output =
         wrap_colorseq_for_shell(AnsiStrings(&module_strings).to_string(), context.shell);
-    write!(buf, "{}", shell_wrapped_output).unwrap();
+    write!(buf, "{shell_wrapped_output}").unwrap();
 
     if context.target == Target::Right {
         // right prompts generally do not allow newlines
diff --git a/src/serde_utils.rs b/src/serde_utils.rs
index dee31493..04ff4371 100644
--- a/src/serde_utils.rs
+++ b/src/serde_utils.rs
@@ -103,9 +103,9 @@ impl ValueDeserializer<'_> {
 }
 
 impl<'de> IntoDeserializer<'de> for ValueDeserializer<'de> {
-    type Deserializer = ValueDeserializer<'de>;
+    type Deserializer = Self;
 
-    fn into_deserializer(self) -> ValueDeserializer<'de> {
+    fn into_deserializer(self) -> Self {
         self
     }
 }