Skip to content

use future-rs latest#698

Merged
conorbros merged 12 commits into
shotover:mainfrom
conorbros:upstream-futures-rs
Aug 17, 2022
Merged

use future-rs latest#698
conorbros merged 12 commits into
shotover:mainfrom
conorbros:upstream-futures-rs

Conversation

@conorbros
Copy link
Copy Markdown

Now that rust-lang/futures-rs#2591 has been merged we can use the latest futures-rs version from git and remove the library code from our repo.

This PR is mostly just adding required traits and fixing some formatting.

@conorbros conorbros requested a review from rukai July 7, 2022 06:41
@rukai
Copy link
Copy Markdown
Contributor

rukai commented Jul 8, 2022

Importing both futures git and futures_util 3.0 seems really wonky to me.
The reason is that futures reexports parts of futures_util.
This means we have traits from 2 versions of futures_util floating around which will cause a lot of confusion and hard to understand errors.

The release process for futures-rs isnt really documented, but by examining these release PRs it appears taiki will manually backport some PRs from master onto the 0.3 branch and then make a release.
rust-lang/futures-rs#2563

So I suggest we put this PR on hold until either a 0.3 backport or a 0.4 release

Comment thread shotover-proxy/Cargo.toml Outdated
@conorbros conorbros marked this pull request as draft July 12, 2022 02:46
@conorbros
Copy link
Copy Markdown
Author

Marking as a draft until a new version of futures-rs is released.

@conorbros conorbros force-pushed the upstream-futures-rs branch from b2f072e to af3b0b9 Compare July 19, 2022 03:12
Comment thread shotover-proxy/Cargo.toml Outdated
@conorbros conorbros marked this pull request as ready for review August 15, 2022 00:18
Comment thread shotover-proxy/src/transforms/cassandra/connection.rs Outdated
@conorbros conorbros force-pushed the upstream-futures-rs branch from 3644b28 to 5d2ab8d Compare August 15, 2022 04:12
Comment thread shotover-proxy/src/transforms/redis/sink_cluster.rs Outdated
@conorbros conorbros force-pushed the upstream-futures-rs branch from 5d2ab8d to 5f91f84 Compare August 15, 2022 04:20
@conorbros conorbros force-pushed the upstream-futures-rs branch from 5f91f84 to 06b59eb Compare August 15, 2022 04:20
Copy link
Copy Markdown
Contributor

@rukai rukai left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, just need to rebase

@conorbros conorbros requested a review from benbromhead August 15, 2022 08:26
@conorbros conorbros force-pushed the upstream-futures-rs branch from 6389eb3 to 7b2bde0 Compare August 16, 2022 08:20
@conorbros conorbros enabled auto-merge (squash) August 16, 2022 08:28
@conorbros conorbros merged commit 832b836 into shotover:main Aug 17, 2022
@conorbros conorbros deleted the upstream-futures-rs branch August 17, 2022 04:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants