1
0
mirror of https://github.com/Llewellynvdm/starship.git synced 2024-12-12 14:17:45 +00:00

chore: fix rust 1.79 lint warnings (#6034)

* chore: fix rust 1.79 lint warnings

* chore: update config-schema
This commit is contained in:
David Knaack 2024-06-22 09:52:46 +02:00 committed by GitHub
parent eade2327e5
commit aa05a1e5ab
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 16 additions and 8 deletions

View File

@ -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"

View File

@ -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),

View File

@ -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(),

View File

@ -119,7 +119,6 @@ fn is_ssh_session(context: &Context) -> bool {
#[cfg(test)]
mod tests {
use gix::config::key;
use crate::test::ModuleRenderer;

View File

@ -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

View File

@ -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
}
}