Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

deps: bump root deps as of 2024-12-20 #1648

Merged
merged 2 commits into from
Dec 20, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
68 changes: 34 additions & 34 deletions Cargo.lock

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

24 changes: 12 additions & 12 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -72,23 +72,23 @@ logging = ["fern", "log", "time"]
generate_schema = ["schemars", "serde_json", "strum"]

[dependencies]
anyhow = "1.0.93"
anyhow = "1.0.94"
backtrace = "0.3.74"
cfg-if = "1.0.0"
clap = { version = "4.5.21", features = ["default", "cargo", "wrap_help", "derive"] }
clap = { version = "4.5.23", features = ["default", "cargo", "wrap_help", "derive"] }
concat-string = "1.0.1"
crossterm = "0.28.1"
ctrlc = { version = "3.4.5", features = ["termination"] }
dirs = "5.0.1"
# Maybe consider https://github.com/rust-lang/rustc-hash for some cases too?
hashbrown = "0.15.2"
humantime = "2.1.0"
indexmap = "2.6.0"
indexmap = "2.7.0"
indoc = "2.0.5"
itertools = "0.13.0"
nvml-wrapper = { version = "0.10.0", optional = true, features = ["legacy-functions"] }
regex = "1.11.1"
serde = { version = "1.0.214", features = ["derive"] }
serde = { version = "1.0.216", features = ["derive"] }
starship-battery = { version = "0.10.0", optional = true }
sysinfo = "=0.30.13"
toml_edit = { version = "0.22.22", features = ["serde"] }
Expand All @@ -98,20 +98,20 @@ unicode-segmentation = "1.12.0"
unicode-width = "0.2.0"

# Used for logging.
fern = { version = "0.7.0", optional = true }
fern = { version = "0.7.1", optional = true }
log = { version = "0.4.22", optional = true }
time = { version = "0.3.36", features = ["local-offset", "formatting", "macros"], optional = true }
time = { version = "0.3.37", features = ["local-offset", "formatting", "macros"], optional = true }

# These are just used for JSON schema generation.
schemars = { version = "0.8.21", optional = true }
serde_json = { version = "1.0.133", optional = true }
strum = { version = "0.26.3", features = ["derive"], optional = true }

[target.'cfg(unix)'.dependencies]
libc = "0.2.162"
libc = "0.2.169"

[target.'cfg(target_os = "linux")'.dependencies]
rustix = { version = "0.38.40", features = ["fs", "param"] }
rustix = { version = "0.38.42", features = ["fs", "param"] }

[target.'cfg(target_os = "macos")'.dependencies]
core-foundation = "0.10.0"
Expand All @@ -129,22 +129,22 @@ windows = { version = "0.58.0", features = [
] }

[target.'cfg(target_os = "freebsd")'.dependencies]
serde_json = { version = "1.0.132" }
serde_json = { version = "1.0.133" }
sysctl = { version = "0.6.0" }
filedescriptor = "0.8.2"

[dev-dependencies]
assert_cmd = "2.0.16"
cargo-husky = { version = "1.5.0", default-features = false, features = ["user-hooks"] }
predicates = "3.1.2"
predicates = "3.1.3"
tempfile = "3.14.0"

[target.'cfg(all(target_arch = "x86_64", target_os = "linux"))'.dev-dependencies]
portable-pty = "0.8.1"

[build-dependencies]
clap = { version = "4.5.21", features = ["default", "cargo", "wrap_help", "derive"] }
clap_complete = "4.5.38"
clap = { version = "4.5.23", features = ["default", "cargo", "wrap_help", "derive"] }
clap_complete = "4.5.40"
clap_complete_nushell = "4.5.4"
clap_complete_fig = "4.5.2"
clap_mangen = "0.2.24"
Expand Down
1 change: 1 addition & 0 deletions src/data_collection/amd.rs
Original file line number Diff line number Diff line change
Expand Up @@ -437,6 +437,7 @@ pub fn get_amd_vecs(
total_mem += mem.total
}

// TODO: Not sure if this overlaps with the existing generic temperature code.
if widgets_to_harvest.use_temp && Filter::optional_should_keep(filter, &device_name) {
if let Some(temperatures) = get_amd_temp(&device_path) {
for info in temperatures {
Expand Down
21 changes: 1 addition & 20 deletions src/utils/logging.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,26 +11,7 @@ pub fn init_logger(
let dispatch = fern::Dispatch::new()
.format(|out, message, record| {
let offset = OFFSET.get_or_init(|| {
use time::util::local_offset::Soundness;

// SAFETY: We only invoke this once, quickly, and it should be invoked in a
// single-thread context. We also should only ever hit this
// logging at all in a debug context which is generally fine,
// release builds should have this logging disabled entirely for now.
unsafe {
// XXX: If we ever DO add general logging as a release feature, evaluate this
// again and whether this is something we want enabled in
// release builds! What might be safe is falling back to the non-set-soundness
// mode when specifically using certain feature flags (e.g. dev-logging feature
// enables this behaviour).

time::util::local_offset::set_soundness(Soundness::Unsound);
let res =
time::UtcOffset::current_local_offset().unwrap_or(time::UtcOffset::UTC);
time::util::local_offset::set_soundness(Soundness::Sound);

res
}
time::UtcOffset::current_local_offset().unwrap_or(time::UtcOffset::UTC)
});

let offset_time = {
Expand Down
Loading