From e583f7dd3f4ab511606357ba1c318d034276118d Mon Sep 17 00:00:00 2001
From: Aku Kotkavuo <aku.kotkavuo@gmail.com>
Date: Sat, 3 Jan 2015 14:42:08 +0200
Subject: [PATCH] Change deriving to derive

https://github.com/rust-lang/rust/commit/7506fe52696c5b3b628f173d74dc4a13b5ccc1f3
---
 sdl2-sys/src/controller.rs |  6 +++---
 sdl2-sys/src/event.rs      | 42 +++++++++++++++++++-------------------
 sdl2-sys/src/haptic.rs     | 12 +++++------
 sdl2-sys/src/joystick.rs   |  2 +-
 sdl2-sys/src/keyboard.rs   |  2 +-
 sdl2-sys/src/pixels.rs     |  2 +-
 sdl2-sys/src/rect.rs       |  4 ++--
 sdl2-sys/src/rect_2.rs     |  4 ++--
 sdl2-sys/src/touch.rs      |  2 +-
 sdl2-sys/src/version.rs    |  2 +-
 sdl2-sys/src/video.rs      |  8 ++++----
 src/sdl2/audio.rs          |  8 ++++----
 src/sdl2/controller.rs     |  4 ++--
 src/sdl2/event.rs          |  4 ++--
 src/sdl2/keycode.rs        |  2 +-
 src/sdl2/mouse.rs          |  6 +++---
 src/sdl2/pixels.rs         |  8 ++++----
 src/sdl2/render.rs         | 14 ++++++-------
 src/sdl2/rwops.rs          |  2 +-
 src/sdl2/scancode.rs       |  2 +-
 src/sdl2/sdl.rs            |  2 +-
 src/sdl2/surface.rs        |  2 +-
 src/sdl2/version.rs        |  2 +-
 src/sdl2/video.rs          | 14 ++++++-------
 24 files changed, 78 insertions(+), 78 deletions(-)

diff --git a/sdl2-sys/src/controller.rs b/sdl2-sys/src/controller.rs
index 6e310631..8a302da7 100644
--- a/sdl2-sys/src/controller.rs
+++ b/sdl2-sys/src/controller.rs
@@ -12,7 +12,7 @@ pub const SDL_CONTROLLER_BINDTYPE_AXIS: SDL_GameControllerBindType = 2;
 pub const SDL_CONTROLLER_BINDTYPE_HAT: SDL_GameControllerBindType = 3;
 
 #[allow(dead_code, non_snake_case)]
