From 6633e6cea2a87215c267b3947ddcdf35ec37212b Mon Sep 17 00:00:00 2001 From: Zach Reizner Date: Tue, 25 Mar 2014 00:33:56 -0500 Subject: [PATCH] removal of eq in TotalEq in rust@master --- src/codegen/keycode.rs | 5 ----- src/codegen/scancode.rs | 7 +------ src/sdl2/generated/scancode.rs | 2 +- 3 files changed, 2 insertions(+), 12 deletions(-) diff --git a/src/codegen/keycode.rs b/src/codegen/keycode.rs index b0e43b99..834929eb 100644 --- a/src/codegen/keycode.rs +++ b/src/codegen/keycode.rs @@ -37,11 +37,6 @@ impl TotalOrd for Key { } } impl TotalEq for Key { - fn equals(&self, other: &Key) -> bool { - if self.code == other.code { - true - } else { false } - } } diff --git a/src/codegen/scancode.rs b/src/codegen/scancode.rs index 3ab96800..4b9da34b 100644 --- a/src/codegen/scancode.rs +++ b/src/codegen/scancode.rs @@ -37,11 +37,6 @@ impl TotalOrd for ScanCode { } } impl TotalEq for ScanCode { - fn equals(&self, other: &ScanCode) -> bool { - if self.code == other.code { - true - } else { false } - } } fn ScanCode(code: uint, ident: &'static str) -> ScanCode { @@ -321,7 +316,7 @@ use std::hash::sip::SipState; use std::num::FromPrimitive; use std::num::ToPrimitive; -#[deriving(Eq)] +#[deriving(Eq, TotalEq)] pub enum ScanCode { ".as_bytes())); for &entry in entries.iter() { diff --git a/src/sdl2/generated/scancode.rs b/src/sdl2/generated/scancode.rs index bc132e4c..2cd7fe89 100644 --- a/src/sdl2/generated/scancode.rs +++ b/src/sdl2/generated/scancode.rs @@ -6,7 +6,7 @@ use std::hash::sip::SipState; use std::num::FromPrimitive; use std::num::ToPrimitive; -#[deriving(Eq)] +#[deriving(Eq, TotalEq)] pub enum ScanCode { UnknownScanCode = 0, AScanCode = 4,