From 77827f57b76fdf5d5cc7b3e0b05f2fb51a11fc01 Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@kaed.uk>
Date: Sun, 23 Apr 2017 15:48:51 +0100
Subject: [PATCH] Rename 'english' keymap to 'us'

This keyboard layout is only used in the United States, other
english-speaking countries may have their own standard keyboard layouts.

This commit changes the name of the 'english' layout to 'us' to match
X11.
---
 ps2d/src/keymap.rs | 6 +++---
 ps2d/src/main.rs   | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/ps2d/src/keymap.rs b/ps2d/src/keymap.rs
index 24c3ecda17..2d514156c9 100644
--- a/ps2d/src/keymap.rs
+++ b/ps2d/src/keymap.rs
@@ -1,5 +1,5 @@
-pub mod english {
-    static ENGLISH: [[char; 2]; 58] = [
+pub mod us {
+    static US: [[char; 2]; 58] = [
         ['\0', '\0'],
         ['\x1B', '\x1B'],
         ['1', '!'],
@@ -61,7 +61,7 @@ pub mod english {
     ];
 
     pub fn get_char(scancode: u8, shift: bool) -> char {
-        if let Some(c) = ENGLISH.get(scancode as usize) {
+        if let Some(c) = US.get(scancode as usize) {
             if shift {
                 c[1]
             } else {
diff --git a/ps2d/src/main.rs b/ps2d/src/main.rs
index a63405659b..fce59bb645 100644
--- a/ps2d/src/main.rs
+++ b/ps2d/src/main.rs
@@ -197,12 +197,12 @@ fn daemon(input: File) {
     let keymap = match env::args().skip(1).next() {
         Some(k) => match k.to_lowercase().as_ref() {
             "dvorak" => (keymap::dvorak::get_char),
-            "english" => (keymap::english::get_char),
+            "us" => (keymap::us::get_char),
             "azerty" => (keymap::azerty::get_char),
             "bepo" => (keymap::bepo::get_char),
-            &_ => (keymap::english::get_char)
+            &_ => (keymap::us::get_char)
         },
-        None => (keymap::english::get_char)
+        None => (keymap::us::get_char)
     };
     let ps2d = Arc::new(RefCell::new(Ps2d::new(input, keymap)));