Skip to content

Commit

Permalink
Merge #1523
Browse files Browse the repository at this point in the history 
1523: chore: upgrade cargo deps r=tiagolobocastro a=tiagolobocastro

todo: upgrade clap as require more code changes across various binaries

Co-authored-by: Tiago Castro <[email protected]>
  • Loading branch information
@tiagolobocastro
mayastor-bors and tiagolobocastro committed Oct 13, 2023
2 parents 9dc4ec1 + ee66642 commit 25e1332
Show file tree
Hide file tree
Showing 16 changed files with 770 additions and 970 deletions.
1,423 changes: 610 additions & 813 deletions Cargo.lock
View file

Large diffs are not rendered by default.

26 changes: 13 additions & 13 deletions io-engine-bench/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,27 +6,27 @@ edition = "2021"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dev-dependencies]
tokio = { version = "1.12.0", features = [ "full" ] }
chrono = "0.4.19"
env_logger = "0.9.0"
futures = "0.3.16"
once_cell = "1.8.0"
tonic = "0.8.3"
tracing = "0.1.26"
tracing-core = "0.1.19"
tokio = { version = "1.33.0", features = [ "full" ] }
chrono = "0.4.31"
env_logger = "0.10.0"
futures = "0.3.28"
once_cell = "1.18.0"
tonic = "0.9.2"
tracing = "0.1.37"
tracing-core = "0.1.31"
tracing-futures = "0.2.5"
tracing-subscriber = "0.2.20"
url = "2.2.2"
crossbeam = "0.8.1"
uuid = { version = "0.8.2", features = ["v4"] }
tracing-subscriber = "0.3.17"
url = "2.4.1"
crossbeam = "0.8.2"
uuid = { version = "1.4.1", features = ["v4"] }
run_script = "0.10.1"
mayastor-api = { path = "../rpc/mayastor-api" }
io-engine = { path = "../io-engine" }
composer = { path = "../utils/io-engine-dependencies/composer" }
spdk-rs = { path = "../spdk-rs" }
io-engine-tests = { path = "../io-engine-tests" }
libnvme-rs = { path = "../libnvme-rs", version = "0.1.0" }
criterion = { version = "0.3.5", features = [ "async_tokio" ] }
criterion = { version = "0.5.1", features = [ "async_tokio" ] }

