forked from extern/nushell
Use variable names directly in the format strings (#7906)
# Description Lint: `clippy::uninlined_format_args` More readable in most situations. (May be slightly confusing for modifier format strings https://doc.rust-lang.org/std/fmt/index.html#formatting-parameters) Alternative to #7865 # User-Facing Changes None intended # Tests + Formatting (Ran `cargo +stable clippy --fix --workspace -- -A clippy::all -D clippy::uninlined_format_args` to achieve this. Depends on Rust `1.67`)
This commit is contained in:
committed by
GitHub
parent
6ae497eedc
commit
ab480856a5
@ -93,8 +93,7 @@ fn action(
|
||||
not_valid => return Value::Error { error:ShellError::GenericError(
|
||||
"value is not an accepted character set".to_string(),
|
||||
format!(
|
||||
"{} is not a valid character-set.\nPlease use `help hash base64` to see a list of valid character sets.",
|
||||
not_valid
|
||||
"{not_valid} is not a valid character-set.\nPlease use `help hash base64` to see a list of valid character sets."
|
||||
),
|
||||
Some(config_character_set.span),
|
||||
None,
|
||||
|
@ -62,8 +62,7 @@ fn parse_encoding(span: Span, label: &str) -> Result<&'static Encoding, ShellErr
|
||||
match Encoding::for_label_no_replacement(label.as_bytes()) {
|
||||
None => Err(ShellError::GenericError(
|
||||
format!(
|
||||
r#"{} is not a valid encoding"#,
|
||||
label
|
||||
r#"{label} is not a valid encoding"#
|
||||
),
|
||||
"invalid encoding".into(),
|
||||
Some(span),
|
||||
|
@ -303,7 +303,7 @@ fn format_record(
|
||||
}
|
||||
Some(err) => {
|
||||
return Err(ShellError::TypeMismatch(
|
||||
format!("expression is invalid, detail message: {:?}", err),
|
||||
format!("expression is invalid, detail message: {err:?}"),
|
||||
*span,
|
||||
))
|
||||
}
|
||||
|
@ -298,7 +298,7 @@ impl fmt::Display for Counter {
|
||||
Counter::CodePoints => "codepoints",
|
||||
};
|
||||
|
||||
write!(f, "{}", s)
|
||||
write!(f, "{s}")
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -266,10 +266,10 @@ fn trim(s: &str, char_: Option<char>, closure_flags: &ClosureFlags) -> String {
|
||||
'\x0B' => r"\v".to_string(),
|
||||
'\x0C' => r"\f".to_string(),
|
||||
'\x0D' => r"\r".to_string(),
|
||||
_ => format!(r"\{}", r),
|
||||
_ => format!(r"\{r}"),
|
||||
};
|
||||
// create a regex string that looks for 2 or more of each of these characters
|
||||
let re_str = format!("{}{{2,}}", reg);
|
||||
let re_str = format!("{reg}{{2,}}");
|
||||
// create the regex
|
||||
let re = Regex::new(&re_str).expect("Error creating regular expression");
|
||||
// replace all multiple occurrences with single occurrences represented by r
|
||||
|
Reference in New Issue
Block a user