From 137b87bbe57662e88518eb8a0033b548a0313f33 Mon Sep 17 00:00:00 2001
From: Markus Pettersson <markus.pettersson@mullvad.net>
Date: Sun, 19 Oct 2025 21:59:02 +0200
Subject: Use `AsFd` to get rid of re-borrowing of zbus Power Key fd

---
 src/niri.rs | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/niri.rs b/src/niri.rs
index 0a7894b5..49178f3f 100644
--- a/src/niri.rs
+++ b/src/niri.rs
@@ -2777,8 +2777,6 @@ impl Niri {
 
     #[cfg(feature = "dbus")]
     pub fn inhibit_power_key(&mut self) -> anyhow::Result<()> {
-        use std::os::fd::{AsRawFd, BorrowedFd};
-
         use smithay::reexports::rustix::io::{fcntl_setfd, FdFlags};
 
         let conn = zbus::blocking::Connection::system()?;
@@ -2794,8 +2792,7 @@ impl Niri {
         let fd: zbus::zvariant::OwnedFd = message.body().deserialize()?;
 
         // Don't leak the fd to child processes.
-        let borrowed = unsafe { BorrowedFd::borrow_raw(fd.as_raw_fd()) };
-        if let Err(err) = fcntl_setfd(borrowed, FdFlags::CLOEXEC) {
+        if let Err(err) = fcntl_setfd(&fd, FdFlags::CLOEXEC) {
             warn!("error setting CLOEXEC on inhibit fd: {err:?}");
         };
 
-- 
cgit