Skip to content

Commit 6dadb6e

Browse files
committed
Auto merge of rust-lang#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
2 parents dda102c + 53efefb commit 6dadb6e

File tree

5 files changed

+21
-45
lines changed

5 files changed

+21
-45
lines changed

Cargo.lock

+10-34
Original file line numberDiff line numberDiff line change
@@ -1224,19 +1224,6 @@ dependencies = [
12241224
"regex",
12251225
]
12261226

1227-
[[package]]
1228-
name = "env_logger"
1229-
version = "0.10.2"
1230-
source = "registry+https://github.com/rust-lang/crates.io-index"
1231-
checksum = "4cd405aab171cb85d6735e5c8d9db038c17d3ca007a4d2c25f337935c3d90580"
1232-
dependencies = [
1233-
"humantime",
1234-
"is-terminal",
1235-
"log",
1236-
"regex",
1237-
"termcolor",
1238-
]
1239-
12401227
[[package]]
12411228
name = "env_logger"
12421229
version = "0.11.2"
@@ -2058,17 +2045,6 @@ version = "2.9.0"
20582045
source = "registry+https://github.com/rust-lang/crates.io-index"
20592046
checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3"
20602047

2061-
[[package]]
2062-
name = "is-terminal"
2063-
version = "0.4.12"
2064-
source = "registry+https://github.com/rust-lang/crates.io-index"
2065-
checksum = "f23ff5ef2b80d608d61efee834934d862cd92461afc0560dedf493e4c033738b"
2066-
dependencies = [
2067-
"hermit-abi",
2068-
"libc",
2069-
"windows-sys 0.52.0",
2070-
]
2071-
20722048
[[package]]
20732049
name = "itertools"
20742050
version = "0.11.0"
@@ -2364,7 +2340,7 @@ dependencies = [
23642340
"clap",
23652341
"clap_complete",
23662342
"elasticlunr-rs",
2367-
"env_logger 0.11.2",
2343+
"env_logger",
23682344
"handlebars",
23692345
"log",
23702346
"memchr",
@@ -2709,7 +2685,7 @@ dependencies = [
27092685
"camino",
27102686
"clap",
27112687
"derive_builder",
2712-
"env_logger 0.10.2",
2688+
"env_logger",
27132689
"fs_extra",
27142690
"glob",
27152691
"humansize",
@@ -2788,9 +2764,9 @@ dependencies = [
27882764

27892765
[[package]]
27902766
name = "papergrid"
2791-
version = "0.10.0"
2767+
version = "0.11.0"
27922768
source = "registry+https://github.com/rust-lang/crates.io-index"
2793-
checksum = "a2ccbe15f2b6db62f9a9871642746427e297b0ceb85f9a7f1ee5ff47d184d0c8"
2769+
checksum = "9ad43c07024ef767f9160710b3a6773976194758c7919b17e63b863db0bdf7fb"
27942770
dependencies = [
27952771
"bytecount",
27962772
"fnv",
@@ -3326,7 +3302,7 @@ name = "rustbook"
33263302
version = "0.1.0"
33273303
dependencies = [
33283304
"clap",
3329-
"env_logger 0.10.2",
3305+
"env_logger",
33303306
"mdbook",
33313307
]
33323308

@@ -5270,16 +5246,16 @@ dependencies = [
52705246

52715247
[[package]]
52725248
name = "sysinfo"
5273-
version = "0.29.11"
5249+
version = "0.30.5"
52745250
source = "registry+https://github.com/rust-lang/crates.io-index"
5275-
checksum = "cd727fc423c2060f6c92d9534cef765c65a6ed3f428a03d7def74a8c4348e666"
5251+
checksum = "1fb4f3438c8f6389c864e61221cbc97e9bca98b4daf39a5beb7bea660f528bb2"
52765252
dependencies = [
52775253
"cfg-if",
52785254
"core-foundation-sys",
52795255
"libc",
52805256
"ntapi",
52815257
"once_cell",
5282-
"winapi",
5258+
"windows",
52835259
]
52845260

52855261
[[package]]
@@ -5314,9 +5290,9 @@ dependencies = [
53145290

53155291
[[package]]
53165292
name = "tabled"
5317-
version = "0.13.0"
5293+
version = "0.15.0"
53185294
source = "registry+https://github.com/rust-lang/crates.io-index"
5319-
checksum = "4d38d39c754ae037a9bc3ca1580a985db7371cd14f1229172d1db9093feb6739"
5295+
checksum = "4c998b0c8b921495196a48aabaf1901ff28be0760136e31604f7967b0792050e"
53205296
dependencies = [
53215297
"papergrid",
53225298
"unicode-width",

src/tools/opt-dist/Cargo.toml

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@ edition = "2021"
55

66
[dependencies]
77
build_helper = { path = "../build_helper" }
8-
env_logger = "0.10"
8+
env_logger = "0.11"
99
log = "0.4"
1010
anyhow = { version = "1", features = ["backtrace"] }
1111
humantime = "2"
1212
humansize = "2"
13-
sysinfo = { version = "0.29", default-features = false }
13+
sysinfo = { version = "0.30", default-features = false }
1414
fs_extra = "1"
1515
camino = "1"
1616
reqwest = { version = "0.11", features = ["blocking"] }
@@ -23,4 +23,4 @@ glob = "0.3"
2323
tempfile = "3.5"
2424
derive_builder = "0.20"
2525
clap = { version = "4", features = ["derive"] }
26-
tabled = { version = "0.13", default-features = false, features = ["std"] }
26+
tabled = { version = "0.15", default-features = false, features = ["std"] }

src/tools/opt-dist/src/utils/artifact_size.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ use std::io::Write;
22

33
use tabled::builder::Builder;
44
use tabled::settings::object::Columns;
5-
use tabled::settings::style::{BorderChar, Offset};
5+
use tabled::settings::style::{LineChar, Offset};
66
use tabled::settings::{Modify, Style};
77

88
use crate::environment::Environment;
@@ -40,19 +40,19 @@ pub fn print_binary_sizes(env: &Environment) -> anyhow::Result<()> {
4040
// Write to GitHub summary
4141
if let Ok(summary_path) = std::env::var("GITHUB_STEP_SUMMARY") {
4242
let mut builder = Builder::default();
43+
builder.push_record(vec!["Artifact", "Size"]);
4344
for (name, size_formatted) in items {
4445
builder.push_record(vec![name, size_formatted]);
4546
}
4647

47-
builder.set_header(vec!["Artifact", "Size"]);
4848
let mut table = builder.build();
4949

5050
let mut file = std::fs::File::options().append(true).create(true).open(summary_path)?;
5151
writeln!(
5252
file,
5353
"# Artifact size\n{}\n",
5454
table.with(Style::markdown()).with(
55-
Modify::new(Columns::single(1)).with(BorderChar::horizontal(':', Offset::End(0))),
55+
Modify::new(Columns::single(1)).with(LineChar::horizontal(':', Offset::End(0))),
5656
)
5757
)?;
5858
}

src/tools/opt-dist/src/utils/mod.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use sysinfo::{DiskExt, RefreshKind, System, SystemExt};
1+
use sysinfo::Disks;
22

33
use crate::environment::Environment;
44
use crate::timer::Timer;
@@ -15,9 +15,9 @@ pub fn format_env_variables() -> String {
1515
}
1616

1717
pub fn print_free_disk_space() -> anyhow::Result<()> {
18-
let sys = System::new_with_specifics(RefreshKind::default().with_disks_list().with_disks());
19-
let available_space: u64 = sys.disks().iter().map(|d| d.available_space()).sum();
20-
let total_space: u64 = sys.disks().iter().map(|d| d.total_space()).sum();
18+
let disks = Disks::new_with_refreshed_list();
19+
let available_space: u64 = disks.list().iter().map(|d| d.available_space()).sum();
20+
let total_space: u64 = disks.list().iter().map(|d| d.total_space()).sum();
2121
let used_space = total_space - available_space;
2222

2323
log::info!(

src/tools/rustbook/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ edition = "2021"
66

77
[dependencies]
88
clap = "4.0.32"
9-
env_logger = "0.10"
9+
env_logger = "0.11"
1010

1111
[dependencies.mdbook]
1212
version = "0.4.37"

0 commit comments

Comments
 (0)