[[bench]]
name = "nexus"
Expand Down
86 changes: 43 additions & 43 deletions io-engine-tests/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,60 +7,60 @@ edition = "2018"
[dependencies]
ansi_term = "0.12.1"
assert_matches = "1.5.0"
async-channel = "1.6.1"
async-task = "4.0.3"
async-trait = "0.1.51"
async-channel = "1.9.0"
async-task = "4.4.1"
async-trait = "0.1.73"
bincode = "1.3.3"
byte-unit = "4.0.12"
bytes = "1.0.1"
chrono = "0.4.19"
byte-unit = "4.0.19"
bytes = "1.5.0"
chrono = "0.4.31"
clap = "2.33.3"
colored_json = "2.1.0"
crc = "1.8.1"
crossbeam = "0.8.1"
colored_json = "3.3.0"
crc = "3.0.1"
crossbeam = "0.8.2"
crossbeam-sync = "0.0.0"
dns-lookup = "1.0.8"
env_logger = "0.9.0"
etcd-client = "0.7.1"
dns-lookup = "2.0.3"
env_logger = "0.10.0"
etcd-client = "0.12.1"
function_name = "0.3.0"
futures = "0.3.16"
futures = "0.3.28"
hex = "0.4.3"
http = "0.2.4"
io-uring = "0.5.1"
http = "0.2.9"
io-uring = "0.6.2"
ioctl-gen = "0.1.1"
jsonrpc = { path = "../jsonrpc"}
lazy_static = "1.4.0"
libc = "0.2.99"
log = "0.4.14"
libc = "0.2.149"
log = "0.4.20"
md5 = "0.7.0"
merge = "0.1.0"
nix = "0.22.1"
once_cell = "1.8.0"
parking_lot = "0.11.1"
nix = "0.27.1"
once_cell = "1.18.0"
parking_lot = "0.12.1"
pin-utils = "0.1.0"
proc-mounts = "0.2.4"
prost = "0.11.6"
prost-derive = "0.11.6"
prost-types = "0.11.6"
rand = "0.8.4"
proc-mounts = "0.3.0"
prost = "0.11.9"
prost-derive = "0.11.9"
prost-types = "0.11.9"
rand = "0.8.5"
rand_chacha = "0.3.1"
regex = "1.5.4"
regex = "1.10.0"
run_script = "0.10.1"
serde_json = "1.0.66"
serde_yaml = "0.8.18"
sha2 = "0.10.2"
signal-hook = "0.3.9"
snafu = "0.7.1"
structopt = "0.3.22"
tonic = "0.8.3"
tower = "0.4.8"
tracing = "0.1.26"
tracing-core = "0.1.19"
serde_json = "1.0.107"
serde_yaml = "0.9.25"
sha2 = "0.10.8"
signal-hook = "0.3.17"
snafu = "0.7.5"
structopt = "0.3.26"
tonic = "0.9.2"
tower = "0.4.13"
tracing = "0.1.37"
tracing-core = "0.1.31"
tracing-futures = "0.2.5"
tracing-log = "0.1.2"
tracing-subscriber = "0.2.20"
udev = "0.6.2"
url = "2.2.2"
tracing-log = "0.1.3"
tracing-subscriber = "0.3.17"
udev = "0.8.0"
url = "2.4.1"

composer = { path = "../utils/io-engine-dependencies/composer" }
libnvme-rs = { path = "../libnvme-rs" }
Expand All @@ -71,7 +71,7 @@ io-engine-tests-macros = { path = "./io-engine-tests-macros" }

[dependencies.serde]
features = ["derive"]
version = "1.0.127"
version = "1.0.188"

[dependencies.spdk-rs]
path = "../spdk-rs"
Expand All @@ -81,8 +81,8 @@ path = "../sysfs"

[dependencies.tokio]
features = ["full"]
version = "1.10.0"
version = "1.33.0"

[dependencies.uuid]
features = ["v4"]
version = "0.8.2"
version = "1.4.1"
4 changes: 2 additions & 2 deletions io-engine-tests/io-engine-tests-macros/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ edition = "2018"
proc-macro = true

[dependencies]
proc-macro2 = "1.0.66"
proc-macro2 = "1.0.69"
quote = "1.0.33"
syn = { version = "2.0.29", features = ["extra-traits"] }
syn = { version = "2.0.38", features = ["extra-traits"] }
94 changes: 47 additions & 47 deletions io-engine/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,64 +45,64 @@ path = "src/bin/casperf.rs"

