Run cargo fmt on source files (#106)

* Run cargo fmt on source files

* Update with rustfmt.toml

* Change rustfmt configuration and run it again

Author: yamadapc

.rustfmt.toml

@@ -1,2 +1,3 @@
 fn_args_layout = "Compressed"
+use_small_heuristics = "Max"
 use_field_init_shorthand = true

examples/open_window.rs

@@ -1,12 +1,12 @@
 use std::time::Duration;
 
-use rtrb::{RingBuffer, Consumer};
+use rtrb::{Consumer, RingBuffer};
 
 use baseview::{Event, EventStatus, Window, WindowHandler, WindowScalePolicy};
 
 #[derive(Debug, Clone)]
 enum Message {
-    Hello
+    Hello,
 }
 
 struct OpenWindowExample {
@@ -40,18 +40,13 @@ fn main() {
 
     let (mut tx, rx) = RingBuffer::new(128).split();
 
-    ::std::thread::spawn(move || {
-        loop {
-            ::std::thread::sleep(Duration::from_secs(5));
+    ::std::thread::spawn(move || loop {
+        ::std::thread::sleep(Duration::from_secs(5));
 
-            if let Err(_) = tx.push(Message::Hello) {
-                println!("Failed sending message");
-            }
+        if let Err(_) = tx.push(Message::Hello) {
+            println!("Failed sending message");
         }
     });
 
-    Window::open_blocking(
-        window_open_options,
-        |_| OpenWindowExample { rx }
-    );
+    Window::open_blocking(window_open_options, |_| OpenWindowExample { rx });
 }

src/event.rs

@@ -1,7 +1,6 @@
 use keyboard_types::KeyboardEvent;
 
-use crate::{WindowInfo, Point};
-
+use crate::{Point, WindowInfo};
 
 #[derive(Debug, Copy, Clone, Eq, PartialEq)]
 pub enum MouseButton {
@@ -83,7 +82,6 @@ pub enum Event {
     Window(WindowEvent),
 }
 
-
 /// Return value for [WindowHandler::on_event](`crate::WindowHandler::on_event()`),
 /// indicating whether the event was handled by your window or should be passed
 /// back to the platform.

src/keyboard.rs

@@ -19,7 +19,6 @@
 
 use keyboard_types::{Code, Location};
 
-
 #[cfg(any(target_os = "linux", target_os = "macos"))]
 /// Map key code to location.
 ///
@@ -52,4 +51,4 @@ pub fn code_to_location(code: Code) -> Location {
         | Code::NumpadSubtract => Location::Numpad,
         _ => Location::Standard,
     }
-}
+}

src/lib.rs

@@ -1,9 +1,9 @@
+#[cfg(target_os = "macos")]
+mod macos;
 #[cfg(target_os = "windows")]
 mod win;
 #[cfg(target_os = "linux")]
 mod x11;
-#[cfg(target_os = "macos")]
-mod macos;
 
 mod event;
 mod keyboard;

src/macos/keyboard.rs

@@ -19,14 +19,13 @@
 //! Conversion of platform keyboard event into cross-platform event.
 
 use cocoa::appkit::{NSEvent, NSEventModifierFlags, NSEventType};
-use cocoa::foundation::NSString;
 use cocoa::base::id;
-use keyboard_types::{Code, KeyState, Key, KeyboardEvent, Modifiers};
+use cocoa::foundation::NSString;
+use keyboard_types::{Code, Key, KeyState, KeyboardEvent, Modifiers};
 use objc::{msg_send, sel, sel_impl};
 
 use crate::keyboard::code_to_location;
 
-
 pub(crate) fn from_nsstring(s: id) -> String {
     unsafe {
         let slice = std::slice::from_raw_parts(s.UTF8String() as *const _, s.len());
@@ -245,15 +244,13 @@ fn code_to_key(code: Code) -> Option<Key> {
     })
 }
 
-
 fn is_valid_key(s: &str) -> bool {
     match s.chars().next() {
         None => false,
         Some(c) => c >= ' ' && c != '\x7f' && !('\u{e000}'..'\u{f900}').contains(&c),
     }
 }
 
-
 fn is_modifier_code(code: Code) -> bool {
     matches!(
         code,
@@ -270,7 +267,6 @@ fn is_modifier_code(code: Code) -> bool {
     )
 }
 
-
 impl KeyboardState {
     pub(crate) fn new() -> KeyboardState {
         let last_mods = NSEventModifierFlags::empty();
@@ -329,33 +325,21 @@ impl KeyboardState {
                     }
                 }
             };
-            let event = KeyboardEvent {
-                code,
-                key,
-                location,
-                modifiers,
-                state,
-                is_composing,
-                repeat,
-            };
+            let event =
+                KeyboardEvent { code, key, location, modifiers, state, is_composing, repeat };
             Some(event)
         }
     }
 }
 
-
 const MODIFIER_MAP: &[(NSEventModifierFlags, Modifiers)] = &[
     (NSEventModifierFlags::NSShiftKeyMask, Modifiers::SHIFT),
     (NSEventModifierFlags::NSAlternateKeyMask, Modifiers::ALT),
     (NSEventModifierFlags::NSControlKeyMask, Modifiers::CONTROL),
     (NSEventModifierFlags::NSCommandKeyMask, Modifiers::META),
-    (
-        NSEventModifierFlags::NSAlphaShiftKeyMask,
-        Modifiers::CAPS_LOCK,
-    ),
+    (NSEventModifierFlags::NSAlphaShiftKeyMask, Modifiers::CAPS_LOCK),
 ];
 
-
 pub(crate) fn make_modifiers(raw: NSEventModifierFlags) -> Modifiers {
     let mut modifiers = Modifiers::empty();
     for &(flags, mods) in MODIFIER_MAP {
@@ -364,4 +348,4 @@ pub(crate) fn make_modifiers(raw: NSEventModifierFlags) -> Modifiers {
         }
     }
     modifiers
-}
+}

src/macos/mod.rs

@@ -1,5 +1,5 @@
 mod keyboard;
-mod window;
 mod view;
+mod window;
 
 pub use window::*;