From 536ea812a22c329f8829e44c80fb5d13f0eb8c59 Mon Sep 17 00:00:00 2001 From: Andrew Johnson Date: Wed, 23 May 2018 13:49:01 -0600 Subject: [PATCH] TR suggestions --- Chapter06/fixed/src/admin.rs | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/Chapter06/fixed/src/admin.rs b/Chapter06/fixed/src/admin.rs index f890b3c..4410730 100644 --- a/Chapter06/fixed/src/admin.rs +++ b/Chapter06/fixed/src/admin.rs @@ -42,13 +42,14 @@ pub fn toErrorCode(i: i32) -> ErrorCode { } } -pub struct AuthorizedSessionRaw(*const c_void); +struct AuthorizedSessionInner(*const c_void); + #[derive(Clone)] pub struct AuthorizedSession { - session: Rc + session: Rc } -impl Drop for AuthorizedSessionRaw { +impl Drop for AuthorizedSessionInner { fn drop(&mut self) { unsafe { magic::free_override_session(self.0); @@ -65,7 +66,7 @@ pub fn authorize_override() -> Result { magic::poll_override_session() }; let session = AuthorizedSession { - session: Rc::new(AuthorizedSessionRaw(session)) + session: Rc::new(AuthorizedSessionInner(session)) }; check_error(session) } @@ -79,7 +80,7 @@ pub fn authorize_privileged() -> Result { magic::poll_physical_override_privileged_session() }; let session = AuthorizedSession { - session: Rc::new(AuthorizedSessionRaw(session)) + session: Rc::new(AuthorizedSessionInner(session)) }; check_error(session) } @@ -93,7 +94,7 @@ pub fn authorize_admin() -> Result { magic::poll_physical_override_admin_session() }; let session = AuthorizedSession { - session: Rc::new(AuthorizedSessionRaw(session)) + session: Rc::new(AuthorizedSessionInner(session)) }; check_error(session) }