Update for Rustc 1.0.0 beta

This commit is contained in:
Pierre Krieger 2015-04-04 09:06:46 +02:00
parent b5eba32ee5
commit 07b2009dae
8 changed files with 51 additions and 47 deletions

View file

@ -16,7 +16,7 @@ pub struct Buffer<'a, T> {
impl Voice {
pub fn new() -> Voice {
unsafe {
let name = ffi::CString::from_slice(b"default");
let name = ffi::CString::new(b"default".to_vec()).unwrap();
let mut playback_handle = mem::uninitialized();
check_errors(alsa::snd_pcm_open(&mut playback_handle, name.as_ptr(), alsa::SND_PCM_STREAM_PLAYBACK, alsa::SND_PCM_NONBLOCK)).unwrap();
@ -110,8 +110,9 @@ fn check_errors(err: libc::c_int) -> Result<(), String> {
if err < 0 {
unsafe {
let s = String::from_utf8(ffi::c_str_to_bytes(&alsa::snd_strerror(err)).to_vec());
return Err(s.unwrap());
let s = ffi::CStr::from_ptr(alsa::snd_strerror(err)).to_bytes().to_vec();
let s = String::from_utf8(s).unwrap();
return Err(s);
}
}