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/examples/monte-carlo.rs | 39 ++++++++++++++++++---------------------
 rand/examples/monty-hall.rs  | 10 +++-------
 2 files changed, 21 insertions(+), 28 deletions(-)

(limited to 'rand/examples')

diff --git a/rand/examples/monte-carlo.rs b/rand/examples/monte-carlo.rs
index 9162996..39c779f 100644
--- a/rand/examples/monte-carlo.rs
+++ b/rand/examples/monte-carlo.rs
@@ -11,7 +11,7 @@
 //!
 //! Imagine that we have a square with sides of length 2 and a unit circle
 //! (radius = 1), both centered at the origin. The areas are:
-//! 
+//!
 //! ```text
 //!     area of circle  = πr² = π * r * r = π
 //!     area of square  = 2² = 4
@@ -24,28 +24,25 @@
 //! the square at random, calculate the fraction that fall within the circle,
 //! and multiply this fraction by 4.
 
-#![cfg(feature="std")]
-
-
-extern crate rand;
+#![cfg(feature = "std")]
 
 use rand::distributions::{Distribution, Uniform};
 
 fn main() {
-   let range = Uniform::new(-1.0f64, 1.0);
-   let mut rng = rand::thread_rng();
-
-   let total = 1_000_000;
-   let mut in_circle = 0;
-
-   for _ in 0..total {
-       let a = range.sample(&mut rng);
-       let b = range.sample(&mut rng);
-       if a*a + b*b <= 1.0 {
-           in_circle += 1;
-       }
-   }
-
-   // prints something close to 3.14159...
-   println!("π is approximately {}", 4. * (in_circle as f64) / (total as f64));
+    let range = Uniform::new(-1.0f64, 1.0);
+    let mut rng = rand::thread_rng();
+
+    let total = 1_000_000;
+    let mut in_circle = 0;
+
+    for _ in 0..total {
+        let a = range.sample(&mut rng);
+        let b = range.sample(&mut rng);
+        if a*a + b*b <= 1.0 {
+            in_circle += 1;
+        }
+    }
+
+    // prints something close to 3.14159...
+    println!("π is approximately {}", 4. * (in_circle as f64) / (total as f64));
 }
diff --git a/rand/examples/monty-hall.rs b/rand/examples/monty-hall.rs
index 0932c5e..9fe5839 100644
--- a/rand/examples/monty-hall.rs
+++ b/rand/examples/monty-hall.rs
@@ -26,13 +26,10 @@
 //!
 //! [Monty Hall Problem]: https://en.wikipedia.org/wiki/Monty_Hall_problem
 
-#![cfg(feature="std")]
+#![cfg(feature = "std")]
 
-
-extern crate rand;
-
-use rand::Rng;
 use rand::distributions::{Distribution, Uniform};
+use rand::Rng;
 
 struct SimulationResult {
     win: bool,
@@ -40,8 +37,7 @@ struct SimulationResult {
 }
 
 // Run a single simulation of the Monty Hall problem.
-fn simulate<R: Rng>(random_door: &Uniform<u32>, rng: &mut R)
-                    -> SimulationResult {
+fn simulate<R: Rng>(random_door: &Uniform<u32>, rng: &mut R) -> SimulationResult {
     let car = random_door.sample(rng);
 
     // This is our initial choice
-- 
cgit v1.2.3