mirror of
https://github.com/encounter/rust-sdl2.git
synced 2026-07-10 21:18:41 -07:00
Merge pull request #120 from honzasp/ord-rename
Update to rustc version b981add
This commit is contained in:
@@ -27,7 +27,7 @@ impl PartialEq for Key {
|
||||
}
|
||||
}
|
||||
|
||||
impl TotalOrd for Key {
|
||||
impl Ord for Key {
|
||||
fn cmp(&self, other: &Key) -> Ordering {
|
||||
if self.code < other.code {
|
||||
Less
|
||||
@@ -36,7 +36,7 @@ impl TotalOrd for Key {
|
||||
} else { Equal }
|
||||
}
|
||||
}
|
||||
impl TotalEq for Key {
|
||||
impl Eq for Key {
|
||||
}
|
||||
|
||||
#[allow(non_snake_case_functions)]
|
||||
@@ -310,7 +310,7 @@ use std::hash::sip::SipState;
|
||||
use std::num::FromPrimitive;
|
||||
use std::num::ToPrimitive;
|
||||
|
||||
#[deriving(PartialEq, TotalEq, Show)]
|
||||
#[deriving(PartialEq, Eq, Show)]
|
||||
pub enum KeyCode {
|
||||
".as_bytes()));
|
||||
for &entry in entries.iter() {
|
||||
|
||||
@@ -27,7 +27,7 @@ impl PartialEq for ScanCode {
|
||||
}
|
||||
}
|
||||
|
||||
impl TotalOrd for ScanCode {
|
||||
impl Ord for ScanCode {
|
||||
fn cmp(&self, other: &ScanCode) -> Ordering {
|
||||
if self.code < other.code {
|
||||
Less
|
||||
@@ -36,7 +36,7 @@ impl TotalOrd for ScanCode {
|
||||
} else { Equal }
|
||||
}
|
||||
}
|
||||
impl TotalEq for ScanCode {
|
||||
impl Eq for ScanCode {
|
||||
}
|
||||
|
||||
#[allow(non_snake_case_functions)]
|
||||
@@ -317,7 +317,7 @@ use std::hash::sip::SipState;
|
||||
use std::num::FromPrimitive;
|
||||
use std::num::ToPrimitive;
|
||||
|
||||
#[deriving(PartialEq, TotalEq, Show)]
|
||||
#[deriving(PartialEq, Eq, Show)]
|
||||
pub enum ScanCode {
|
||||
".as_bytes()));
|
||||
for &entry in entries.iter() {
|
||||
|
||||
Reference in New Issue
Block a user