Take OwnedFd instead of RawFd as argument to receive_to_fd

This appears to be the only use of `RawFd` in a public API. With this
change, these functions should be safe to call.

I'm not sure if it would make more sense for these functions to not
close the file descriptor. In which case they could take `BorrowedFd`.
But this matches the current implementation, but with an IO safe type.

CHANGELOG.md

@@ -13,6 +13,7 @@
 - `xkeysym::Keysym` is used as a keyboard key representation instead of `u32`
 - `wayland-rs` dependencies are updated to 0.31
 - `calloop` dependency updated to 0.12.1
+- Take `OwnedFd` instead of `RawFd` as argument to `receive_to_fd` functions.
 
 #### Fixed
 

src/data_device_manager/data_offer.rs

@@ -1,6 +1,6 @@
 use std::{
     ops::{Deref, DerefMut},
-    os::unix::prelude::{BorrowedFd, FromRawFd, RawFd},
+    os::unix::prelude::{AsFd, BorrowedFd, FromRawFd, IntoRawFd, OwnedFd},
     sync::{Arc, Mutex},
 };
 
@@ -427,16 +427,14 @@ pub fn receive(offer: &WlDataOffer, mime_type: String) -> std::io::Result<ReadPi
 /// At least make sure you flush your events to the server before
 /// doing so.
 ///
-/// # Safety
-///
 /// The provided file destructor must be a valid FD for writing, and will be closed
 /// once the contents are written.
-pub unsafe fn receive_to_fd(offer: &WlDataOffer, mime_type: String, writefd: RawFd) {
+pub fn receive_to_fd(offer: &WlDataOffer, mime_type: String, writefd: OwnedFd) {
     use nix::unistd::close;
 
-    offer.receive(mime_type, unsafe { BorrowedFd::borrow_raw(writefd) });
+    offer.receive(mime_type, writefd.as_fd());
 
-    if let Err(err) = close(writefd) {
+    if let Err(err) = close(writefd.into_raw_fd()) {
         log::warn!("Failed to close write pipe: {}", err);
     }
 }

src/primary_selection/offer.rs

@@ -1,5 +1,5 @@
 use std::{
-    os::unix::io::{BorrowedFd, FromRawFd, RawFd},
+    os::unix::io::{AsFd, BorrowedFd, FromRawFd, IntoRawFd, OwnedFd},
     sync::Mutex,
 };
 
@@ -50,16 +50,16 @@ impl PrimarySelectionOffer {
         Ok(unsafe { FromRawFd::from_raw_fd(readfd) })
     }
 
-    /// # Safety
+    /// Request to receive the data of a given mime type, writen to `writefd`.
     ///
     /// The provided file destructor must be a valid FD for writing, and will be closed
     /// once the contents are written.
-    pub unsafe fn receive_to_fd(&self, mime_type: String, writefd: RawFd) {
+    pub fn receive_to_fd(&self, mime_type: String, writefd: OwnedFd) {
         use nix::unistd::close;
 
-        self.offer.receive(mime_type, unsafe { BorrowedFd::borrow_raw(writefd) });
+        self.offer.receive(mime_type, writefd.as_fd());
 
-        if let Err(err) = close(writefd) {
+        if let Err(err) = close(writefd.into_raw_fd()) {
             log::warn!("Failed to close write pipe: {}", err);
         }
     }