diff options
| author | Emīls <emils@mullvad.net> | 2020-02-20 18:52:06 +0000 |
|---|---|---|
| committer | Emīls <emils@mullvad.net> | 2020-02-21 11:54:52 +0000 |
| commit | eb1e1b97ec8453a60c2f9143cdacd4ba47e8a98c (patch) | |
| tree | 173cfcbe33296a6cd74a7192a65faaeac0f90548 | |
| parent | fcbffb352e3775b6d6ca839b8c047cc9c6b0d1b1 (diff) | |
| download | mullvadvpn-eb1e1b97ec8453a60c2f9143cdacd4ba47e8a98c.tar.xz mullvadvpn-eb1e1b97ec8453a60c2f9143cdacd4ba47e8a98c.zip | |
Simplify error checking
| -rw-r--r-- | mullvad-daemon/src/lib.rs | 3 | ||||
| -rw-r--r-- | mullvad-daemon/src/version_check.rs | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/mullvad-daemon/src/lib.rs b/mullvad-daemon/src/lib.rs index e261b3772c..f5e76d9b99 100644 --- a/mullvad-daemon/src/lib.rs +++ b/mullvad-daemon/src/lib.rs @@ -1673,12 +1673,13 @@ impl TunnelParametersGenerator for MullvadTunnelParametersGenerator { retry_attempt: u32, ) -> std::result::Result<TunnelParameters, ParameterGenerationError> { let (response_tx, response_rx) = mpsc::channel(); - if let Err(_) = self + if self .tx .unbounded_send(InternalDaemonEvent::GenerateTunnelParameters( response_tx, retry_attempt, )) + .is_err() { log::error!("Failed to send daemon command to generate tunnel parameters!"); return Err(ParameterGenerationError::NoMatchingRelay); diff --git a/mullvad-daemon/src/version_check.rs b/mullvad-daemon/src/version_check.rs index 33e8fb86af..da24b85ea3 100644 --- a/mullvad-daemon/src/version_check.rs +++ b/mullvad-daemon/src/version_check.rs @@ -176,9 +176,10 @@ impl<T: From<AppVersionInfo>> Future for VersionUpdater<T> { log::debug!("Got new version check: {:?}", app_version_info); self.next_update_time = Instant::now() + UPDATE_INTERVAL; if app_version_info != self.last_app_version_info { - if let Err(_) = self + if self .update_sender .unbounded_send(app_version_info.clone().into()) + .is_err() { log::warn!( "Version update receiver is closed, stopping version updater" |