From 1055eed078f674ad4cc657e99a247310183d635e Mon Sep 17 00:00:00 2001 From: mitchmindtree Date: Sun, 22 Feb 2015 01:17:47 +1100 Subject: Removed as_slice_with_nul as CString now derefs to a CStr --- src/x11/headless.rs | 2 +- src/x11/window/mod.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src/x11') diff --git a/src/x11/headless.rs b/src/x11/headless.rs index a0f0556..ca47414 100644 --- a/src/x11/headless.rs +++ b/src/x11/headless.rs @@ -8,7 +8,7 @@ use super::ffi; fn with_c_str(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 { diff --git a/src/x11/window/mod.rs b/src/x11/window/mod.rs index 0c6da4e..8664b4a 100644 --- a/src/x11/window/mod.rs +++ b/src/x11/window/mod.rs @@ -39,7 +39,7 @@ fn ensure_thread_init() { fn with_c_str(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 { -- cgit v1.2.3