Bug 1594995 - Part 1: Update neqo dependencies to specify a rev instead of a version, and run `./mach vendor rust` on a clean central tip, r=heycam
authorVictor Porof <vporof@mozilla.com>
Wed, 13 Nov 2019 11:52:15 +0000
changeset 501777 f65cd268b0e59b40ff7e6b1daa536c2e626e6bfe
parent 501776 07adfe0808dd4e04c53e8d641898fda21ccbdd24
child 501778 fc5e72bd0abfdfe155acad1f474f6b6651819ad6
push id114172
push userdluca@mozilla.com
push dateTue, 19 Nov 2019 11:31:10 +0000
treeherdermozilla-inbound@b5c5ba07d3db [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersheycam
bugs1594995
milestone72.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1594995 - Part 1: Update neqo dependencies to specify a rev instead of a version, and run `./mach vendor rust` on a clean central tip, r=heycam Differential Revision: https://phabricator.services.mozilla.com/D52316
.cargo/config.in
Cargo.lock
netwerk/socket/neqo_glue/Cargo.toml
--- a/.cargo/config.in
+++ b/.cargo/config.in
@@ -3,19 +3,19 @@
 # Please do not edit.
 
 [source."https://github.com/shravanrn/nix/"]
 branch = "r0.13.1"
 git = "https://github.com/shravanrn/nix/"
 replace-with = "vendored-sources"
 
 [source."https://github.com/mozilla/neqo"]
-branch = "master"
 git = "https://github.com/mozilla/neqo"
 replace-with = "vendored-sources"
+rev = "a17c1e83"
 
 [source."https://github.com/hsivonen/packed_simd"]
 branch = "rust_1_32"
 git = "https://github.com/hsivonen/packed_simd"
 replace-with = "vendored-sources"
 
 [source."https://github.com/alexcrichton/mio-named-pipes"]
 branch = "master"
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2076,85 +2076,85 @@ dependencies = [
 [[package]]
 name = "murmurhash3"
 version = "0.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "neqo-common"
 version = "0.1.4"
-source = "git+https://github.com/mozilla/neqo#a17c1e83bb44ed923eb16a4c675ffe569b3a08f3"
+source = "git+https://github.com/mozilla/neqo?rev=a17c1e83#a17c1e83bb44ed923eb16a4c675ffe569b3a08f3"
 dependencies = [
  "env_logger 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "num-traits 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "neqo-crypto"
 version = "0.1.4"
-source = "git+https://github.com/mozilla/neqo#a17c1e83bb44ed923eb16a4c675ffe569b3a08f3"
+source = "git+https://github.com/mozilla/neqo?rev=a17c1e83#a17c1e83bb44ed923eb16a4c675ffe569b3a08f3"
 dependencies = [
  "bindgen 0.51.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "neqo-common 0.1.4 (git+https://github.com/mozilla/neqo)",
+ "neqo-common 0.1.4 (git+https://github.com/mozilla/neqo?rev=a17c1e83)",
  "serde 1.0.88 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_derive 1.0.88 (registry+https://github.com/rust-lang/crates.io-index)",
  "toml 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "neqo-http3"
 version = "0.1.4"
-source = "git+https://github.com/mozilla/neqo#a17c1e83bb44ed923eb16a4c675ffe569b3a08f3"
+source = "git+https://github.com/mozilla/neqo?rev=a17c1e83#a17c1e83bb44ed923eb16a4c675ffe569b3a08f3"
 dependencies = [
  "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "neqo-common 0.1.4 (git+https://github.com/mozilla/neqo)",
- "neqo-crypto 0.1.4 (git+https://github.com/mozilla/neqo)",
- "neqo-qpack 0.1.4 (git+https://github.com/mozilla/neqo)",
- "neqo-transport 0.1.4 (git+https://github.com/mozilla/neqo)",
+ "neqo-common 0.1.4 (git+https://github.com/mozilla/neqo?rev=a17c1e83)",
+ "neqo-crypto 0.1.4 (git+https://github.com/mozilla/neqo?rev=a17c1e83)",
+ "neqo-qpack 0.1.4 (git+https://github.com/mozilla/neqo?rev=a17c1e83)",
+ "neqo-transport 0.1.4 (git+https://github.com/mozilla/neqo?rev=a17c1e83)",
  "num-traits 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "smallvec 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "neqo-qpack"
 version = "0.1.4"
-source = "git+https://github.com/mozilla/neqo#a17c1e83bb44ed923eb16a4c675ffe569b3a08f3"
+source = "git+https://github.com/mozilla/neqo?rev=a17c1e83#a17c1e83bb44ed923eb16a4c675ffe569b3a08f3"
 dependencies = [
  "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "neqo-common 0.1.4 (git+https://github.com/mozilla/neqo)",
- "neqo-crypto 0.1.4 (git+https://github.com/mozilla/neqo)",
- "neqo-transport 0.1.4 (git+https://github.com/mozilla/neqo)",
+ "neqo-common 0.1.4 (git+https://github.com/mozilla/neqo?rev=a17c1e83)",
+ "neqo-crypto 0.1.4 (git+https://github.com/mozilla/neqo?rev=a17c1e83)",
+ "neqo-transport 0.1.4 (git+https://github.com/mozilla/neqo?rev=a17c1e83)",
 ]
 
 [[package]]
 name = "neqo-transport"
 version = "0.1.4"
-source = "git+https://github.com/mozilla/neqo#a17c1e83bb44ed923eb16a4c675ffe569b3a08f3"
+source = "git+https://github.com/mozilla/neqo?rev=a17c1e83#a17c1e83bb44ed923eb16a4c675ffe569b3a08f3"
 dependencies = [
  "derive_more 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "neqo-common 0.1.4 (git+https://github.com/mozilla/neqo)",
- "neqo-crypto 0.1.4 (git+https://github.com/mozilla/neqo)",
+ "neqo-common 0.1.4 (git+https://github.com/mozilla/neqo?rev=a17c1e83)",
+ "neqo-crypto 0.1.4 (git+https://github.com/mozilla/neqo?rev=a17c1e83)",
  "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "slice-deque 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "smallvec 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "neqo_glue"
 version = "0.1.0"
 dependencies = [
- "neqo-common 0.1.4 (git+https://github.com/mozilla/neqo)",
- "neqo-crypto 0.1.4 (git+https://github.com/mozilla/neqo)",
- "neqo-http3 0.1.4 (git+https://github.com/mozilla/neqo)",
- "neqo-transport 0.1.4 (git+https://github.com/mozilla/neqo)",
+ "neqo-common 0.1.4 (git+https://github.com/mozilla/neqo?rev=a17c1e83)",
+ "neqo-crypto 0.1.4 (git+https://github.com/mozilla/neqo?rev=a17c1e83)",
+ "neqo-http3 0.1.4 (git+https://github.com/mozilla/neqo?rev=a17c1e83)",
+ "neqo-transport 0.1.4 (git+https://github.com/mozilla/neqo?rev=a17c1e83)",
  "nserror 0.1.0",
  "nsstring 0.1.0",
  "thin-vec 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "xpcom 0.1.0",
 ]
 
 [[package]]
 name = "net2"
@@ -4270,21 +4270,21 @@ dependencies = [
 "checksum mio-named-pipes 0.1.6 (git+https://github.com/alexcrichton/mio-named-pipes)" = "<none>"
 "checksum mio-uds 0.6.7 (registry+https://github.com/rust-lang/crates.io-index)" = "966257a94e196b11bb43aca423754d87429960a768de9414f3691d6957abf125"
 "checksum miow 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "8c1f2f3b1cf331de6896aabf6e9d55dca90356cc9960cca7eaaf408a355ae919"
 "checksum miow 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "396aa0f2003d7df8395cb93e09871561ccc3e785f0acb369170e8cc74ddf9226"
 "checksum moz_cbor 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "20c82a57087fd5990d7122dbff1607c3b20c3d2958e9d9ad9765aab415e2c91c"
 "checksum mp4parse_fallible 0.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "6626c2aef76eb8f984eef02e475883d3fe9112e114720446c5810fc5f045cd30"
 "checksum msdos_time 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "aad9dfe950c057b1bfe9c1f2aa51583a8468ef2a5baba2ebbe06d775efeb7729"
 "checksum murmurhash3 0.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "a2983372caf4480544083767bf2d27defafe32af49ab4df3a0b7fc90793a3664"
-"checksum neqo-common 0.1.4 (git+https://github.com/mozilla/neqo)" = "<none>"
-"checksum neqo-crypto 0.1.4 (git+https://github.com/mozilla/neqo)" = "<none>"
-"checksum neqo-http3 0.1.4 (git+https://github.com/mozilla/neqo)" = "<none>"
-"checksum neqo-qpack 0.1.4 (git+https://github.com/mozilla/neqo)" = "<none>"
-"checksum neqo-transport 0.1.4 (git+https://github.com/mozilla/neqo)" = "<none>"
+"checksum neqo-common 0.1.4 (git+https://github.com/mozilla/neqo?rev=a17c1e83)" = "<none>"
+"checksum neqo-crypto 0.1.4 (git+https://github.com/mozilla/neqo?rev=a17c1e83)" = "<none>"
+"checksum neqo-http3 0.1.4 (git+https://github.com/mozilla/neqo?rev=a17c1e83)" = "<none>"
+"checksum neqo-qpack 0.1.4 (git+https://github.com/mozilla/neqo?rev=a17c1e83)" = "<none>"
+"checksum neqo-transport 0.1.4 (git+https://github.com/mozilla/neqo?rev=a17c1e83)" = "<none>"
 "checksum net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)" = "42550d9fb7b6684a6d404d9fa7250c2eb2646df731d1c06afc06dcee9e1bcf88"
 "checksum new_debug_unreachable 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0cdc457076c78ab54d5e0d6fa7c47981757f1e34dc39ff92787f217dede586c4"
 "checksum nix 0.13.1 (git+https://github.com/shravanrn/nix/?branch=r0.13.1)" = "<none>"
 "checksum nodrop 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)" = "9a2228dca57108069a5262f2ed8bd2e82496d2e074a06d1ccc7ce1687b6ae0a2"
 "checksum nom 4.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "9c349f68f25f596b9f44cf0e7c69752a5c633b0550c3ff849518bfba0233774a"
 "checksum num-bigint 0.1.44 (registry+https://github.com/rust-lang/crates.io-index)" = "e63899ad0da84ce718c14936262a41cee2c79c981fc0a0e7c7beb47d5a07e8c1"
 "checksum num-derive 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "eafd0b45c5537c3ba526f79d3e75120036502bebacbb3f3220914067ce39dbf2"
 "checksum num-derive 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0c8b15b261814f992e33760b1fca9fe8b693d8a65299f20c9901688636cfb746"
--- a/netwerk/socket/neqo_glue/Cargo.toml
+++ b/netwerk/socket/neqo_glue/Cargo.toml
@@ -3,21 +3,21 @@ name = "neqo_glue"
 version = "0.1.0"
 authors = ["Dragana Damjanovic <dd.mozilla@gmail.com>"]
 edition = "2018"
 
 [lib]
 name = "neqo_glue"
 
 [dependencies]
-neqo-http3 = { version = "0.1.4", git = "https://github.com/mozilla/neqo" }
-neqo-transport = { version = "0.1.4", git = "https://github.com/mozilla/neqo" }
-neqo-common = { version = "0.1.4", git = "https://github.com/mozilla/neqo" }
+neqo-http3 = { rev = "a17c1e83", git = "https://github.com/mozilla/neqo" }
+neqo-transport = { rev = "a17c1e83", git = "https://github.com/mozilla/neqo" }
+neqo-common = { rev = "a17c1e83", git = "https://github.com/mozilla/neqo" }
 nserror = { path = "../../../xpcom/rust/nserror" }
 nsstring = { path = "../../../xpcom/rust/nsstring" }
 xpcom = { path = "../../../xpcom/rust/xpcom" }
 thin-vec = { version = "0.1.0", features = ["gecko-ffi"] }
 
 [dependencies.neqo-crypto]
-version = "0.1.4"
+rev = "a17c1e83"
 git = "https://github.com/mozilla/neqo"
 default-features = false
 features = ["gecko"]