From 0b8ed00c84404fcca3ba83b3a8cc1a41cec4778e Mon Sep 17 00:00:00 2001
From: Jack Grigg <jack@electriccoin.co>
Date: Wed, 4 May 2022 23:16:27 +0000
Subject: [PATCH] Migrate to Rust 2021

---
 Cargo.toml               | 2 +-
 src/arithmetic/fields.rs | 2 +-
 src/fields/fp.rs         | 1 -
 src/fields/fq.rs         | 1 -
 4 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 3e660c4..be8da06 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -8,7 +8,7 @@ authors = [
     "Daira Hopwood <daira@electriccoin.co>",
     "Jack Grigg <jack@electriccoin.co>",
 ]
-edition = "2018"
+edition = "2021"
 rust-version = "1.56"
 license = "MIT OR Apache-2.0"
 repository = "https://github.com/zcash/pasta_curves"
diff --git a/src/arithmetic/fields.rs b/src/arithmetic/fields.rs
index 43e1b26..3cf2e9e 100644
--- a/src/arithmetic/fields.rs
+++ b/src/arithmetic/fields.rs
@@ -13,7 +13,7 @@ use core::assert;
 #[cfg(feature = "sqrt-table")]
 use alloc::{boxed::Box, vec::Vec};
 #[cfg(feature = "sqrt-table")]
-use core::{convert::TryInto, marker::PhantomData};
+use core::marker::PhantomData;
 
 const_assert!(size_of::<usize>() >= 4);
 
diff --git a/src/fields/fp.rs b/src/fields/fp.rs
index 6e39fc1..6d8db0d 100644
--- a/src/fields/fp.rs
+++ b/src/fields/fp.rs
@@ -1,4 +1,3 @@
-use core::convert::TryInto;
 use core::fmt;
 use core::ops::{Add, Mul, Neg, Sub};
 
diff --git a/src/fields/fq.rs b/src/fields/fq.rs
index 5604c15..0a08718 100644
--- a/src/fields/fq.rs
+++ b/src/fields/fq.rs
@@ -1,4 +1,3 @@
-use core::convert::TryInto;
 use core::fmt;
 use core::ops::{Add, Mul, Neg, Sub};