Merge branch 'upgrade-to-rust-2021'

18 files changed, 21 insertions, 19 deletions

diff --git a/android/translations-converter/Cargo.toml b/android/translations-converter/Cargo.toml
index 50b410de29..6e744a3c4f 100644
--- a/android/translations-converter/Cargo.toml
+++ b/android/translations-converter/Cargo.toml
@@ -3,9 +3,8 @@ name = "translations-converter"
 version = "0.1.0"
 authors = ["Mullvad VPN"]
 license = "GPL-3.0"
-edition = "2018"
-
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+edition = "2021"
+publish = false
 
 [dependencies]
 derive_more = "0.99"
diff --git a/mullvad-cli/Cargo.toml b/mullvad-cli/Cargo.toml
index 5376d587bc..4085bb778d 100644
--- a/mullvad-cli/Cargo.toml
+++ b/mullvad-cli/Cargo.toml
@@ -4,7 +4,7 @@ version = "2021.6.0-beta1"
 authors = ["Mullvad VPN"]
 description = "Manage the Mullvad VPN daemon via a convenient CLI"
 license = "GPL-3.0"
-edition = "2018"
+edition = "2021"
 publish = false
 
 [[bin]]
diff --git a/mullvad-daemon/Cargo.toml b/mullvad-daemon/Cargo.toml
index 474449fe0a..cbe5d25e1c 100644
--- a/mullvad-daemon/Cargo.toml
+++ b/mullvad-daemon/Cargo.toml
@@ -4,7 +4,7 @@ version = "2021.6.0-beta1"
 authors = ["Mullvad VPN"]
 description = "Mullvad VPN daemon. Runs and controls the VPN tunnels"
 license = "GPL-3.0"
-edition = "2018"
+edition = "2021"
 publish = false
 
 [dependencies]
diff --git a/mullvad-exclude/Cargo.toml b/mullvad-exclude/Cargo.toml
index f6e785b6ef..1e29056b33 100644
--- a/mullvad-exclude/Cargo.toml
+++ b/mullvad-exclude/Cargo.toml
@@ -3,7 +3,7 @@ name = "mullvad-exclude"
 version = "2021.6.0-beta1"
 authors = ["Mullvad VPN"]
 license = "GPL-3.0"
-edition = "2018"
+edition = "2021"
 publish = false
 
 [target.'cfg(target_os = "linux")'.dependencies]
diff --git a/mullvad-jni/Cargo.toml b/mullvad-jni/Cargo.toml
index d383a3f79a..8f03d65c64 100644
--- a/mullvad-jni/Cargo.toml
+++ b/mullvad-jni/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.1.0"
 authors = ["Mullvad VPN"]
 description = "JNI interface for the Mullvad daemon"
 license = "GPL-3.0"
-edition = "2018"
+edition = "2021"
 publish = false
 
 [lib]
diff --git a/mullvad-management-interface/Cargo.toml b/mullvad-management-interface/Cargo.toml
index c41e6bbc8e..346bf7f9b1 100644
--- a/mullvad-management-interface/Cargo.toml
+++ b/mullvad-management-interface/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.1.0"
 authors = ["Mullvad VPN"]
 description = "Mullvad VPN IPC. Contains types and functions for IPC clients and servers."
 license = "GPL-3.0"
-edition = "2018"
+edition = "2021"
 publish = false
 
 [dependencies]
diff --git a/mullvad-paths/Cargo.toml b/mullvad-paths/Cargo.toml
index ed63341acb..439aa3f236 100644
--- a/mullvad-paths/Cargo.toml
+++ b/mullvad-paths/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.1.0"
 authors = ["Mullvad VPN"]
 description = "Mullvad VPN application paths and directories"
 license = "GPL-3.0"
-edition = "2018"
+edition = "2021"
 publish = false
 
 [dependencies]
diff --git a/mullvad-problem-report/Cargo.toml b/mullvad-problem-report/Cargo.toml
index fd13566f8a..91ff6bd40e 100644
--- a/mullvad-problem-report/Cargo.toml
+++ b/mullvad-problem-report/Cargo.toml
@@ -4,7 +4,7 @@ version = "2021.6.0-beta1"
 authors = ["Mullvad VPN"]
 description = "Collect Mullvad VPN logs into a report and send it to support"
 license = "GPL-3.0"
-edition = "2018"
+edition = "2021"
 publish = false
 
 [dependencies]
diff --git a/mullvad-rpc/Cargo.toml b/mullvad-rpc/Cargo.toml
index 7a6c970ec2..614fd7763c 100644
--- a/mullvad-rpc/Cargo.toml
+++ b/mullvad-rpc/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.1.0"
 authors = ["Mullvad VPN"]
 description = "Mullvad VPN RPC clients. Providing an interface to query our infrastructure for information."
 license = "GPL-3.0"
