Merge branch 'update-rustfmt'

2 files changed, 10 insertions, 6 deletions

diff --git a/mullvad-cli/src/cmds/relay.rs b/mullvad-cli/src/cmds/relay.rs
index a4d0f37cfc..84f8b655f0 100644
--- a/mullvad-cli/src/cmds/relay.rs
+++ b/mullvad-cli/src/cmds/relay.rs
@@ -216,7 +216,7 @@ fn parse_port_constraint(raw_port: &str) -> Result<Constraint<u16>> {
     match raw_port.to_lowercase().as_str() {
         "any" => Ok(Constraint::Any),
         port => Ok(Constraint::Only(
-            u16::from_str(port).chain_err(|| "Invalid port")?
+            u16::from_str(port).chain_err(|| "Invalid port")?,
         )),
     }
 }
diff --git a/mullvad-daemon/src/bin/problem-report.rs b/mullvad-daemon/src/bin/problem-report.rs
index 2186be166b..b3b484da73 100644
--- a/mullvad-daemon/src/bin/problem-report.rs
+++ b/mullvad-daemon/src/bin/problem-report.rs
@@ -230,8 +230,10 @@ fn logs_from_log_directory() -> Result<impl Iterator<Item = Result<PathBuf>>> {
 }
 
 fn send_problem_report(user_email: &str, user_message: &str, report_path: &Path) -> Result<()> {
-    let report_content = normalize_newlines(read_file_lossy(report_path, REPORT_MAX_SIZE)
-        .chain_err(|| ErrorKind::ReadLogError(report_path.to_path_buf()))?);
+    let report_content = normalize_newlines(
+        read_file_lossy(report_path, REPORT_MAX_SIZE)
+            .chain_err(|| ErrorKind::ReadLogError(report_path.to_path_buf()))?,
+    );
     let metadata = collect_metadata();
     let mut rpc_manager = mullvad_rpc::MullvadRpcFactory::new();
     let mut rpc_client = mullvad_rpc::ProblemReportProxy::connect(&mut rpc_manager)
@@ -305,9 +307,11 @@ impl ProblemReport {
     /// contents if an error occurs while reading the log file.
     pub fn add_log(&mut self, path: &Path) {
         if self.log_paths.insert(path.to_owned()) {
-            let content = self.redact(&read_file_lossy(path, LOG_MAX_READ_BYTES)
-                .chain_err(|| ErrorKind::ReadLogError(path.to_path_buf()))
-                .unwrap_or_else(|e| e.display_chain().to_string()));
+            let content = self.redact(
+                &read_file_lossy(path, LOG_MAX_READ_BYTES)
+                    .chain_err(|| ErrorKind::ReadLogError(path.to_path_buf()))
+                    .unwrap_or_else(|e| e.display_chain().to_string()),
+            );
             let path = self.redact(&path.to_string_lossy());
             self.logs.push((path, content));
         }