From db448d9936c6e81c18b76c9013fd275dd7e6aa21 Mon Sep 17 00:00:00 2001 From: Alessandro Passaro Date: Mon, 9 Dec 2024 14:33:36 +0000 Subject: [PATCH] Upgrade crates Signed-off-by: Alessandro Passaro --- Cargo.lock | 46 ++++++++++++++++++++--------- mountpoint-s3-client/Cargo.toml | 36 +++++++++++------------ mountpoint-s3-crt-sys/Cargo.toml | 10 +++---- mountpoint-s3-crt/Cargo.toml | 16 +++++----- mountpoint-s3/Cargo.toml | 50 ++++++++++++++++---------------- mountpoint-s3/src/metrics.rs | 4 +-- 6 files changed, 91 insertions(+), 71 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 5014025d1..947a0271e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -839,9 +839,9 @@ dependencies = [ [[package]] name = "bindgen" -version = "0.70.1" +version = "0.71.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f49d8fed880d473ea71efb9bf597651e77201bdd4893efe54c9e5d65ae04ce6f" +checksum = "5f58bf3d7db68cfbac37cfc485a8d711e87e064c3d0fe0435b92f7a407f9d6b3" dependencies = [ "bitflags", "cexpr", @@ -2560,7 +2560,7 @@ dependencies = [ "syslog", "tempfile", "test-case", - "thiserror", + "thiserror 2.0.6", "time", "tokio", "tracing", @@ -2607,7 +2607,7 @@ dependencies = [ "static_assertions", "tempfile", "test-case", - "thiserror", + "thiserror 2.0.6", "time", "tokio", "tracing", @@ -2632,7 +2632,7 @@ dependencies = [ "smallstr", "static_assertions", "test-case", - "thiserror", + "thiserror 2.0.6", "tracing", "tracing-subscriber", ] @@ -3219,7 +3219,7 @@ checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43" dependencies = [ "getrandom", "libredox", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -3306,9 +3306,9 @@ checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" [[package]] name = "rustc-hash" -version = "1.1.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" +checksum = "c7fb8039b3032c191086b10f11f319a6e99e1e82889c5cc6046f515c9db1d497" [[package]] name = "rustc_version" @@ -3799,9 +3799,9 @@ dependencies = [ [[package]] name = "sysinfo" -version = "0.32.1" +version = "0.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c33cd241af0f2e9e3b5c32163b873b29956890b5342e6745b917ce9d490f4af" +checksum = "948512566b1895f93b1592c7574baeb2de842f224f2aab158799ecadb8ebbb46" dependencies = [ "core-foundation-sys", "libc", @@ -3898,7 +3898,16 @@ version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52" dependencies = [ - "thiserror-impl", + "thiserror-impl 1.0.69", +] + +[[package]] +name = "thiserror" +version = "2.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8fec2a1820ebd077e2b90c4df007bebf344cd394098a13c563957d0afc83ea47" +dependencies = [ + "thiserror-impl 2.0.6", ] [[package]] @@ -3912,6 +3921,17 @@ dependencies = [ "syn 2.0.90", ] +[[package]] +name = "thiserror-impl" +version = "2.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d65750cab40f4ff1929fb1ba509e9914eb756131cef4210da8d5d700d26f6312" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.90", +] + [[package]] name = "thread_local" version = "1.1.8" @@ -4323,9 +4343,9 @@ dependencies = [ [[package]] name = "which" -version = "6.0.3" +version = "7.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4ee928febd44d98f2f459a4a79bd4d928591333a494a10a868418ac1b39cf1f" +checksum = "c9cad3279ade7346b96e38731a641d7343dd6a53d55083dd54eadfa5a1b38c6b" dependencies = [ "either", "home", diff --git a/mountpoint-s3-client/Cargo.toml b/mountpoint-s3-client/Cargo.toml index 7a038c4dd..ee493ff2a 100644 --- a/mountpoint-s3-client/Cargo.toml +++ b/mountpoint-s3-client/Cargo.toml @@ -14,43 +14,43 @@ mountpoint-s3-crt-sys = { path = "../mountpoint-s3-crt-sys", version = "0.10.0" async-trait = "0.1.83" auto_impl = "1.2.0" base64ct = { version = "1.6.0", features = ["std"] } -const_format = "0.2.33" +const_format = "0.2.34" futures = "0.3.31" lazy_static = "1.5.0" -metrics = "0.24.0" +metrics = "0.24.1" once_cell = "1.20.2" percent-encoding = "2.3.1" -pin-project = "1.1.6" +pin-project = "1.1.7" platform-info = "2.0.4" -regex = "1.11.0" -serde_json = "1.0.132" +regex = "1.11.1" +serde_json = "1.0.133" static_assertions = "1.1.0" -thiserror = "1.0.65" -time = { version = "0.3.36", features = ["formatting", "parsing"] } -tracing = { version = "0.1.40", default-features = false, features = ["std", "log"] } +thiserror = "2.0.6" +time = { version = "0.3.37", features = ["formatting", "parsing"] } +tracing = { version = "0.1.41", default-features = false, features = ["std", "log"] } xmltree = "0.11.0" # Dependencies for the mock client only -async-io = { version = "2.3.4", optional = true } +async-io = { version = "2.4.0", optional = true } async-lock = { version = "3.4.0", optional = true } md-5 = { version = "0.10.6", optional = true } rand = { version = "0.8.5", optional = true } rand_chacha = { version = "0.3.1", optional = true } [dev-dependencies] -aws-config = "1.5.8" +aws-config = "1.5.10" aws-credential-types = "1.2.1" -aws-sdk-s3 = "1.57.0" -aws-smithy-runtime-api = "1.7.2" -bytes = "1.8.0" -clap = { version = "4.5.20", features = ["derive"] } -ctor = "0.2.8" +aws-sdk-s3 = "1.65.0" +aws-smithy-runtime-api = "1.7.3" +bytes = "1.9.0" +clap = { version = "4.5.23", features = ["derive"] } +ctor = "0.2.9" proptest = "1.5.0" rusty-fork = "0.3.0" -tempfile = "3.13.0" +tempfile = "3.14.0" test-case = "3.3.1" -tokio = { version = "1.41.0", features = ["rt", "macros"] } -tracing-subscriber = { version = "0.3.18", features = ["fmt", "env-filter"] } +tokio = { version = "1.42.0", features = ["rt", "macros"] } +tracing-subscriber = { version = "0.3.19", features = ["fmt", "env-filter"] } # HACK: we want our own tests to use the mock client, but don't want to enable it for consumers by # default, so we take a dev-dependency on ourself with that feature enabled. diff --git a/mountpoint-s3-crt-sys/Cargo.toml b/mountpoint-s3-crt-sys/Cargo.toml index 6cce59795..552222b78 100644 --- a/mountpoint-s3-crt-sys/Cargo.toml +++ b/mountpoint-s3-crt-sys/Cargo.toml @@ -70,16 +70,16 @@ exclude = [ ] [build-dependencies] -bindgen = { version = "0.70.1", default-features = false, features = [ +bindgen = { version = "0.71.1", default-features = false, features = [ "runtime", ] } -cc = "1.1.31" -cmake = "0.1.51" +cc = "1.2.3" +cmake = "0.1.52" rustflags = "0.1.6" -which = "6.0.3" +which = "7.0.0" [dependencies] -libc = "0.2.161" +libc = "0.2.168" [lib] doctest = false diff --git a/mountpoint-s3-crt/Cargo.toml b/mountpoint-s3-crt/Cargo.toml index d986a8dee..dec30af4f 100644 --- a/mountpoint-s3-crt/Cargo.toml +++ b/mountpoint-s3-crt/Cargo.toml @@ -11,22 +11,22 @@ description = "Rust interface to the AWS Common Runtime for Mountpoint for Amazo mountpoint-s3-crt-sys = { path = "../mountpoint-s3-crt-sys", version = "0.10.0" } futures = "0.3.31" -libc = "0.2.161" +libc = "0.2.168" log = "0.4.22" smallstr = "0.3.0" static_assertions = "1.1.0" -thiserror = "1.0.65" +thiserror = "2.0.6" [dev-dependencies] -anyhow = { version = "1.0.91", features = ["backtrace"] } -clap = { version = "4.5.20", features = ["derive"] } +anyhow = { version = "1.0.94", features = ["backtrace"] } +clap = { version = "4.5.23", features = ["derive"] } criterion = "0.5.1" -ctor = "0.2.8" +ctor = "0.2.9" rand = { version = "0.8.5", features = ["small_rng"] } -serde_json = "1.0.132" +serde_json = "1.0.133" test-case = "3.3.1" -tracing = { version = "0.1.40", default-features = false, features = ["std", "log"] } -tracing-subscriber = { version = "0.3.18", features = ["fmt", "env-filter"] } +tracing = { version = "0.1.41", default-features = false, features = ["std", "log"] } +tracing-subscriber = { version = "0.3.19", features = ["fmt", "env-filter"] } [[bench]] name = "event_loop_future" diff --git a/mountpoint-s3/Cargo.toml b/mountpoint-s3/Cargo.toml index bedbbf1ca..40686aa85 100644 --- a/mountpoint-s3/Cargo.toml +++ b/mountpoint-s3/Cargo.toml @@ -11,42 +11,42 @@ fuser = { path = "../vendor/fuser", version = "0.15.0", features = ["abi-7-28"] mountpoint-s3-client = { path = "../mountpoint-s3-client", version = "0.11.0" } mountpoint-s3-crt = { path = "../mountpoint-s3-crt", version = "0.10.0" } -anyhow = { version = "1.0.91", features = ["backtrace"] } +anyhow = { version = "1.0.94", features = ["backtrace"] } async-channel = "2.3.1" async-lock = "3.4.0" +async-stream = "0.3.6" async-trait = "0.1.83" +base64ct = "1.6.0" bincode = "1.3.3" bitflags = "2.6.0" -bytes = { version = "1.8.0", features = ["serde"] } -clap = { version = "4.5.20", features = ["derive"] } -const_format = "0.2.33" +bytes = { version = "1.9.0", features = ["serde"] } +clap = { version = "4.5.23", features = ["derive"] } +const_format = "0.2.34" crc32c = "0.6.8" ctrlc = { version = "3.4.5", features = ["termination"] } dashmap = "6.1.0" futures = "0.3.31" hdrhistogram = { version = "7.5.4", default-features = false } hex = "0.4.3" -libc = "0.2.161" +humansize = "2.1.3" +libc = "0.2.168" linked-hash-map = "0.5.6" -metrics = "0.24.0" +metrics = "0.24.1" nix = { version = "0.29.0", default-features = false, features = ["fs", "process", "signal", "user"] } owo-colors = { version = "4.1.0", features = ["supports-colors"] } rand = "0.8.5" -regex = "1.11.0" -serde = { version = "1.0.213", features = ["derive"] } -serde_json = "1.0.132" +regex = "1.11.1" +serde = { version = "1.0.215", features = ["derive"] } +serde_json = "1.0.133" sha2 = "0.10.8" -supports-color = "3.0.1" -sysinfo = "0.32.0" +supports-color = "3.0.2" +sysinfo = "0.33.0" syslog = "7.0.0" -thiserror = "1.0.65" -time = { version = "0.3.36", features = ["macros", "formatting"] } -tracing = { version = "0.1.40", features = ["log"] } +thiserror = "2.0.6" +time = { version = "0.3.37", features = ["macros", "formatting"] } +tracing = { version = "0.1.41", features = ["log"] } tracing-log = "0.2.0" -tracing-subscriber = { version = "0.3.18", features = ["env-filter"] } -async-stream = "0.3.6" -humansize = "2.1.3" -base64ct = "1.6.0" +tracing-subscriber = { version = "0.3.19", features = ["env-filter"] } [target.'cfg(target_os = "linux")'.dependencies] procfs = { version = "0.17.0", default-features = false } @@ -56,25 +56,25 @@ mountpoint-s3-client = { path = "../mountpoint-s3-client", features = ["mock"] } assert_cmd = "2.0.16" assert_fs = "1.1.2" -aws-config = "1.5.8" +aws-config = "1.5.10" aws-credential-types = "1.2.1" -aws-sdk-s3 = "1.57.0" -ctor = "0.2.8" +aws-sdk-s3 = "1.65.0" +ctor = "0.2.9" filetime = "0.2.25" futures = { version = "*", features = ["thread-pool"] } +httpmock = "0.7.0" predicates = "3.1.2" proptest = "1.5.0" proptest-derive = "0.5.0" rand = "0.8.5" rand_chacha = "0.3.1" -serial_test = "3.1.1" +serial_test = "3.2.0" sha2 = "0.10.8" shuttle = { version = "0.8.0" } -tempfile = "3.13.0" +tempfile = "3.14.0" test-case = "3.3.1" -tokio = { version = "1.41.0", features = ["rt", "macros"] } +tokio = { version = "1.42.0", features = ["rt", "macros"] } walkdir = "2.5.0" -httpmock = "0.7.0" [build-dependencies] built = { version = "0.7.5", features = ["git2"] } diff --git a/mountpoint-s3/src/metrics.rs b/mountpoint-s3/src/metrics.rs index c3c22b38d..4cc693fb9 100644 --- a/mountpoint-s3/src/metrics.rs +++ b/mountpoint-s3/src/metrics.rs @@ -71,11 +71,11 @@ pub fn install() -> MetricsSinkHandle { fn poll_process_metrics(sys: &mut System) { if let Ok(pid) = get_current_pid() { let last_mem = sys.process(pid).map_or(0, |process| process.memory()); - sys.refresh_memory_specifics(MemoryRefreshKind::new().with_ram()); + sys.refresh_memory_specifics(MemoryRefreshKind::nothing().with_ram()); sys.refresh_processes_specifics( ProcessesToUpdate::Some(&[pid]), false, - ProcessRefreshKind::new().with_memory(), + ProcessRefreshKind::nothing().with_memory(), ); if let Some(process) = sys.process(pid) { // update the metrics only when there is some change, otherwise it will be too spammy.