Commit 40b66aba authored by Sandor Molnar's avatar Sandor Molnar
Browse files

Backed out 3 changesets (bug 1744668) for causing multiple failures. CLOSED TREE 

Backed out changeset 46c822b70a3f (bug 1744668)
Backed out changeset a1b048e394fe (bug 1744668)
Backed out changeset 49b593d05354 (bug 1744668)
parent c0474edc

.cargo/config.in

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ rev = "470320364f59672c0e1ee60240f2cd15f0e5b52f" 
[source."https://github.com/mozilla/application-services"]

git = "https://github.com/mozilla/application-services"

replace-with = "vendored-sources"

rev = "df1a47fde89f49201b1e839f960e8f16eb95a55d"

rev = "8a576fbe79199fa8664f64285524017f74ebcc5f"



[source."https://github.com/mozilla-spidermonkey/jsparagus"]

git = "https://github.com/mozilla-spidermonkey/jsparagus"

Cargo.lock

+18 −37
Original line number Diff line number Diff line
@@ -525,12 +525,6 @@ version = "0.5.6" 
source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "0e4cec68f03f32e44924783795810fa50a7035d8c8ebe78580ad7e6c703fba38"



[[package]]

name = "bytes"

version = "1.1.0"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "c4872d67bab6358e59559027aa3b9157c53d9358c51423c17554809a8858e0f8"



[[package]]

name = "cache-padded"

version = "1.1.1"
@@ -1365,7 +1359,10 @@ checksum = "ff511d5dc435d703f4971bc399647c9bc38e20cb41452e3b9feb4765419ed3f3" 
[[package]]

name = "error-support"

version = "0.1.0"

source = "git+https://github.com/mozilla/application-services?rev=df1a47fde89f49201b1e839f960e8f16eb95a55d#df1a47fde89f49201b1e839f960e8f16eb95a55d"

source = "git+https://github.com/mozilla/application-services?rev=8a576fbe79199fa8664f64285524017f74ebcc5f#8a576fbe79199fa8664f64285524017f74ebcc5f"

dependencies = [

 "thiserror",

]



[[package]]

name = "etagere"
@@ -1627,16 +1624,6 @@ version = "0.1.1" 
source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"



[[package]]

name = "form_urlencoded"

version = "1.0.1"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "5fc25a87fa4fd2094bffb06925852034d90a17f0d1e05197d4956d3555752191"

dependencies = [

 "matches",

 "percent-encoding",

]



[[package]]

name = "freetype"

version = "0.7.0"
@@ -2420,7 +2407,7 @@ dependencies = [ 
[[package]]

name = "interrupt-support"

version = "0.1.0"

source = "git+https://github.com/mozilla/application-services?rev=df1a47fde89f49201b1e839f960e8f16eb95a55d#df1a47fde89f49201b1e839f960e8f16eb95a55d"

source = "git+https://github.com/mozilla/application-services?rev=8a576fbe79199fa8664f64285524017f74ebcc5f#8a576fbe79199fa8664f64285524017f74ebcc5f"



[[package]]

name = "intl-memoizer"
@@ -3413,7 +3400,7 @@ dependencies = [ 
[[package]]

name = "nss_build_common"

version = "0.1.0"

source = "git+https://github.com/mozilla/application-services?rev=df1a47fde89f49201b1e839f960e8f16eb95a55d#df1a47fde89f49201b1e839f960e8f16eb95a55d"

source = "git+https://github.com/mozilla/application-services?rev=8a576fbe79199fa8664f64285524017f74ebcc5f#8a576fbe79199fa8664f64285524017f74ebcc5f"



[[package]]

name = "nsstring"
@@ -3923,22 +3910,20 @@ checksum = "0a7c000c0ce9d9bb94c0fbacdf20e5087fbe652c556ffb2c9387d980e17d51fb" 


[[package]]

name = "prost"

version = "0.8.0"

version = "0.6.1"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "de5e2533f59d08fcf364fd374ebda0692a70bd6d7e66ef97f306f45c6c5d8020"

checksum = "ce49aefe0a6144a45de32927c77bd2859a5f7677b55f220ae5b744e87389c212"

dependencies = [

 "bytes 1.1.0",

 "bytes 0.5.6",

 "prost-derive",

]



[[package]]

name = "prost-derive"

version = "0.8.0"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "600d2f334aa05acb02a755e217ef1ab6dea4d51b58b7846588b747edec04efba"

version = "0.6.1"

dependencies = [

 "anyhow",

 "itertools 0.10.1",

 "itertools 0.8.2",

 "proc-macro2",

 "quote",

 "syn",
@@ -4640,16 +4625,13 @@ dependencies = [ 
[[package]]

name = "sql-support"

version = "0.1.0"

source = "git+https://github.com/mozilla/application-services?rev=df1a47fde89f49201b1e839f960e8f16eb95a55d#df1a47fde89f49201b1e839f960e8f16eb95a55d"

source = "git+https://github.com/mozilla/application-services?rev=8a576fbe79199fa8664f64285524017f74ebcc5f#8a576fbe79199fa8664f64285524017f74ebcc5f"

dependencies = [

 "ffi-support",

 "interrupt-support",

 "lazy_static",

 "log",

 "nss_build_common",

 "rusqlite",

 "tempfile",

 "thiserror",

]



[[package]]
@@ -4833,7 +4815,7 @@ dependencies = [ 
[[package]]

name = "sync-guid"

version = "0.1.0"

source = "git+https://github.com/mozilla/application-services?rev=df1a47fde89f49201b1e839f960e8f16eb95a55d#df1a47fde89f49201b1e839f960e8f16eb95a55d"

source = "git+https://github.com/mozilla/application-services?rev=8a576fbe79199fa8664f64285524017f74ebcc5f#8a576fbe79199fa8664f64285524017f74ebcc5f"

dependencies = [

 "base64 0.12.3",

 "rand",
@@ -4844,7 +4826,7 @@ dependencies = [ 
[[package]]

name = "sync15-traits"

version = "0.1.0"

source = "git+https://github.com/mozilla/application-services?rev=df1a47fde89f49201b1e839f960e8f16eb95a55d#df1a47fde89f49201b1e839f960e8f16eb95a55d"

source = "git+https://github.com/mozilla/application-services?rev=8a576fbe79199fa8664f64285524017f74ebcc5f#8a576fbe79199fa8664f64285524017f74ebcc5f"

dependencies = [

 "anyhow",

 "ffi-support",
@@ -5343,11 +5325,10 @@ checksum = "2ace0b4755d0a2959962769239d56267f8a024fef2d9b32666b3dcd0946b0906" 


[[package]]

name = "url"

version = "2.2.2"

version = "2.1.0"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "a507c383b2d33b5fc35d1861e77e6b383d158b2da5e14fe51b83dfedf6fd578c"

checksum = "75b414f6c464c879d7f9babf951f23bc3743fb7313c081b2e6ca719067ea9d61"

dependencies = [

 "form_urlencoded",

 "idna",

 "matches",

 "percent-encoding",
@@ -5385,7 +5366,7 @@ checksum = "5fecdca9a5291cc2b8dcf7dc02453fee791a280f3743cb0905f8822ae463b3fe" 
[[package]]

name = "viaduct"

version = "0.1.0"

source = "git+https://github.com/mozilla/application-services?rev=df1a47fde89f49201b1e839f960e8f16eb95a55d#df1a47fde89f49201b1e839f960e8f16eb95a55d"

source = "git+https://github.com/mozilla/application-services?rev=8a576fbe79199fa8664f64285524017f74ebcc5f#8a576fbe79199fa8664f64285524017f74ebcc5f"

dependencies = [

 "ffi-support",

 "log",
@@ -5534,7 +5515,7 @@ dependencies = [ 
[[package]]

name = "webext-storage"

version = "0.1.0"

source = "git+https://github.com/mozilla/application-services?rev=df1a47fde89f49201b1e839f960e8f16eb95a55d#df1a47fde89f49201b1e839f960e8f16eb95a55d"

source = "git+https://github.com/mozilla/application-services?rev=8a576fbe79199fa8664f64285524017f74ebcc5f#8a576fbe79199fa8664f64285524017f74ebcc5f"

dependencies = [

 "error-support",

 "ffi-support",

Cargo.toml

+3 −0
Original line number Diff line number Diff line
@@ -106,3 +106,6 @@ path = "third_party/rust/autocfg" 
# There is not going to be new version of mio 0.6, mio now being >= 0.7.11.

[patch.crates-io.mio]

path = "third_party/rust/mio-0.6.23"



[patch.crates-io.prost-derive]

path = "third_party/rust/prost-derive"

services/sync/golden_gate/Cargo.toml

+2 −2
Original line number Diff line number Diff line
@@ -8,14 +8,14 @@ edition = "2018" 
[dependencies]

atomic_refcell = "0.1"

cstr = "0.2"

interrupt-support = { git = "https://github.com/mozilla/application-services", rev = "df1a47fde89f49201b1e839f960e8f16eb95a55d" }

interrupt-support = { git = "https://github.com/mozilla/application-services", rev = "8a576fbe79199fa8664f64285524017f74ebcc5f" }

log = "0.4"

moz_task = { path = "../../../xpcom/rust/moz_task" }

nserror = { path = "../../../xpcom/rust/nserror" }

nsstring = { path = "../../../xpcom/rust/nsstring" }

serde_json = "1"

storage_variant = { path = "../../../storage/variant" }

sync15-traits = { git = "https://github.com/mozilla/application-services", rev = "df1a47fde89f49201b1e839f960e8f16eb95a55d" }

sync15-traits = { git = "https://github.com/mozilla/application-services", rev = "8a576fbe79199fa8664f64285524017f74ebcc5f" }

xpcom = { path = "../../../xpcom/rust/xpcom" }



[dependencies.thin-vec]

third_party/rust/bytes-0.5.6/.cargo-checksum.json

deleted100644 → 0
+0 −1
Original line number Diff line number Diff line 
{"files":{"CHANGELOG.md":"7c1c6fe9fa6aa8a155d4a04dab5d4e3abadb349121886b2f24252db0e45fba51","Cargo.toml":"bb5072cd9bad83919ed35f49f3a7f88b608a0150d6ccdcbb4bf17dfb3c64ef3f","LICENSE":"45f522cacecb1023856e46df79ca625dfc550c94910078bd8aec6e02880b3d42","README.md":"2c2f6f1a240ad375f9dbd8e7f023510b645d98e327ea0a42ba339c94fd9baaa9","benches/buf.rs":"b0f4f1130081680f6f99d1efd49a75bd1d97d9a30117b7ad9525c96b7c8968e6","benches/bytes.rs":"dc5289a9ce82be35e71ed5853ab33aa108a30460e481135f6058fe4d2f7dc15e","benches/bytes_mut.rs":"1326fe6224b26826228e02b4133151e756f38152c2d9cfe66adf83af76c3ec98","ci/test-stable.sh":"6e010f1a95b72fea7bebdd217fda78427f3eb07b1e753f79507c71d982b2d38a","ci/tsan.sh":"466b86b19225dd26c756cf2252cb1973f87a145642c99364b462ed7ceb55c7dd","src/buf/buf_impl.rs":"fe1bc64bb9aef5b57d83901268f89bf148490e71bebc340c7ecc40ff95bcfb70","src/buf/buf_mut.rs":"d226189d9db76c9023537dcca0687aa5dd25851a9052d19154de8ee9b25bdee3","src/buf/ext/chain.rs":"337f58e1a8da5b4768e55921ff394f4ba3a0c6d476448fd5bceab6f3c1db1b3e","src/buf/ext/limit.rs":"a705d7cf38f9a11a904d6ee5e7afea83e9abdf8f454bb8e16b407b0e055dc11a","src/buf/ext/mod.rs":"ba2fa392c61b7429530c71797114e3f09d9b6b750b6f77f57fde964d2b218bc4","src/buf/ext/reader.rs":"ee4733fa2c2d893c6df8151c2333a46171619e8a45ec9bae863edc8deb438ac5","src/buf/ext/take.rs":"e92be765539b8b0c1cb67a01b691319cccd35fc098f2bb59ced3bbbe41ee0257","src/buf/ext/writer.rs":"3c52df6e73d09935d37bed9a05689c1966952f980b85b40aaab05081ec7ef6d8","src/buf/iter.rs":"a0de69367fa61d0d1c6c2ff4b4d337de9c5f4213d0c86e083226cf409666d860","src/buf/mod.rs":"4f8e3b4c4b69b7d004306d458ad835801e53659b38ca08312d7217d82da4c64f","src/buf/vec_deque.rs":"5a4063961d10380c1ab3681f8b3f6201112766d9f57a63e2861dc9f2b134668d","src/bytes.rs":"8c3aa5fe425604206ffc1b85a8bff5a9be38917786453450955984523f829cec","src/bytes_mut.rs":"e276f74da841ab65ca681cb09820de98aa2e9837dd975ed564b1a9be40440cf3","src/fmt/debug.rs":"19ebe7e5516e40ab712995f3ec2e0ba78ddfa905cce117e6d01e8eb330f3970a","src/fmt/hex.rs":"13755ec6f1b79923e1f1a05c51b179a38c03c40bb8ed2db0210e8901812e61e7","src/fmt/mod.rs":"176da4e359da99b8e5cf16e480cb7b978f574876827f1b9bb9c08da4d74ac0f5","src/lib.rs":"9b96e2a011a782ceb82428e6b71fd212a46bc186bd152102018c7b6428a0d441","src/loom.rs":"5dc97a5afce14875a66e44cbf0afa67e084c8b6b8c560bc14e7a70ef73aee96e","src/serde.rs":"3ecd7e828cd4c2b7db93c807cb1548fad209e674df493edf7cda69a7b04d405d","tests/test_buf.rs":"3ca99c58f470e7c4beb18e5dc69250ce541dd8ac96b88fb1162640510a735ada","tests/test_buf_mut.rs":"56636e439cb07af2fabdfb60a08995829680c9730a8ebe5c6ad2f54dbf208e32","tests/test_bytes.rs":"3ec0a82ce98fea633ed7d635caca21cd8035d0c9ea4287d1cc0199e167a4a3c1","tests/test_bytes_odd_alloc.rs":"87d51d4ab6ad98193b140ea8158f6631eba985a204c2ea94d34b3bb157791a16","tests/test_bytes_vec_alloc.rs":"2b686b6ab44f924e69d8270a4f256eb3626a3b4db8c1919b74bc422c10124899","tests/test_chain.rs":"71772fbc0bab72a697bd85c6c1be0eddfe7d7dc4f4737a0cd53be4ad191d076b","tests/test_debug.rs":"13299107172809e8cbbd823964ac9450cd0d6b6de79f2e6a2e0f44b9225a0593","tests/test_iter.rs":"c1f46823df26a90139645fd8728a03138edd95b2849dfec830452a80ddd9726d","tests/test_reader.rs":"9c94e164aa7de4c10966f8084ad04d06f4e9c66e156d017d194a1dac3dfc6619","tests/test_serde.rs":"2691f891796ba259de0ecf926de05c514f4912cc5fcd3e6a1591efbcd23ed4d0","tests/test_take.rs":"975aa2e216b6a3c939b31e41ecfbb3a90938096413a14a2ae986c842d2250180"},"package":"0e4cec68f03f32e44924783795810fa50a7035d8c8ebe78580ad7e6c703fba38"}
 
 No newline at end of file