From 95bedfd3934a023134c8da2c0307e586ee93e70a Mon Sep 17 00:00:00 2001 From: SteveLauC Date: Mon, 17 Jun 2024 08:21:36 +0800 Subject: [PATCH] refactor: remove EventFd::defuse() and EventFd::arm() (#2452) * fix: remove Eventfd::arm() and defuse() * chore: changelog entry --- changelog/2452.removed.md | 1 + src/sys/epoll.rs | 2 +- src/sys/eventfd.rs | 14 -------------- 3 files changed, 2 insertions(+), 15 deletions(-) create mode 100644 changelog/2452.removed.md diff --git a/changelog/2452.removed.md b/changelog/2452.removed.md new file mode 100644 index 0000000000..acf9d1f060 --- /dev/null +++ b/changelog/2452.removed.md @@ -0,0 +1 @@ +`EventFd::defuse()` is removed because it does nothing, `EventFd::arm()` is also removed for symmetry reasons. diff --git a/src/sys/epoll.rs b/src/sys/epoll.rs index ec146a8c53..317d713a5a 100644 --- a/src/sys/epoll.rs +++ b/src/sys/epoll.rs @@ -88,7 +88,7 @@ impl EpollEvent { /// epoll.add(&eventfd, EpollEvent::new(EpollFlags::EPOLLIN,DATA))?; /// /// // Arm eventfd & Time wait -/// eventfd.arm()?; +/// eventfd.write(1)?; /// let now = Instant::now(); /// /// // Wait on event diff --git a/src/sys/eventfd.rs b/src/sys/eventfd.rs index 50abc22546..8c8c923f35 100644 --- a/src/sys/eventfd.rs +++ b/src/sys/eventfd.rs @@ -58,20 +58,6 @@ impl EventFd { Self::from_value_and_flags(init_val, EfdFlags::empty()) } - /// Arms `self`, a following call to `poll`, `select` or `epoll` will return immediately. - /// - /// [`EventFd::write`] with `1`. - pub fn arm(&self) -> Result { - self.write(1) - } - - /// Defuses `self`, a following call to `poll`, `select` or `epoll` will block. - /// - /// [`EventFd::write`] with `0`. - pub fn defuse(&self) -> Result { - self.write(0) - } - /// Enqueues `value` triggers, i.e., adds the integer value supplied in `value` /// to the counter. ///