From e30e2cd278f540ab2ab7f8d0af2de04d7e6557f9 Mon Sep 17 00:00:00 2001
From: Noah <33094578+coolreader18@users.noreply.github.com>
Date: Wed, 15 Jul 2020 12:53:57 -0500
Subject: [PATCH] Update some num-* crates

---
 Cargo.lock           | 20 ++++++++++----------
 bytecode/Cargo.toml  |  2 +-
 parser/Cargo.toml    |  2 +-
 vm/Cargo.toml        |  4 ++--
 vm/src/obj/objint.rs |  6 +++---
 5 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 156c88a12..e810a1fd8 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -964,9 +964,9 @@ checksum = "72ef4a56884ca558e5ddb05a1d1e7e1bfd9a68d9ed024c21704cc98872dae1bb"
 
 [[package]]
 name = "num-bigint"
-version = "0.2.6"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "090c7f9998ee0ff65aa5b723e4009f7b217707f1fb5ea551329cc4d6231fb304"
+checksum = "b7f3fc75e3697059fb1bc465e3d8cca6cf92f56854f201158b3f9c77d5a3cfa0"
 dependencies = [
  "autocfg 1.0.0",
  "num-integer",
@@ -987,9 +987,9 @@ dependencies = [
 
 [[package]]
 name = "num-integer"
-version = "0.1.42"
+version = "0.1.43"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f6ea62e9d81a77cd3ee9a2a5b9b609447857f3d358704331e4ef39eb247fcba"
+checksum = "8d59457e662d541ba17869cf51cf177c0b5f0cbf476c66bdc90bf1edac4f875b"
 dependencies = [
  "autocfg 1.0.0",
  "num-traits",
@@ -997,9 +997,9 @@ dependencies = [
 
 [[package]]
 name = "num-iter"
-version = "0.1.40"
+version = "0.1.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dfb0800a0291891dd9f4fe7bd9c19384f98f7fbe0cd0f39a2c6b88b9868bbc00"
+checksum = "7a6e6b7c748f995c4c29c5f5ae0248536e04a5739927c74ec0fa564805094b9f"
 dependencies = [
  "autocfg 1.0.0",
  "num-integer",
@@ -1008,9 +1008,9 @@ dependencies = [
 
 [[package]]
 name = "num-rational"
-version = "0.2.4"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c000134b5dbf44adc5cb772486d335293351644b801551abe8f75c84cfa4aef"
+checksum = "a5b4d7360f362cfb50dde8143501e6940b22f644be75a4cc90b2d81968908138"
 dependencies = [
  "autocfg 1.0.0",
  "num-bigint",
@@ -1020,9 +1020,9 @@ dependencies = [
 
 [[package]]
 name = "num-traits"
-version = "0.2.11"
+version = "0.2.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c62be47e61d1842b9170f0fdeec8eba98e60e90e5446449a0545e5152acd7096"
+checksum = "ac267bcc07f48ee5f8935ab0d24f316fb722d7a1292e2913f0cc196b29ffd611"
 dependencies = [
  "autocfg 1.0.0",
 ]
diff --git a/bytecode/Cargo.toml b/bytecode/Cargo.toml
index 289f9fc6a..f46fd4e79 100644
--- a/bytecode/Cargo.toml
+++ b/bytecode/Cargo.toml
@@ -12,7 +12,7 @@ license = "MIT"
 bincode =  "1.1"
 bitflags = "1.1"
 lz4-compress = "0.1.1"
-num-bigint = { version = "0.2", features = ["serde"] }
+num-bigint = { version = "0.3", features = ["serde"] }
 num-complex = { version = "0.2", features = ["serde"] }
 serde = { version = "1.0", features = ["derive"] }
 itertools = "0.8"
diff --git a/parser/Cargo.toml b/parser/Cargo.toml
index d4c0c7e7a..8d3aa4b09 100644
--- a/parser/Cargo.toml
+++ b/parser/Cargo.toml
@@ -14,7 +14,7 @@ lalrpop="0.17"
 [dependencies]
 lalrpop-util="0.17"
 log="0.4.1"
-num-bigint = "0.2"
+num-bigint = "0.3"
 num-traits = "0.2"
 unic-emoji-char = "0.9"
 unic-ucd-ident  = "0.9"
diff --git a/vm/Cargo.toml b/vm/Cargo.toml
index a65bc2408..50cbc9213 100644
--- a/vm/Cargo.toml
+++ b/vm/Cargo.toml
@@ -27,10 +27,10 @@ blake2 = "0.8"
 volatile = "0.2"
 
 num-complex = { version = "0.2.2", features = ["serde"] }
-num-bigint = { version = "0.2.4", features = ["serde"] }
+num-bigint = { version = "0.3", features = ["serde"] }
 num-traits = "0.2.8"
 num-integer = "0.1.41"
-num-rational = "0.2.2"
+num-rational = "0.3"
 num-iter = "0.1.39"
 rand = { version = "0.7", features = ["wasm-bindgen"] }
 rand_core = "0.5"
diff --git a/vm/src/obj/objint.rs b/vm/src/obj/objint.rs
index 615e8a2f6..d1b73f7dd 100644
--- a/vm/src/obj/objint.rs
+++ b/vm/src/obj/objint.rs
@@ -124,7 +124,7 @@ fn inner_pow(int1: &BigInt, int2: &BigInt, vm: &VirtualMachine) -> PyResult {
         objfloat::float_pow(v1, v2, vm).into_pyobject(vm)
     } else {
         Ok(if let Some(v2) = int2.to_u64() {
-            vm.ctx.new_int(int1.pow(v2))
+            vm.ctx.new_int(Pow::pow(int1, v2))
         } else if int1.is_one() {
             vm.ctx.new_int(1)
         } else if int1.is_zero() {
@@ -519,7 +519,7 @@ impl PyInt {
 
     #[pymethod(name = "__sizeof__")]
     fn sizeof(&self) -> usize {
-        size_of::<Self>() + ((self.value.bits() + 7) & !7) / 8
+        size_of::<Self>() + (((self.value.bits() + 7) & !7) / 8) as usize
     }
 
     #[pymethod(name = "as_integer_ratio")]
@@ -531,7 +531,7 @@ impl PyInt {
     }
 
     #[pymethod]
-    fn bit_length(&self) -> usize {
+    fn bit_length(&self) -> u64 {
         self.value.bits()
     }