diff options
| author | bors <bors@rust-lang.org> | 2024-02-23 07:42:50 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-02-23 07:42:50 +0000 |
| commit | 6dadb6eb23e7719da4e372d3e13d50282323d022 (patch) | |
| tree | 6f69849f95668c0c96cc845373781994b2a85cc2 /src | |
| parent | dda102c190f854f6b2dc165622c8173ffb752025 (diff) | |
| parent | 53efefb3c237d55e6c5fdaf3cbb91f6f3c240a15 (diff) | |
Auto merge of #121448 - klensy:bump-22-02-24, r=clubby789
bump few deps Bumps `sysinfo`, `tabled`; dedupes `env_logger`; drops `is-terminal` https://github.com/zhiburt/tabled/blob/v0.15.1/CHANGELOG.md https://github.com/GuillaumeGomez/sysinfo/blob/v0.30.5/CHANGELOG.md
Diffstat (limited to 'src')
| -rw-r--r-- | src/tools/opt-dist/Cargo.toml | 6 | ||||
| -rw-r--r-- | src/tools/opt-dist/src/utils/artifact_size.rs | 6 | ||||
| -rw-r--r-- | src/tools/opt-dist/src/utils/mod.rs | 8 | ||||
| -rw-r--r-- | src/tools/rustbook/Cargo.toml | 2 |
4 files changed, 11 insertions, 11 deletions
diff --git a/src/tools/opt-dist/Cargo.toml b/src/tools/opt-dist/Cargo.toml index eb6f889a6f3..4cb6acb394c 100644 --- a/src/tools/opt-dist/Cargo.toml +++ b/src/tools/opt-dist/Cargo.toml @@ -5,12 +5,12 @@ edition = "2021" [dependencies] build_helper = { path = "../build_helper" } -env_logger = "0.10" +env_logger = "0.11" log = "0.4" anyhow = { version = "1", features = ["backtrace"] } humantime = "2" humansize = "2" -sysinfo = { version = "0.29", default-features = false } +sysinfo = { version = "0.30", default-features = false } fs_extra = "1" camino = "1" reqwest = { version = "0.11", features = ["blocking"] } @@ -23,4 +23,4 @@ glob = "0.3" tempfile = "3.5" derive_builder = "0.20" clap = { version = "4", features = ["derive"] } -tabled = { version = "0.13", default-features = false, features = ["std"] } +tabled = { version = "0.15", default-features = false, features = ["std"] } diff --git a/src/tools/opt-dist/src/utils/artifact_size.rs b/src/tools/opt-dist/src/utils/artifact_size.rs index 4dc8952b60a..eb1f6bcf21d 100644 --- a/src/tools/opt-dist/src/utils/artifact_size.rs +++ b/src/tools/opt-dist/src/utils/artifact_size.rs @@ -2,7 +2,7 @@ use std::io::Write; use tabled::builder::Builder; use tabled::settings::object::Columns; -use tabled::settings::style::{BorderChar, Offset}; +use tabled::settings::style::{LineChar, Offset}; use tabled::settings::{Modify, Style}; use crate::environment::Environment; @@ -40,11 +40,11 @@ pub fn print_binary_sizes(env: &Environment) -> anyhow::Result<()> { // Write to GitHub summary if let Ok(summary_path) = std::env::var("GITHUB_STEP_SUMMARY") { let mut builder = Builder::default(); + builder.push_record(vec!["Artifact", "Size"]); for (name, size_formatted) in items { builder.push_record(vec![name, size_formatted]); } - builder.set_header(vec!["Artifact", "Size"]); let mut table = builder.build(); let mut file = std::fs::File::options().append(true).create(true).open(summary_path)?; @@ -52,7 +52,7 @@ pub fn print_binary_sizes(env: &Environment) -> anyhow::Result<()> { file, "# Artifact size\n{}\n", table.with(Style::markdown()).with( - Modify::new(Columns::single(1)).with(BorderChar::horizontal(':', Offset::End(0))), + Modify::new(Columns::single(1)).with(LineChar::horizontal(':', Offset::End(0))), ) )?; } diff --git a/src/tools/opt-dist/src/utils/mod.rs b/src/tools/opt-dist/src/utils/mod.rs index ca1292dd5b8..22b0483c071 100644 --- a/src/tools/opt-dist/src/utils/mod.rs +++ b/src/tools/opt-dist/src/utils/mod.rs @@ -1,4 +1,4 @@ -use sysinfo::{DiskExt, RefreshKind, System, SystemExt}; +use sysinfo::Disks; use crate::environment::Environment; use crate::timer::Timer; @@ -15,9 +15,9 @@ pub fn format_env_variables() -> String { } pub fn print_free_disk_space() -> anyhow::Result<()> { - let sys = System::new_with_specifics(RefreshKind::default().with_disks_list().with_disks()); - let available_space: u64 = sys.disks().iter().map(|d| d.available_space()).sum(); - let total_space: u64 = sys.disks().iter().map(|d| d.total_space()).sum(); + let disks = Disks::new_with_refreshed_list(); + let available_space: u64 = disks.list().iter().map(|d| d.available_space()).sum(); + let total_space: u64 = disks.list().iter().map(|d| d.total_space()).sum(); let used_space = total_space - available_space; log::info!( diff --git a/src/tools/rustbook/Cargo.toml b/src/tools/rustbook/Cargo.toml index a380a20b1ac..2ef9004c476 100644 --- a/src/tools/rustbook/Cargo.toml +++ b/src/tools/rustbook/Cargo.toml @@ -6,7 +6,7 @@ edition = "2021" [dependencies] clap = "4.0.32" -env_logger = "0.10" +env_logger = "0.11" [dependencies.mdbook] version = "0.4.37" |
