From 0786d534f4a39e21bc485778ede2d9efcb244137 Mon Sep 17 00:00:00 2001
From: dAxpeDDa <daxpedda@gmail.com>
Date: Sun, 4 Jun 2023 12:18:38 +0200
Subject: [PATCH] Take `IntoIterator` in `send_events()`

---
 src/platform_impl/web/event_loop/runner.rs    |   2 +-
 .../web/event_loop/window_target.rs           | 116 ++++++++----------
 2 files changed, 53 insertions(+), 65 deletions(-)

diff --git a/src/platform_impl/web/event_loop/runner.rs b/src/platform_impl/web/event_loop/runner.rs
index c28a28e5..7134088f 100644
--- a/src/platform_impl/web/event_loop/runner.rs
+++ b/src/platform_impl/web/event_loop/runner.rs
@@ -192,7 +192,7 @@ impl<T: 'static> Shared<T> {
     // Add a series of events to the event loop runner
     //
     // It will determine if the event should be immediately sent to the user or buffered for later
-    pub fn send_events(&self, events: impl Iterator<Item = Event<'static, T>>) {
+    pub fn send_events(&self, events: impl IntoIterator<Item = Event<'static, T>>) {
         // If the event loop is closed, it should discard any new events
         if self.is_closed() {
             return;
diff --git a/src/platform_impl/web/event_loop/window_target.rs b/src/platform_impl/web/event_loop/window_target.rs
index f87cf934..310c0a86 100644
--- a/src/platform_impl/web/event_loop/window_target.rs
+++ b/src/platform_impl/web/event_loop/window_target.rs
@@ -278,24 +278,21 @@ impl<T> EventLoopWindowTarget<T> {
                 let runner = self.runner.clone();
 
                 move |pointer_id, position, delta| {
-                    runner.send_events(
-                        [
-                            Event::WindowEvent {
-                                window_id: RootWindowId(id),
-                                event: WindowEvent::CursorMoved {
-                                    device_id: RootDeviceId(DeviceId(pointer_id)),
-                                    position,
-                                },
-                            },
-                            Event::DeviceEvent {
+                    runner.send_events([
+                        Event::WindowEvent {
+                            window_id: RootWindowId(id),
+                            event: WindowEvent::CursorMoved {
                                 device_id: RootDeviceId(DeviceId(pointer_id)),
-                                event: DeviceEvent::MouseMotion {
-                                    delta: (delta.x, delta.y),
-                                },
+                                position,
                             },
-                        ]
-                        .into_iter(),
-                    );
+                        },
+                        Event::DeviceEvent {
+                            device_id: RootDeviceId(DeviceId(pointer_id)),
+                            event: DeviceEvent::MouseMotion {
+                                delta: (delta.x, delta.y),
+                            },
+                        },
+                    ]);
                 }
             },
             {
@@ -341,19 +338,16 @@ impl<T> EventLoopWindowTarget<T> {
                     // A chorded button event may come in without any prior CursorMoved events,
                     // therefore we should send a CursorMoved event to make sure that the
                     // user code has the correct cursor position.
-                    runner.send_events(
-                        [
-                            Event::WindowEvent {
-                                window_id: RootWindowId(id),
-                                event: WindowEvent::CursorMoved {
-                                    device_id: RootDeviceId(DeviceId(pointer_id)),
-                                    position,
-                                },
+                    runner.send_events([
+                        Event::WindowEvent {
+                            window_id: RootWindowId(id),
+                            event: WindowEvent::CursorMoved {
+                                device_id: RootDeviceId(DeviceId(pointer_id)),
+                                position,
                             },
-                            button_event,
-                        ]
-                        .into_iter(),
-                    );
+                        },
+                        button_event,
+                    ]);
                 }
             },
             prevent_default,
@@ -381,26 +375,23 @@ impl<T> EventLoopWindowTarget<T> {
                     // A mouse down event may come in without any prior CursorMoved events,
                     // therefore we should send a CursorMoved event to make sure that the
                     // user code has the correct cursor position.
-                    runner.send_events(
-                        [
-                            Event::WindowEvent {
-                                window_id: RootWindowId(id),
-                                event: WindowEvent::CursorMoved {
-                                    device_id: RootDeviceId(DeviceId(pointer_id)),
-                                    position,
-                                },
+                    runner.send_events([
+                        Event::WindowEvent {
+                            window_id: RootWindowId(id),
+                            event: WindowEvent::CursorMoved {
+                                device_id: RootDeviceId(DeviceId(pointer_id)),
+                                position,
                             },
-                            Event::WindowEvent {
-                                window_id: RootWindowId(id),
-                                event: WindowEvent::MouseInput {
-                                    device_id: RootDeviceId(DeviceId(pointer_id)),
-                                    state: ElementState::Pressed,
-                                    button,
-                                },
+                        },
+                        Event::WindowEvent {
+                            window_id: RootWindowId(id),
+                            event: WindowEvent::MouseInput {
+                                device_id: RootDeviceId(DeviceId(pointer_id)),
+                                state: ElementState::Pressed,
+                                button,
                             },
-                        ]
-                        .into_iter(),
-                    );
+                        },
+                    ]);
                 }
             },
             {
@@ -445,26 +436,23 @@ impl<T> EventLoopWindowTarget<T> {
                     // A mouse up event may come in without any prior CursorMoved events,
                     // therefore we should send a CursorMoved event to make sure that the
                     // user code has the correct cursor position.
-                    runner.send_events(
-                        [
-                            Event::WindowEvent {
-                                window_id: RootWindowId(id),
-                                event: WindowEvent::CursorMoved {
-                                    device_id: RootDeviceId(DeviceId(pointer_id)),
-                                    position,
-                                },
+                    runner.send_events([
+                        Event::WindowEvent {
+                            window_id: RootWindowId(id),
+                            event: WindowEvent::CursorMoved {
+                                device_id: RootDeviceId(DeviceId(pointer_id)),
+                                position,
                             },
-                            Event::WindowEvent {
-                                window_id: RootWindowId(id),
-                                event: WindowEvent::MouseInput {
-                                    device_id: RootDeviceId(DeviceId(pointer_id)),
-                                    state: ElementState::Released,
-                                    button,
-                                },
+                        },
+                        Event::WindowEvent {
+                            window_id: RootWindowId(id),
+                            event: WindowEvent::MouseInput {
+                                device_id: RootDeviceId(DeviceId(pointer_id)),
+                                state: ElementState::Released,
+                                button,
                             },
-                        ]
-                        .into_iter(),
-                    );
+                        },
+                    ]);
                 }
             },
             {