-#[deriving(Copy, Clone)]
+#[derive(Copy, Clone)]
 #[repr(C)]
 pub struct SDL_GameControllerButtonBind {
     bindType: SDL_GameControllerBindType,
@@ -20,14 +20,14 @@ pub struct SDL_GameControllerButtonBind {
 }
 
 #[allow(dead_code)]
-#[deriving(Copy, Clone)]
+#[derive(Copy, Clone)]
 #[repr(C)]
 pub struct SDL_GameControllerButtonBindData {
     data: [c_uchar, ..8u],
 }
 
 #[allow(dead_code)]
-#[deriving(Copy, Clone)]
+#[derive(Copy, Clone)]
 pub struct SDL_GameControllerButtonBindDataHat {
     hat: c_int,
     hat_mask: c_int,
diff --git a/sdl2-sys/src/event.rs b/sdl2-sys/src/event.rs
index cb9ed725..e4f11ffd 100644
--- a/sdl2-sys/src/event.rs
+++ b/sdl2-sys/src/event.rs
@@ -60,14 +60,14 @@ pub const SDL_DROPFILE: SDL_EventType = 4096;
 pub const SDL_USEREVENT: SDL_EventType = 32768;
 pub const SDL_LASTEVENT: SDL_EventType = 65535;
 
-#[deriving(Copy, Clone)]
+#[derive(Copy, Clone)]
 #[repr(C)]
 pub struct SDL_CommonEvent {
     pub _type: uint32_t,
     pub timestamp: uint32_t,
 }
 
-#[deriving(Copy, Clone)]
+#[derive(Copy, Clone)]
 #[repr(C)]
 pub struct SDL_WindowEvent {
     pub _type: uint32_t,
@@ -81,7 +81,7 @@ pub struct SDL_WindowEvent {
     pub data2: int32_t,
 }
 
-#[deriving(Copy, Clone)]
+#[derive(Copy, Clone)]
 #[repr(C)]
 pub struct SDL_KeyboardEvent {
     pub _type: uint32_t,
@@ -94,7 +94,7 @@ pub struct SDL_KeyboardEvent {
     pub keysym: SDL_Keysym,
 }
 
-#[deriving(Copy, Clone)]
+#[derive(Copy, Clone)]
 #[repr(C)]
 pub struct SDL_TextEditingEvent {
     pub _type: uint32_t,
@@ -105,7 +105,7 @@ pub struct SDL_TextEditingEvent {
     pub length: int32_t,
 }
 
-#[deriving(Copy, Clone)]
+#[derive(Copy, Clone)]
 #[repr(C)]
 pub struct SDL_TextInputEvent {
     pub _type: uint32_t,
@@ -114,7 +114,7 @@ pub struct SDL_TextInputEvent {
     pub text: [c_char, ..32u],
 }
 
-#[deriving(Copy, Clone)]
+#[derive(Copy, Clone)]
 #[repr(C)]
 pub struct SDL_MouseMotionEvent {
     pub _type: uint32_t,
@@ -128,7 +128,7 @@ pub struct SDL_MouseMotionEvent {
     pub yrel: int32_t,
 }
 
-#[deriving(Copy, Clone)]
+#[derive(Copy, Clone)]
 #[repr(C)]
 pub struct SDL_MouseButtonEvent {
     pub _type: uint32_t,
@@ -143,7 +143,7 @@ pub struct SDL_MouseButtonEvent {
     pub y: int32_t,
 }
 
-#[deriving(Copy, Clone)]
+#[derive(Copy, Clone)]
 #[repr(C)]
 pub struct SDL_MouseWheelEvent {
     pub _type: uint32_t,
@@ -154,7 +154,7 @@ pub struct SDL_MouseWheelEvent {
     pub y: int32_t,
 }
 
-#[deriving(Copy, Clone)]
+#[derive(Copy, Clone)]
 #[repr(C)]
 pub struct SDL_JoyAxisEvent {
     pub _type: uint32_t,
@@ -168,7 +168,7 @@ pub struct SDL_JoyAxisEvent {
     pub padding4: uint16_t,
 }
 
-#[deriving(Copy, Clone)]
+#[derive(Copy, Clone)]
 #[repr(C)]
 pub struct SDL_JoyBallEvent {
     pub _type: uint32_t,
@@ -182,7 +182,7 @@ pub struct SDL_JoyBallEvent {
     pub yrel: int16_t,
 }
 
-#[deriving(Copy, Clone)]
+#[derive(Copy, Clone)]
 #[repr(C)]
 pub struct SDL_JoyHatEvent {
     pub _type: uint32_t,
@@ -194,7 +194,7 @@ pub struct SDL_JoyHatEvent {
     pub padding2: uint8_t,
 }
 
-#[deriving(Copy, Clone)]
+#[derive(Copy, Clone)]
 #[repr(C)]
 pub struct SDL_JoyButtonEvent {
     pub _type: uint32_t,
@@ -206,7 +206,7 @@ pub struct SDL_JoyButtonEvent {
     pub padding2: uint8_t,
 }
 
-#[deriving(Copy, Clone)]
+#[derive(Copy, Clone)]
 #[repr(C)]
 pub struct SDL_JoyDeviceEvent {
     pub _type: uint32_t,
@@ -214,7 +214,7 @@ pub struct SDL_JoyDeviceEvent {
     pub which: int32_t,
 }
 
-#[deriving(Copy, Clone)]
+#[derive(Copy, Clone)]
 #[repr(C)]
 pub struct SDL_ControllerAxisEvent {
     pub _type: uint32_t,
@@ -228,7 +228,7 @@ pub struct SDL_ControllerAxisEvent {
     pub padding4: uint16_t,
 }
 
-#[deriving(Copy, Clone)]
+#[derive(Copy, Clone)]
 #[repr(C)]
 pub struct SDL_ControllerButtonEvent {
     pub _type: uint32_t,
@@ -240,7 +240,7 @@ pub struct SDL_ControllerButtonEvent {
     pub padding2: uint8_t,
 }
 
-#[deriving(Copy, Clone)]
+#[derive(Copy, Clone)]
 #[repr(C)]
 pub struct SDL_ControllerDeviceEvent {
     pub _type: uint32_t,
@@ -248,7 +248,7 @@ pub struct SDL_ControllerDeviceEvent {
     pub which: int32_t,
 }
 
-#[deriving(Copy, Clone)]
+#[derive(Copy, Clone)]
 #[repr(C)]
 pub struct SDL_TouchFingerEvent {
     pub _type: uint32_t,
@@ -262,7 +262,7 @@ pub struct SDL_TouchFingerEvent {
     pub pressure: c_float,
 }
 
-#[deriving(Copy, Clone)]
+#[derive(Copy, Clone)]
 #[repr(C)]
 pub struct SDL_MultiGestureEvent {
     pub _type: uint32_t,
@@ -276,7 +276,7 @@ pub struct SDL_MultiGestureEvent {
     pub padding: uint16_t,
 }
 
-#[deriving(Copy, Clone)]
+#[derive(Copy, Clone)]
 #[repr(C)]
 pub struct SDL_DollarGestureEvent {
     pub _type: uint32_t,
@@ -297,14 +297,14 @@ pub struct SDL_DropEvent {
     pub file: *const c_char,
 }
 
-#[deriving(Copy, Clone)]
+#[derive(Copy, Clone)]
 #[repr(C)]
 pub struct SDL_QuitEvent {
     pub _type: uint32_t,
     pub timestamp: uint32_t,
 }
 
-#[deriving(Copy, Clone)]
+#[derive(Copy, Clone)]
 #[repr(C)]
 pub struct SDL_OSEvent {
     pub _type: uint32_t,
diff --git a/sdl2-sys/src/haptic.rs b/sdl2-sys/src/haptic.rs
index 8130a68e..ac47657d 100644
--- a/sdl2-sys/src/haptic.rs
+++ b/sdl2-sys/src/haptic.rs
@@ -20,14 +20,14 @@ pub const SDL_HAPTIC_PAUSE: uint16_t = 1 << 15;
 
 pub type SDL_Haptic = c_void;
 
-#[deriving(Copy, Clone)]
+#[derive(Copy, Clone)]
 #[repr(C)]
 pub struct SDL_HapticDirection {
     pub _type: uint8_t,
     pub dir: [int32_t, ..3],
 }
 
-#[deriving(Copy, Clone)]
+#[derive(Copy, Clone)]
 #[repr(C)]
 pub struct SDL_HapticConstant {
     pub _type: uint16_t,
@@ -43,7 +43,7 @@ pub struct SDL_HapticConstant {
     pub fade_level: uint16_t,
 }
 
-#[deriving(Copy, Clone)]
+#[derive(Copy, Clone)]
 #[repr(C)]
 pub struct SDL_HapticPeriodic {
     pub _type: uint16_t,
@@ -62,7 +62,7 @@ pub struct SDL_HapticPeriodic {
     pub fade_level: uint16_t,
 }
 
-#[deriving(Copy, Clone)]
+#[derive(Copy, Clone)]
 #[repr(C)]
 pub struct SDL_HapticCondition {
     pub _type: uint16_t,
@@ -79,7 +79,7 @@ pub struct SDL_HapticCondition {
     pub center: [int16_t, ..3],
 }
 
-#[deriving(Copy, Clone)]
+#[derive(Copy, Clone)]
 #[repr(C)]
 pub struct SDL_HapticRamp {
     pub _type: uint16_t,
@@ -95,7 +95,7 @@ pub struct SDL_HapticRamp {
     pub fade_level: uint16_t,
 }
 
-#[deriving(Copy, Clone)]
+#[derive(Copy, Clone)]
 #[repr(C)]
 pub struct SDL_HapticLeftRight {
     pub _type: uint16_t,
diff --git a/sdl2-sys/src/joystick.rs b/sdl2-sys/src/joystick.rs
index 7b9f185c..e16689f3 100644
--- a/sdl2-sys/src/joystick.rs
+++ b/sdl2-sys/src/joystick.rs
@@ -5,7 +5,7 @@ pub type SDL_bool = c_int;
 pub type SDL_Joystick = c_void;
 
 #[allow(dead_code)]
-#[deriving(Copy, Clone)]
+#[derive(Copy, Clone)]
 #[repr(C)]
 pub struct SDL_JoystickGUID {
     pub data: [uint8_t, ..16u],
diff --git a/sdl2-sys/src/keyboard.rs b/sdl2-sys/src/keyboard.rs
index 2412c74d..405afaa7 100644
--- a/sdl2-sys/src/keyboard.rs
+++ b/sdl2-sys/src/keyboard.rs
@@ -10,7 +10,7 @@ pub type SDL_Keymod = c_uint;
 pub type SDL_Scancode = c_uint;
 
 // SDL_keyboard.h
-#[deriving(Copy, Clone)]
+#[derive(Copy, Clone)]
 pub struct SDL_Keysym {
     pub scancode: SDL_Scancode,
     pub sym: SDL_Keycode,
diff --git a/sdl2-sys/src/pixels.rs b/sdl2-sys/src/pixels.rs
index cd320272..7732ced6 100644
--- a/sdl2-sys/src/pixels.rs
+++ b/sdl2-sys/src/pixels.rs
@@ -1,7 +1,7 @@
 use libc::{c_int, uint8_t, uint32_t};
 
 //SDL_pixels.h
-#[deriving(Copy, Clone)]
+#[derive(Copy, Clone)]
 #[repr(C)]
 pub struct SDL_Color {
     pub r: uint8_t,
diff --git a/sdl2-sys/src/rect.rs b/sdl2-sys/src/rect.rs
index d1ffaa48..7fa74cd0 100644
--- a/sdl2-sys/src/rect.rs
+++ b/sdl2-sys/src/rect.rs
@@ -6,7 +6,7 @@ use std::mem;
 use libc::c_int;
 
 /// A structure that defines a two dimensional point.
-#[deriving(PartialEq, Clone, Show, Copy)]
+#[derive(PartialEq, Clone, Show, Copy)]
 #[repr(C)]
 pub struct Point {
     pub x: i32,
@@ -14,7 +14,7 @@ pub struct Point {
 }
 
 /// A structure that defines a rectangle, with the origin at the upper left.
-#[deriving(PartialEq, Clone, Show, Copy)]
+#[derive(PartialEq, Clone, Show, Copy)]
 #[repr(C)]
 pub struct Rect {
     pub x: i32,
diff --git a/sdl2-sys/src/rect_2.rs b/sdl2-sys/src/rect_2.rs
index 80565d39..1baa83e5 100644
--- a/sdl2-sys/src/rect_2.rs
+++ b/sdl2-sys/src/rect_2.rs
@@ -1,7 +1,7 @@
 use libc::c_int;
 
 /// A structure that defines a two dimensional point.
-#[deriving(PartialEq, Clone, Show, Copy)]
+#[derive(PartialEq, Clone, Show, Copy)]
 #[repr(C)]
 pub struct SDL_Point {
     pub x: i32,
@@ -9,7 +9,7 @@ pub struct SDL_Point {
 }
 
 /// A structure that defines a rectangle, with the origin at the upper left.
-#[deriving(PartialEq, Clone, Show, Copy)]
+#[derive(PartialEq, Clone, Show, Copy)]
 #[repr(C)]
 pub struct SDL_Rect {
     pub x: i32,
diff --git a/sdl2-sys/src/touch.rs b/sdl2-sys/src/touch.rs
index 2a5b26b7..070dd84c 100644
--- a/sdl2-sys/src/touch.rs
+++ b/sdl2-sys/src/touch.rs
@@ -5,7 +5,7 @@ pub type SDL_FingerID = int64_t;
 pub type SDL_Finger = Finger;
 pub type TouchDevice = SDL_TouchID;
 
-#[deriving(PartialEq, Copy)]
+#[derive(PartialEq, Copy)]
 #[repr(C)]
 pub struct Finger {
     id: TouchDevice,
diff --git a/sdl2-sys/src/version.rs b/sdl2-sys/src/version.rs
index ef7672ed..efd5c86e 100644
--- a/sdl2-sys/src/version.rs
+++ b/sdl2-sys/src/version.rs
@@ -2,7 +2,7 @@
 
 use libc::{uint8_t, c_char, c_int};
 
-#[deriving(Copy, Clone)]
+#[derive(Copy, Clone)]
 #[repr(C)]
 pub struct SDL_version {
     pub major: uint8_t,
diff --git a/sdl2-sys/src/video.rs b/sdl2-sys/src/video.rs
index 5120028a..095d30e6 100644
--- a/sdl2-sys/src/video.rs
+++ b/sdl2-sys/src/video.rs
@@ -25,7 +25,7 @@ pub type SDL_WindowPos = c_int;
 pub const SDL_WINDOWPOS_CENTERED: SDL_WindowPos = 0x2FFF0000;
 pub const SDL_WINDOWPOS_UNDEFINED: SDL_WindowPos = 0x1FFF0000;
 
-#[deriving(Copy, Clone)]
+#[derive(Copy, Clone)]
 pub enum SDL_WindowFlags {
     SDL_WINDOW_FULLSCREEN = 0x00000001,
     SDL_WINDOW_OPENGL = 0x00000002,
@@ -43,7 +43,7 @@ pub enum SDL_WindowFlags {
     SDL_WINDOW_ALLOW_HIGHDPI = 0x00002000
 }
 
-#[deriving(Copy, Clone)]
+#[derive(Copy, Clone)]
 pub enum SDL_WindowEventID {
     SDL_WINDOWEVENT_NONE,
     SDL_WINDOWEVENT_SHOWN,
@@ -64,7 +64,7 @@ pub enum SDL_WindowEventID {
 
 pub type SDL_GLContext = *const c_void;
 
-#[deriving(Copy, Clone, FromPrimitive)]
+#[derive(Copy, Clone, FromPrimitive)]
 #[repr(C)]
 pub enum SDL_GLattr {
     SDL_GL_RED_SIZE = 0,
@@ -93,7 +93,7 @@ pub enum SDL_GLattr {
     SDL_GL_FRAMEBUFFER_SRGB_CAPABLE = 23
 }
 
-#[deriving(Copy, Clone)]
+#[derive(Copy, Clone)]
 pub enum SDL_GLprofile {
     SDL_GL_CONTEXT_PROFILE_CORE = 0x0001,
     SDL_GL_CONTEXT_PROFILE_COMPATIBILITY = 0x0002,
diff --git a/src/sdl2/audio.rs b/src/sdl2/audio.rs
index 06c48444..0f9d8cbd 100644
--- a/src/sdl2/audio.rs
+++ b/src/sdl2/audio.rs
@@ -37,7 +37,7 @@ pub const AUDIOS32SYS : AudioFormat = ll::AUDIO_S32SYS;
 pub const AUDIOF32SYS : AudioFormat = ll::AUDIO_F32SYS;
 
 #[repr(C)]
-#[deriving(Copy, Clone, PartialEq, Hash, Show, FromPrimitive)]
+#[derive(Copy, Clone, PartialEq, Hash, Show, FromPrimitive)]
 pub enum AudioStatus {
     Stopped = ll::SDL_AUDIO_STOPPED as int,
     Playing = ll::SDL_AUDIO_PLAYING as int,
@@ -88,7 +88,7 @@ pub fn get_current_audio_driver() -> String {
     }
 }
 
-#[deriving(Copy, Clone, Show)]
+#[derive(Copy, Clone, Show)]
 pub struct AudioSpecWAV {
     pub freq: i32,
     // TODO: Showing format should be prettier
@@ -278,7 +278,7 @@ impl<T: AudioFormatNum<T>, CB: AudioCallback<T>> AudioSpecDesired<T, CB> {
 }
 
 #[allow(missing_copy_implementations)]
-#[deriving(Show)]
+#[derive(Show)]
 pub struct AudioSpec {
     pub freq: i32,
     // TODO: Showing format should be prettier
@@ -395,7 +395,7 @@ impl<'a, CB> Drop for AudioDeviceLockGuard<'a, CB> {
     }
 }
 
-#[deriving(PartialEq)] #[allow(raw_pointer_deriving)]
+#[derive(PartialEq)] #[allow(raw_pointer_deriving)]
 pub struct AudioCVT {
     raw: *mut ll::SDL_AudioCVT,
     owned: bool,
diff --git a/src/sdl2/controller.rs b/src/sdl2/controller.rs
index b9205979..fc6dbeee 100644
--- a/src/sdl2/controller.rs
+++ b/src/sdl2/controller.rs
@@ -2,7 +2,7 @@ use libc::c_int;
 
 pub use sys::controller as ll;
 
-#[deriving(Copy, Clone, PartialEq)]
+#[derive(Copy, Clone, PartialEq)]
 #[repr(i32)]
 pub enum ControllerAxis {
     Invalid      = ll::SDL_CONTROLLER_AXIS_INVALID,
@@ -26,7 +26,7 @@ pub fn wrap_controller_axis(bitflags: u8) -> ControllerAxis {
     }
 }
 
-#[deriving(Copy, Clone, PartialEq)]
+#[derive(Copy, Clone, PartialEq)]
 #[repr(i32)]
 pub enum ControllerButton {
     Invalid       = ll::SDL_CONTROLLER_BUTTON_INVALID,
diff --git a/src/sdl2/event.rs b/src/sdl2/event.rs
index 5dabd0f6..d1bf6e2a 100644
--- a/src/sdl2/event.rs
+++ b/src/sdl2/event.rs
@@ -26,7 +26,7 @@ use SdlResult;
 pub use sys::event as ll;
 
 /// Types of events that can be delivered.
-#[deriving(Copy, Clone, FromPrimitive)]
+#[derive(Copy, Clone, FromPrimitive)]
 #[repr(u32)]
 pub enum EventType {
     First = ll::SDL_FIRSTEVENT,
@@ -81,7 +81,7 @@ pub enum EventType {
     Last = ll::SDL_LASTEVENT,
 }
 
-#[deriving(Copy, Clone, Show)]
+#[derive(Copy, Clone, Show)]
 /// An enum of window events.
 pub enum WindowEventId {
     None,
diff --git a/src/sdl2/keycode.rs b/src/sdl2/keycode.rs
index 0763db9d..155e1100 100644
--- a/src/sdl2/keycode.rs
+++ b/src/sdl2/keycode.rs
@@ -1,6 +1,6 @@
 use std::hash::{mod, Hash};
 
-#[deriving(PartialEq, Eq, FromPrimitive, Show, Copy)]
+#[derive(PartialEq, Eq, FromPrimitive, Show, Copy)]
 pub enum KeyCode {
     Unknown            = 0,
     Backspace          = 8,
diff --git a/src/sdl2/mouse.rs b/src/sdl2/mouse.rs
index 0c6129f5..712defeb 100644
--- a/src/sdl2/mouse.rs
+++ b/src/sdl2/mouse.rs
@@ -7,7 +7,7 @@ use video;
 
 pub use sys::mouse as ll;
 
-#[deriving(Copy, Clone, PartialEq)]
+#[derive(Copy, Clone, PartialEq)]
 #[repr(u32)]
 pub enum SystemCursor {
     Arrow = ll::SDL_SYSTEM_CURSOR_ARROW,
@@ -24,7 +24,7 @@ pub enum SystemCursor {
     Hand = ll::SDL_SYSTEM_CURSOR_HAND,
 }
 
-#[deriving(PartialEq)] #[allow(raw_pointer_deriving)]
+#[derive(PartialEq)] #[allow(raw_pointer_deriving)]
 pub struct Cursor {
     raw: *const ll::SDL_Cursor,
     owned: bool
@@ -87,7 +87,7 @@ impl Cursor {
     }
 }
 
-#[deriving(Copy, Clone, PartialEq)]
+#[derive(Copy, Clone, PartialEq)]
 pub enum Mouse {
     Left,
     Middle,
diff --git a/src/sdl2/pixels.rs b/src/sdl2/pixels.rs
index 4d195ae1..8bd1519f 100644
--- a/src/sdl2/pixels.rs
+++ b/src/sdl2/pixels.rs
@@ -2,14 +2,14 @@ extern crate rand;
 
 pub use sys::pixels as ll;
 
-#[deriving(PartialEq)] #[allow(raw_pointer_deriving, missing_copy_implementations)]
+#[derive(PartialEq)] #[allow(raw_pointer_deriving, missing_copy_implementations)]
 pub struct Palette {
     raw: *const ll::SDL_Palette
 }
 
 impl_raw_accessors!(Palette, *const ll::SDL_Palette);
 
-#[deriving(PartialEq, Clone, Copy)]
+#[derive(PartialEq, Clone, Copy)]
 pub enum Color {
     RGB(u8, u8, u8),
     RGBA(u8, u8, u8, u8)
@@ -54,7 +54,7 @@ impl rand::Rand for Color {
     }
 }
 
-#[deriving(PartialEq)] #[allow(raw_pointer_deriving, missing_copy_implementations)]
+#[derive(PartialEq)] #[allow(raw_pointer_deriving, missing_copy_implementations)]
 pub struct PixelFormat {
     raw: *const ll::SDL_PixelFormat
 }
@@ -62,7 +62,7 @@ pub struct PixelFormat {
 impl_raw_accessors!(PixelFormat, *const ll::SDL_PixelFormat);
 impl_raw_constructor!(PixelFormat -> PixelFormat (raw: *const ll::SDL_PixelFormat));
 
-#[deriving(Copy, Clone, PartialEq, Show, FromPrimitive)]
+#[derive(Copy, Clone, PartialEq, Show, FromPrimitive)]
 pub enum PixelFormatFlag {
     Unknown = ll::SDL_PIXELFORMAT_UNKNOWN as int,
     Index1LSB = ll::SDL_PIXELFORMAT_INDEX1LSB as int,
diff --git a/src/sdl2/render.rs b/src/sdl2/render.rs
index dedad6a4..cc066029 100644
--- a/src/sdl2/render.rs
+++ b/src/sdl2/render.rs
@@ -17,13 +17,13 @@ use std::borrow::ToOwned;
 
 pub use sys::render as ll;
 
-#[deriving(Copy, Clone)]
+#[derive(Copy, Clone)]
 pub enum RenderDriverIndex {
     Auto,
     Index(int)
 }
 
-#[deriving(Copy, Clone, PartialEq, FromPrimitive)]
+#[derive(Copy, Clone, PartialEq, FromPrimitive)]
 pub enum TextureAccess {
     Static = ll::SDL_TEXTUREACCESS_STATIC as int,
     Streaming = ll::SDL_TEXTUREACCESS_STREAMING as int,
@@ -39,7 +39,7 @@ bitflags! {
     }
 }
 
-#[deriving(PartialEq)]
+#[derive(PartialEq)]
 pub struct RendererInfo {
     pub name: String,
     pub flags: RendererFlags,
@@ -48,7 +48,7 @@ pub struct RendererInfo {
     pub max_texture_height: int
 }
 
-#[deriving(Copy, Clone, PartialEq, FromPrimitive)]
+#[derive(Copy, Clone, PartialEq, FromPrimitive)]
 pub enum BlendMode {
     None = ll::SDL_BLENDMODE_NONE as int,
     Blend = ll::SDL_BLENDMODE_BLEND as int,
@@ -56,7 +56,7 @@ pub enum BlendMode {
     Mod = ll::SDL_BLENDMODE_MOD as int
 }
 
-#[deriving(Copy, Clone, PartialEq)]
+#[derive(Copy, Clone, PartialEq)]
 pub enum RendererFlip {
     None = ll::SDL_FLIP_NONE as int,
     Horizontal = ll::SDL_FLIP_HORIZONTAL as int,
@@ -482,7 +482,7 @@ impl Renderer {
 }
 
 
-#[deriving(Copy, Clone)]
+#[derive(Copy, Clone)]
 pub struct TextureQuery {
     pub format: pixels::PixelFormatFlag,
     pub access: TextureAccess,
@@ -490,7 +490,7 @@ pub struct TextureQuery {
     pub height: int
 }
 
-#[deriving(PartialEq)] #[allow(raw_pointer_deriving)]
+#[derive(PartialEq)] #[allow(raw_pointer_deriving)]
 pub struct Texture {
     pub raw: *const ll::SDL_Texture,
     pub owned: bool
diff --git a/src/sdl2/rwops.rs b/src/sdl2/rwops.rs
index 5899b124..2a6a07c2 100644
--- a/src/sdl2/rwops.rs
+++ b/src/sdl2/rwops.rs
@@ -6,7 +6,7 @@ use SdlResult;
 
 pub use sys::rwops as ll;
 
-#[deriving(PartialEq)] #[allow(raw_pointer_deriving)]
+#[derive(PartialEq)] #[allow(raw_pointer_deriving)]
 pub struct RWops {
     raw: *const ll::SDL_RWops,
     close_on_drop: bool
diff --git a/src/sdl2/scancode.rs b/src/sdl2/scancode.rs
index fa9f2db0..1e7889f3 100644
--- a/src/sdl2/scancode.rs
+++ b/src/sdl2/scancode.rs
@@ -1,6 +1,6 @@
 use std::hash::{mod, Hash};
 
-#[deriving(PartialEq, Eq, FromPrimitive, Show, Copy)]
+#[derive(PartialEq, Eq, FromPrimitive, Show, Copy)]
 pub enum ScanCode {
     Unknown            = 0,
     A                  = 4,
diff --git a/src/sdl2/sdl.rs b/src/sdl2/sdl.rs
index be1a5ef2..2ac79c2b 100644
--- a/src/sdl2/sdl.rs
+++ b/src/sdl2/sdl.rs
@@ -17,7 +17,7 @@ bitflags! {
     }
 }
 
-#[deriving(Copy, Clone, PartialEq)]
+#[derive(Copy, Clone, PartialEq)]
 pub enum Error {
     NoMemError = ll::SDL_ENOMEM as int,
     ReadError = ll::SDL_EFREAD as int,
diff --git a/src/sdl2/surface.rs b/src/sdl2/surface.rs
index 7eb05ee1..7b5ffab1 100644
--- a/src/sdl2/surface.rs
+++ b/src/sdl2/surface.rs
@@ -19,7 +19,7 @@ bitflags! {
     }
 }
 
-#[deriving(PartialEq)]
+#[derive(PartialEq)]
 #[allow(raw_pointer_deriving, missing_copy_implementations)]
 pub struct Surface {
     raw: *const ll::SDL_Surface,
diff --git a/src/sdl2/version.rs b/src/sdl2/version.rs
index 47053d1d..73171c40 100644
--- a/src/sdl2/version.rs
+++ b/src/sdl2/version.rs
@@ -9,7 +9,7 @@ use std::borrow::ToOwned;
 pub use sys::version as ll;
 
 /// A structure that contains information about the version of SDL in use.
-#[deriving(PartialEq, Copy, Clone)]
+#[derive(PartialEq, Copy, Clone)]
 pub struct Version {
     /// major version
     pub major: int,
diff --git a/src/sdl2/video.rs b/src/sdl2/video.rs
index 7562ed21..bd757437 100644
--- a/src/sdl2/video.rs
+++ b/src/sdl2/video.rs
@@ -12,7 +12,7 @@ use get_error;
 
 pub use sys::video as ll;
 
-#[deriving(Copy, Clone, PartialEq)]
+#[derive(Copy, Clone, PartialEq)]
 pub enum GLAttr {
     GLRedSize = 0,
     GLGreenSize = 1,
@@ -40,7 +40,7 @@ pub enum GLAttr {
     GLFramebufferSRGBCapable = 23,
 }
 
-#[deriving(Copy, Clone, PartialEq)]
+#[derive(Copy, Clone, PartialEq)]
 pub enum GLProfile {
   GLCoreProfile = 0x0001,
   GLCompatibilityProfile = 0x0002,
@@ -59,7 +59,7 @@ fn empty_sdl_display_mode() -> ll::SDL_DisplayMode {
 }
 
 #[allow(missing_copy_implementations)]
-#[deriving(Clone, PartialEq)]
+#[derive(Clone, PartialEq)]
 pub struct DisplayMode {
     pub format: u32,
     pub w: int,
@@ -117,14 +117,14 @@ bitflags! {
     }
 }
 
-#[deriving(Copy, Clone, PartialEq)]
+#[derive(Copy, Clone, PartialEq)]
 pub enum FullscreenType {
     FTOff = 0,
     FTTrue = 0x00000001,
     FTDesktop = 0x00001001,
 }
 
-#[deriving(PartialEq, Copy)]
+#[derive(PartialEq, Copy)]
 pub enum WindowPos {
     PosUndefined,
     PosCentered,
@@ -139,7 +139,7 @@ fn unwrap_windowpos (pos: WindowPos) -> ll::SDL_WindowPos {
     }
 }
 
-#[deriving(PartialEq)]
+#[derive(PartialEq)]
 pub struct GLContext {
     raw: ll::SDL_GLContext,
     owned: bool
@@ -155,7 +155,7 @@ impl Drop for GLContext {
     }
 }
 
-#[deriving(PartialEq)]
+#[derive(PartialEq)]
 #[allow(raw_pointer_deriving)]
 pub struct Window {
     raw: *const ll::SDL_Window,