min
/
boring2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix SslString Debug impl and drop lifetime

This commit is contained in:
Steven Fackler 2015-05-17 11:22:42 -07:00
parent af19831c9d
commit 1123c7387e
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
openssl/src/x509/mod.rs
View File

@ -24,17 +24,17 @@ use nid;
#[cfg(test)] #[cfg(test)]
mod tests; mod tests;
pub struct SslString<'s> { pub struct SslString {
s : &'s str s : &'static str
} }
impl<'s> Drop for SslString<'s> { impl<'s> Drop for SslString {
fn drop(&mut self) { fn drop(&mut self) {
unsafe { ffi::CRYPTO_free(self.s.as_ptr() as *mut c_void); } unsafe { ffi::CRYPTO_free(self.s.as_ptr() as *mut c_void); }
} }
} }
impl<'s> Deref for SslString<'s> { impl Deref for SslString {
type Target = str; type Target = str;
fn deref(&self) -> &str { fn deref(&self) -> &str {
@ -42,23 +42,23 @@ impl<'s> Deref for SslString<'s> {
} }
} }
impl<'s> SslString<'s> { impl SslString {
pub unsafe fn new(buf: *const c_char) -> SslString<'s> { unsafe fn new(buf: *const c_char) -> SslString {
SslString { SslString {
s: str::from_utf8(CStr::from_ptr(buf).to_bytes()).unwrap() s: str::from_utf8(CStr::from_ptr(buf).to_bytes()).unwrap()
} }
} }
} }
impl<'s> fmt::Display for SslString<'s> { impl fmt::Display for SslString {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
write!(f, "{:?}", self) fmt::Display::fmt(self.s, f)
} }
} }
impl<'s> fmt::Debug for SslString<'s> { impl fmt::Debug for SslString {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
write!(f, "{:?}", self) fmt::Debug::fmt(self.s, f)
} }
} }