-
Notifications
You must be signed in to change notification settings - Fork 673
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
Relax assertions in sockaddr_storage_to_addr to match the documentation. #1486
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The tests you modified are now doing two completely different things. Better to split them up, testing only the minimal amount of functionality in each test.
test/sys/test_socket.rs
Outdated
let storage_ptr = storage.as_mut_ptr().cast::<sockaddr_in6>(); | ||
let (ffi_ptr, ffi_size) = sockaddr.as_ffi_pair(); | ||
// XXX this does not pass. | ||
// assert_eq!(mem::size_of::<sockaddr>(), ffi_size as usize); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You should delete this comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Done.
You'll need to rebase to fix the test failures. |
Done. |
Just one more thing: would you mind squashing your commits? |
Done. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
bors r+
1486: Relax assertions in sockaddr_storage_to_addr to match the documentation. r=asomers a=khuey Fixes #1479 1490: add libc::IP6T_SO_ORIGINAL_DST to socket opt r=asomers a=bearice the original PR #1410 was stalled for a while let's make it happen. this should closes #1410 and #938 1493: Fix crates.io badge r=asomers a=atouchet Co-authored-by: Kyle Huey <[email protected]> Co-authored-by: Icemic <[email protected]> Co-authored-by: Bearice Ren <[email protected]> Co-authored-by: Alex Touchet <[email protected]>
This PR was included in a batch that timed out, it will be automatically retried |
1486: Relax assertions in sockaddr_storage_to_addr to match the documentation. r=asomers a=khuey Fixes #1479 Co-authored-by: Kyle Huey <[email protected]>
Timed out. |
bors retry |
Thanks. |
Fixes #1479