Merge pull request #63 from pnkfelix/misc-updates-for-newer-rustc

Misc updates for newer rustc

Author: AngryLawyer

src/codegen/branchify.rs

@@ -1,4 +1,4 @@
-#[macro_escape];
+#![macro_escape]
 
 use std::io::BufferedWriter;
 use std::io::{File, Writer};

src/codegen/keycode.rs

@@ -1,5 +1,4 @@
 use std::io::{IoResult,Writer};
-use std::vec::Vec;
 use super::get_writer;
 
 struct Key {

src/codegen/main.rs

@@ -1,5 +1,5 @@
-#[feature(macro_rules)];
-#[crate_id = "codegen#0.1"];
+#![feature(macro_rules)]
+#![crate_id = "codegen#0.1"]
 
 use std::os;
 use std::io::BufferedWriter;

src/codegen/scancode.rs

@@ -1,5 +1,4 @@
 use std::io::{IoResult,Writer};
-use std::vec::Vec;
 use super::get_writer;
 
 struct ScanCode {

src/sdl2/lib.rs

@@ -1,10 +1,10 @@
-#[crate_id="sdl2#0.0.1"];
-#[crate_type = "lib"];
+#![crate_id="sdl2#0.0.1"]
+#![crate_type = "lib"]
 
-#[desc = "SDL2 bindings"];
-#[license = "MIT"];
+#![desc = "SDL2 bindings"]
+#![license = "MIT"]
 
-#[feature(globs)];
+#![feature(globs)]
 
 extern crate collections;
 

src/sdl2/mouse.rs

@@ -71,7 +71,7 @@ pub enum SystemCursor {
     HandCursor = ll::SDL_SYSTEM_CURSOR_HAND,
 }
 
-#[deriving(Eq)]
+#[deriving(Eq)] #[allow(raw_pointer_deriving)] 
 pub struct Cursor {
     raw: *ll::SDL_Cursor,
     owned: bool

src/sdl2/pixels.rs

@@ -87,7 +87,7 @@ pub mod ll {
         pub fn SDL_MapRGBA(format: *SDL_PixelFormat, r: uint8_t, g: uint8_t, b: uint8_t, a: uint8_t) -> uint32_t;
     }
 }
-#[deriving(Eq)]
+#[deriving(Eq)] #[allow(raw_pointer_deriving)]
 pub struct Palette {
     raw: *ll::SDL_Palette
 }
@@ -130,7 +130,7 @@ impl rand::Rand for Color {
     }
 }
 
-#[deriving(Eq)]
+#[deriving(Eq)] #[allow(raw_pointer_deriving)]
 pub struct PixelFormat {
     raw: *ll::SDL_PixelFormat
 }

src/sdl2/render.rs

@@ -214,7 +214,7 @@ enum RendererParent {
     Surface(~surface::Surface),
 }
 
-#[deriving(Eq)]
+#[deriving(Eq)] #[allow(raw_pointer_deriving)]
 pub struct Renderer {
     raw: *ll::SDL_Renderer,
     priv parent: RendererParent,
@@ -522,7 +522,7 @@ pub struct TextureQuery {
     height: int
 }
 
-#[deriving(Eq)]
+#[deriving(Eq)] #[allow(raw_pointer_deriving)]
 pub struct Texture {
     raw: *ll::SDL_Texture,
     owned: bool

src/sdl2/surface.rs

@@ -83,7 +83,7 @@ pub enum SurfaceFlag {
     DontFree = ll::SDL_DONTFREE as int
 }
 
-#[deriving(Eq)]
+#[deriving(Eq)] #[allow(raw_pointer_deriving)]
 pub struct Surface {
     raw: *ll::SDL_Surface,
     owned: bool

src/sdl2/video.rs

@@ -337,7 +337,7 @@ impl Drop for GLContext {
 }
 
 
-#[deriving(Eq)]
+#[deriving(Eq)] #[allow(raw_pointer_deriving)]
 pub struct Window {
     raw: *ll::SDL_Window,
     owned: bool