summaryrefslogtreecommitdiffstats
path: root/safe_libc/src
diff options
context:
space:
mode:
Diffstat (limited to 'safe_libc/src')
-rw-r--r--safe_libc/src/boxed.rs44
-rw-r--r--safe_libc/src/stdio.rs2
-rw-r--r--safe_libc/src/string.rs12
3 files changed, 43 insertions, 15 deletions
diff --git a/safe_libc/src/boxed.rs b/safe_libc/src/boxed.rs
index 72c961c..625c5b0 100644
--- a/safe_libc/src/boxed.rs
+++ b/safe_libc/src/boxed.rs
@@ -1,6 +1,6 @@
use crate::util;
-use core::{mem, ptr};
+use core::{fmt, mem, ptr};
use core::ops::{Deref, DerefMut};
fn alloc<T>(len: usize) -> *mut T {
@@ -11,26 +11,26 @@ fn alloc<T>(len: usize) -> *mut T {
let align = mem::align_of::<T>();
util::must_succeed(
unsafe {
- libc::memalign(align as libc::size_t, size as libc::size_t) as *mut T
+ libc::memalign(align as libc::size_t, size as libc::size_t)
}
- )
+ ).cast()
}
#[inline]
-fn dangling<T>() -> *mut T {
+const fn dangling<T>() -> *mut T {
mem::align_of::<T>() as *mut T
}
#[inline]
fn slice_len<T>(p: *const [T]) -> usize {
- unsafe { mem::transmute::<*const [T], [usize; 2]>(p)[1] }
+ unsafe { mem::transmute::<_, [usize; 2]>(p)[1] }
}
pub struct CBox<T: ?Sized>(*mut T);
impl<T: ?Sized> CBox<T> {
#[inline]
- pub unsafe fn from_raw_unchecked(p: *mut T) -> CBox<T> {
+ pub const unsafe fn from_raw_unchecked(p: *mut T) -> CBox<T> {
CBox(p)
}
@@ -42,7 +42,7 @@ impl<T: ?Sized> CBox<T> {
}
#[inline]
- pub fn as_ptr(&self) -> *const T {
+ pub const fn as_ptr(&self) -> *const T {
self.0
}
@@ -108,7 +108,7 @@ impl<T: ?Sized> Drop for CBox<T> {
fn drop(&mut self) {
unsafe {
ptr::drop_in_place(self.0);
- libc::free(self.0 as *mut libc::c_void);
+ libc::free(self.0.cast());
}
}
}
@@ -144,3 +144,31 @@ impl<T> DerefMut for CBox<[T]> {
unsafe { &mut *self.safe_ptr() }
}
}
+
+impl<T: fmt::Debug> fmt::Debug for CBox<T> {
+ #[inline]
+ fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+ fmt::Debug::fmt(&**self, f)
+ }
+}
+
+impl<T> fmt::Debug for CBox<[T]> where [T]: fmt::Debug {
+ #[inline]
+ fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+ fmt::Debug::fmt(&**self, f)
+ }
+}
+
+impl<T: fmt::Display> fmt::Display for CBox<T> {
+ #[inline]
+ fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+ fmt::Display::fmt(&**self, f)
+ }
+}
+
+impl<T> fmt::Display for CBox<[T]> where [T]: fmt::Display {
+ #[inline]
+ fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+ fmt::Display::fmt(&**self, f)
+ }
+}
diff --git a/safe_libc/src/stdio.rs b/safe_libc/src/stdio.rs
index 5f33f74..271f023 100644
--- a/safe_libc/src/stdio.rs
+++ b/safe_libc/src/stdio.rs
@@ -22,7 +22,7 @@ impl OStream {
pub fn write(&mut self, b: &[u8]) {
unsafe {
libc::fwrite(
- b.as_ptr() as *const libc::c_void,
+ b.as_ptr().cast(),
1,
b.len(),
self.file,
diff --git a/safe_libc/src/string.rs b/safe_libc/src/string.rs
index c85f788..8f973ad 100644
--- a/safe_libc/src/string.rs
+++ b/safe_libc/src/string.rs
@@ -12,7 +12,7 @@ pub struct CStr { inner: libc::c_char }
impl CStr {
#[inline]
pub unsafe fn from_ptr_unchecked<'a>(p: *const libc::c_char) -> &'a CStr {
- &*(p as *const CStr)
+ &*p.cast()
}
#[inline]
@@ -23,7 +23,7 @@ impl CStr {
#[inline]
pub unsafe fn from_mut_ptr_unchecked<'a>(p: *mut libc::c_char) -> &'a mut CStr {
- &mut *(p as *mut CStr)
+ &mut *p.cast()
}
#[inline]
@@ -34,7 +34,7 @@ impl CStr {
#[inline]
pub unsafe fn from_bytes_with_nul_unchecked(bytes: &[u8]) -> &CStr {
- CStr::from_ptr_unchecked(bytes.as_ptr() as *const libc::c_char)
+ CStr::from_ptr_unchecked(bytes.as_ptr().cast())
}
// TODO
@@ -59,7 +59,7 @@ impl CStr {
#[inline]
pub fn as_bytes(&self) -> &[u8] {
unsafe { slice::from_raw_parts(
- self.as_ptr() as *const u8,
+ self.as_ptr().cast(),
self.len(),
) }
}
@@ -67,7 +67,7 @@ impl CStr {
#[inline]
pub fn as_mut_bytes(&mut self) -> &mut [u8] {
unsafe { slice::from_raw_parts_mut(
- self.as_mut_ptr() as *mut u8,
+ self.as_mut_ptr().cast(),
self.len(),
) }
}
@@ -126,7 +126,7 @@ impl From<&[u8]> for CString {
unsafe {
CString::from_raw_unchecked(
util::must_succeed(libc::strndup(
- s.as_ptr() as *const libc::c_char,
+ s.as_ptr().cast(),
s.len() as libc::size_t,
))
)