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.

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

Upgrade to support hyper1 #14

Merged
merged 4 commits into from
Feb 2, 2024
Merged

Upgrade to support hyper1 #14

merged 4 commits into from
Feb 2, 2024

Conversation

aviramha
Copy link
Contributor

@aviramha aviramha commented Jan 21, 2024

Closes #13

Copy link

codecov bot commented Jan 21, 2024

Codecov Report

Attention: 6 lines in your changes are missing coverage. Please review.

Comparison is base (d7789e3) 91.24% compared to head (3786c88) 84.40%.

Files Patch % Lines
src/lib.rs 70.00% 6 Missing ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##           master      #14      +/-   ##
==========================================
- Coverage   91.24%   84.40%   -6.85%     
==========================================
  Files           1        1              
  Lines         377      404      +27     
==========================================
- Hits          344      341       -3     
- Misses         33       63      +30     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

Cargo.toml Outdated

http = "1"
tower-service = "0.3"
hyper-util = { version = "0.1", features = ["tokio"]}
Copy link
Owner

Choose a reason for hiding this comment

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

Suggested change
hyper-util = { version = "0.1", features = ["tokio"]}
hyper-util = { version = "0.1", features = ["tokio"] }

src/lib.rs Outdated
@@ -160,7 +162,7 @@ where
.call(self.proxy_addr)
.await
.map_err(Into::<BoxedError>::into)?;
let mut buf_stream = BufStream::new(stream); // fixes issue #3
let mut buf_stream = TokioIo::new(stream); // fixes issue #3
Copy link
Owner

Choose a reason for hiding this comment

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

Suggested change
let mut buf_stream = TokioIo::new(stream); // fixes issue #3
let mut buf_stream = BufStream::new(TokioIo::new(stream)); // fixes issue #3

Cargo.toml Outdated
@@ -16,24 +16,27 @@ edition = "2018"
github-actions = { repository = "https://github.com/ark0f/hyper-socks2", workflow = "CI" }

[dependencies]
hyper = "0.14"
hyper = { version = "1", features = ["server", "http1", "client"] }
Copy link
Owner

Choose a reason for hiding this comment

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

It looks like we don't need any of these features

Cargo.toml Outdated
tokio = { version = "1.0", features = ["macros"] }
hyper-util = { version = "0.1", features = ["http1", "client", "client-legacy"]}
Copy link
Owner

Choose a reason for hiding this comment

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

Suggested change
hyper-util = { version = "0.1", features = ["http1", "client", "client-legacy"]}
hyper-util = { version = "0.1", features = ["http1", "client", "client-legacy"] }

@aviramha aviramha requested a review from ark0f February 1, 2024 06:23
@aviramha
Copy link
Contributor Author

aviramha commented Feb 1, 2024

Thanks for the review. I think I resolved all comments.

Copy link
Owner

@ark0f ark0f left a comment

Choose a reason for hiding this comment

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

Thank you for contribution

@ark0f ark0f changed the title upgrade to support hyper1 Upgrade to support hyper1 Feb 2, 2024
@ark0f ark0f merged commit 4e64910 into ark0f:master Feb 2, 2024
4 of 6 checks passed
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.

Update to hyper 1
2 participants