chore(tvix): switch to upstream futures 0.3.30
The bugs have been fixed, https://github.com/rust-lang/futures-rs/pull/2801 and https://github.com/rust-lang/futures-rs/pull/2812 were merged and ended up in that release. Change-Id: Iefd990d2d1719b884504093343e54e9c5258e2e2 Reviewed-on: https://cl.tvl.fyi/c/depot/+/10414 Reviewed-by: raitobezarius <tvl@lahfa.xyz> Autosubmit: flokli <flokli@flokli.de> Tested-by: BuildkiteCI
This commit is contained in:
parent
1f76c5b863
commit
acbb613e61
8 changed files with 48 additions and 109 deletions
44
tvix/Cargo.lock
generated
44
tvix/Cargo.lock
generated
|
@ -879,9 +879,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "futures"
|
||||
version = "0.3.29"
|
||||
version = "0.3.30"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "da0290714b38af9b4a7b094b8a37086d1b4e61f2df9122c3cad2577669145335"
|
||||
checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0"
|
||||
dependencies = [
|
||||
"futures-channel",
|
||||
"futures-core",
|
||||
|
@ -894,8 +894,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "futures-channel"
|
||||
version = "0.3.29"
|
||||
source = "git+https://github.com/edef1c/futures-rs?rev=23e25061f2261794d6d611675a6372c96b70fa85#23e25061f2261794d6d611675a6372c96b70fa85"
|
||||
version = "0.3.30"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78"
|
||||
dependencies = [
|
||||
"futures-core",
|
||||
"futures-sink",
|
||||
|
@ -903,13 +904,15 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "futures-core"
|
||||
version = "0.3.29"
|
||||
source = "git+https://github.com/edef1c/futures-rs?rev=23e25061f2261794d6d611675a6372c96b70fa85#23e25061f2261794d6d611675a6372c96b70fa85"
|
||||
version = "0.3.30"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d"
|
||||
|
||||
[[package]]
|
||||
name = "futures-executor"
|
||||
version = "0.3.29"
|
||||
source = "git+https://github.com/edef1c/futures-rs?rev=23e25061f2261794d6d611675a6372c96b70fa85#23e25061f2261794d6d611675a6372c96b70fa85"
|
||||
version = "0.3.30"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d"
|
||||
dependencies = [
|
||||
"futures-core",
|
||||
"futures-task",
|
||||
|
@ -918,13 +921,15 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "futures-io"
|
||||
version = "0.3.29"
|
||||
source = "git+https://github.com/edef1c/futures-rs?rev=23e25061f2261794d6d611675a6372c96b70fa85#23e25061f2261794d6d611675a6372c96b70fa85"
|
||||
version = "0.3.30"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1"
|
||||
|
||||
[[package]]
|
||||
name = "futures-macro"
|
||||
version = "0.3.29"
|
||||
source = "git+https://github.com/edef1c/futures-rs?rev=23e25061f2261794d6d611675a6372c96b70fa85#23e25061f2261794d6d611675a6372c96b70fa85"
|
||||
version = "0.3.30"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
|
||||
dependencies = [
|
||||
"proc-macro2 1.0.67",
|
||||
"quote 1.0.33",
|
||||
|
@ -933,18 +938,21 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "futures-sink"
|
||||
version = "0.3.29"
|
||||
source = "git+https://github.com/edef1c/futures-rs?rev=23e25061f2261794d6d611675a6372c96b70fa85#23e25061f2261794d6d611675a6372c96b70fa85"
|
||||
version = "0.3.30"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5"
|
||||
|
||||
[[package]]
|
||||
name = "futures-task"
|
||||
version = "0.3.29"
|
||||
source = "git+https://github.com/edef1c/futures-rs?rev=23e25061f2261794d6d611675a6372c96b70fa85#23e25061f2261794d6d611675a6372c96b70fa85"
|
||||
version = "0.3.30"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004"
|
||||
|
||||
[[package]]
|
||||
name = "futures-util"
|
||||
version = "0.3.29"
|
||||
source = "git+https://github.com/edef1c/futures-rs?rev=23e25061f2261794d6d611675a6372c96b70fa85#23e25061f2261794d6d611675a6372c96b70fa85"
|
||||
version = "0.3.30"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48"
|
||||
dependencies = [
|
||||
"futures-channel",
|
||||
"futures-core",
|
||||
|
|
|
@ -2601,9 +2601,9 @@ rec {
|
|||
};
|
||||
"futures" = rec {
|
||||
crateName = "futures";
|
||||
version = "0.3.29";
|
||||
version = "0.3.30";
|
||||
edition = "2018";
|
||||
sha256 = "0dak2ilpcmyjrb1j54fzy9hlw6vd10vqljq9gd59pbrq9dqr00ns";
|
||||
sha256 = "1c04g14bccmprwsvx2j9m2blhwrynq7vhl151lsvcv4gi0b6jp34";
|
||||
dependencies = [
|
||||
{
|
||||
name = "futures-channel";
|
||||
|
@ -2662,14 +2662,9 @@ rec {
|
|||
};
|
||||
"futures-channel" = rec {
|
||||
crateName = "futures-channel";
|
||||
version = "0.3.29";
|
||||
version = "0.3.30";
|
||||
edition = "2018";
|
||||
workspace_member = null;
|
||||
src = pkgs.fetchgit {
|
||||
url = "https://github.com/edef1c/futures-rs";
|
||||
rev = "23e25061f2261794d6d611675a6372c96b70fa85";
|
||||
sha256 = "082d1f2201slvpl36v30lq8dchp5kh91yx64j9n9amf3bsdaf98r";
|
||||
};
|
||||
sha256 = "0y6b7xxqdjm9hlcjpakcg41qfl7lihf6gavk8fyqijsxhvbzgj7a";
|
||||
dependencies = [
|
||||
{
|
||||
name = "futures-core";
|
||||
|
@ -2694,14 +2689,9 @@ rec {
|
|||
};
|
||||
"futures-core" = rec {
|
||||
crateName = "futures-core";
|
||||
version = "0.3.29";
|
||||
version = "0.3.30";
|
||||
edition = "2018";
|
||||
workspace_member = null;
|
||||
src = pkgs.fetchgit {
|
||||
url = "https://github.com/edef1c/futures-rs";
|
||||
rev = "23e25061f2261794d6d611675a6372c96b70fa85";
|
||||
sha256 = "082d1f2201slvpl36v30lq8dchp5kh91yx64j9n9amf3bsdaf98r";
|
||||
};
|
||||
sha256 = "07aslayrn3lbggj54kci0ishmd1pr367fp7iks7adia1p05miinz";
|
||||
features = {
|
||||
"default" = [ "std" ];
|
||||
"portable-atomic" = [ "dep:portable-atomic" ];
|
||||
|
@ -2711,14 +2701,9 @@ rec {
|
|||
};
|
||||
"futures-executor" = rec {
|
||||
crateName = "futures-executor";
|
||||
version = "0.3.29";
|
||||
version = "0.3.30";
|
||||
edition = "2018";
|
||||
workspace_member = null;
|
||||
src = pkgs.fetchgit {
|
||||
url = "https://github.com/edef1c/futures-rs";
|
||||
rev = "23e25061f2261794d6d611675a6372c96b70fa85";
|
||||
sha256 = "082d1f2201slvpl36v30lq8dchp5kh91yx64j9n9amf3bsdaf98r";
|
||||
};
|
||||
sha256 = "07dh08gs9vfll2h36kq32q9xd86xm6lyl9xikmmwlkqnmrrgqxm5";
|
||||
dependencies = [
|
||||
{
|
||||
name = "futures-core";
|
||||
|
@ -2746,14 +2731,9 @@ rec {
|
|||
};
|
||||
"futures-io" = rec {
|
||||
crateName = "futures-io";
|
||||
version = "0.3.29";
|
||||
version = "0.3.30";
|
||||
edition = "2018";
|
||||
workspace_member = null;
|
||||
src = pkgs.fetchgit {
|
||||
url = "https://github.com/edef1c/futures-rs";
|
||||
rev = "23e25061f2261794d6d611675a6372c96b70fa85";
|
||||
sha256 = "082d1f2201slvpl36v30lq8dchp5kh91yx64j9n9amf3bsdaf98r";
|
||||
};
|
||||
sha256 = "1hgh25isvsr4ybibywhr4dpys8mjnscw4wfxxwca70cn1gi26im4";
|
||||
features = {
|
||||
"default" = [ "std" ];
|
||||
};
|
||||
|
@ -2761,14 +2741,9 @@ rec {
|
|||
};
|
||||
"futures-macro" = rec {
|
||||
crateName = "futures-macro";
|
||||
version = "0.3.29";
|
||||
version = "0.3.30";
|
||||
edition = "2018";
|
||||
workspace_member = null;
|
||||
src = pkgs.fetchgit {
|
||||
url = "https://github.com/edef1c/futures-rs";
|
||||
rev = "23e25061f2261794d6d611675a6372c96b70fa85";
|
||||
sha256 = "082d1f2201slvpl36v30lq8dchp5kh91yx64j9n9amf3bsdaf98r";
|
||||
};
|
||||
sha256 = "1b49qh9d402y8nka4q6wvvj0c88qq91wbr192mdn5h54nzs0qxc7";
|
||||
procMacro = true;
|
||||
dependencies = [
|
||||
{
|
||||
|
@ -2789,14 +2764,9 @@ rec {
|
|||
};
|
||||
"futures-sink" = rec {
|
||||
crateName = "futures-sink";
|
||||
version = "0.3.29";
|
||||
version = "0.3.30";
|
||||
edition = "2018";
|
||||
workspace_member = null;
|
||||
src = pkgs.fetchgit {
|
||||
url = "https://github.com/edef1c/futures-rs";
|
||||
rev = "23e25061f2261794d6d611675a6372c96b70fa85";
|
||||
sha256 = "082d1f2201slvpl36v30lq8dchp5kh91yx64j9n9amf3bsdaf98r";
|
||||
};
|
||||
sha256 = "1dag8xyyaya8n8mh8smx7x6w2dpmafg2din145v973a3hw7f1f4z";
|
||||
features = {
|
||||
"default" = [ "std" ];
|
||||
"std" = [ "alloc" ];
|
||||
|
@ -2805,14 +2775,9 @@ rec {
|
|||
};
|
||||
"futures-task" = rec {
|
||||
crateName = "futures-task";
|
||||
version = "0.3.29";
|
||||
version = "0.3.30";
|
||||
edition = "2018";
|
||||
workspace_member = null;
|
||||
src = pkgs.fetchgit {
|
||||
url = "https://github.com/edef1c/futures-rs";
|
||||
rev = "23e25061f2261794d6d611675a6372c96b70fa85";
|
||||
sha256 = "082d1f2201slvpl36v30lq8dchp5kh91yx64j9n9amf3bsdaf98r";
|
||||
};
|
||||
sha256 = "013h1724454hj8qczp8vvs10qfiqrxr937qsrv6rhii68ahlzn1q";
|
||||
features = {
|
||||
"default" = [ "std" ];
|
||||
"std" = [ "alloc" ];
|
||||
|
@ -2821,14 +2786,9 @@ rec {
|
|||
};
|
||||
"futures-util" = rec {
|
||||
crateName = "futures-util";
|
||||
version = "0.3.29";
|
||||
version = "0.3.30";
|
||||
edition = "2018";
|
||||
workspace_member = null;
|
||||
src = pkgs.fetchgit {
|
||||
url = "https://github.com/edef1c/futures-rs";
|
||||
rev = "23e25061f2261794d6d611675a6372c96b70fa85";
|
||||
sha256 = "082d1f2201slvpl36v30lq8dchp5kh91yx64j9n9amf3bsdaf98r";
|
||||
};
|
||||
sha256 = "0j0xqhcir1zf2dcbpd421kgw6wvsk0rpxflylcysn1rlp3g02r1x";
|
||||
dependencies = [
|
||||
{
|
||||
name = "futures-channel";
|
||||
|
|
|
@ -36,15 +36,3 @@ members = [
|
|||
[profile.release-with-debug]
|
||||
inherits = "release"
|
||||
debug = true
|
||||
|
||||
[patch.crates-io]
|
||||
# https://github.com/rust-lang/futures-rs/pull/2801
|
||||
# replace once https://github.com/rust-lang/futures-rs/pull/2812 has been backported and released.
|
||||
futures-channel = { git = "https://github.com/edef1c/futures-rs", rev = "23e25061f2261794d6d611675a6372c96b70fa85" }
|
||||
futures-core = { git = "https://github.com/edef1c/futures-rs", rev = "23e25061f2261794d6d611675a6372c96b70fa85" }
|
||||
futures-executor = { git = "https://github.com/edef1c/futures-rs", rev = "23e25061f2261794d6d611675a6372c96b70fa85" }
|
||||
futures-io = { git = "https://github.com/edef1c/futures-rs", rev = "23e25061f2261794d6d611675a6372c96b70fa85" }
|
||||
futures-macro = { git = "https://github.com/edef1c/futures-rs", rev = "23e25061f2261794d6d611675a6372c96b70fa85" }
|
||||
futures-sink = { git = "https://github.com/edef1c/futures-rs", rev = "23e25061f2261794d6d611675a6372c96b70fa85" }
|
||||
futures-task = { git = "https://github.com/edef1c/futures-rs", rev = "23e25061f2261794d6d611675a6372c96b70fa85" }
|
||||
futures-util = { git = "https://github.com/edef1c/futures-rs", rev = "23e25061f2261794d6d611675a6372c96b70fa85" }
|
||||
|
|
|
@ -8,7 +8,7 @@ async-stream = "0.3.5"
|
|||
blake3 = { version = "1.3.1", features = ["rayon", "std"] }
|
||||
bytes = "1.4.0"
|
||||
data-encoding = "2.3.3"
|
||||
futures = "0.3.28"
|
||||
futures = "0.3.30"
|
||||
lazy_static = "1.4.0"
|
||||
parking_lot = "0.12.1"
|
||||
pin-project-lite = "0.2.13"
|
||||
|
|
|
@ -1,12 +1,4 @@
|
|||
{
|
||||
"futures-channel 0.3.29 (git+https://github.com/edef1c/futures-rs?rev=23e25061f2261794d6d611675a6372c96b70fa85#23e25061f2261794d6d611675a6372c96b70fa85)": "082d1f2201slvpl36v30lq8dchp5kh91yx64j9n9amf3bsdaf98r",
|
||||
"futures-core 0.3.29 (git+https://github.com/edef1c/futures-rs?rev=23e25061f2261794d6d611675a6372c96b70fa85#23e25061f2261794d6d611675a6372c96b70fa85)": "082d1f2201slvpl36v30lq8dchp5kh91yx64j9n9amf3bsdaf98r",
|
||||
"futures-executor 0.3.29 (git+https://github.com/edef1c/futures-rs?rev=23e25061f2261794d6d611675a6372c96b70fa85#23e25061f2261794d6d611675a6372c96b70fa85)": "082d1f2201slvpl36v30lq8dchp5kh91yx64j9n9amf3bsdaf98r",
|
||||
"futures-io 0.3.29 (git+https://github.com/edef1c/futures-rs?rev=23e25061f2261794d6d611675a6372c96b70fa85#23e25061f2261794d6d611675a6372c96b70fa85)": "082d1f2201slvpl36v30lq8dchp5kh91yx64j9n9amf3bsdaf98r",
|
||||
"futures-macro 0.3.29 (git+https://github.com/edef1c/futures-rs?rev=23e25061f2261794d6d611675a6372c96b70fa85#23e25061f2261794d6d611675a6372c96b70fa85)": "082d1f2201slvpl36v30lq8dchp5kh91yx64j9n9amf3bsdaf98r",
|
||||
"futures-sink 0.3.29 (git+https://github.com/edef1c/futures-rs?rev=23e25061f2261794d6d611675a6372c96b70fa85#23e25061f2261794d6d611675a6372c96b70fa85)": "082d1f2201slvpl36v30lq8dchp5kh91yx64j9n9amf3bsdaf98r",
|
||||
"futures-task 0.3.29 (git+https://github.com/edef1c/futures-rs?rev=23e25061f2261794d6d611675a6372c96b70fa85#23e25061f2261794d6d611675a6372c96b70fa85)": "082d1f2201slvpl36v30lq8dchp5kh91yx64j9n9amf3bsdaf98r",
|
||||
"futures-util 0.3.29 (git+https://github.com/edef1c/futures-rs?rev=23e25061f2261794d6d611675a6372c96b70fa85#23e25061f2261794d6d611675a6372c96b70fa85)": "082d1f2201slvpl36v30lq8dchp5kh91yx64j9n9amf3bsdaf98r",
|
||||
"test-generator 0.3.0 (git+https://github.com/JamesGuthrie/test-generator.git?rev=82e799979980962aec1aa324ec6e0e4cad781f41#82e799979980962aec1aa324ec6e0e4cad781f41)": "08brp3qqa55hijc7xby3lam2cc84hvx1zzfqv6lj7smlczh8k32y",
|
||||
"wu-manber 0.1.0 (git+https://github.com/tvlfyi/wu-manber.git#0d5b22bea136659f7de60b102a7030e0daaa503d)": "1zhk83lbq99xzyjwphv2qrb8f8qgfqwa5bbbvyzm0z0bljsjv0pd"
|
||||
}
|
|
@ -78,15 +78,6 @@ let
|
|||
) [
|
||||
"test-generator"
|
||||
"wu-manber"
|
||||
|
||||
"futures-channel"
|
||||
"futures-core"
|
||||
"futures-executor"
|
||||
"futures-io"
|
||||
"futures-macro"
|
||||
"futures-sink"
|
||||
"futures-task"
|
||||
"futures-util"
|
||||
]);
|
||||
};
|
||||
|
||||
|
|
|
@ -14,7 +14,7 @@ bstr = { version = "1.6.0", features = ["alloc", "unicode", "serde"] }
|
|||
data-encoding = "2.3.3"
|
||||
ed25519 = "2.2.3"
|
||||
ed25519-dalek = "2.1.0"
|
||||
futures-util = { version = "0.3.28", features = ["io"], optional = true }
|
||||
futures-util = { version = "0.3.30", features = ["io"], optional = true }
|
||||
glob = "0.3.0"
|
||||
nom = "7.1.3"
|
||||
serde = { version = "1.0", features = ["derive"] }
|
||||
|
@ -23,7 +23,7 @@ sha2 = "0.10.6"
|
|||
thiserror = "1.0.38"
|
||||
|
||||
[dev-dependencies]
|
||||
futures = { version = "0.3.28", default-features = false, features = ["executor"] }
|
||||
futures = { version = "0.3.30", default-features = false, features = ["executor"] }
|
||||
lazy_static = "1.4.0"
|
||||
serde_json = "1.0"
|
||||
test-case = "2.2.2"
|
||||
|
|
|
@ -11,7 +11,7 @@ bytes = "1.4.0"
|
|||
clap = { version = "4.0", features = ["derive", "env"] }
|
||||
count-write = "0.1.0"
|
||||
data-encoding = "2.3.3"
|
||||
futures = "0.3.28"
|
||||
futures = "0.3.30"
|
||||
lazy_static = "1.4.0"
|
||||
nix-compat = { path = "../nix-compat", features = ["async"] }
|
||||
pin-project-lite = "0.2.13"
|
||||
|
|
Loading…
Reference in a new issue