15 files changed, 46 insertions, 32 deletions
diff --git a/Cargo.lock b/Cargo.lock
index c133a68100..2252929cb2 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -468,6 +468,20 @@ dependencies = [
 ]
 
 [[package]]
+name = "err-derive"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dcc7f65832b62ed38939f98966824eb6294911c3629b0e9a262bfb80836d9686"
+dependencies = [
+ "proc-macro-error",
+ "proc-macro2",
+ "quote",
+ "rustversion",
+ "syn",
+ "synstructure",
+]
+
+[[package]]
 name = "errno"
 version = "0.2.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1214,7 +1228,7 @@ dependencies = [
  "chrono",
  "clap",
  "env_logger",
- "err-derive",
+ "err-derive 0.3.0",
  "futures",
  "mullvad-management-interface",
  "mullvad-paths",
@@ -1238,7 +1252,7 @@ dependencies = [
  "ctrlc",
  "dirs-next",
  "duct",
- "err-derive",
+ "err-derive 0.3.0",
  "fern",
  "futures",
  "ipnetwork",
@@ -1272,7 +1286,7 @@ dependencies = [
 name = "mullvad-exclude"
 version = "2021.1.0-beta2"
 dependencies = [
- "err-derive",
+ "err-derive 0.3.0",
  "nix 0.19.1",
  "talpid-types",
 ]
@@ -1281,7 +1295,7 @@ dependencies = [
 name = "mullvad-jni"
 version = "0.1.0"
 dependencies = [
- "err-derive",
+ "err-derive 0.3.0",
  "futures",
  "ipnetwork",
  "jnix",
@@ -1304,7 +1318,7 @@ dependencies = [
 name = "mullvad-management-interface"
 version = "0.1.0"
 dependencies = [
- "err-derive",
+ "err-derive 0.3.0",
  "futures",
  "mullvad-paths",
  "parity-tokio-ipc",
@@ -1322,7 +1336,7 @@ name = "mullvad-paths"
 version = "0.1.0"
 dependencies = [
  "dirs-next",
- "err-derive",
+ "err-derive 0.3.0",
  "log 0.4.14",
 ]
 
@@ -1334,7 +1348,7 @@ dependencies = [
  "dirs-next",
  "duct",
  "env_logger",
- "err-derive",
+ "err-derive 0.3.0",
  "lazy_static",
  "mullvad-paths",
  "mullvad-rpc",
@@ -1353,7 +1367,7 @@ version = "0.1.0"
 dependencies = [
  "bytes 0.5.6",
  "chrono",
- "err-derive",
+ "err-derive 0.3.0",
  "filetime",
  "futures",
  "http",
@@ -1381,7 +1395,7 @@ version = "2021.1.0-beta2"
 dependencies = [
  "clap",
  "env_logger",
- "err-derive",
+ "err-derive 0.3.0",
  "lazy_static",
  "mullvad-daemon",
  "mullvad-management-interface",
@@ -1401,7 +1415,7 @@ name = "mullvad-types"
 version = "0.1.0"
 dependencies = [
  "chrono",
- "err-derive",
+ "err-derive 0.3.0",
  "ipnetwork",
  "jnix",
  "lazy_static",
@@ -1513,12 +1527,12 @@ dependencies = [
 
 [[package]]
 name = "nftnl"
-version = "0.6.0"
+version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8458833d3dd636d15b07f12aa22916d2f73c7607a072247068ecfe7cf28b660"
+checksum = "2453197ab3fcf147bf0ebd193557eeffa3998e6c84670eb8c9d86393bd09011f"
 dependencies = [
  "bitflags 1.2.1",
- "err-derive",
+ "err-derive 0.3.0",
  "log 0.4.14",
  "nftnl-sys",
 ]
@@ -2544,7 +2558,7 @@ dependencies = [
  "cfg-if 1.0.0",
  "chrono",
  "duct",
- "err-derive",
+ "err-derive 0.3.0",
  "failure",
  "futures",
  "hex",
@@ -2600,7 +2614,7 @@ name = "talpid-dbus"
 version = "0.1.0"
 dependencies = [
  "dbus",
- "err-derive",
+ "err-derive 0.3.0",
  "lazy_static",
  "log 0.4.14",
 ]
@@ -2610,7 +2624,7 @@ name = "talpid-openvpn-plugin"
 version = "2021.1.0-beta2"
 dependencies = [
  "env_logger",
- "err-derive",
+ "err-derive 0.3.0",
  "log 0.4.14",
  "openvpn-plugin",
  "parity-tokio-ipc",
@@ -2638,7 +2652,7 @@ name = "talpid-types"
 version = "0.1.0"
 dependencies = [
  "base64",
- "err-derive",
+ "err-derive 0.3.0",
  "ipnetwork",
  "jnix",
  "rand 0.7.3",
@@ -3367,7 +3381,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fdfb0437cd780b66551aa81b466470f1159b1878ed45438b738de8bc6e5012b6"
 dependencies = [
  "bitflags 1.2.1",
- "err-derive",
+ "err-derive 0.2.4",
  "widestring",
  "winapi 0.3.9",
 ]
diff --git a/mullvad-cli/Cargo.toml b/mullvad-cli/Cargo.toml
index e0ee8f2f46..eb6bc3c730 100644
--- a/mullvad-cli/Cargo.toml
+++ b/mullvad-cli/Cargo.toml
@@ -15,7 +15,7 @@ path = "src/main.rs"
 base64 = "0.12"
 chrono = { version = "0.4", features = ["serde"] }
 clap = "2.32"
-err-derive = "0.2.1"
+err-derive = "0.3.0"
 env_logger = "0.7"
 futures = "0.3"
 natord = "1.0.9"
diff --git a/mullvad-daemon/Cargo.toml b/mullvad-daemon/Cargo.toml
index dca5cb288c..051bf0f579 100644
--- a/mullvad-daemon/Cargo.toml
+++ b/mullvad-daemon/Cargo.toml
@@ -11,7 +11,7 @@ publish = false
 cfg-if = "1.0"
 chrono = { version = "0.4", features = ["serde"] }
 clap = "2.25"
-err-derive = "0.2.1"
+err-derive = "0.3.0"
 fern = { version = "0.6", features = ["colored"] }
 futures = "0.3"
 ipnetwork = "0.16"
diff --git a/mullvad-exclude/Cargo.toml b/mullvad-exclude/Cargo.toml
index d90ab85aea..8bbb7f19c1 100644
--- a/mullvad-exclude/Cargo.toml
+++ b/mullvad-exclude/Cargo.toml
@@ -8,5 +8,5 @@ publish = false
 
 [target.'cfg(target_os = "linux")'.dependencies]
 nix = "0.19"
-err-derive = "0.2.1"
+err-derive = "0.3.0"
 talpid-types = { path = "../talpid-types" }
diff --git a/mullvad-jni/Cargo.toml b/mullvad-jni/Cargo.toml
index 21cc9612bb..0d528da82d 100644
--- a/mullvad-jni/Cargo.toml
+++ b/mullvad-jni/Cargo.toml
@@ -11,7 +11,7 @@ publish = false
 crate_type = ["cdylib"]
 
 [target.'cfg(target_os = "android")'.dependencies]
-err-derive = "0.2.1"
+err-derive = "0.3.0"
 futures = "0.3"
 ipnetwork = "0.16"
 jnix = { version = "0.3", features = ["derive"] }
diff --git a/mullvad-management-interface/Cargo.toml b/mullvad-management-interface/Cargo.toml
index 88bbe06ab7..2219fc728f 100644
--- a/mullvad-management-interface/Cargo.toml
+++ b/mullvad-management-interface/Cargo.toml
@@ -8,7 +8,7 @@ edition = "2018"
 publish = false
 
 [dependencies]
-err-derive = "0.2.1"
+err-derive = "0.3.0"
 mullvad-paths = { path = "../mullvad-paths" }
 tonic = "0.3.1"
 tower = "0.3"
diff --git a/mullvad-paths/Cargo.toml b/mullvad-paths/Cargo.toml
index 4589c32783..ed63341acb 100644
--- a/mullvad-paths/Cargo.toml
+++ b/mullvad-paths/Cargo.toml
@@ -8,7 +8,7 @@ edition = "2018"
 publish = false
 
 [dependencies]
-err-derive = "0.2.1"
+err-derive = "0.3.0"
 log = "0.4"
 
 [target.'cfg(any(windows, target_os = "macos"))'.dependencies]
diff --git a/mullvad-problem-report/Cargo.toml b/mullvad-problem-report/Cargo.toml
index 14f9de4cce..431123e5af 100644
--- a/mullvad-problem-report/Cargo.toml
+++ b/mullvad-problem-report/Cargo.toml
@@ -11,7 +11,7 @@ publish = false
 clap = "2.25"
 dirs-next = "2.0"
 env_logger = "0.7"
-err-derive = "0.2.1"
+err-derive = "0.3.0"
 lazy_static = "1.0"
 regex = "1.0"
 uuid = { version = "0.8", features = ["v4"] }
diff --git a/mullvad-rpc/Cargo.toml b/mullvad-rpc/Cargo.toml
index 680a880608..5b6578321d 100644
--- a/mullvad-rpc/Cargo.toml
+++ b/mullvad-rpc/Cargo.toml
@@ -10,7 +10,7 @@ publish = false
 [dependencies]
 bytes = "0.5"
 chrono = { version = "0.4", features = ["serde"] }
-err-derive = "0.2.1"
+err-derive = "0.3.0"
 futures = "0.3"
 http = "0.2"
 hyper = "0.13"
diff --git a/mullvad-setup/Cargo.toml b/mullvad-setup/Cargo.toml
index 33daa1e55a..734df54c3f 100644
--- a/mullvad-setup/Cargo.toml
+++ b/mullvad-setup/Cargo.toml
@@ -14,7 +14,7 @@ path = "src/main.rs"
 [dependencies]
 clap = "2.32"
 env_logger = "0.7"
-err-derive = "0.2.1"
+err-derive = "0.3.0"
 lazy_static = "1.1.0"
 
 mullvad-management-interface = { path = "../mullvad-management-interface" }
diff --git a/mullvad-types/Cargo.toml b/mullvad-types/Cargo.toml
index ab0989c948..c1f5129f4c 100644
--- a/mullvad-types/Cargo.toml
+++ b/mullvad-types/Cargo.toml
@@ -9,7 +9,7 @@ publish = false
 
 [dependencies]
 chrono = { version = "0.4", features = ["serde"] }
-err-derive = "0.2.1"
+err-derive = "0.3.0"
 ipnetwork = "0.16"
 lazy_static = "1.1.0"
 log = "0.4"
diff --git a/talpid-core/Cargo.toml b/talpid-core/Cargo.toml
index 78295fe25d..5685e62d00 100644
--- a/talpid-core/Cargo.toml
+++ b/talpid-core/Cargo.toml
@@ -11,7 +11,7 @@ publish = false
 atty = "0.2"
 cfg-if = "1.0"
 duct = "0.13"
-err-derive = "0.2.1"
+err-derive = "0.3.0"
 futures = "0.3"
 hex = "0.4"
 ipnetwork = "0.16"
diff --git a/talpid-dbus/Cargo.toml b/talpid-dbus/Cargo.toml
index 57ffda5eb9..94d67d61fe 100644
--- a/talpid-dbus/Cargo.toml
+++ b/talpid-dbus/Cargo.toml
@@ -7,6 +7,6 @@ publish = false
 
 [target.'cfg(target_os = "linux")'.dependencies]
 dbus = "0.9"
-err-derive = "0.2.1"
+err-derive = "0.3.0"
 lazy_static = "1.0"
 log = "0.4"
diff --git a/talpid-openvpn-plugin/Cargo.toml b/talpid-openvpn-plugin/Cargo.toml
index 1e5e6de5b8..f26126564d 100644
--- a/talpid-openvpn-plugin/Cargo.toml
+++ b/talpid-openvpn-plugin/Cargo.toml
@@ -11,7 +11,7 @@ publish = false
 crate-type = ["cdylib"]
 
 [dependencies]
-err-derive = "0.2.1"
+err-derive = "0.3.0"
 log = "0.4"
 env_logger = "0.7"
 parity-tokio-ipc = "0.8"
diff --git a/talpid-types/Cargo.toml b/talpid-types/Cargo.toml
index 2b40fca5a8..21d8968410 100644
--- a/talpid-types/Cargo.toml
+++ b/talpid-types/Cargo.toml
@@ -13,7 +13,7 @@ ipnetwork = "0.16"
 base64 = "0.12"
 x25519-dalek = { version = "1.1", features = [ "std", "u64_backend" ], default-features = false }
 rand = "0.7"
-err-derive = "0.2.1"
+err-derive = "0.3.0"
 
 [target.'cfg(target_os = "android")'.dependencies]
 jnix = { version = "0.3", features = ["derive"] }