Use Rust 2021 edition and bump dependencies (#17)

migueldemoura · web-flow · commit dc7be8749e71 · 2021-10-26T17:00:30.000+01:00
* Bump Rust edition to 2021

* Bump dependencies

Only `clap` has a breaking change and required modifications.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -3,22 +3,22 @@ name = "matched-data-cli"
 version = "0.5.0"
 authors = ["Miguel de Moura <mdemoura@cloudflare.com>"]
 description = "Tool to interact with the firewall matched data feature"
-edition = "2018"
+edition = "2021"
 
 [dependencies]
-assert_cmd = "2.0.0"
-assert_fs = "1.0.4"
-bincode = "1.3.1"
-clap = "3.0.0-beta.4"
+assert_cmd = "2.0.2"
+assert_fs = "1.0.6"
+bincode = "1.3.3"
+clap = "3.0.0-beta.5"
 generic-array = { version = "0.14.4", features = ["serde"] }
 hpke = { version = "0.7.1", default-features = false, features = [
     "x25519",
     "serde_impls",
 ] }
 radix64 = "0.6.2"
-rand = "0.8.3"
-serde = { version = "1.0.117", features = ["derive"] }
-serde_json = "1.0.59"
+rand = "0.8.4"
+serde = { version = "1.0.130", features = ["derive"] }
+serde_json = "1.0.68"
 
 [profile.release]
 lto = true
diff --git a/src/main.rs b/src/main.rs
@@ -3,25 +3,25 @@
 mod matched_data;
 
 use crate::matched_data::generate_key_pair;
-use clap::{ArgEnum, Clap};
+use clap::{ArgEnum, Parser};
 use hpke::kex::Serializable;
 use serde::{Deserialize, Serialize};
 use std::io::{stdin, stdout, Write};
 use std::{fs, str};
 
-#[derive(Clap)]
+#[derive(Parser)]
 #[clap(author, version)]
 struct Options {
     #[clap(subcommand)]
     command: Command,
 }
 
-#[derive(ArgEnum)]
+#[derive(ArgEnum, Clone)]
 enum KeyPairOutputFormat {
     Json,
 }
 
-#[derive(Clap)]
+#[derive(Parser)]
 struct GenerateKeyPairOptions {
     #[clap(
         arg_enum,
@@ -34,13 +34,13 @@ struct GenerateKeyPairOptions {
     output_format: KeyPairOutputFormat,
 }
 
-#[derive(ArgEnum)]
+#[derive(ArgEnum, Clone)]
 enum DecryptOutputFormat {
     Raw,
     Utf8Lossy,
 }
 
-#[derive(Clap)]
+#[derive(Parser)]
 struct DecryptOptions {
     #[clap(about = "File containing the base64 encoded encrypted matched data")]
     matched_data_filename: String,
@@ -63,7 +63,7 @@ struct DecryptOptions {
     output_format: DecryptOutputFormat,
 }
 
-#[derive(Clap)]
+#[derive(Parser)]
 enum Command {
     /// Generates a public-private key pair
     GenerateKeyPair(GenerateKeyPairOptions),
