Use OwnedFd/OwnedSocket in Socket #600
Merged
+118
−114
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Unfortunately Windows uses std::os::windows::io::RawSocket (u64), which is different from the RawSocket that we define that uses windows_sys::Win32::Networking::WinSock::SOCKET (usize). So the std lib version gets ranamed to StdRawSocket.
Darksonn
reviewed
Jul 4, 2025
| // something we don't want. So check for that we have this | ||
| // `assert!`. | ||
| #[cfg(unix)] | ||
| assert!(raw >= 0, "tried to create a `Socket` with an invalid fd"); |
Collaborator
There was a problem hiding this comment.
Looks like there is a test for this assertion.
Collaborator
Author
There was a problem hiding this comment.
Updated the test with the error message from std lib, don't think there is value is checking it twice.
Darksonn
approved these changes
Jul 4, 2025
Instead of the workaround where we use std::net::TcpStream.
Collaborator
Author
|
Panic message is different in 1.70 vs. current stable 🤦 I'll just change it to only check for the panic |
It changed between 1.70 and current stable. Checking if the function panics should be good enough.
the8472
reviewed
Jul 4, 2025
Comment on lines
+90
to
+91
| // potentially close a fd it doesn't own. All of that isn't memory | ||
| // unsafe, so it's not desired but never memory unsafe or causes UB. |
Member
There was a problem hiding this comment.
It's not immediate UB, but we consider it library UB because downstream effects can cause memory unsafety, e.g. by incorrectly touching mmap'ed fds.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Instead of the workaround where we use std::net::TcpStream.