From fd091b04316db9dc5fafadbd6bdbe60b127408a9 Mon Sep 17 00:00:00 2001
From: Daniel Mueller <deso@posteo.net>
Date: Thu, 2 Jan 2020 08:32:06 -0800
Subject: Update nitrokey crate to 0.4.0

This change finally updates the version of the nitrokey crate that we
consume to 0.4.0. Along with that we update rand_core, one of its
dependencies, to 0.5.1. Further more we add cfg-if in version 0.1.10 and
getrandom in version 0.1.13, both of which are now new (non-development)
dependencies.

Import subrepo nitrokey/:nitrokey at e81057037e9b4f370b64c0a030a725bc6bdfb870
Import subrepo cfg-if/:cfg-if at 4484a6faf816ff8058088ad857b0c6bb2f4b02b2
Import subrepo getrandom/:getrandom at d661aa7e1b8cc80b47dabe3d2135b3b47d2858af
Import subrepo rand/:rand at d877ed528248b52d947e0484364a4e1ae59ca502
---
 rand/src/distributions/other.rs | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

(limited to 'rand/src/distributions/other.rs')

diff --git a/rand/src/distributions/other.rs b/rand/src/distributions/other.rs
index 2295f79..6ec0473 100644
--- a/rand/src/distributions/other.rs
+++ b/rand/src/distributions/other.rs
@@ -11,8 +11,8 @@
 use core::char;
 use core::num::Wrapping;
 
-use {Rng};
-use distributions::{Distribution, Standard, Uniform};
+use crate::Rng;
+use crate::distributions::{Distribution, Standard, Uniform};
 
 // ----- Sampling distributions -----
 
@@ -116,6 +116,7 @@ macro_rules! tuple_impl {
 }
 
 impl Distribution<()> for Standard {
+    #[allow(clippy::unused_unit)]
     #[inline]
     fn sample<R: Rng + ?Sized>(&self, _: &mut R) -> () { () }
 }
@@ -176,13 +177,13 @@ impl<T> Distribution<Wrapping<T>> for Standard where Standard: Distribution<T> {
 
 #[cfg(test)]
 mod tests {
-    use {Rng, RngCore, Standard};
-    use distributions::Alphanumeric;
+    use crate::{Rng, RngCore, Standard};
+    use crate::distributions::Alphanumeric;
     #[cfg(all(not(feature="std"), feature="alloc"))] use alloc::string::String;
 
     #[test]
     fn test_misc() {
-        let rng: &mut RngCore = &mut ::test::rng(820);
+        let rng: &mut dyn RngCore = &mut crate::test::rng(820);
         
         rng.sample::<char, _>(Standard);
         rng.sample::<bool, _>(Standard);
@@ -192,7 +193,7 @@ mod tests {
     #[test]
     fn test_chars() {
         use core::iter;
-        let mut rng = ::test::rng(805);
+        let mut rng = crate::test::rng(805);
 
         // Test by generating a relatively large number of chars, so we also
         // take the rejection sampling path.
@@ -203,7 +204,7 @@ mod tests {
 
     #[test]
     fn test_alphanumeric() {
-        let mut rng = ::test::rng(806);
+        let mut rng = crate::test::rng(806);
 
         // Test by generating a relatively large number of chars, so we also
         // take the rejection sampling path.
-- 
cgit v1.2.1