Skip to content

Commit

Permalink
chore: fix rust 1.79 lint warnings (starship#6034)
Browse files Browse the repository at this point in the history
* chore: fix rust 1.79 lint warnings

* chore: update config-schema
  • Loading branch information
davidkna authored Jun 22, 2024
1 parent eade232 commit aa05a1e
Show file tree
Hide file tree
Showing 6 changed files with 16 additions and 8 deletions.
9 changes: 9 additions & 0 deletions .github/config-schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -2095,12 +2095,14 @@
"type": "string"
},
"charging_symbol": {
"default": null,
"type": [
"string",
"null"
]
},
"discharging_symbol": {
"default": null,
"type": [
"string",
"null"
Expand Down Expand Up @@ -2771,12 +2773,14 @@
"type": "string"
},
"repo_root_style": {
"default": null,
"type": [
"string",
"null"
]
},
"before_repo_root_style": {
"default": null,
"type": [
"string",
"null"
Expand Down Expand Up @@ -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"
Expand Down
6 changes: 3 additions & 3 deletions src/context.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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".
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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),
Expand Down
2 changes: 1 addition & 1 deletion src/module.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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(),
Expand Down
1 change: 0 additions & 1 deletion src/modules/username.rs
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,6 @@ fn is_ssh_session(context: &Context) -> bool {

#[cfg(test)]
mod tests {
use gix::config::key;

use crate::test::ModuleRenderer;

Expand Down
2 changes: 1 addition & 1 deletion src/print.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions src/serde_utils.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
}
Expand Down

0 comments on commit aa05a1e

Please sign in to comment.