Commit f26e1e92 authored by Mike Hommey's avatar Mike Hommey
Browse files

Bug 1807884 - Update warp to 0.3.3. r=webdriver-reviewers,supply-chain-reviewers,whimboo 

Differential Revision: https://phabricator.services.mozilla.com/D165651
parent 8b0efe23

.cargo/config.in

+5 −0
Original line number Diff line number Diff line
@@ -30,6 +30,11 @@ git = "https://github.com/gfx-rs/wgpu" 
rev = "186a29c34d54d8628bbebb998a537210ac565b71"

replace-with = "vendored-sources"



[source."https://github.com/glandium/warp"]

git = "https://github.com/glandium/warp"

rev = "4af45fae95bc98b0eba1ef0db17e1dac471bb23d"

replace-with = "vendored-sources"



[source."https://github.com/hsivonen/chardetng"]

git = "https://github.com/hsivonen/chardetng"

rev = "3484d3e3ebdc8931493aa5df4d7ee9360a90e76b"

Cargo.lock

+4 −12
Original line number Diff line number Diff line
@@ -2455,7 +2455,7 @@ dependencies = [ 
 "indexmap",

 "slab",

 "tokio 1.17.0",

 "tokio-util 0.7.2",

 "tokio-util",

 "tracing",

]
@@ -5509,13 +5509,6 @@ dependencies = [ 
 "tokio-executor",

]



[[package]]

name = "tokio-util"

version = "0.6.999"

dependencies = [

 "tokio-util 0.7.2",

]



[[package]]

name = "tokio-util"

version = "0.7.2"
@@ -6020,9 +6013,8 @@ dependencies = [ 


[[package]]

name = "warp"

version = "0.3.2"

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

checksum = "3cef4e1e9114a4b7f1ac799f16ce71c14de5778500c5450ec6b7b920c55b587e"

version = "0.3.3"

source = "git+https://github.com/glandium/warp?rev=4af45fae95bc98b0eba1ef0db17e1dac471bb23d#4af45fae95bc98b0eba1ef0db17e1dac471bb23d"

dependencies = [

 "bytes 1.3.0",

 "futures-channel",
@@ -6041,7 +6033,7 @@ dependencies = [ 
 "serde_urlencoded",

 "tokio 1.17.0",

 "tokio-stream",

 "tokio-util 0.6.999",

 "tokio-util",

 "tower-service",

 "tracing",

]

Cargo.toml

+2 −3
Original line number Diff line number Diff line
@@ -104,9 +104,6 @@ memmap2 = { path = "build/rust/memmap2" } 
# Patch getrandom 0.7 to 0.8

rand = { path = "build/rust/rand" }



# Patch tokio-util 0.6 to 0.7

tokio-util = { path = "build/rust/tokio-util" }



# Patch env_logger 0.8 to 0.9

env_logger = { path = "build/rust/env_logger" }
@@ -164,6 +161,8 @@ libudev-sys = { path = "dom/webauthn/libudev-sys" } 
packed_simd = { package = "packed_simd_2", git = "https://github.com/hsivonen/packed_simd", rev="412f9a0aa556611de021bde89dee8fefe6e0fbbd" }

midir = { git = "https://github.com/mozilla/midir.git", rev = "519e651241e867af3391db08f9ae6400bc023e18" }

minidump_writer_linux = { git = "https://github.com/rust-minidump/minidump-writer.git", rev = "75ada456c92a429704691a85e1cb42fef8cafc0d" }

# warp 0.3.3 + https://github.com/seanmonstar/warp/pull/1007

warp = { git = "https://github.com/glandium/warp", rev = "4af45fae95bc98b0eba1ef0db17e1dac471bb23d" }



# application-services overrides to make updating them all simpler.

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

build/rust/tokio-util/Cargo.toml

deleted100644 → 0
+0 −24
Original line number Diff line number Diff line 
[package]

name = "tokio-util"

version = "0.6.999"

edition = "2018"

license = "MPL-2.0"



[lib]

path = "lib.rs"



[dependencies.tokio-util]

version = "0.7"

default-features = false



[features]

__docs_rs = ["tokio-util/__docs_rs"]

codec = ["tokio-util/codec"]

compat = ["tokio-util/compat"]

default = ["tokio-util/default"]

full = ["tokio-util/full"]

io = ["tokio-util/io"]

io-util = ["tokio-util/io-util"]

net = ["tokio-util/net"]

rt = ["tokio-util/rt"]

time = ["tokio-util/time"]

build/rust/tokio-util/lib.rs

deleted100644 → 0
+0 −5
Original line number Diff line number Diff line 
/* This Source Code Form is subject to the terms of the Mozilla Public

 * License, v. 2.0. If a copy of the MPL was not distributed with this

 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */



pub use tokio_util::*;