From 10f625c2c8f601af6fe7cc9fbfcf728e716bdd70 Mon Sep 17 00:00:00 2001 From: David Partouche Date: Sat, 11 Oct 2014 12:04:48 +0200 Subject: [PATCH 1/2] Fixed static uppercase warning --- src/events.rs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/events.rs b/src/events.rs index a3fef42a..e36a7a64 100644 --- a/src/events.rs +++ b/src/events.rs @@ -1,3 +1,5 @@ +#![allow(non_uppercase_statics)] + #[deriving(Clone,Show)] pub enum Event { /// The size of the window has changed. @@ -13,7 +15,7 @@ pub enum Event { ReceivedCharacter(char), /// The window gained or lost focus. - /// + /// /// The parameter is true if the window has gained focus, and false if it has lost focus. Focused(bool), @@ -21,7 +23,7 @@ pub enum Event { KeyboardInput(ElementState, ScanCode, Option, KeyModifiers), /// The cursor has moved on the window. - /// + /// /// The parameter are the (x,y) coords in pixels relative to the top-left corner of the window. MouseMoved((int, int)), From a2df6a86993aaa9ed5a352ae71fdc58922d505c6 Mon Sep 17 00:00:00 2001 From: David Partouche Date: Sat, 11 Oct 2014 12:38:34 +0200 Subject: [PATCH 2/2] Changed statics to uppercase --- src/events.rs | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/src/events.rs b/src/events.rs index e36a7a64..f28fb594 100644 --- a/src/events.rs +++ b/src/events.rs @@ -1,5 +1,3 @@ -#![allow(non_uppercase_statics)] - #[deriving(Clone,Show)] pub enum Event { /// The size of the window has changed. @@ -40,14 +38,14 @@ pub type ScanCode = u8; bitflags!( #[deriving(Show)] flags KeyModifiers: u8 { - const LeftControlModifier = 1, - const RightControlModifier = 2, - const LeftShitModifier = 4, - const RightShitModifier = 8, - const LeftAltModifier = 16, - const RightRightModifier = 32, - const NumLockModifier = 64, - const CapsLockModifier = 128 + const LEFT_CONTROL_MODIFIER = 1, + const RIGHT_CONTROL_MODIFIER = 2, + const LEFT_SHIFT_MODIFIER = 4, + const RIGHT_SHIFT_MODIFIER = 8, + const LEFT_ALT_MODIFIER = 16, + const RIGHT_ALT_MODIFIER = 32, + const NUM_LOCK_MODIFIER = 64, + const CAPS_LOCK_MODIFIER = 128 } )