From 74b76d3f5e57874460694dccd5dc42eab6c08019 Mon Sep 17 00:00:00 2001
From: Jack Grigg <thestr4d@gmail.com>
Date: Sun, 20 Mar 2022 16:50:09 +0000
Subject: [PATCH 1/3] Migrate to 2021 edition

Closes str4d/age-plugin-yubikey#52.
---
 Cargo.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Cargo.toml b/Cargo.toml
index 6aefe48..83df6b9 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -8,7 +8,7 @@ readme = "README.md"
 keywords = ["age", "cli", "encryption", "yubikey"]
 categories = ["command-line-utilities", "cryptography"]
 license = "MIT OR Apache-2.0"
-edition = "2018"
+edition = "2021"
 
 [package.metadata.deb]
 extended-description = """\

From 7d2e3a68290ad2b9e2366899c9e009629a7a0cee Mon Sep 17 00:00:00 2001
From: Jack Grigg <thestr4d@gmail.com>
Date: Sun, 20 Mar 2022 16:51:12 +0000
Subject: [PATCH 2/3] Remove trait imports that are in the 2021 edition prelude

---
 src/format.rs | 1 -
 src/key.rs    | 1 -
 src/main.rs   | 1 -
 src/p256.rs   | 1 -
 4 files changed, 4 deletions(-)

diff --git a/src/format.rs b/src/format.rs
index 4da1f9e..5128105 100644
--- a/src/format.rs
+++ b/src/format.rs
@@ -5,7 +5,6 @@ use age_core::{
 };
 use p256::{ecdh::EphemeralSecret, elliptic_curve::sec1::ToEncodedPoint};
 use rand::rngs::OsRng;
-use std::convert::TryInto;
 
 use crate::{p256::Recipient, STANZA_TAG};
 
diff --git a/src/key.rs b/src/key.rs
index f9f64b8..d44ecf4 100644
--- a/src/key.rs
+++ b/src/key.rs
@@ -9,7 +9,6 @@ use age_plugin::{identity, Callbacks};
 use bech32::{ToBase32, Variant};
 use dialoguer::Password;
 use log::warn;
-use std::convert::TryInto;
 use std::fmt;
 use std::io;
 use std::iter;
diff --git a/src/main.rs b/src/main.rs
index cacae6e..b3e90c7 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,4 +1,3 @@
-use std::convert::{TryFrom, TryInto};
 use std::fs::{File, OpenOptions};
 use std::io::{self, Write};
 
diff --git a/src/p256.rs b/src/p256.rs
index c9bd31b..a85bb47 100644
--- a/src/p256.rs
+++ b/src/p256.rs
@@ -1,7 +1,6 @@
 use bech32::{ToBase32, Variant};
 use p256::elliptic_curve::sec1::{FromEncodedPoint, ToEncodedPoint};
 use sha2::{Digest, Sha256};
-use std::convert::TryInto;
 use std::fmt;
 
 use crate::RECIPIENT_PREFIX;

From 5afec288c911fed38cec35c18f6a7b32d73e8b6c Mon Sep 17 00:00:00 2001
From: Jack Grigg <thestr4d@gmail.com>
Date: Sun, 20 Mar 2022 16:52:03 +0000
Subject: [PATCH 3/3] Forbid unsafe code

---
 src/main.rs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/main.rs b/src/main.rs
index b3e90c7..743cc56 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,3 +1,5 @@
+#![forbid(unsafe_code)]
+
 use std::fs::{File, OpenOptions};
 use std::io::{self, Write};