From 83034ac75b02c26f64204c8f7933929899dd4f35 Mon Sep 17 00:00:00 2001
From: Nick Santana <nick@mobilecoin.com>
Date: Tue, 2 Jan 2024 12:17:00 -0800
Subject: [PATCH] Update yare to version 2

Also remove unnecessary minor and patch version specification in
manifest files.
---
 Cargo.lock                        | 11 +++++------
 capable/Cargo.toml                |  2 +-
 capable/types/Cargo.toml          |  6 +++---
 core/types/Cargo.toml             | 20 ++++++++++----------
 dcap/ql/Cargo.toml                | 10 +++++-----
 dcap/ql/types/Cargo.toml          |  2 +-
 dcap/quoteverify/types/Cargo.toml |  2 +-
 dcap/types/Cargo.toml             | 28 ++++++++++++++--------------
 tservice/Cargo.toml               |  6 +++---
 tservice/types/Cargo.toml         |  2 +-
 10 files changed, 44 insertions(+), 45 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 43e1a2cc..cc01bcc4 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1247,7 +1247,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
 dependencies = [
  "proc-macro2",
- "quote",
  "unicode-ident",
 ]
 
@@ -1434,22 +1433,22 @@ dependencies = [
 
 [[package]]
 name = "yare"
-version = "1.0.2"
+version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df119f412cd2150ab3e88ebee015a615b00140ff81acd07746262df4a4678c47"
+checksum = "d84be877e6a6cde26dd843583544f46e193a5b324b585c4914167a47ee3245ab"
 dependencies = [
  "yare-macro",
 ]
 
 [[package]]
 name = "yare-macro"
-version = "1.0.1"
+version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9467ac0aa6668b663fa80addde47e40ac364dc9d9a243b4df26ba647e4605633"
+checksum = "74e7573777bff194739148d7ffe000c9c652f1db6dafbb7d3b8475551bd4189d"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn 2.0.28",
 ]
 
 [[package]]
diff --git a/capable/Cargo.toml b/capable/Cargo.toml
index 2c3148d6..fac47642 100644
--- a/capable/Cargo.toml
+++ b/capable/Cargo.toml
@@ -20,4 +20,4 @@ mc-sgx-core-types = { path = "../core/types", version = "=0.10.1" }
 mc-sgx-util = { path = "../util", version = "=0.10.1" }
 
 [dev-dependencies]
-yare = "1.0.1"
+yare = "2"
diff --git a/capable/types/Cargo.toml b/capable/types/Cargo.toml
index 05b92a6c..56252d7d 100644
--- a/capable/types/Cargo.toml
+++ b/capable/types/Cargo.toml
@@ -15,11 +15,11 @@ rust-version = "1.62.1"
 default = []
 
 [dependencies]
-displaydoc = { version = "0.2.3", default-features = false }
+displaydoc = { version = "0.2", default-features = false }
 mc-sgx-capable-sys-types = { path = "../sys/types", version = "=0.10.1" }
 mc-sgx-core-types = { path = "../../core/types", version = "=0.10.1" }
 mc-sgx-util = { path = "../../util", version = "=0.10.1" }
-serde = { version = "1.0", default-features = false, features = ["derive"] }
+serde = { version = "1", default-features = false, features = ["derive"] }
 
 [dev-dependencies]
-yare = "1.0.1"
+yare = "2"
diff --git a/core/types/Cargo.toml b/core/types/Cargo.toml
index d3cef4ed..3b7071f5 100644
--- a/core/types/Cargo.toml
+++ b/core/types/Cargo.toml
@@ -16,14 +16,14 @@ default = []
 alloc = []
 
 [dependencies]
-bitflags = "2.0.0"
-displaydoc = { version = "0.2.3", default-features = false }
-hex = { version = "0.4.2", default-features = false }
+bitflags = "2"
+displaydoc = { version = "0.2", default-features = false }
+hex = { version = "0.4", default-features = false }
 mc-sgx-core-sys-types = { path = "../sys/types", version = "=0.10.1" }
 mc-sgx-util = { path = "../../util", version = "=0.10.1" }
