Merge pull request #57 from drbawb/exp/vec_ng-moved

`std::vec_ng` moved to `std::vec` in rust@master

Author: AngryLawyer

src/codegen/branchify.rs

@@ -3,7 +3,7 @@
 use std::io::BufferedWriter;
 use std::io::{File, Writer};
 use std::str::Chars;
-use std::vec_ng::Vec;
+use std::vec::Vec;
 
 struct ParseBranch {
     matches: Vec<u8>,

src/codegen/keycode.rs

@@ -1,6 +1,6 @@
 use std::io::{IoResult,Writer};
+use std::vec::Vec;
 use super::get_writer;
-use std::vec_ng::Vec;
 
 struct Key {
     code: uint,

src/codegen/main.rs

@@ -8,7 +8,7 @@ use std::io;
 use std::io::stdio::println;
 use std::io::fs::mkdir_recursive;
 use std::path::GenericPath;
-use std::vec_ng::Vec;
+use std::vec::Vec;
 pub mod branchify;
 pub mod keycode;
 pub mod scancode;

src/codegen/scancode.rs

@@ -1,6 +1,6 @@
 use std::io::{IoResult,Writer};
+use std::vec::Vec;
 use super::get_writer;
-use std::vec_ng::Vec;
 
 struct ScanCode {
     code: uint,

src/sdl2/event.rs

@@ -2,7 +2,7 @@ use std::cast;
 use std::libc::{c_int, c_void, uint32_t};
 use std::num::FromPrimitive;
 use std::str;
-use std::vec_ng::Vec;
+use std::vec::Vec;
 
 use controller;
 use controller::{ControllerAxis, ControllerButton};

src/sdl2/joystick.rs

@@ -1,4 +1,4 @@
-use std::vec_ng::Vec;
+use std::vec::Vec;
 
 #[allow(non_camel_case_types)]
 pub mod ll {

src/sdl2/keyboard.rs

@@ -2,8 +2,8 @@ use collections::hashmap::HashMap;
 use std::num::FromPrimitive;
 use std::ptr;
 use std::str;
-use std::vec;
-use std::vec_ng::Vec;
+use std::slice;
+use std::vec::Vec;
 
 use keycode::KeyCode;
 use rect::Rect;
@@ -102,7 +102,7 @@ pub fn get_keyboard_state() -> ~HashMap<ScanCode, bool> {
     let mut state: ~HashMap<ScanCode, bool> = ~HashMap::new();
     let count = 0;
 
-    let raw = unsafe { vec::raw::from_buf_raw(ll::SDL_GetKeyboardState(&count),
+    let raw = unsafe { slice::raw::from_buf_raw(ll::SDL_GetKeyboardState(&count),
                                               count as uint) };
 
     let mut current = 0;

src/sdl2/mouse.rs

@@ -1,5 +1,5 @@
 use std::ptr;
-use std::vec_ng::Vec;
+use std::vec::Vec;
 
 use get_error;
 use surface;

src/sdl2/render.rs

@@ -9,7 +9,7 @@ use std::cast;
 use rect::Point;
 use rect::Rect;
 use std::num::FromPrimitive;
-use std::vec_ng::Vec;
+use std::vec::Vec;
 
 #[allow(non_camel_case_types)]
 pub mod ll {

src/sdl2/sdl.rs

@@ -1,6 +1,6 @@
 use std::cast;
 use std::str;
-use std::vec_ng::Vec;
+use std::vec::Vec;
 
 // Setup linking for all targets.
 #[cfg(target_os="macos")]

src/sdl2/video.rs

@@ -2,7 +2,7 @@ use std::libc::{c_int, c_float, uint32_t};
 use std::ptr;
 use std::str;
 use std::cast;
-use std::vec_ng::Vec;
+use std::vec::Vec;
 
 use rect::Rect;
 use surface::Surface;