Update wayland-server to 0.31 #1115
Merged
Conversation
This file contains 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
Drakulix
approved these changes
Sep 4, 2023
elinorbgr
force-pushed
the
elinorbgr/wayland-031
branch
3 times, most recently
from
5df2af0
to
0394e34
Compare
elinorbgr
force-pushed
the
elinorbgr/wayland-031
branch
from
0394e34
to
2aec201
Compare
Drakulix
reviewed
Sep 22, 2023
| if let Err(e) = socket::bind(fd, &addr) { | ||
| let _ = ::nix::unistd::close(fd); | ||
| if let Err(e) = socket::bind(fd.as_raw_fd(), &addr) { | ||
| let _ = ::nix::unistd::close(fd.as_raw_fd()); |
There was a problem hiding this comment.
So socket now returns an OwnedFd, would this cause a double close? Or more specifically, why do we still close it manually?
There was a problem hiding this comment.
It could use into_raw_fd, but yeah, there should be no reason to call close manually with OwnedFds.
| if let Err(e) = socket::listen(fd, 1) { | ||
| let _ = ::nix::unistd::close(fd); | ||
| if let Err(e) = socket::listen(&fd, 1) { | ||
| let _ = ::nix::unistd::close(fd.as_raw_fd()); |
| return Err(e); | ||
| } | ||
| Ok(unsafe { FromRawFd::from_raw_fd(fd) }) | ||
| Ok(unsafe { FromRawFd::from_raw_fd(fd.as_raw_fd()) }) |
There was a problem hiding this comment.
Suggested change
| Ok(unsafe { FromRawFd::from_raw_fd(fd.as_raw_fd()) }) | |
| Ok(fd.into()) |
Also implements From<OwnedFd>. The current approach would drop fd afterwards and close the file descriptor we just created the unix socket from.
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.
Based on #1108
Blocked on Smithay/gbm.rs#26
This is a pretty boring PR, mostly just fixing the prototypes of the methods that changed.
I tested that anvil still runs and is able to display weston-terminal.