From 067e0e89ef0e0e4226d91e4066488ffe490cb04b Mon Sep 17 00:00:00 2001
From: Greg M <morenzg@gmail.com>
Date: Tue, 1 Jul 2014 10:36:57 -0400
Subject: [PATCH] Upgrade to latest rust

---
 src/codegen/keycode.rs  | 15 ++++++++++-----
 src/codegen/scancode.rs | 15 ++++++++++-----
 2 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/src/codegen/keycode.rs b/src/codegen/keycode.rs
index 103901ab..0e4c41ea 100644
--- a/src/codegen/keycode.rs
+++ b/src/codegen/keycode.rs
@@ -8,13 +8,18 @@ struct Key {
 }
 
 impl PartialOrd for Key {
-    fn lt (&self, other: &Key) -> bool {
-        if self.code < other.code {
-            true
-        } else {
-            false
+    fn partial_cmp(&self, other: &Key) -> Option<Ordering> {
+        match (!self.lt(other), !other.lt(self)) {
+            (false, false) => None,
+            (false, true) => Some(Less),
+            (true, false) => Some(Greater),
+            (true, true) => Some(Equal),
         }
     }
+
+    fn lt (&self, other: &Key) -> bool {
+        self.code < other.code
+    }
 }
 
 impl PartialEq for Key {
diff --git a/src/codegen/scancode.rs b/src/codegen/scancode.rs
index f095db75..c603b27b 100644
--- a/src/codegen/scancode.rs
+++ b/src/codegen/scancode.rs
@@ -8,13 +8,18 @@ struct ScanCode {
 }
 
 impl PartialOrd for ScanCode {
-    fn lt (&self, other: &ScanCode) -> bool {
-        if self.code < other.code {
-            true
-        } else {
-            false
+    fn partial_cmp(&self, other: &ScanCode) -> Option<Ordering> {
+        match (!self.lt(other), !other.lt(self)) {
+            (false, false) => None,
+            (false, true) => Some(Less),
+            (true, false) => Some(Greater),
+            (true, true) => Some(Equal),
         }
     }
+
+    fn lt (&self, other: &ScanCode) -> bool {
+        self.code < other.code
+    }
 }
 
 impl PartialEq for ScanCode {