Mercurial > crates > nonstick

changeset 12:30831c70e5c0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove PhantomData usage. PhantomData is used through the library to substitute associated constants (to types). However, calling `PamItem::item_type(PhantomData<T>)` can easily be substituted by calling `T::item_type()`, getting rid of the need for PhantomData.
author Marc Brinkmann <git@marcbrinkmann.de>
date Sun, 26 Feb 2017 12:12:36 +0100
parents 827faa554528
children cc39d168aeb8
files src/conv.rs src/items.rs src/module.rs
diffstat 3 files changed, 12 insertions(+), 15 deletions(-) [+]
line wrap: on
line diff
--- a/src/conv.rs	Sun Feb 26 12:08:11 2017 +0100
+++ b/src/conv.rs	Sun Feb 26 12:12:36 2017 +0100
@@ -1,7 +1,6 @@
 use libc::{c_char, c_int};
 use std::ptr;
 use std::ffi::{CStr, CString};
-use std::marker::PhantomData;
 
 use constants;
 use constants::*;
@@ -76,7 +75,7 @@
 }
 
 impl PamItem for PamConv {
-    fn item_type(_: PhantomData<Self>) -> PamItemType {
+    fn item_type() -> PamItemType {
         PAM_CONV
     }
 }
--- a/src/items.rs	Sun Feb 26 12:08:11 2017 +0100
+++ b/src/items.rs	Sun Feb 26 12:12:36 2017 +0100
@@ -1,4 +1,3 @@
-use std::marker::PhantomData;
 use constants::{PamItemType, PAM_SERVICE, PAM_USER, PAM_USER_PROMPT, PAM_TTY, PAM_RUSER, PAM_RHOST,
                 PAM_AUTHTOK, PAM_OLDAUTHTOK};
 use module::PamItem;
@@ -8,7 +7,7 @@
 pub struct PamService {}
 
 impl PamItem for PamService {
-    fn item_type(_: PhantomData<Self>) -> PamItemType {
+    fn item_type() -> PamItemType {
         PAM_SERVICE
     }
 }
@@ -16,7 +15,7 @@
 pub struct PamUser {}
 
 impl PamItem for PamUser {
-    fn item_type(_: PhantomData<Self>) -> PamItemType {
+    fn item_type() -> PamItemType {
         PAM_USER
     }
 }
@@ -24,7 +23,7 @@
 pub struct PamUserPrompt {}
 
 impl PamItem for PamUserPrompt {
-    fn item_type(_: PhantomData<Self>) -> PamItemType {
+    fn item_type() -> PamItemType {
         PAM_USER_PROMPT
     }
 }
@@ -32,7 +31,7 @@
 pub struct PamTty {}
 
 impl PamItem for PamTty {
-    fn item_type(_: PhantomData<Self>) -> PamItemType {
+    fn item_type() -> PamItemType {
         PAM_TTY
     }
 }
@@ -40,7 +39,7 @@
 pub struct PamRUser {}
 
 impl PamItem for PamRUser {
-    fn item_type(_: PhantomData<Self>) -> PamItemType {
+    fn item_type() -> PamItemType {
         PAM_RUSER
     }
 }
@@ -48,7 +47,7 @@
 pub struct PamRHost {}
 
 impl PamItem for PamRHost {
-    fn item_type(_: PhantomData<Self>) -> PamItemType {
+    fn item_type() -> PamItemType {
         PAM_RHOST
     }
 }
@@ -56,7 +55,7 @@
 pub struct PamAuthTok {}
 
 impl PamItem for PamAuthTok {
-    fn item_type(_: PhantomData<Self>) -> PamItemType {
+    fn item_type() -> PamItemType {
         PAM_AUTHTOK
     }
 }
@@ -64,7 +63,7 @@
 pub struct PamOldAuthTok {}
 
 impl PamItem for PamOldAuthTok {
-    fn item_type(_: PhantomData<Self>) -> PamItemType {
+    fn item_type() -> PamItemType {
         PAM_OLDAUTHTOK
     }
 }
--- a/src/module.rs	Sun Feb 26 12:08:11 2017 +0100
+++ b/src/module.rs	Sun Feb 26 12:12:36 2017 +0100
@@ -3,7 +3,6 @@
 use libc::c_char;
 use std::{mem, ptr};
 use std::ffi::{CStr, CString};
-use std::marker::PhantomData;
 
 use constants;
 use constants::*;
@@ -66,7 +65,7 @@
     /// API contract specifies that when the API function `pam_get_item` is
     /// called with the constant PAM_CONV, it will return a value of type
     /// `PamConv`.
-    fn item_type(_: PhantomData<Self>) -> PamItemType;
+    fn item_type() -> PamItemType;
 }
 
 /// Gets some value, identified by `key`, that has been set by the module
@@ -121,7 +120,7 @@
 pub fn get_item<'a, T: PamItem>(pamh: &'a PamHandleT) -> PamResult<&'a T> {
     let mut ptr: *const PamItemT = ptr::null();
     let (res, item) = unsafe {
-        let r = pam_get_item(pamh, PamItem::item_type(PhantomData::<T>), &mut ptr);
+        let r = pam_get_item(pamh, T::item_type(), &mut ptr);
         let typed_ptr: *const T = mem::transmute(ptr);
         let t: &T = &*typed_ptr;
         (r, t)
@@ -145,7 +144,7 @@
 
     let res = unsafe {
         pam_set_item(pamh,
-                     PamItem::item_type(PhantomData::<P>),
+                     P::item_type(),
 
                      // unwrapping is okay here, as c_item will not be a NULL
                      // pointer