Bug 1426116 - Update for changes in WR PR 2251. r?jrmuizel draft
authorKartikaya Gupta <kgupta@mozilla.com>
Mon, 08 Jan 2018 09:19:27 -0500
changeset 717227 3f6bc749728cbb191c627e7455040afb217bcca7
parent 717226 02fac64d1565e93bfbe7fe3e3ef4e163e082879a
child 717228 46916b8aa1b4d565df921d66eba5aeb4a73cfe75
push id94606
push userkgupta@mozilla.com
push dateMon, 08 Jan 2018 14:20:02 +0000
reviewersjrmuizel
bugs1426116
milestone59.0a1
Bug 1426116 - Update for changes in WR PR 2251. r?jrmuizel MozReview-Commit-ID: RoLZCW1fs0
.cargo/config.in
toolkit/library/gtest/rust/Cargo.toml
toolkit/library/rust/Cargo.toml
--- a/.cargo/config.in
+++ b/.cargo/config.in
@@ -4,15 +4,15 @@
 # taskcluster/scripts/builder/build-sm-rust-bindings.sh
 
 [source.crates-io]
 registry = 'https://github.com/rust-lang/crates.io-index'
 replace-with = 'vendored-sources'
 
 [source."https://github.com/gankro/serde"]
 git = "https://github.com/gankro/serde"
-branch = "deserialize_from_enums3"
+branch = "deserialize_from_enums4"
 replace-with = "vendored-sources"
 
 [source.vendored-sources]
 directory = '@top_srcdir@/third_party/rust'
 
 @WIN64_CARGO_LINKER_CONFIG@
--- a/toolkit/library/gtest/rust/Cargo.toml
+++ b/toolkit/library/gtest/rust/Cargo.toml
@@ -42,10 +42,9 @@ panic = "abort"
 [profile.release]
 opt-level = 2
 rpath = false
 debug-assertions = false
 panic = "abort"
 
 [patch.crates-io]
 libudev-sys = { path = "../../../../dom/webauthn/libudev-sys" }
-serde = { git = "https://github.com/gankro/serde", branch = "deserialize_from_enums3" }
-serde_derive = { git = "https://github.com/gankro/serde", branch = "deserialize_from_enums3", feature = "deserialize_from" }
+serde_derive = { git = "https://github.com/gankro/serde", branch = "deserialize_from_enums4", feature = "deserialize_in_place" }
--- a/toolkit/library/rust/Cargo.toml
+++ b/toolkit/library/rust/Cargo.toml
@@ -43,10 +43,9 @@ panic = "abort"
 [profile.release]
 opt-level = 2
 rpath = false
 debug-assertions = false
 panic = "abort"
 
 [patch.crates-io]
 libudev-sys = { path = "../../../dom/webauthn/libudev-sys" }
-serde = { git = "https://github.com/gankro/serde", branch = "deserialize_from_enums3" }
-serde_derive = { git = "https://github.com/gankro/serde", branch = "deserialize_from_enums3", feature = "deserialize_from" }
+serde_derive = { git = "https://github.com/gankro/serde", branch = "deserialize_from_enums4", feature = "deserialize_in_place" }