commit 6cf210a969cfe728101ffd249d1a5c525617ad10
author Woyten <woyten.tielesch@online.de> Fri Nov 15 21:18:35 2019 +0100
committer Woyten <woyten.tielesch@online.de> Sat Nov 23 16:32:46 2019 +0100
tree fe0634368f12a07c6f5d985ab7102ba2acb00312
parent 6c38aa135bef6f689d802eb7fd2cb0cb538e036f

Improve lifetimes and warnings

src/buttons.rs

diff --git a/src/buttons.rs b/src/buttons.rs
index 916e052..5821794 100644
--- a/src/buttons.rs
+++ b/src/buttons.rs
@@ -4,6 +4,7 @@
 use crate::result::TockResult;
 use crate::result::TockValue;
 use crate::syscalls;
+use core::marker::PhantomData;
 
 const DRIVER_NUMBER: usize = 0x00003;
 
@@ -73,7 +74,7 @@
         ButtonIter {
             curr_button: 0,
             button_count: self.count,
-            _lifetime: &(),
+            _lifetime: Default::default(),
         }
     }
 }
@@ -106,7 +107,7 @@
 pub struct ButtonIter<'a> {
     curr_button: usize,
     button_count: usize,
-    _lifetime: &'a (),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> Iterator for ButtonIter<'a> {
@@ -116,7 +117,7 @@
         if self.curr_button < self.button_count {
             let item = ButtonHandle {
                 button_num: self.curr_button,
-                _lifetime: &(),
+                _lifetime: Default::default(),
             };
             self.curr_button += 1;
             Some(item)
@@ -128,7 +129,7 @@
 
 pub struct ButtonHandle<'a> {
     button_num: usize,
-    _lifetime: &'a (),
+    _lifetime: PhantomData<&'a ()>,
 }
 
 impl<'a> ButtonHandle<'a> {