Skip to content

Commit

Permalink
fix(tvix): patch futures::AsyncBufReadExt::fill_buf
Browse files Browse the repository at this point in the history 
This fixes EOF handling for buffered readers.

Link: rust-lang/futures-rs#2801
Change-Id: Ie98ca6a3e1de38500b0195e9b62511501acb1d2c
Reviewed-on: https://cl.tvl.fyi/c/depot/+/10086
Reviewed-by: flokli <flokli@flokli.de>
Tested-by: BuildkiteCI
  • Loading branch information
@edef1c
edef1c committed Nov 19, 2023
1 parent 4500d55 commit 19c5670
Show file tree
Hide file tree
Showing 4 changed files with 75 additions and 24 deletions.
24 changes: 8 additions & 16 deletions Cargo.lock
View file

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

56 changes: 48 additions & 8 deletions Cargo.nix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2407,7 +2407,12 @@ rec {
crateName = "futures-channel";
version = "0.3.29";
edition = "2018";
sha256 = "1jxsifvrbqzdadk0svbax71cba5d3qg3wgjq8i160mxmd1kdckgz";
workspace_member = null;
src = pkgs.fetchgit {
url = "https://github.com/edef1c/futures-rs";
rev = "23e25061f2261794d6d611675a6372c96b70fa85";
sha256 = "082d1f2201slvpl36v30lq8dchp5kh91yx64j9n9amf3bsdaf98r";
};
dependencies = [
{
name = "futures-core";
Expand All @@ -2434,7 +2439,12 @@ rec {
crateName = "futures-core";
version = "0.3.29";
edition = "2018";
sha256 = "1308bpj0g36nhx2y6bl4mm6f1gnh9xyvvw2q2wpdgnb6dv3247gb";
workspace_member = null;
src = pkgs.fetchgit {
url = "https://github.com/edef1c/futures-rs";
rev = "23e25061f2261794d6d611675a6372c96b70fa85";
sha256 = "082d1f2201slvpl36v30lq8dchp5kh91yx64j9n9amf3bsdaf98r";
};
features = {
"default" = [ "std" ];
"portable-atomic" = [ "dep:portable-atomic" ];
Expand All @@ -2446,7 +2456,12 @@ rec {
crateName = "futures-executor";
version = "0.3.29";
edition = "2018";
sha256 = "1g4pjni0sw28djx6mlcfz584abm2lpifz86cmng0kkxh7mlvhkqg";
workspace_member = null;
src = pkgs.fetchgit {
url = "https://github.com/edef1c/futures-rs";
rev = "23e25061f2261794d6d611675a6372c96b70fa85";
sha256 = "082d1f2201slvpl36v30lq8dchp5kh91yx64j9n9amf3bsdaf98r";
};
dependencies = [
{
name = "futures-core";
Expand Down Expand Up @@ -2476,7 +2491,12 @@ rec {
crateName = "futures-io";
version = "0.3.29";
edition = "2018";
sha256 = "1ajsljgny3zfxwahba9byjzclrgvm1ypakca8z854k2w7cb4mwwb";
workspace_member = null;
src = pkgs.fetchgit {
url = "https://github.com/edef1c/futures-rs";
rev = "23e25061f2261794d6d611675a6372c96b70fa85";
sha256 = "082d1f2201slvpl36v30lq8dchp5kh91yx64j9n9amf3bsdaf98r";
};
features = {
"default" = [ "std" ];
};
Expand All @@ -2486,7 +2506,12 @@ rec {
crateName = "futures-macro";
version = "0.3.29";
edition = "2018";
sha256 = "1nwd18i8kvpkdfwm045hddjli0n96zi7pn6f99zi9c74j7ym7cak";
workspace_member = null;
src = pkgs.fetchgit {
url = "https://github.com/edef1c/futures-rs";
rev = "23e25061f2261794d6d611675a6372c96b70fa85";
sha256 = "082d1f2201slvpl36v30lq8dchp5kh91yx64j9n9amf3bsdaf98r";
};
procMacro = true;
dependencies = [
{
Expand All @@ -2509,7 +2534,12 @@ rec {
crateName = "futures-sink";
version = "0.3.29";
edition = "2018";
sha256 = "05q8jykqddxzp8nwf00wjk5m5mqi546d7i8hsxma7hiqxrw36vg3";
workspace_member = null;
src = pkgs.fetchgit {
url = "https://github.com/edef1c/futures-rs";
rev = "23e25061f2261794d6d611675a6372c96b70fa85";
sha256 = "082d1f2201slvpl36v30lq8dchp5kh91yx64j9n9amf3bsdaf98r";
};
features = {
"default" = [ "std" ];
"std" = [ "alloc" ];
Expand All @@ -2520,7 +2550,12 @@ rec {
crateName = "futures-task";
version = "0.3.29";
edition = "2018";
sha256 = "1qmsss8rb5ppql4qvd4r70h9gpfcpd0bg2b3qilxrnhdkc397lgg";
workspace_member = null;
src = pkgs.fetchgit {
url = "https://github.com/edef1c/futures-rs";
rev = "23e25061f2261794d6d611675a6372c96b70fa85";
sha256 = "082d1f2201slvpl36v30lq8dchp5kh91yx64j9n9amf3bsdaf98r";
};
features = {
"default" = [ "std" ];
"std" = [ "alloc" ];
Expand All @@ -2531,7 +2566,12 @@ rec {
crateName = "futures-util";
version = "0.3.29";
edition = "2018";
sha256 = "0141rkqh0psj4h8x8lgsl1p29dhqr7z2wcixkcbs60z74kb2d5d1";
workspace_member = null;
src = pkgs.fetchgit {
url = "https://github.com/edef1c/futures-rs";
rev = "23e25061f2261794d6d611675a6372c96b70fa85";
sha256 = "082d1f2201slvpl36v30lq8dchp5kh91yx64j9n9amf3bsdaf98r";
};
dependencies = [
{
name = "futures-channel";
Expand Down
11 changes: 11 additions & 0 deletions Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,3 +36,14 @@ members = [
[profile.release-with-debug]
inherits = "release"
debug = true

[patch.crates-io]
# https://github.com/rust-lang/futures-rs/pull/2801
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 changes: 8 additions & 0 deletions crate-hashes.json
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
{
"fuse-backend-rs 0.10.5 (git+https://github.com/griff/fuse-backend-rs?branch=macfuse-fix#70b835cada7e1f18e5cbb13f6c4b698ba203c820)": "107iaw8zqsz888xh9nkq3vvki1c1rqqqg0mncdplradhhn7wp3kp",
"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"
}

0 comments on commit 19c5670

Please sign in to comment.