Merge branch 'mutable-references' into next

RFC:
	https://lists.sr.ht/~ireas/nitrokey-rs-dev/%3C20190126174327.tbuyk2s535kfiqm4%40localhost%3E
	https://lists.sr.ht/~ireas/nitrokey-rs-dev/%3C43cc304d-23e8-7f95-2167-ce3f0530b81e%40posteo.net%3E

* mutable-references:
  Store mutable reference to Device in PasswordSafe
  Refactor User and Admin to use a mutable reference
  Require mutable reference if method changes device state
  Add device_mut method to DeviceWrapper
  Implement DerefMut for User and Admin

1 files changed, 6 insertions, 6 deletions

diff --git a/tests/util/mod.rs b/tests/util/mod.rs
index bd207a9..f80372d 100644
--- a/tests/util/mod.rs
+++ b/tests/util/mod.rs
@@ -8,7 +8,7 @@ pub static USER_PASSWORD: &str = "123456";
 
 #[macro_export]
 macro_rules! unwrap_ok {
-    ($val:expr) => {{
+    ($val:expr) => {
         match $val {
             Ok(val) => val,
             Err(err) => panic!(
@@ -18,12 +18,12 @@ macro_rules! unwrap_ok {
                 err
             ),
         }
-    }};
+    };
 }
 
 #[macro_export]
 macro_rules! assert_any_ok {
-    ($val:expr) => {{
+    ($val:expr) => {
         match &$val {
             Ok(_) => {}
             Err(err) => panic!(
@@ -33,12 +33,12 @@ macro_rules! assert_any_ok {
                 err
             ),
         }
-    }};
+    };
 }
 
 #[macro_export]
 macro_rules! assert_ok {
-    ($left:expr, $right:expr) => {{
+    ($left:expr, $right:expr) => {
         match &$right {
             Ok(right) => match &$left {
                 left => {
@@ -59,7 +59,7 @@ macro_rules! assert_ok {
                 $left, right_err
             ),
         }
-    }};
+    };
 }
 
 #[macro_export]