diff --git a/src/codegen/branchify.rs b/src/codegen/branchify.rs index 0300d60c849..225ba180f07 100644 --- a/src/codegen/branchify.rs +++ b/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, diff --git a/src/codegen/keycode.rs b/src/codegen/keycode.rs index d3678a508fc..b0e43b99979 100644 --- a/src/codegen/keycode.rs +++ b/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, diff --git a/src/codegen/main.rs b/src/codegen/main.rs index 9e2211d03f0..14eb52244d4 100644 --- a/src/codegen/main.rs +++ b/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; diff --git a/src/codegen/scancode.rs b/src/codegen/scancode.rs index 2d1060bc16e..3ab96800b31 100644 --- a/src/codegen/scancode.rs +++ b/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, diff --git a/src/sdl2/event.rs b/src/sdl2/event.rs index cc8982af300..2469af25d45 100644 --- a/src/sdl2/event.rs +++ b/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}; diff --git a/src/sdl2/joystick.rs b/src/sdl2/joystick.rs index 82a2299bd2d..477a7137a50 100644 --- a/src/sdl2/joystick.rs +++ b/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 { diff --git a/src/sdl2/keyboard.rs b/src/sdl2/keyboard.rs index 2f5018456b7..a9003288cc3 100644 --- a/src/sdl2/keyboard.rs +++ b/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 { let mut state: ~HashMap = ~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; diff --git a/src/sdl2/mouse.rs b/src/sdl2/mouse.rs index 7661a3c3aa7..b0494921cb6 100644 --- a/src/sdl2/mouse.rs +++ b/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; diff --git a/src/sdl2/render.rs b/src/sdl2/render.rs index b02ad4992ae..4ac4bd83d1a 100644 --- a/src/sdl2/render.rs +++ b/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 { diff --git a/src/sdl2/sdl.rs b/src/sdl2/sdl.rs index 3d564dd5201..54080032005 100644 --- a/src/sdl2/sdl.rs +++ b/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")] diff --git a/src/sdl2/video.rs b/src/sdl2/video.rs index 52f62064a55..ec8d8fcc807 100644 --- a/src/sdl2/video.rs +++ b/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;