From 9abcafd305c004e4a24827d1533e0b0081aeb25c Mon Sep 17 00:00:00 2001
From: Stig Johan Berggren <stigjb@gmail.com>
Date: Wed, 13 May 2020 13:46:16 +0200
Subject: [PATCH 1/3] Upgrade dependencies

num and rand dependencies were old
---
 Cargo.toml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index c2fac9c..fd4f9ca 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -11,8 +11,8 @@ homepage = "https://github.com/RustAudio/pitch_calc"
 edition = "2018"
 
 [dependencies]
-num = "0.1.28"
-rand = "0.3.12"
+num = ">=0.1.28, <1"
+rand = ">=0.3.12, <1"
 serde = { optional = true, version = "1.0.*", features = ["derive"] }
 
 [dev-dependencies]

From f151ce52f84b41dbc8666ae677c27f5c8fc8daa8 Mon Sep 17 00:00:00 2001
From: Stig Johan Berggren <stigjb@gmail.com>
Date: Wed, 13 May 2020 14:00:59 +0200
Subject: [PATCH 2/3] Update minimum rand version

The Rand trait is deprecated, impl Distribution for Standard instead
---
 Cargo.toml    | 2 +-
 src/letter.rs | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index fd4f9ca..2aac793 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -12,7 +12,7 @@ edition = "2018"
 
 [dependencies]
 num = ">=0.1.28, <1"
-rand = ">=0.3.12, <1"
+rand = ">=0.5, <1"
 serde = { optional = true, version = "1.0.*", features = ["derive"] }
 
 [dev-dependencies]
diff --git a/src/letter.rs b/src/letter.rs
index e822f3b..9716787 100644
--- a/src/letter.rs
+++ b/src/letter.rs
@@ -136,8 +136,8 @@ impl ToPrimitive for Letter {
     }
 }
 
-impl ::rand::Rand for Letter {
-    fn rand<R: ::rand::Rng>(rng: &mut R) -> Letter {
+impl ::rand::distributions::Distribution<Letter> for ::rand::distributions::Standard {
+    fn sample<R: rand::Rng + ?Sized>(&self, rng: &mut R) -> Letter {
         rng.gen_range(0, 12).to_letter()
     }
 }

From f582868f8697241ffa2a8a04f4ab5b2a05e4cfa4 Mon Sep 17 00:00:00 2001
From: Stig Johan Berggren <stigjb@gmail.com>
Date: Wed, 13 May 2020 23:44:11 +0200
Subject: [PATCH 3/3] Use num-traits instead of num

---
 Cargo.toml    | 4 ++--
 src/calc.rs   | 2 +-
 src/letter.rs | 4 ++--
 src/utils.rs  | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 2aac793..3b06d52 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -11,8 +11,8 @@ homepage = "https://github.com/RustAudio/pitch_calc"
 edition = "2018"
 
 [dependencies]
-num = ">=0.1.28, <1"
-rand = ">=0.5, <1"
+num-traits = "0.2.11"
+rand = "0.7.3"
 serde = { optional = true, version = "1.0.*", features = ["derive"] }
 
 [dev-dependencies]
diff --git a/src/calc.rs b/src/calc.rs
index f6e5c1a..e43f7be 100644
--- a/src/calc.rs
+++ b/src/calc.rs
@@ -1,6 +1,6 @@
 use crate::utils::modulo;
 use crate::{Letter, Octave, MAX_HZ, MIN_HZ, TOTAL_LETTERS};
-use num::{Float, FromPrimitive, ToPrimitive};
+use num_traits::{Float, FromPrimitive, ToPrimitive};
 
 /// Useful for conversions between Step and Hz.
 const TWELFTH_ROOT_OF_TWO: f32 = 1.059463094359;
diff --git a/src/letter.rs b/src/letter.rs
index 9716787..1431913 100644
--- a/src/letter.rs
+++ b/src/letter.rs
@@ -1,7 +1,7 @@
 use self::Letter::{Ab, Ash, Bb, Csh, Db, Dsh, Eb, Fsh, Gb, Gsh, A, B, C, D, E, F, G};
 use crate::utils::modulo;
-use num::PrimInt as Int;
-use num::{FromPrimitive, ToPrimitive};
+use num_traits::PrimInt as Int;
+use num_traits::{FromPrimitive, ToPrimitive};
 #[cfg(feature = "serde")]
 use serde::{Deserialize, Serialize};
 use std::cmp::Ordering;
diff --git a/src/utils.rs b/src/utils.rs
index 4742961..4d00222 100644
--- a/src/utils.rs
+++ b/src/utils.rs
@@ -1,4 +1,4 @@
-use num::PrimInt as Int;
+use num_traits::PrimInt as Int;
 
 /// The modulo function (handles negatives differently to Rust's remainder `%` operator).
 #[inline]