Commit 4f852478 authored by Mike Hommey's avatar Mike Hommey
Browse files

Bug 1744668 - Upgrade viaduct to the version from application-services v87.1.0. r=markh 

This removes the need for the local prost-derive patch.
Viaduct itself has not changed a whole lot.

Differential Revision: https://phabricator.services.mozilla.com/D133025
parent dacc08f1

.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 = "8a576fbe79199fa8664f64285524017f74ebcc5f"

rev = "df1a47fde89f49201b1e839f960e8f16eb95a55d"



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

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

Cargo.lock

+14 −6
Original line number Diff line number Diff line
@@ -525,6 +525,12 @@ 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"
@@ -3920,20 +3926,22 @@ checksum = "0a7c000c0ce9d9bb94c0fbacdf20e5087fbe652c556ffb2c9387d980e17d51fb" 


[[package]]

name = "prost"

version = "0.6.1"

version = "0.8.0"

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

checksum = "ce49aefe0a6144a45de32927c77bd2859a5f7677b55f220ae5b744e87389c212"

checksum = "de5e2533f59d08fcf364fd374ebda0692a70bd6d7e66ef97f306f45c6c5d8020"

dependencies = [

 "bytes 0.5.6",

 "bytes 1.1.0",

 "prost-derive",

]



[[package]]

name = "prost-derive"

version = "0.6.1"

version = "0.8.0"

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

checksum = "600d2f334aa05acb02a755e217ef1ab6dea4d51b58b7846588b747edec04efba"

