chore: Fix several style lints (#17488)
It's not comprehensive enough to start linting on `style` group, but hey, it's a start. Release Notes: - N/A
This commit is contained in:
@@ -36,16 +36,15 @@ impl KeymapBlock {
|
||||
#[serde(transparent)]
|
||||
pub struct KeymapAction(Value);
|
||||
|
||||
impl ToString for KeymapAction {
|
||||
fn to_string(&self) -> String {
|
||||
impl std::fmt::Display for KeymapAction {
|
||||
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
|
||||
match &self.0 {
|
||||
Value::String(s) => s.clone(),
|
||||
Value::Array(arr) => arr
|
||||
.iter()
|
||||
.map(|v| v.to_string())
|
||||
.collect::<Vec<_>>()
|
||||
.join(", "),
|
||||
_ => self.0.to_string(),
|
||||
Value::String(s) => write!(f, "{}", s),
|
||||
Value::Array(arr) => {
|
||||
let strings: Vec<String> = arr.iter().map(|v| v.to_string()).collect();
|
||||
write!(f, "{}", strings.join(", "))
|
||||
}
|
||||
_ => write!(f, "{}", self.0),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -926,7 +926,7 @@ fn update_value_in_json_text<'a>(
|
||||
}
|
||||
} else if key_path
|
||||
.last()
|
||||
.map_or(false, |key| preserved_keys.contains(&key))
|
||||
.map_or(false, |key| preserved_keys.contains(key))
|
||||
|| old_value != new_value
|
||||
{
|
||||
let mut new_value = new_value.clone();
|
||||
|
||||
Reference in New Issue
Block a user