-edition = "2018"
+edition = "2021"
 publish = false
 
 [features]
diff --git a/mullvad-setup/Cargo.toml b/mullvad-setup/Cargo.toml
index 18c6f0a18f..efb533b59f 100644
--- a/mullvad-setup/Cargo.toml
+++ b/mullvad-setup/Cargo.toml
@@ -4,7 +4,7 @@ version = "2021.6.0-beta1"
 authors = ["Mullvad VPN"]
 description = "Tool used to manage daemon setup"
 license = "GPL-3.0"
-edition = "2018"
+edition = "2021"
 publish = false
 
 [[bin]]
diff --git a/mullvad-tests/Cargo.toml b/mullvad-tests/Cargo.toml
index d0dc132b22..5bc1a230a4 100644
--- a/mullvad-tests/Cargo.toml
+++ b/mullvad-tests/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.1.0"
 authors = ["Mullvad VPN"]
 description = "Mullvad test specific modules and binaries"
 license = "GPL-3.0"
-edition = "2018"
+edition = "2021"
 publish = false
 
 [features]
diff --git a/mullvad-types/Cargo.toml b/mullvad-types/Cargo.toml
index 9cf71ef61e..b16b3bee13 100644
--- a/mullvad-types/Cargo.toml
+++ b/mullvad-types/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.1.0"
 authors = ["Mullvad VPN"]
 description = "Common base data structures for Mullvad VPN client"
 license = "GPL-3.0"
-edition = "2018"
+edition = "2021"
 publish = false
 
 [dependencies]
diff --git a/talpid-core/Cargo.toml b/talpid-core/Cargo.toml
index 6ca225ec91..389f470e80 100644
--- a/talpid-core/Cargo.toml
+++ b/talpid-core/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.1.0"
 authors = ["Mullvad VPN"]
 description = "Privacy preserving and secure VPN client library"
 license = "GPL-3.0"
-edition = "2018"
+edition = "2021"
 publish = false
 
 [dependencies]
diff --git a/talpid-core/src/split_tunnel/windows/mod.rs b/talpid-core/src/split_tunnel/windows/mod.rs
index 55c45c83df..d9aa5cb286 100644
--- a/talpid-core/src/split_tunnel/windows/mod.rs
+++ b/talpid-core/src/split_tunnel/windows/mod.rs
@@ -153,6 +153,9 @@ impl SplitTunnel {
         let event_thread = std::thread::spawn(move || {
             use driver::{EventBody, EventId};
 
+            // Take ownership of the entire struct (Rust 2021 edition change)
+            let _ = &event_context;
+
             let mut data_buffer = Vec::with_capacity(DRIVER_EVENT_BUFFER_SIZE);
             let mut returned_bytes = 0u32;
 
diff --git a/talpid-dbus/Cargo.toml b/talpid-dbus/Cargo.toml
index 71de00801e..9160c4980e 100644
--- a/talpid-dbus/Cargo.toml
+++ b/talpid-dbus/Cargo.toml
@@ -2,7 +2,7 @@
 name = "talpid-dbus"
 version = "0.1.0"
 authors = ["Mullvad VPN"]
-edition = "2018"
+edition = "2021"
 publish = false
 
 [target.'cfg(target_os = "linux")'.dependencies]
diff --git a/talpid-openvpn-plugin/Cargo.toml b/talpid-openvpn-plugin/Cargo.toml
index c498ec8e45..ef472effe9 100644
--- a/talpid-openvpn-plugin/Cargo.toml
+++ b/talpid-openvpn-plugin/Cargo.toml
@@ -4,7 +4,7 @@ version = "2021.6.0-beta1"
 authors = ["Mullvad VPN"]
 description = "OpenVPN shared library plugin for relaying OpenVPN events to talpid_core"
 license = "GPL-3.0"
-edition = "2018"
+edition = "2021"
 publish = false
 
 [lib]
diff --git a/talpid-platform-metadata/Cargo.toml b/talpid-platform-metadata/Cargo.toml
index d75ae1c3f1..de4b470fcd 100644
--- a/talpid-platform-metadata/Cargo.toml
+++ b/talpid-platform-metadata/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.1.0"
 authors = ["Mullvad VPN"]
 description = "Platform metadata detection functions"
 license = "GPL-3.0"
-edition = "2018"
+edition = "2021"
 publish = false
 
 
diff --git a/talpid-types/Cargo.toml b/talpid-types/Cargo.toml
index 6851a71f2d..33c62e3244 100644
--- a/talpid-types/Cargo.toml
+++ b/talpid-types/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.1.0"
 authors = ["Mullvad VPN"]
 description = "Common base structures for talpid"
 license = "GPL-3.0"
-edition = "2018"
+edition = "2021"
 publish = false
 
 [dependencies]