Removed as_slice_with_nul as CString now derefs to a CStr

This commit is contained in:
mitchmindtree 2015-02-22 01:17:47 +11:00
parent 0389c834e4
commit 1055eed078
5 changed files with 5 additions and 5 deletions

View file

@ -8,7 +8,7 @@ use super::ffi;
fn with_c_str<F, T>(s: &str, f: F) -> T where F: FnOnce(*const libc::c_char) -> T {
use std::ffi::CString;
let c_str = CString::from_slice(s.as_bytes());
f(c_str.as_bytes_with_nul().as_ptr())
f(c_str.as_ptr())
}
pub struct HeadlessContext {

View file

@ -39,7 +39,7 @@ fn ensure_thread_init() {
fn with_c_str<F, T>(s: &str, f: F) -> T where F: FnOnce(*const libc::c_char) -> T {
use std::ffi::CString;
let c_str = CString::from_slice(s.as_bytes());
f(c_str.as_bytes_with_nul().as_ptr())
f(c_str.as_ptr())
}
struct XWindow {