Fix merge issues manually

bevyengine · Aug 24, 2020 · 0e4c7a4 · 0e4c7a4
1 parent c1343a3
commit 0e4c7a4
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/crates/bevy_input/src/lib.rs b/crates/bevy_input/src/lib.rs
@@ -16,7 +16,10 @@ use bevy_app::prelude::*;
 use bevy_window::{AxisId, Cursor};
 use keyboard::{keyboard_input_system, KeyCode, KeyboardInput};
 
-use mouse::{axis_system, cursor_system, mouse_axis_system, mouse_button_input_system, MouseButton, MouseButtonInput, MouseMotion, MouseWheel};
+use mouse::{
+    axis_system, cursor_system, mouse_axis_system, mouse_button_input_system, MouseButton,
+    MouseButtonInput, MouseMotion, MouseWheel,
+};
 
 use bevy_ecs::IntoQuerySystem;
 

diff --git a/crates/bevy_input/src/mouse.rs b/crates/bevy_input/src/mouse.rs
@@ -33,7 +33,7 @@ pub enum Mouse {
     Vertical,
     Horizontal,
 }
-  /// Unit of scroll
+/// Unit of scroll
 #[derive(Debug, Clone)]
 pub enum MouseScrollUnit {
     Line,

diff --git a/crates/bevy_winit/src/lib.rs b/crates/bevy_winit/src/lib.rs
@@ -199,8 +199,8 @@ pub fn winit_runner(mut app: App) {
                 },
                 _ => {}
             },
-            event::Event::DeviceEvent { ref event, .. } => {
-                if let DeviceEvent::MouseMotion { delta } = event {
+            event::Event::DeviceEvent { ref event, .. } => match event {
+                DeviceEvent::MouseMotion { delta } => {
                     let mut mouse_motion_events =
                         app.resources.get_mut::<Events<MouseMotion>>().unwrap();
                     mouse_motion_events.send(MouseMotion {