[dependencies]
ansi_term = "0.12.1"
async-channel = "1.6.1"
async-task = "4.0.3"
async-trait = "0.1.51"
async-channel = "1.9.0"
async-task = "4.4.1"
async-trait = "0.1.73"
bit-vec = "0.6.3"
bincode = "1.3.3"
byte-unit = "4.0.12"
bytes = "1.0.1"
chrono = "0.4.19"
byte-unit = "4.0.19"
bytes = "1.5.0"
chrono = "0.4.31"
clap = "2.33.3"
colored_json = "2.1.0"
crc = "1.8.1"
crossbeam = "0.8.1"
colored_json = "3.3.0"
crc = "3.0.1"
crossbeam = "0.8.2"
crossbeam-sync = "0.0.0"
dns-lookup = "1.0.8"
env_logger = "0.9.0"
etcd-client = "0.7.1"
dns-lookup = "2.0.3"
env_logger = "0.10.0"
etcd-client = "0.12.1"
function_name = "0.3.0"
futures = "0.3.16"
futures = "0.3.28"
hex = "0.4.3"
http = "0.2.4"
http = "0.2.9"
humantime = "2.1.0"
io-uring = "0.5.1"
io-uring = "0.6.2"
ioctl-gen = "0.1.1"
lazy_static = "1.4.0"
libc = "0.2.99"
log = "0.4.14"
libc = "0.2.149"
log = "0.4.20"
md5 = "0.7.0"
merge = "0.1.0"
nix = "0.22.1"
once_cell = "1.8.0"
parking_lot = "0.11.1"
nix = { version = "0.27.1", default-features = false, features = [ "hostname", "net", "socket", "ioctl" ] }
once_cell = "1.18.0"
parking_lot = "0.12.1"
pin-utils = "0.1.0"
proc-mounts = "0.2.4"
prost = "0.11.6"
prost-derive = "0.11.6"
prost-types = "0.11.6"
rand = "0.8.4"
regex = "1.5.4"
serde_json = "1.0.66"
serde_yaml = "0.8.18"
sha2 = "0.10.2"
signal-hook = "0.3.9"
snafu = "0.7.1"
structopt = "0.3.22"
strum = "0.24"
strum_macros = "0.24"
tonic = "0.8.3"
tower = "0.4.8"
tracing = "0.1.26"
tracing-core = "0.1.19"
proc-mounts = "0.3.0"
prost = "0.11.9"
prost-derive = "0.11.9"
prost-types = "0.11.9"
rand = "0.8.5"
regex = "1.10.0"
serde_json = "1.0.107"
serde_yaml = "0.9.25"
sha2 = "0.10.8"
signal-hook = "0.3.17"
snafu = "0.7.5"
structopt = "0.3.26"
strum = "0.25"
strum_macros = "0.25"
tonic = "0.9.2"
tower = "0.4.13"
tracing = "0.1.37"
tracing-core = "0.1.31"
tracing-futures = "0.2.5"
tracing-log = "0.1.2"
tracing-subscriber = "0.3.16"
udev = "0.6.2"
url = "2.2.2"
tracing-log = "0.1.3"
tracing-subscriber = "0.3.17"
udev = "0.8.0"
url = "2.4.1"
gettid = "0.1.2"
async-process = { version = "1.5.0" }
rstack = { version = "0.3.2" }
async-process = { version = "1.8.1" }
rstack = { version = "0.3.3" }
tokio-stream = "0.1.14"

jsonrpc = { path = "../jsonrpc"}
Expand All @@ -115,15 +115,15 @@ event-publisher = { path = "../utils/io-engine-dependencies/event-publisher" }

[dependencies.serde]
features = ["derive"]
version = "1.0.127"
version = "1.0.188"

[dependencies.tokio]
features = ["full"]
version = "1.10.0"
version = "1.33.0"

[dependencies.uuid]
features = ["v4"]
version = "0.8.2"
version = "1.4.1"

[dev-dependencies]
assert_matches = "1.5.0"
Expand Down
4 changes: 2 additions & 2 deletions io-engine/src/bdev/nvmf.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -211,8 +211,8 @@ impl CreateDestroy for Nvmf {
}
if let Some(mut bdev) = UntypedBdev::lookup_by_name(&self.get_name()) {
if let Some(u) = self.uuid {
if bdev.uuid_as_string() != u.to_hyphenated().to_string() {
error!("Connected to device {} but expect to connect to {} instead", bdev.uuid_as_string(), u.to_hyphenated().to_string());
if bdev.uuid_as_string() != u.hyphenated().to_string() {
error!("Connected to device {} but expect to connect to {} instead", bdev.uuid_as_string(), u.hyphenated().to_string());
}
};
if !bdev.add_alias(&self.alias) {
Expand Down
Loading

0 comments on commit 25e1332

Please sign in to comment.