From d7d5b6f0c049bac923c87ab9d49ca743a8adcb6a Mon Sep 17 00:00:00 2001
From: Mike Hilgendorf <mike@hilgendorf.audio>
Date: Sat, 16 Nov 2019 08:37:09 -0800
Subject: [PATCH] removed EventIterator and replaced with impl Trait syntax
 (#111)

---
 src/api.rs | 36 +++---------------------------------
 1 file changed, 3 insertions(+), 33 deletions(-)

diff --git a/src/api.rs b/src/api.rs
index a060bc2c..65a39025 100644
--- a/src/api.rs
+++ b/src/api.rs
@@ -4,7 +4,6 @@ use std::os::raw::c_void;
 
 use self::consts::*;
 use plugin::Plugin;
-use std::marker::PhantomData;
 
 /// Constant values
 #[allow(missing_docs)] // For obvious constants
@@ -405,7 +404,6 @@ pub struct Events {
 
 impl Events {
     #[inline]
-    #[allow(dead_code)]
     pub(crate) fn events_raw(&self) -> &[*const Event] {
         use std::slice;
         unsafe {
@@ -453,37 +451,9 @@ impl Events {
     /// # }
     /// ```
     #[inline]
-    pub fn events(&self) -> EventIterator {
-        let ptr = self.events.as_ptr() as *const *const Event;
-        EventIterator {
-            current: ptr,
-            end: unsafe { ptr.offset(self.num_events as isize) },
-            _marker: PhantomData,
-        }
-    }
-}
-
-/// An iterator over events, returned by `api::Events::events`
-pub struct EventIterator<'a> {
-    current: *const *const Event,
-    end: *const *const Event,
-    _marker: PhantomData<&'a Event>,
-}
-
-impl<'a> Iterator for EventIterator<'a> {
-    type Item = ::event::Event<'a>;
-
-    fn next(&mut self) -> Option<Self::Item> {
-        if self.current == self.end {
-            None
-        } else {
-            let event = unsafe {
-                let e = **self.current;
-                self.current = self.current.offset(1);
-                e
-            };
-            Some(event.into())
-        }
+    #[allow(clippy::needless_lifetimes)]
+    pub fn events<'a>(&'a self) -> impl Iterator<Item = ::event::Event<'a>> {
+        self.events_raw().iter().map(|ptr| unsafe { **ptr }.into())
     }
 }