From 8f3d9850402efa3a15d1b92c4fe99623418b2c17 Mon Sep 17 00:00:00 2001
From: Xavier L'Heureux <xavier.lheureux@icloud.com>
Date: Wed, 13 Feb 2019 06:43:31 -0500
Subject: [PATCH] Fmt and finish minor changes according to Clippy
---
src/lib/shell/assignments.rs | 10 +++++++---
src/lib/shell/mod.rs | 1 +
src/lib/shell/pipe_exec/mod.rs | 4 +---
src/lib/shell/variables/mod.rs | 26 ++++++++++----------------
4 files changed, 19 insertions(+), 22 deletions(-)
diff --git a/src/lib/shell/assignments.rs b/src/lib/shell/assignments.rs
index 7c321f71..d532ffce 100644
--- a/src/lib/shell/assignments.rs
+++ b/src/lib/shell/assignments.rs
@@ -440,8 +440,10 @@ impl VariableStore for Shell {
for action in actions_step2 {
match action {
Ok(Action::UpdateArray(key, operator, ..)) => {
- if operator == Operator::OptionalEqual && self.variables.get_ref(key.name).is_some() {
- continue;
+ if operator == Operator::OptionalEqual
+ && self.variables.get_ref(key.name).is_some()
+ {
+ continue;
}
match collected.remove(key.name) {
hmap @ Some(VariableType::HashMap(_)) => {
@@ -528,7 +530,9 @@ impl VariableStore for Shell {
}
}
Ok(Action::UpdateString(key, operator, ..)) => {
- if operator == Operator::OptionalEqual && self.variables.get_ref(key.name).is_some() {
+ if operator == Operator::OptionalEqual
+ && self.variables.get_ref(key.name).is_some()
+ {
continue;
}
match collected.remove(key.name) {
diff --git a/src/lib/shell/mod.rs b/src/lib/shell/mod.rs
index 8c49e963..a098e672 100644
--- a/src/lib/shell/mod.rs
+++ b/src/lib/shell/mod.rs
@@ -120,6 +120,7 @@ pub struct Shell {
ignore_setting: IgnoreSetting,
}
+#[derive(Default)]
pub struct ShellBuilder;
impl ShellBuilder {
diff --git a/src/lib/shell/pipe_exec/mod.rs b/src/lib/shell/pipe_exec/mod.rs
index aefab2f9..efe71b42 100644
--- a/src/lib/shell/pipe_exec/mod.rs
+++ b/src/lib/shell/pipe_exec/mod.rs
@@ -815,9 +815,7 @@ pub(crate) fn pipe(
ext_stdio_pipes = None;
- if set_process_group(&mut pgid, current_pid)
- && foreground
- && !shell.is_library
+ if set_process_group(&mut pgid, current_pid) && foreground && !shell.is_library
{
let _ = sys::tcsetpgrp(0, pgid);
}
diff --git a/src/lib/shell/variables/mod.rs b/src/lib/shell/variables/mod.rs
index 8b7c125a..5b8d8526 100644
--- a/src/lib/shell/variables/mod.rs
+++ b/src/lib/shell/variables/mod.rs
@@ -127,25 +127,19 @@ impl fmt::Display for VariableType {
VariableType::Alias(ref alias) => write!(f, "{}", **alias),
VariableType::Array(ref array) => write!(f, "{}", array.join(" ")),
VariableType::HashMap(ref map) => {
- let mut format =
- map.into_iter()
- .fold(String::new(), |mut format, (_, var_type)| {
- format.push_str(&format!("{}", var_type));
- format.push(' ');
- format
- });
- format.pop();
+ let format = map
+ .iter()
+ .map(|(_, var_type)| format!("{}", var_type))
+ .collect::<Vec<_>>()
+ .join(" ");
write!(f, "{}", format)
}
VariableType::BTreeMap(ref map) => {
- let mut format =
- map.iter()
- .fold(String::new(), |mut format, (_, var_type)| {
- format.push_str(&format!("{}", var_type));
- format.push(' ');
- format
- });
- format.pop();
+ let format = map
+ .iter()
+ .map(|(_, var_type)| format!("{}", var_type))
+ .collect::<Vec<_>>()
+ .join(" ");
write!(f, "{}", format)
}
_ => write!(f, ""),
--
GitLab