summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--mullvad-daemon/src/relays.rs5
-rw-r--r--mullvad-daemon/src/settings.rs1
2 files changed, 4 insertions, 2 deletions
diff --git a/mullvad-daemon/src/relays.rs b/mullvad-daemon/src/relays.rs
index 0fdb6ebba9..54b56cde5f 100644
--- a/mullvad-daemon/src/relays.rs
+++ b/mullvad-daemon/src/relays.rs
@@ -994,7 +994,10 @@ impl RelayListUpdater {
}
async fn run(mut self, mut cmd_rx: mpsc::Receiver<()>) {
- let mut check_interval = tokio::time::interval(UPDATE_CHECK_INTERVAL).fuse();
+ let mut check_interval = tokio_stream::wrappers::IntervalStream::new(
+ tokio::time::interval(UPDATE_CHECK_INTERVAL),
+ )
+ .fuse();
let mut download_future = Box::pin(Fuse::terminated());
loop {
futures::select! {
diff --git a/mullvad-daemon/src/settings.rs b/mullvad-daemon/src/settings.rs
index e789337699..02568e3226 100644
--- a/mullvad-daemon/src/settings.rs
+++ b/mullvad-daemon/src/settings.rs
@@ -149,7 +149,6 @@ impl SettingsPersister {
let mut options = fs::OpenOptions::new();
#[cfg(unix)]
{
- use fs::os::unix::OpenOptionsExt;
options.mode(0o600);
}
let mut file = options