From b11a7f177bbaf2f63948da9b7967422cb9775de4 Mon Sep 17 00:00:00 2001
From: Carter Anderson <mcanders1@gmail.com>
Date: Thu, 30 Apr 2020 16:29:52 -0700
Subject: [PATCH] system_fn: port exit_on_esc

---
 crates/bevy_input/src/system.rs | 27 ++++++++++++---------------
 1 file changed, 12 insertions(+), 15 deletions(-)

diff --git a/crates/bevy_input/src/system.rs b/crates/bevy_input/src/system.rs
index 1a8ef35dfc..f35906a2f3 100644
--- a/crates/bevy_input/src/system.rs
+++ b/crates/bevy_input/src/system.rs
@@ -4,20 +4,17 @@ use legion::prelude::*;
 
 pub fn exit_on_esc_system(resources: &mut Resources) -> Box<dyn Schedulable> {
     let mut keyboard_input_event_reader = resources.get_event_reader::<KeyboardInput>();
-    SystemBuilder::new("exit_on_esc")
-        .read_resource::<Events<KeyboardInput>>()
-        .write_resource::<Events<AppExit>>()
-        .build(
-            move |_, _, (ref keyboard_input_events, ref mut app_exit_events), _| {
-                for event in keyboard_input_event_reader.iter(keyboard_input_events) {
-                    if let Some(virtual_key_code) = event.virtual_key_code {
-                        if event.state == ElementState::Pressed
-                            && virtual_key_code == VirtualKeyCode::Escape
-                        {
-                            app_exit_events.send(AppExit);
-                        }
-                    }
+    (move |keyboard_input_events: Resource<Events<KeyboardInput>>,
+           mut app_exit_events: ResourceMut<Events<AppExit>>| {
+        for event in keyboard_input_event_reader.iter(&keyboard_input_events) {
+            if let Some(virtual_key_code) = event.virtual_key_code {
+                if event.state == ElementState::Pressed
+                    && virtual_key_code == VirtualKeyCode::Escape
+                {
+                    app_exit_events.send(AppExit);
                 }
-            },
-        )
+            }
+        }
+    })
+    .system_named("exit_on_esc")
 }