Skip to content

Commit

Permalink
chore(tvix): switch to upstream futures 0.3.30
Browse files Browse the repository at this point in the history 
The bugs have been fixed,
rust-lang/futures-rs#2801 and
rust-lang/futures-rs#2812 were merged and ended
up in that release.

Change-Id: Iefd990d2d1719b884504093343e54e9c5258e2e2
Reviewed-on: https://cl.tvl.fyi/c/depot/+/10414
Reviewed-by: raitobezarius <[email protected]>
Autosubmit: flokli <[email protected]>
Tested-by: BuildkiteCI
  • Loading branch information
@flokli
flokli authored and clbot committed Dec 24, 2023
1 parent e1c59d9 commit bd6b8f5
Show file tree
Hide file tree
Showing 7 changed files with 48 additions and 100 deletions.
44 changes: 26 additions & 18 deletions Cargo.lock
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

76 changes: 18 additions & 58 deletions Cargo.nix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down Expand Up @@ -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";
Expand All @@ -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" ];
Expand All @@ -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";
Expand Down Expand Up @@ -2746,29 +2731,19 @@ 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" ];
};
resolvedDefaultFeatures = [ "default" "std" ];
};
"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 = [
{
Expand All @@ -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" ];
Expand All @@ -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" ];
Expand All @@ -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";
Expand Down
12 changes: 0 additions & 12 deletions Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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" }
2 changes: 1 addition & 1 deletion castore/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
8 changes: 0 additions & 8 deletions crate-hashes.json
View file
Original file line number Diff line number Diff line change
@@ -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"
}
4 changes: 2 additions & 2 deletions nix-compat/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"] }
Expand All @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion store/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down

0 comments on commit bd6b8f5

Please sign in to comment.