rustfmt after 0.2.15 upgrade

3 files changed, 25 insertions, 25 deletions

diff --git a/mullvad-cli/src/cmds/account.rs b/mullvad-cli/src/cmds/account.rs
index 854ce8fc91..1475c333a7 100644
--- a/mullvad-cli/src/cmds/account.rs
+++ b/mullvad-cli/src/cmds/account.rs
@@ -50,10 +50,12 @@ impl Command for Account {
 
 impl Account {
     fn set(&self, token: Option<&str>) -> Result<()> {
-        rpc::call("set_account", &[token]).map(|_: Option<()>| if let Some(token) = token {
-            println!("Mullvad account \"{}\" set", token);
-        } else {
-            println!("Mullvad account removed");
+        rpc::call("set_account", &[token]).map(|_: Option<()>| {
+            if let Some(token) = token {
+                println!("Mullvad account \"{}\" set", token);
+            } else {
+                println!("Mullvad account removed");
+            }
         })
     }
 
diff --git a/mullvad-daemon/src/bin/problem-report.rs b/mullvad-daemon/src/bin/problem-report.rs
index 18b0678ddf..c3607186fb 100644
--- a/mullvad-daemon/src/bin/problem-report.rs
+++ b/mullvad-daemon/src/bin/problem-report.rs
@@ -133,12 +133,8 @@ fn run() -> Result<()> {
     }
 }
 
-fn collect_report(
-    log_paths: &[&Path],
-    output_path: &Path,
-    remove_terms: Vec<String>,
-) -> Result<()> {
-    let mut problem_report = ProblemReport::new(remove_terms);
+fn collect_report(log_paths: &[&Path], output_path: &Path, redacts: Vec<String>) -> Result<()> {
+    let mut problem_report = ProblemReport::new(redacts);
     for log_path in log_paths {
         problem_report.add_log(log_path);
     }
diff --git a/socket-relay/src/udp.rs b/socket-relay/src/udp.rs
index 032b238442..c5b48ffb7c 100644
--- a/socket-relay/src/udp.rs
+++ b/socket-relay/src/udp.rs
@@ -97,21 +97,23 @@ impl Relay {
         });
 
         let recv_stream = forward_stream
-            .filter_map(move |(addr, data)| if addr == destination {
-                trace!(
-                    "Returning {} byte response from {} to {}",
-                    data.len(),
-                    addr,
-                    client_addr
-                );
-                Some((client_addr, data))
-            } else {
-                trace!(
-                    "Discarding data from {}, expecting data from {}",
-                    addr,
-                    destination
-                );
-                None
+            .filter_map(move |(addr, data)| {
+                if addr == destination {
+                    trace!(
+                        "Returning {} byte response from {} to {}",
+                        data.len(),
+                        addr,
+                        client_addr
+                    );
+                    Some((client_addr, data))
+                } else {
+                    trace!(
+                        "Discarding data from {}, expecting data from {}",
+                        addr,
+                        destination
+                    );
+                    None
+                }
             })
             .map_err(|e| {
                 error!("Error reading datagrams from forward socket: {}", e)