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

Update dependencies for the main ttrpc project #189

Merged
merged 2 commits into from
May 27, 2023

Conversation

jsturtevant
Copy link
Collaborator

Updates the dependencies for the main ttrpc project. This is in preparation for a release to include the Windows files in support for projects like the rust shim in containerd/rust-extensions#139

Updates the dependencies for the main ttrpc project

Signed-off-by: James Sturtevant <jstur@microsoft.com>
@jsturtevant
Copy link
Collaborator Author

The nix dependency is failing due to:

error: use of deprecated enum `nix::sys::socket::SockAddr`: use SockaddrLike or SockaddrStorage instead
   --> src/common.rs:107:62

Is this something that should be addressed or should we move back to an older version and address later?

@Tim-Zhang
Copy link
Member

Tim-Zhang commented May 23, 2023

The nix dependency is failing due to:

error: use of deprecated enum `nix::sys::socket::SockAddr`: use SockaddrLike or SockaddrStorage instead
   --> src/common.rs:107:62

Is this something that should be addressed or should we move back to an older version and address later?

I think we could adapt the new nix API by using SockaddrLike instead of SockAddr

@codecov
Copy link

codecov bot commented May 23, 2023

Codecov Report

Patch coverage has no change and project coverage change: -0.03 ⚠️

Comparison is base (dde3298) 24.39% compared to head (48cdc42) 24.36%.

❗ Current head 48cdc42 differs from pull request most recent head fee3e00. Consider uploading reports for the commit fee3e00 to get more accurate results

Additional details and impacted files
@@            Coverage Diff             @@
##           master     #189      +/-   ##
==========================================
- Coverage   24.39%   24.36%   -0.03%     
==========================================
  Files          17       17              
  Lines        2529     2532       +3     
==========================================
  Hits          617      617              
- Misses       1912     1915       +3     
Impacted Files Coverage Δ
src/common.rs 34.57% <0.00%> (-1.00%) ⬇️
src/error.rs 55.55% <0.00%> (ø)

☔ View full report in Codecov by Sentry.
📢 Do you have feedback about the report comment? Let us know in this issue.

@jsturtevant
Copy link
Collaborator Author

@Tim-Zhang I've update to use those API's.

Another option instead of boxing the trait would be to refactor some of these functions where make_socket are used. I don't know enough about the impact of Boxing to know if a bigger refactor of those functions makes sense or this is good enough.

src/common.rs Outdated Show resolved Hide resolved
@Tim-Zhang
Copy link
Member

Tim-Zhang commented May 25, 2023

@jsturtevant I have some suggestions and I've just left a comment

Adopt new nix API's for SockaddrLike

Signed-off-by: James Sturtevant <jstur@microsoft.com>
Copy link
Member

@Tim-Zhang Tim-Zhang left a comment

Choose a reason for hiding this comment

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

LGTM, thanks @jsturtevant

@lifupan lifupan merged commit edc11a7 into containerd:master May 27, 2023
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.

4 participants