Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

use future-rs latest #698

Merged
merged 12 commits into from Aug 17, 2022
Merged

use future-rs latest #698

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
120cb14
use future-rs latest
conorbros Jul 7, 2022
af3b0b9
review feedback
conorbros Jul 8, 2022
f03f466
Merge branch 'main' into upstream-futures-rs
conorbros Aug 14, 2022
5d6d429
rebase errors
conorbros Aug 14, 2022
d97ddbf
Merge branch 'main' into upstream-futures-rs
conorbros Aug 15, 2022
cc58265
Merge branch 'main' into upstream-futures-rs
rukai Aug 15, 2022
06b59eb
review feedback
conorbros Aug 15, 2022
4859944
Merge branch 'main' into upstream-futures-rs
conorbros Aug 15, 2022
851b386
rebase
conorbros Aug 15, 2022
49bd298
Merge branch 'main' into upstream-futures-rs
rukai Aug 16, 2022
7b2bde0
Merge branch 'main' into upstream-futures-rs
conorbros Aug 16, 2022
3f36ff4
Merge branch 'main' into upstream-futures-rs
rukai Aug 16, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
179 changes: 129 additions & 50 deletions Cargo.lock
View file
Open in desktop

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

4 changes: 2 additions & 2 deletions shotover-proxy/Cargo.toml
View file
Open in desktop
Expand Up @@ -20,8 +20,8 @@ tokio-util = { version = "0.7.0", features = ["full"] }
tokio-stream = "0.1.2"
bytes = "1.0.0"
bytes-utils = "0.1.1"
futures = "0.3.12"
futures-core = "0.3.1"
futures = { git = "https://github.com/rust-lang/futures-rs" }
conorbros marked this conversation as resolved.
Show resolved Hide resolved
futures-util = "0.3.21"
async-trait = "0.1.30"
clap = { version = "3.0.4", features = ["cargo", "derive"] }
derivative = "2.1.1"
Expand Down