dependencies = [

 "anyhow",

 "itertools 0.8.2",

 "itertools 0.10.1",

 "proc-macro2",

 "quote",

 "syn",
@@ -5377,7 +5385,7 @@ checksum = "5fecdca9a5291cc2b8dcf7dc02453fee791a280f3743cb0905f8822ae463b3fe" 
[[package]]

name = "viaduct"

version = "0.1.0"

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

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

dependencies = [

 "ffi-support",

 "log",

Cargo.toml

+0 −3
Original line number Diff line number Diff line
@@ -106,6 +106,3 @@ 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"

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

0 → 100644
+1 −0
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

third_party/rust/bytes-0.5.6/CHANGELOG.md

0 → 100644
+166 −0
Original line number Diff line number Diff line 
# 0.5.6 (July 13, 2020)



- Improve `BytesMut` to reuse buffer when fully `advance`d.

- Mark `BytesMut::{as_mut, set_len}` with `#[inline]`.

- Relax synchronization when cloning in shared vtable of `Bytes`.

- Move `loom` to `dev-dependencies`.



# 0.5.5 (June 18, 2020)



### Added

- Allow using the `serde` feature in `no_std` environments (#385).



### Fix

- Fix `BufMut::advance_mut` to panic if advanced passed the capacity (#354)..

- Fix `BytesMut::freeze` ignoring amount previously `advance`d (#352).



# 0.5.4 (January 23, 2020)



### Added

- Make `Bytes::new` a `const fn`.

- Add `From<BytesMut>` for `Bytes`.



### Fix

- Fix reversed arguments in `PartialOrd` for `Bytes`.

- Fix `Bytes::truncate` losing original capacity when repr is an unshared `Vec`.

- Fix `Bytes::from(Vec)` when allocator gave `Vec` a pointer with LSB set.

- Fix panic in `Bytes::slice_ref` if argument is an empty slice.



# 0.5.3 (December 12, 2019)



### Added

- `must_use` attributes to `split`, `split_off`, and `split_to` methods (#337).



### Fix

- Potential freeing of a null pointer in `Bytes` when constructed with an empty `Vec<u8>` (#341, #342).

- Calling `Bytes::truncate` with a size large than the length will no longer clear the `Bytes` (#333).



# 0.5.2 (November 27, 2019)



### Added

- `Limit` methods `into_inner`, `get_ref`, `get_mut`, `limit`, and `set_limit` (#325).



# 0.5.1 (November 25, 2019)



### Fix

- Growth documentation for `BytesMut` (#321)



# 0.5.0 (November 25, 2019)



### Fix

- Potential overflow in `copy_to_slice`



### Changed

- Increased minimum supported Rust version to 1.39.

- `Bytes` is now a "trait object", allowing for custom allocation strategies (#298)

- `BytesMut` implicitly grows internal storage. `remaining_mut()` returns

  `usize::MAX` (#316).

- `BufMut::bytes_mut` returns `&mut [MaybeUninit<u8>]` to reflect the unknown

  initialization state (#305).

- `Buf` / `BufMut` implementations for `&[u8]` and `&mut [u8]`

  respectively (#261).

- Move `Buf` / `BufMut` "extra" functions to an extension trait (#306).

- `BufMutExt::limit` (#309).

- `Bytes::slice` takes a `RangeBounds` argument (#265).

- `Bytes::from_static` is now a `const fn` (#311).

- A multitude of smaller performance optimizations.



### Added

- `no_std` support (#281).

- `get_*`, `put_*`, `get_*_le`, and `put_*le` accessors for handling byte order.

- `BorrowMut` implementation for `BytesMut` (#185).



### Removed

- `IntoBuf` (#288).

- `Buf` implementation for `&str` (#301).

- `byteorder` dependency (#280).

- `iovec` dependency, use `std::IoSlice` instead (#263).

- optional `either` dependency (#315).

- optional `i128` feature -- now available on stable. (#276).



# 0.4.12 (March 6, 2019)



### Added

- Implement `FromIterator<&'a u8>` for `BytesMut`/`Bytes` (#244).

- Implement `Buf` for `VecDeque` (#249).



# 0.4.11 (November 17, 2018)



* Use raw pointers for potentially racy loads (#233).

* Implement `BufRead` for `buf::Reader` (#232).

* Documentation tweaks (#234).



# 0.4.10 (September 4, 2018)



* impl `Buf` and `BufMut` for `Either` (#225).

* Add `Bytes::slice_ref` (#208).



# 0.4.9 (July 12, 2018)



* Add 128 bit number support behind a feature flag (#209).

* Implement `IntoBuf` for `&mut [u8]`



# 0.4.8 (May 25, 2018)



* Fix panic in `BytesMut` `FromIterator` implementation.

* Bytes: Recycle space when reserving space in vec mode (#197).

* Bytes: Add resize fn (#203).



# 0.4.7 (April 27, 2018)



* Make `Buf` and `BufMut` usable as trait objects (#186).

* impl BorrowMut for BytesMut (#185).

* Improve accessor performance (#195).



# 0.4.6 (Janary 8, 2018)



* Implement FromIterator for Bytes/BytesMut (#148).

* Add `advance` fn to Bytes/BytesMut (#166).

* Add `unsplit` fn to `BytesMut` (#162, #173).

* Improvements to Bytes split fns (#92).



# 0.4.5 (August 12, 2017)



* Fix range bug in `Take::bytes`

* Misc performance improvements

* Add extra `PartialEq` implementations.

* Add `Bytes::with_capacity`

* Implement `AsMut[u8]` for `BytesMut`



# 0.4.4 (May 26, 2017)



* Add serde support behind feature flag

* Add `extend_from_slice` on `Bytes` and `BytesMut`

* Add `truncate` and `clear` on `Bytes`

* Misc additional std trait implementations

* Misc performance improvements



# 0.4.3 (April 30, 2017)



* Fix Vec::advance_mut bug

* Bump minimum Rust version to 1.15

* Misc performance tweaks



# 0.4.2 (April 5, 2017)



* Misc performance tweaks

* Improved `Debug` implementation for `Bytes`

* Avoid some incorrect assert panics



# 0.4.1 (March 15, 2017)



* Expose `buf` module and have most types available from there vs. root.

* Implement `IntoBuf` for `T: Buf`.

* Add `FromBuf` and `Buf::collect`.

* Add iterator adapter for `Buf`.

* Add scatter/gather support to `Buf` and `BufMut`.

* Add `Buf::chain`.

* Reduce allocations on repeated calls to `BytesMut::reserve`.

* Implement `Debug` for more types.

* Remove `Source` in favor of `IntoBuf`.

* Implement `Extend` for `BytesMut`.





# 0.4.0 (February 24, 2017)



* Initial release