diff --git a/src/sdl2/audio.rs b/src/sdl2/audio.rs index 0569c4698b7..3ff53241057 100644 --- a/src/sdl2/audio.rs +++ b/src/sdl2/audio.rs @@ -1,7 +1,7 @@ //! Audio Functions use std::ptr; use std::mem; -use std::c_str::{CString, ToCStr}; +use std::ffi::CString; use std::c_vec::CVec; use std::borrow::ToOwned; use std::num::FromPrimitive; @@ -216,9 +216,9 @@ impl, CB: AudioCallback> AudioSpecDesired { samples: 0, padding: 0, size: 0, - callback: Some(audio_callback_marshall:: + callback: Some(audio_callback_marshall:: as extern "C" fn - (arg1: *const c_void, + (arg1: *const c_void, arg2: *const uint8_t, arg3: c_int)), userdata: transmute(userdata) @@ -237,7 +237,6 @@ impl, CB: AudioCallback> AudioSpecDesired { pub fn open_audio_device(self, device: Option<&str>, iscapture: bool) -> SdlResult> { use std::mem::uninitialized; use std::ptr::null; - use std::c_str::CString; use libc::c_char; let mut userdata = AudioSpecDesired::callback_to_userdata(self.callback); diff --git a/src/sdl2/clipboard.rs b/src/sdl2/clipboard.rs index 46500310186..e9b0a9e2d38 100644 --- a/src/sdl2/clipboard.rs +++ b/src/sdl2/clipboard.rs @@ -1,6 +1,5 @@ use SdlResult; use get_error; -use std::c_str::ToCStr; pub use sys::clipboard as ll; diff --git a/src/sdl2/filesystem.rs b/src/sdl2/filesystem.rs index 70b120b758d..61218cf1879 100644 --- a/src/sdl2/filesystem.rs +++ b/src/sdl2/filesystem.rs @@ -1,5 +1,3 @@ -use std::c_str::ToCStr; - use SdlResult; use get_error; diff --git a/src/sdl2/keyboard.rs b/src/sdl2/keyboard.rs index 91d7a888067..e9b968f7d80 100644 --- a/src/sdl2/keyboard.rs +++ b/src/sdl2/keyboard.rs @@ -1,7 +1,6 @@ use std::collections::HashMap; use std::num::FromPrimitive; use std::ptr; -use std::c_str::ToCStr; use keycode::KeyCode; use rect::Rect; diff --git a/src/sdl2/messagebox.rs b/src/sdl2/messagebox.rs index c73d3f0ec03..0c7afb1e187 100644 --- a/src/sdl2/messagebox.rs +++ b/src/sdl2/messagebox.rs @@ -1,5 +1,4 @@ use std::ptr; -use std::c_str::ToCStr; use video::Window; use get_error; diff --git a/src/sdl2/rwops.rs b/src/sdl2/rwops.rs index 35b3f295dc2..2a6a07c25c2 100644 --- a/src/sdl2/rwops.rs +++ b/src/sdl2/rwops.rs @@ -1,6 +1,5 @@ use std::io; use std::io::IoResult; -use std::c_str::ToCStr; use libc::{c_void, c_int, size_t}; use get_error; use SdlResult; diff --git a/src/sdl2/sdl.rs b/src/sdl2/sdl.rs index d2e71c17f4f..17ffefbdc8d 100644 --- a/src/sdl2/sdl.rs +++ b/src/sdl2/sdl.rs @@ -1,4 +1,4 @@ -use std::c_str::{CString, ToCStr}; +use std::ffi::CString; use std::borrow::ToOwned; use sys::sdl as ll; diff --git a/src/sdl2/version.rs b/src/sdl2/version.rs index 73171c400ec..5fe217d4b98 100644 --- a/src/sdl2/version.rs +++ b/src/sdl2/version.rs @@ -3,7 +3,7 @@ Querying SDL Version */ use std::fmt; -use std::c_str::CString; +use std::ffi::CString; use std::borrow::ToOwned; pub use sys::version as ll; diff --git a/src/sdl2/video.rs b/src/sdl2/video.rs index 573b19023b2..2a1fd5bb6b6 100644 --- a/src/sdl2/video.rs +++ b/src/sdl2/video.rs @@ -1,7 +1,6 @@ use libc::{c_int, c_float, uint32_t}; use std::ptr; use std::vec::Vec; -use std::c_str::ToCStr; use rect::Rect; use surface::Surface;