-nom = { version = "7.1.2", default-features = false }
-rand_core = { version = "0.6.4", default-features = false }
-serde = { version = "1.0", default-features = false, features = ["derive"] }
+nom = { version = "7", default-features = false }
+rand_core = { version = "0.6", default-features = false }
+serde = { version = "1", default-features = false, features = ["derive"] }
 subtle = { version = "2", default-features = false }
 
 # `getrandom` is pulled in by `rand_core` we only need to access it directly when registering a custom spng,
@@ -32,7 +32,7 @@ subtle = { version = "2", default-features = false }
 getrandom = { version = "0.2", default-features = false, features = ["custom"] }
 
 [dev-dependencies]
-rand = "0.8.5"
-serde_cbor = "0.11.1"
-textwrap = "0.16.0"
-yare = "1.0.1"
+rand = "0.8"
+serde_cbor = "0.11"
+textwrap = "0.16"
+yare = "2"
diff --git a/dcap/ql/Cargo.toml b/dcap/ql/Cargo.toml
index fe865b98..b84517ab 100644
--- a/dcap/ql/Cargo.toml
+++ b/dcap/ql/Cargo.toml
@@ -13,14 +13,14 @@ categories = ["api-bindings", "hardware-support"]
 keywords = ["sgx"]
 
 [dependencies]
-displaydoc = { version = "0.2.3", default-features = false }
+displaydoc = { version = "0.2", default-features = false }
 mc-sgx-core-sys-types = { path = "../../core/sys/types", version = "=0.10.1" }
 mc-sgx-core-types = { path = "../../core/types", version = "=0.10.1" }
 mc-sgx-dcap-ql-sys = { path = "sys", version = "=0.10.1" }
 mc-sgx-dcap-ql-types = { path = "types", version = "=0.10.1" }
 mc-sgx-dcap-types = { path = "../types", version = "=0.10.1", features = ["alloc"] }
 mc-sgx-util = { path = "../../util", version = "=0.10.1" }
-once_cell = "1.17.0"
+once_cell = "1"
 
 [features]
 default = []
@@ -29,6 +29,6 @@ default = []
 sim = []
 
 [dev-dependencies]
-serial_test = { version = "2.0.0", default-features = false }
-tempfile = "3.7.1"
-yare = "1.0.1"
+serial_test = { version = "2", default-features = false }
+tempfile = "3"
+yare = "2"
diff --git a/dcap/ql/types/Cargo.toml b/dcap/ql/types/Cargo.toml
index e247ba86..cf5711cb 100644
--- a/dcap/ql/types/Cargo.toml
+++ b/dcap/ql/types/Cargo.toml
@@ -16,4 +16,4 @@ mc-sgx-core-types = { path = "../../../core/types", version = "=0.10.1" }
 mc-sgx-dcap-ql-sys-types = { path = "../sys/types", version = "=0.10.1" }
 
 [dev-dependencies]
-yare = "1.0.2"
+yare = "2"
diff --git a/dcap/quoteverify/types/Cargo.toml b/dcap/quoteverify/types/Cargo.toml
index 219d7dc3..25a8f894 100644
--- a/dcap/quoteverify/types/Cargo.toml
+++ b/dcap/quoteverify/types/Cargo.toml
@@ -16,4 +16,4 @@ mc-sgx-core-types = { path = "../../../core/types", version = "=0.10.1" }
 mc-sgx-dcap-quoteverify-sys-types = { path = "../sys/types", version = "=0.10.1" }
 
 [dev-dependencies]
-yare = "1.0.2"
+yare = "2"
diff --git a/dcap/types/Cargo.toml b/dcap/types/Cargo.toml
index c99961a8..645decf5 100644
--- a/dcap/types/Cargo.toml
+++ b/dcap/types/Cargo.toml
@@ -17,24 +17,24 @@ alloc = ["dep:x509-cert", "serde/alloc"]
 tcb = ["alloc", "dep:x509-cert", "dep:const-oid", "dep:hex", "serde/alloc"]
 
 [dependencies]
