auto merge of #5379 : genkku/servo/code_value, r=jdm

Changed Key::N to KeyN, also changed Equals to Equal, and NumpadEquals to NumpadEqual.
This commit is contained in:
bors-servo 2015-03-30 07:58:06 -06:00
commit 629edc5c46

View file

@ -320,7 +320,7 @@ fn code_value(key: constellation_msg::Key) -> &'static str {
constellation_msg::Key::Num8 => "Digit8", constellation_msg::Key::Num8 => "Digit8",
constellation_msg::Key::Num9 => "Digit9", constellation_msg::Key::Num9 => "Digit9",
constellation_msg::Key::Semicolon => "Semicolon", constellation_msg::Key::Semicolon => "Semicolon",
constellation_msg::Key::Equal => "Equals", constellation_msg::Key::Equal => "Equal",
constellation_msg::Key::A => "KeyA", constellation_msg::Key::A => "KeyA",
constellation_msg::Key::B => "KeyB", constellation_msg::Key::B => "KeyB",
constellation_msg::Key::C => "KeyC", constellation_msg::Key::C => "KeyC",
@ -414,7 +414,7 @@ fn code_value(key: constellation_msg::Key) -> &'static str {
constellation_msg::Key::KpSubtract => "NumpadSubtract", constellation_msg::Key::KpSubtract => "NumpadSubtract",
constellation_msg::Key::KpAdd => "NumpadAdd", constellation_msg::Key::KpAdd => "NumpadAdd",
constellation_msg::Key::KpEnter => "NumpadEnter", constellation_msg::Key::KpEnter => "NumpadEnter",
constellation_msg::Key::KpEqual => "NumpadEquals", constellation_msg::Key::KpEqual => "NumpadEqual",
constellation_msg::Key::LeftShift | constellation_msg::Key::RightShift => "Shift", constellation_msg::Key::LeftShift | constellation_msg::Key::RightShift => "Shift",
constellation_msg::Key::LeftControl | constellation_msg::Key::RightControl => "Control", constellation_msg::Key::LeftControl | constellation_msg::Key::RightControl => "Control",
constellation_msg::Key::LeftAlt | constellation_msg::Key::RightAlt => "Alt", constellation_msg::Key::LeftAlt | constellation_msg::Key::RightAlt => "Alt",