summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorOskar Nyberg <oskar@mullvad.net>2020-10-27 14:22:00 +0100
committerOskar Nyberg <oskar@mullvad.net>2020-10-27 14:22:00 +0100
commit4167c40f504e007d473df06498894aa5c4ba2af5 (patch)
treecc42c69b7f3a1ba47dcf9bfb69b61cc9f10b6d82
parentbd82fd752c42fb7237747e116d2d3cc29388e7ba (diff)
parent92b9fc9d16b7a79af0b775c4a35c08fda7fa983e (diff)
downloadmullvadvpn-4167c40f504e007d473df06498894aa5c4ba2af5.tar.xz
mullvadvpn-4167c40f504e007d473df06498894aa5c4ba2af5.zip
Merge branch 'move-from-rs-release-git-dependency' into master
-rw-r--r--Cargo.lock21
-rw-r--r--mullvad-problem-report/Cargo.toml2
2 files changed, 3 insertions, 20 deletions
diff --git a/Cargo.lock b/Cargo.lock
index aa6dfd34ab..48ec1c4536 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2115,10 +2115,8 @@ dependencies = [
[[package]]
name = "rs-release"
version = "0.1.7"
-source = "git+https://github.com/mullvad/rs-release?branch=snailquote-unescape#88b2afb04c3b2b1b76f27d8b8d48cd52facd292a"
-dependencies = [
- "snailquote",
-]
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d4a874cf4a0b9bc283edaa65d81d62368b84b1a8e56196e4885ca4701fd49972"
[[package]]
name = "rtnetlink"
@@ -2382,15 +2380,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fbee7696b84bbf3d89a1c2eccff0850e3047ed46bfcd2e92c29a2d074d57e252"
[[package]]
-name = "snailquote"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc3e2894a343234fb8a8653cf9d49ef6aea44e6581612ca311c91c4bd356dec4"
-dependencies = [
- "unicode_categories",
-]
-
-[[package]]
name = "socket2"
version = "0.3.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -3128,12 +3117,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564"
[[package]]
-name = "unicode_categories"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39ec24b3121d976906ece63c9daad25b85969647682eee313cb5779fdd69e14e"
-
-[[package]]
name = "unreachable"
version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
diff --git a/mullvad-problem-report/Cargo.toml b/mullvad-problem-report/Cargo.toml
index ccbc6cf09b..3aaac42758 100644
--- a/mullvad-problem-report/Cargo.toml
+++ b/mullvad-problem-report/Cargo.toml
@@ -27,7 +27,7 @@ duct = "0.13"
[target.'cfg(target_os = "linux")'.dependencies]
-rs-release = { git = "https://github.com/mullvad/rs-release", branch = "snailquote-unescape" }
+rs-release = "0.1.7"
[target.'cfg(windows)'.build-dependencies]