summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorLinus Färnstrand <linus@mullvad.net>2019-09-23 17:49:12 +0200
committerLinus Färnstrand <linus@mullvad.net>2019-09-23 17:51:08 +0200
commit398c322135b05322409830e2887de3a6fdfc6fdb (patch)
treeb6f4ed43dd09cd08b7969619af754d25a8f3807d
parentd170cc6d3471c91384cb860abb714bc43bf55d9a (diff)
downloadmullvadvpn-398c322135b05322409830e2887de3a6fdfc6fdb.tar.xz
mullvadvpn-398c322135b05322409830e2887de3a6fdfc6fdb.zip
Upgrade derive_more
-rw-r--r--Cargo.lock10
-rw-r--r--mullvad-rpc/Cargo.toml2
-rw-r--r--talpid-core/Cargo.toml2
3 files changed, 8 insertions, 6 deletions
diff --git a/Cargo.lock b/Cargo.lock
index e66ee3534e..33e95e8d52 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -417,11 +417,13 @@ dependencies = [
[[package]]
name = "derive_more"
-version = "0.14.1"
+version = "0.15.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
"proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",
"quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
+ "regex 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
"rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
"syn 0.15.44 (registry+https://github.com/rust-lang/crates.io-index)",
]
@@ -1313,7 +1315,7 @@ name = "mullvad-rpc"
version = "0.1.0"
dependencies = [
"chrono 0.4.9 (registry+https://github.com/rust-lang/crates.io-index)",
- "derive_more 0.14.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "derive_more 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)",
"err-derive 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
"filetime 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
"futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2284,7 +2286,7 @@ dependencies = [
"atty 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)",
"cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
"dbus 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "derive_more 0.14.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "derive_more 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)",
"duct 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
"err-derive 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
"failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3037,7 +3039,7 @@ dependencies = [
"checksum derive-try-from-primitive 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "81dbd65eb15734b6d50dc6ac86f14f928462be0a5df6bda17761e909071ede5d"
"checksum derive_builder 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "3ac53fa6a3cda160df823a9346442525dcaf1e171999a1cf23e67067e4fd64d4"
"checksum derive_builder_core 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0288a23da9333c246bb18c143426074a6ae96747995c5819d2947b64cd942b37"
-"checksum derive_more 0.14.1 (registry+https://github.com/rust-lang/crates.io-index)" = "6d944ac6003ed268757ef1ee686753b57efc5fcf0ebe7b64c9fc81e7e32ff839"
+"checksum derive_more 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7a141330240c921ec6d074a3e188a7c7ef95668bb95e7d44fa0e5778ec2a7afe"
"checksum digest 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f3d0c8c8752312f9713efd397ff63acb9f85585afbf179282e720e7704954dd5"
"checksum dirs 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "3fd78930633bd1c6e35c4b42b1df7b0cbc6bc191146e512bb3bedf243fcc3901"
"checksum duct 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3640af123c78bedc20c1d3928e43cc0621e57011899d1ef917900c12fdb7a1ee"
diff --git a/mullvad-rpc/Cargo.toml b/mullvad-rpc/Cargo.toml
index a0c276fbbe..7436200222 100644
--- a/mullvad-rpc/Cargo.toml
+++ b/mullvad-rpc/Cargo.toml
@@ -8,7 +8,7 @@ edition = "2018"
[dependencies]
chrono = { version = "0.4", features = ["serde"] }
-derive_more = "0.14.0"
+derive_more = "0.15"
err-derive = "0.1.5"
futures = "0.1.15"
jsonrpc-client-core = "0.5"
diff --git a/talpid-core/Cargo.toml b/talpid-core/Cargo.toml
index 606a45ca3f..ad033f2ce3 100644
--- a/talpid-core/Cargo.toml
+++ b/talpid-core/Cargo.toml
@@ -9,7 +9,7 @@ edition = "2018"
[dependencies]
atty = "0.2"
cfg-if = "0.1"
-derive_more = "0.14"
+derive_more = "0.15"
duct = "0.12"
err-derive = "0.1.5"
futures = "0.1"