-const-oid = { version = "0.9.2", default-features = false, optional = true }
-displaydoc = { version = "0.2.3", default-features = false }
-hex = { version = "0.4.3", default-features = false, features = ["alloc"], optional = true }
+const-oid = { version = "0.9", default-features = false, optional = true }
+displaydoc = { version = "0.2", default-features = false }
+hex = { version = "0.4", default-features = false, features = ["alloc"], optional = true }
 mc-sgx-core-types = { path = "../../core/types", version = "=0.10.1" }
 mc-sgx-dcap-sys-types = { path = "../sys/types", version = "=0.10.1" }
 mc-sgx-util = { path = "../../util", version = "=0.10.1" }
-nom = { version = "7.1.2", default-features = false }
-p256 = { version = "0.13.0", default-features = false, features = ["ecdsa-core", "ecdsa"] }
-serde = { version = "1.0", default-features = false, features = ["derive"] }
-sha2 = { version = "0.10.6", default-features = false }
-static_assertions = "1.1.0"
+nom = { version = "7", default-features = false }
+p256 = { version = "0.13", default-features = false, features = ["ecdsa-core", "ecdsa"] }
+serde = { version = "1", default-features = false, features = ["derive"] }
+sha2 = { version = "0.10", default-features = false }
+static_assertions = "1"
 subtle = { version = "2", default-features = false }
-x509-cert = { version = "0.2.3", default-features = false, features = ["pem"], optional = true }
+x509-cert = { version = "0.2", default-features = false, features = ["pem"], optional = true }
 
 [dev-dependencies]
-assert_matches = "1.5.0"
+assert_matches = "1"
 mc-sgx-core-sys-types = { path = "../../core/sys/types", version = "=0.10.1" }
-serde_cbor = "0.11.2"
-textwrap = "0.16.0"
-x509-cert = { version = "0.2.3", default-features = false, features = ["pem"] }
-yare = "1.0.1"
+serde_cbor = "0.11"
+textwrap = "0.16"
+x509-cert = { version = "0.2", default-features = false, features = ["pem"] }
+yare = "2"
diff --git a/tservice/Cargo.toml b/tservice/Cargo.toml
index fbec5339..0f2fe4fa 100644
--- a/tservice/Cargo.toml
+++ b/tservice/Cargo.toml
@@ -17,7 +17,7 @@ test = false
 doctest = false
 
 [dependencies]
-displaydoc = { version = "0.2.3", default-features = false }
+displaydoc = { version = "0.2", default-features = false }
 mc-sgx-core-sys-types = { path = "../core/sys/types", version = "=0.10.1" }
 mc-sgx-core-types = { path = "../core/types", version = "=0.10.1" }
 mc-sgx-trts = { path = "../trts", version = "=0.10.1" }
@@ -25,8 +25,8 @@ mc-sgx-tservice-sys = { path = "sys", version = "=0.10.1" }
 mc-sgx-tservice-sys-types = { path = "sys/types", version = "=0.10.1" }
 mc-sgx-tservice-types = { path = "types", version = "=0.10.1", features = [ "alloc" ] }
 mc-sgx-util = { path = "../util", version = "=0.10.1" }
-serde = { version = "1.0", default-features = false, features = ["derive", "alloc"] }
+serde = { version = "1", default-features = false, features = ["derive", "alloc"] }
 
 [dev-dependencies]
 mc-sgx-tservice-types = { path = "types", version = "=0.10.1", features = [ "test-utils" ] }
-yare = "1.0.2"
+yare = "2"
diff --git a/tservice/types/Cargo.toml b/tservice/types/Cargo.toml
index a2a1b1b6..453b2374 100644
--- a/tservice/types/Cargo.toml
+++ b/tservice/types/Cargo.toml
@@ -21,4 +21,4 @@ mc-sgx-core-types = { path = "../../core/types", version = "=0.10.1" }
 mc-sgx-tservice-sys-types = { path = "../sys/types", version = "=0.10.1" }
 
 [dev-dependencies]
-yare = "1.0.2"
+yare = "2"