From cba8dd7d81c4f2d2490a6c3bb340ca7afbb308ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Linus=20F=C3=A4rnstrand?= <linus@mullvad.net>
Date: Fri, 5 Jan 2024 16:17:09 +0100
Subject: [PATCH 1/3] Remove version and publish cargo metadata

Since Rust 1.75.0 the `version` field is optional. The version
defaults to "0.0.0" if it's not specified, and `publish` defaults
to false if no version has been given. So by not specifying
a version we get both `version = "0.0.0" and `publish = false`
"for free"
---
 Cargo.toml                                                      | 2 --
 android/translations-converter/Cargo.toml                       | 2 --
 .../Transport/Shadowsocks/shadowsocks-proxy/Cargo.toml          | 2 --
 ios/TunnelObfuscation/tunnel-obfuscator-proxy/Cargo.toml        | 2 --
 mullvad-api/Cargo.toml                                          | 2 --
 mullvad-cli/Cargo.toml                                          | 2 --
 mullvad-daemon/Cargo.toml                                       | 2 --
 mullvad-exclude/Cargo.toml                                      | 2 --
 mullvad-fs/Cargo.toml                                           | 2 --
 mullvad-jni/Cargo.toml                                          | 2 --
 mullvad-management-interface/Cargo.toml                         | 2 --
 mullvad-nsis/Cargo.toml                                         | 2 --
 mullvad-paths/Cargo.toml                                        | 2 --
 mullvad-problem-report/Cargo.toml                               | 2 --
 mullvad-relay-selector/Cargo.toml                               | 2 --
 mullvad-setup/Cargo.toml                                        | 2 --
 mullvad-types/Cargo.toml                                        | 2 --
 mullvad-version/Cargo.toml                                      | 2 --
 talpid-core/Cargo.toml                                          | 2 --
 talpid-dbus/Cargo.toml                                          | 2 --
 talpid-openvpn-plugin/Cargo.toml                                | 2 --
 talpid-openvpn/Cargo.toml                                       | 2 --
 talpid-platform-metadata/Cargo.toml                             | 2 --
 talpid-routing/Cargo.toml                                       | 2 --
 talpid-time/Cargo.toml                                          | 2 --
 talpid-tunnel-config-client/Cargo.toml                          | 2 --
 talpid-tunnel/Cargo.toml                                        | 2 --
 talpid-types/Cargo.toml                                         | 2 --
 talpid-windows/Cargo.toml                                       | 2 --
 talpid-wireguard/Cargo.toml                                     | 2 --
 test/test-manager/Cargo.toml                                    | 1 -
 test/test-manager/test_macro/Cargo.toml                         | 1 -
 test/test-runner/Cargo.toml                                     | 1 -
 tunnel-obfuscation/Cargo.toml                                   | 2 --
 34 files changed, 65 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index d5db47a22ac0..a1bbf9c2bbf4 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,10 +1,8 @@
 [workspace.package]
-version = "0.0.0"
 authors = ["Mullvad VPN"]
 repository = "https://github.com/mullvad/mullvadvpn-app/"
 license = "GPL-3.0"
 edition = "2021"
-publish = false
 
 [workspace]
 resolver = "2"
diff --git a/android/translations-converter/Cargo.toml b/android/translations-converter/Cargo.toml
index ee6cd4989fe5..67295759bc77 100644
--- a/android/translations-converter/Cargo.toml
+++ b/android/translations-converter/Cargo.toml
@@ -1,12 +1,10 @@
 [package]
 name = "translations-converter"
 description = "Converts between PO and Android style localization formats"
-version.workspace = true
 authors.workspace = true
 repository.workspace = true
 license.workspace = true
 edition.workspace = true
-publish.workspace = true
 
 [lints]
 workspace = true
diff --git a/ios/MullvadREST/Transport/Shadowsocks/shadowsocks-proxy/Cargo.toml b/ios/MullvadREST/Transport/Shadowsocks/shadowsocks-proxy/Cargo.toml
index 1247e3200ad7..2d63683a904e 100644
--- a/ios/MullvadREST/Transport/Shadowsocks/shadowsocks-proxy/Cargo.toml
+++ b/ios/MullvadREST/Transport/Shadowsocks/shadowsocks-proxy/Cargo.toml
@@ -1,11 +1,9 @@
 [package]
 name = "shadowsocks-proxy"
-version.workspace = true
 authors.workspace = true
 repository.workspace = true
 license.workspace = true
 edition.workspace = true
-publish.workspace = true
 
 [lints]
 workspace = true
diff --git a/ios/TunnelObfuscation/tunnel-obfuscator-proxy/Cargo.toml b/ios/TunnelObfuscation/tunnel-obfuscator-proxy/Cargo.toml
index 0eb3980e735b..9e2f22791264 100644
--- a/ios/TunnelObfuscation/tunnel-obfuscator-proxy/Cargo.toml
+++ b/ios/TunnelObfuscation/tunnel-obfuscator-proxy/Cargo.toml
@@ -1,11 +1,9 @@
 [package]
 name = "tunnel-obfuscator-proxy"
-version.workspace = true
 authors.workspace = true
 repository.workspace = true
 license.workspace = true
 edition.workspace = true
-publish.workspace = true
 
 [lints]
 workspace = true
diff --git a/mullvad-api/Cargo.toml b/mullvad-api/Cargo.toml
index 9ff57b3fd2f6..9c7f6c9ade9d 100644
--- a/mullvad-api/Cargo.toml
+++ b/mullvad-api/Cargo.toml
@@ -1,12 +1,10 @@
 [package]
 name = "mullvad-api"
 description = "Mullvad VPN API clients. Providing an interface to query our infrastructure for information."
-version.workspace = true
 authors.workspace = true
 repository.workspace = true
 license.workspace = true
 edition.workspace = true
-publish.workspace = true
 
 [lints]
 workspace = true
diff --git a/mullvad-cli/Cargo.toml b/mullvad-cli/Cargo.toml
index 8e310dce3b2c..fab9ac615601 100644
--- a/mullvad-cli/Cargo.toml
+++ b/mullvad-cli/Cargo.toml
@@ -1,12 +1,10 @@
 [package]
 name = "mullvad-cli"
 description = "Manage the Mullvad VPN daemon via a convenient CLI"
-version.workspace = true
 authors.workspace = true
 repository.workspace = true
 license.workspace = true
 edition.workspace = true
-publish.workspace = true
 
 [lints]
 workspace = true
diff --git a/mullvad-daemon/Cargo.toml b/mullvad-daemon/Cargo.toml
index 7391b268f888..72c700b41bbe 100644
--- a/mullvad-daemon/Cargo.toml
+++ b/mullvad-daemon/Cargo.toml
@@ -1,12 +1,10 @@
 [package]
 name = "mullvad-daemon"
 description = "Mullvad VPN daemon. Runs and controls the VPN tunnels"
-version.workspace = true
 authors.workspace = true
 repository.workspace = true
 license.workspace = true
 edition.workspace = true
-publish.workspace = true
 
 [lints]
 workspace = true
diff --git a/mullvad-exclude/Cargo.toml b/mullvad-exclude/Cargo.toml
index b641fd281bdc..3ff19ae5fb81 100644
--- a/mullvad-exclude/Cargo.toml
+++ b/mullvad-exclude/Cargo.toml
@@ -1,12 +1,10 @@
 [package]
 name = "mullvad-exclude"
 description = "Runs programs outside the Mullvad VPN tunnel on Linux"
-version.workspace = true
 authors.workspace = true
 repository.workspace = true
 license.workspace = true
 edition.workspace = true
-publish.workspace = true
 
 [lints]
 workspace = true
diff --git a/mullvad-fs/Cargo.toml b/mullvad-fs/Cargo.toml
index e0d43888c6c2..5b0e4f6b7d93 100644
--- a/mullvad-fs/Cargo.toml
+++ b/mullvad-fs/Cargo.toml
@@ -1,12 +1,10 @@
 [package]
 name = "mullvad-fs"
 description = "File utility library"
-version.workspace = true
 authors.workspace = true
 repository.workspace = true
 license.workspace = true
 edition.workspace = true
-publish.workspace = true
 
 [lints]
 workspace = true
diff --git a/mullvad-jni/Cargo.toml b/mullvad-jni/Cargo.toml
index 6ed3ddcadf45..5020e2d17ebf 100644
--- a/mullvad-jni/Cargo.toml
+++ b/mullvad-jni/Cargo.toml
@@ -1,12 +1,10 @@
 [package]
 name = "mullvad-jni"
 description = "JNI interface for the Mullvad daemon"
-version.workspace = true
 authors.workspace = true
 repository.workspace = true
 license.workspace = true
 edition.workspace = true
-publish.workspace = true
 
 [lints]
 workspace = true
diff --git a/mullvad-management-interface/Cargo.toml b/mullvad-management-interface/Cargo.toml
index b83298779e17..8391a187249d 100644
--- a/mullvad-management-interface/Cargo.toml
+++ b/mullvad-management-interface/Cargo.toml
@@ -1,12 +1,10 @@
 [package]
 name = "mullvad-management-interface"
 description = "Mullvad VPN IPC. Contains types and functions for IPC clients and servers."
-version.workspace = true
 authors.workspace = true
 repository.workspace = true
 license.workspace = true
 edition.workspace = true
-publish.workspace = true
 
 [lints]
 workspace = true
diff --git a/mullvad-nsis/Cargo.toml b/mullvad-nsis/Cargo.toml
index dd6b2aa8bc6c..ed949873c38f 100644
--- a/mullvad-nsis/Cargo.toml
+++ b/mullvad-nsis/Cargo.toml
@@ -1,12 +1,10 @@
 [package]
 name = "mullvad-nsis"
 description = "Helper library used by Mullvad NSIS plugins"
-version.workspace = true
 authors.workspace = true
 repository.workspace = true
 license.workspace = true
 edition.workspace = true
-publish.workspace = true
 
 [lints]
 workspace = true
diff --git a/mullvad-paths/Cargo.toml b/mullvad-paths/Cargo.toml
index df8a66635ae3..1965c1713aa6 100644
--- a/mullvad-paths/Cargo.toml
+++ b/mullvad-paths/Cargo.toml
@@ -1,12 +1,10 @@
 [package]
 name = "mullvad-paths"
 description = "Mullvad VPN application paths and directories"
-version.workspace = true
 authors.workspace = true
 repository.workspace = true
 license.workspace = true
 edition.workspace = true
-publish.workspace = true
 
 [lints]
 workspace = true
diff --git a/mullvad-problem-report/Cargo.toml b/mullvad-problem-report/Cargo.toml
index d5b19d370315..2eed3352905c 100644
--- a/mullvad-problem-report/Cargo.toml
+++ b/mullvad-problem-report/Cargo.toml
@@ -1,12 +1,10 @@
 [package]
 name = "mullvad-problem-report"
 description = "Collect Mullvad VPN logs into a report and send it to support"
-version.workspace = true
 authors.workspace = true
 repository.workspace = true
 license.workspace = true
 edition.workspace = true
-publish.workspace = true
 
 [lints]
 workspace = true
diff --git a/mullvad-relay-selector/Cargo.toml b/mullvad-relay-selector/Cargo.toml
index 7cf25034bc6c..ad09d174dd11 100644
--- a/mullvad-relay-selector/Cargo.toml
+++ b/mullvad-relay-selector/Cargo.toml
@@ -1,12 +1,10 @@
 [package]
 name = "mullvad-relay-selector"
 description = "Mullvad VPN relay selector"
-version.workspace = true
 authors.workspace = true
 repository.workspace = true
 license.workspace = true
 edition.workspace = true
-publish.workspace = true
 
 [lints]
 workspace = true
diff --git a/mullvad-setup/Cargo.toml b/mullvad-setup/Cargo.toml
index bc13c3e593ad..b60540a9fe52 100644
--- a/mullvad-setup/Cargo.toml
+++ b/mullvad-setup/Cargo.toml
@@ -1,12 +1,10 @@
 [package]
 name = "mullvad-setup"
 description = "Tool used to manage daemon setup"
-version.workspace = true
 authors.workspace = true
 repository.workspace = true
 license.workspace = true
 edition.workspace = true
-publish.workspace = true
 
 [lints]
 workspace = true
diff --git a/mullvad-types/Cargo.toml b/mullvad-types/Cargo.toml
index 68e036e5f776..44c63941fa6c 100644
--- a/mullvad-types/Cargo.toml
+++ b/mullvad-types/Cargo.toml
@@ -1,12 +1,10 @@
 [package]
 name = "mullvad-types"
 description = "Common base data structures for Mullvad VPN client"
-version.workspace = true
 authors.workspace = true
 repository.workspace = true
 license.workspace = true
 edition.workspace = true
-publish.workspace = true
 
 [lints]
 workspace = true
diff --git a/mullvad-version/Cargo.toml b/mullvad-version/Cargo.toml
index 229b858f5ff1..e95699a2f0bf 100644
--- a/mullvad-version/Cargo.toml
+++ b/mullvad-version/Cargo.toml
@@ -6,12 +6,10 @@ what version string a build should have. This crate is responsible for computing
 `-dev-$git_hash` suffix as well as transforming the version into semver, Android versionCode
 and other formats.
 """
-version.workspace = true
 authors.workspace = true
 repository.workspace = true
 license.workspace = true
 edition.workspace = true
-publish.workspace = true
 
 [lints]
 workspace = true
diff --git a/talpid-core/Cargo.toml b/talpid-core/Cargo.toml
index b7ff565293af..3d64ae0e1b03 100644
--- a/talpid-core/Cargo.toml
+++ b/talpid-core/Cargo.toml
@@ -1,12 +1,10 @@
 [package]
 name = "talpid-core"
 description = "Privacy preserving and secure VPN client library"
-version.workspace = true
 authors.workspace = true
 repository.workspace = true
 license.workspace = true
 edition.workspace = true
-publish.workspace = true
 
 [lints]
 workspace = true
diff --git a/talpid-dbus/Cargo.toml b/talpid-dbus/Cargo.toml
index 346f154a9550..7d0470473f90 100644
--- a/talpid-dbus/Cargo.toml
+++ b/talpid-dbus/Cargo.toml
@@ -1,11 +1,9 @@
 [package]
 name = "talpid-dbus"
-version.workspace = true
 authors.workspace = true
 repository.workspace = true
 license.workspace = true
 edition.workspace = true
-publish.workspace = true
 
 [lints]
 workspace = true
diff --git a/talpid-openvpn-plugin/Cargo.toml b/talpid-openvpn-plugin/Cargo.toml
index 2dc6506c0316..fa85050df86f 100644
--- a/talpid-openvpn-plugin/Cargo.toml
+++ b/talpid-openvpn-plugin/Cargo.toml
@@ -1,12 +1,10 @@
 [package]
 name = "talpid-openvpn-plugin"
 description = "OpenVPN shared library plugin for relaying OpenVPN events to talpid_core"
-version.workspace = true
 authors.workspace = true
 repository.workspace = true
 license.workspace = true
 edition.workspace = true
-publish.workspace = true
 
 [lints]
 workspace = true
diff --git a/talpid-openvpn/Cargo.toml b/talpid-openvpn/Cargo.toml
index 2dfa62d321f7..dc05e1a55238 100644
--- a/talpid-openvpn/Cargo.toml
+++ b/talpid-openvpn/Cargo.toml
@@ -1,12 +1,10 @@
 [package]
 name = "talpid-openvpn"
 description = "Library for creating OpenVPN tunnels"
-version.workspace = true
 authors.workspace = true
 repository.workspace = true
 license.workspace = true
 edition.workspace = true
-publish.workspace = true
 
 [lints]
 workspace = true
diff --git a/talpid-platform-metadata/Cargo.toml b/talpid-platform-metadata/Cargo.toml
index 168bb2e0bafd..07146261a8bf 100644
--- a/talpid-platform-metadata/Cargo.toml
+++ b/talpid-platform-metadata/Cargo.toml
@@ -1,12 +1,10 @@
 [package]
 name = "talpid-platform-metadata"
 description = "Platform metadata detection functions"
-version.workspace = true
 authors.workspace = true
 repository.workspace = true
 license.workspace = true
 edition.workspace = true
-publish.workspace = true
 
 [lints]
 workspace = true
diff --git a/talpid-routing/Cargo.toml b/talpid-routing/Cargo.toml
index 1844377bbdfc..fbf65fed765d 100644
--- a/talpid-routing/Cargo.toml
+++ b/talpid-routing/Cargo.toml
@@ -1,12 +1,10 @@
 [package]
 name = "talpid-routing"
 description = "Library for managing routing tables"
-version.workspace = true
 authors.workspace = true
 repository.workspace = true
 license.workspace = true
 edition.workspace = true
-publish.workspace = true
 
 [lints]
 workspace = true
diff --git a/talpid-time/Cargo.toml b/talpid-time/Cargo.toml
index fc0effe6b98c..0b59f8e0e73a 100644
--- a/talpid-time/Cargo.toml
+++ b/talpid-time/Cargo.toml
@@ -1,12 +1,10 @@
 [package]
 name = "talpid-time"
 description = "Time functions"
-version.workspace = true
 authors.workspace = true
 repository.workspace = true
 license.workspace = true
 edition.workspace = true
-publish.workspace = true
 
 [lints]
 workspace = true
diff --git a/talpid-tunnel-config-client/Cargo.toml b/talpid-tunnel-config-client/Cargo.toml
index 46a96828c634..9c7feb162fe1 100644
--- a/talpid-tunnel-config-client/Cargo.toml
+++ b/talpid-tunnel-config-client/Cargo.toml
@@ -1,12 +1,10 @@
 [package]
 name = "talpid-tunnel-config-client"
 description = "Uses the relay RPC service to set up PQ-safe peers, etc."
-version.workspace = true
 authors.workspace = true
 repository.workspace = true
 license.workspace = true
 edition.workspace = true
-publish.workspace = true
 
 [lints]
 workspace = true
diff --git a/talpid-tunnel/Cargo.toml b/talpid-tunnel/Cargo.toml
index e6cda3ac99f8..8f230ecc56ad 100644
--- a/talpid-tunnel/Cargo.toml
+++ b/talpid-tunnel/Cargo.toml
@@ -1,12 +1,10 @@
 [package]
 name = "talpid-tunnel"
 description = "Library for creating tunnel devices and interfacing with various VPN tunnels"
-version.workspace = true
 authors.workspace = true
 repository.workspace = true
 license.workspace = true
 edition.workspace = true
-publish.workspace = true
 
 [lints]
 workspace = true
diff --git a/talpid-types/Cargo.toml b/talpid-types/Cargo.toml
index 0b3905774d25..c16917257c7f 100644
--- a/talpid-types/Cargo.toml
+++ b/talpid-types/Cargo.toml
@@ -1,12 +1,10 @@
 [package]
 name = "talpid-types"
 description = "Common base structures for talpid"
-version.workspace = true
 authors.workspace = true
 repository.workspace = true
 license.workspace = true
 edition.workspace = true
-publish.workspace = true
 
 [lints]
 workspace = true
diff --git a/talpid-windows/Cargo.toml b/talpid-windows/Cargo.toml
index 15bb5824dceb..f7ef92515bd2 100644
--- a/talpid-windows/Cargo.toml
+++ b/talpid-windows/Cargo.toml
@@ -1,12 +1,10 @@
 [package]
 name = "talpid-windows"
 description = "Nice abstractions for Windows"
-version.workspace = true
 authors.workspace = true
 repository.workspace = true
 license.workspace = true
 edition.workspace = true
-publish.workspace = true
 
 [lints]
 workspace = true
diff --git a/talpid-wireguard/Cargo.toml b/talpid-wireguard/Cargo.toml
index f50383d92b69..26073cfb234d 100644
--- a/talpid-wireguard/Cargo.toml
+++ b/talpid-wireguard/Cargo.toml
@@ -1,12 +1,10 @@
 [package]
 name = "talpid-wireguard"
 description = "Library for creating various WireGuard tunnels"
-version.workspace = true
 authors.workspace = true
 repository.workspace = true
 license.workspace = true
 edition.workspace = true
-publish.workspace = true
 
 [lints]
 workspace = true
diff --git a/test/test-manager/Cargo.toml b/test/test-manager/Cargo.toml
index 5f583e8f4f3e..ffba39bae0b4 100644
--- a/test/test-manager/Cargo.toml
+++ b/test/test-manager/Cargo.toml
@@ -1,6 +1,5 @@
 [package]
 name = "test-manager"
-version = "0.1.0"
 edition = "2021"
 
 [lints]
diff --git a/test/test-manager/test_macro/Cargo.toml b/test/test-manager/test_macro/Cargo.toml
index 7883deaeccce..4942a8af4896 100644
--- a/test/test-manager/test_macro/Cargo.toml
+++ b/test/test-manager/test_macro/Cargo.toml
@@ -3,7 +3,6 @@ proc-macro = true
 
 [package]
 name = "test_macro"
-version = "0.1.0"
 edition = "2021"
 
 [dependencies]
diff --git a/test/test-runner/Cargo.toml b/test/test-runner/Cargo.toml
index 6f95d2b34b23..cb92a3551315 100644
--- a/test/test-runner/Cargo.toml
+++ b/test/test-runner/Cargo.toml
@@ -1,6 +1,5 @@
 [package]
 name = "test-runner"
-version = "0.1.0"
 edition = "2021"
 
 [lints]
diff --git a/tunnel-obfuscation/Cargo.toml b/tunnel-obfuscation/Cargo.toml
index 2a7bc8fdc324..2fafc3a92784 100644
--- a/tunnel-obfuscation/Cargo.toml
+++ b/tunnel-obfuscation/Cargo.toml
@@ -1,12 +1,10 @@
 [package]
 name = "tunnel-obfuscation"
 description = "Provides different types of obfuscation layers for WireGuard"
-version.workspace = true
 authors.workspace = true
 repository.workspace = true
 license.workspace = true
 edition.workspace = true
-publish.workspace = true
 
 [lints]
 workspace = true

From 8e714c784a3a3d65b148cb7d34098dea94ae1ebd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Linus=20F=C3=A4rnstrand?= <linus@mullvad.net>
Date: Fri, 5 Jan 2024 16:25:31 +0100
Subject: [PATCH 2/3] Make cargo deny use stable rust

---
 .github/workflows/rust-supply-chain.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/rust-supply-chain.yml b/.github/workflows/rust-supply-chain.yml
index 67e15b73906f..b679766c73c2 100644
--- a/.github/workflows/rust-supply-chain.yml
+++ b/.github/workflows/rust-supply-chain.yml
@@ -20,4 +20,5 @@ jobs:
         uses: EmbarkStudios/cargo-deny-action@v1
         with:
           log-level: warn
+          rust-version: stable
           command: check all

From d884332294ec97363e4dcf3d0a21ecb3373b5e9a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Linus=20F=C3=A4rnstrand?= <linus@mullvad.net>
Date: Mon, 8 Jan 2024 11:50:59 +0100
Subject: [PATCH 3/3] Bump nightly toolchain used for cargo udeps

---
 .github/workflows/rust-unused-dependencies.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/rust-unused-dependencies.yml b/.github/workflows/rust-unused-dependencies.yml
index b2c95bcd7a30..98f279d1def5 100644
--- a/.github/workflows/rust-unused-dependencies.yml
+++ b/.github/workflows/rust-unused-dependencies.yml
@@ -10,7 +10,7 @@ on:
   workflow_dispatch:
 env:
   # Pinning nightly just to avoid random breakage. It's fine to bump this at any time
-  RUST_NIGHTLY_TOOLCHAIN: nightly-2023-08-03
+  RUST_NIGHTLY_TOOLCHAIN: nightly-2024-01-07
 jobs:
   prepare-containers:
     runs-on: ubuntu-latest