Skip to content

Commit

Permalink
Update yare to version 2 (#464)
Browse files Browse the repository at this point in the history 
Also remove unnecessary minor and patch version specification in
manifest files.
  • Loading branch information
@nick-mobilecoin
nick-mobilecoin authored Jan 3, 2024
2 parents 6baae9a + 83034ac commit 0d3f69a
Show file tree
Hide file tree
Showing 10 changed files with 44 additions and 45 deletions.
11 changes: 5 additions & 6 deletions Cargo.lock
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion capable/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
6 changes: 3 additions & 3 deletions capable/types/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
20 changes: 10 additions & 10 deletions core/types/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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"
10 changes: 5 additions & 5 deletions dcap/ql/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 = []
Expand All @@ -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"
2 changes: 1 addition & 1 deletion dcap/ql/types/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
2 changes: 1 addition & 1 deletion dcap/quoteverify/types/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
28 changes: 14 additions & 14 deletions dcap/types/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
6 changes: 3 additions & 3 deletions tservice/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,16 @@ 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" }
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"
2 changes: 1 addition & 1 deletion tservice/types/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"

0 comments on commit 0d3f69a

Please sign in to comment.