Skip to content

Commit e3811a7

Browse files
committed
Auto merge of rust-lang#115975 - mkroening:reduce-atty, r=davidtwco
dependencies: reduce the amount of crates pulling in atty It would be nice to have only one `hermit-abi` in `Cargo.lock` (rust-lang#107405 (comment)). The only crate pulling in the old `hermit-abi` version is `atty`, which is unmaintained. This PR upgrades three dependencies, which then no longer depend on `atty`: * `Cargo.lock`: `colored v2.0.0 -> v2.0.4` * `Cargo.lock`: `tracing-tree v0.2.3 -> v0.2.4` * Miri: `env_logger 0.9.3 -> 0.10.0` The only dependency chain left that pulls in `hermit-abi 0.1.19` is: `hermit-abi 0.1.19` -> `atty 0.2.14` -> `env_logger 0.7.1` -> `jsonpath_lib 0.2.6` -> `jsondocck 0.1.0` (src/tools/jsondocck) Replacing jsondocck with jsondocckng is tracked in rust-lang#94140.
2 parents 78e74d9 + 4241f94 commit e3811a7

File tree

3 files changed

+10
-23
lines changed

3 files changed

+10
-23
lines changed

Cargo.lock

+8-21
Original file line numberDiff line numberDiff line change
@@ -627,13 +627,13 @@ checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7"
627627

628628
[[package]]
629629
name = "colored"
630-
version = "2.0.0"
630+
version = "2.0.4"
631631
source = "registry+https://github.com/rust-lang/crates.io-index"
632-
checksum = "b3616f750b84d8f0de8a58bda93e08e2a81ad3f523089b05f1dffecab48c6cbd"
632+
checksum = "2674ec482fbc38012cf31e6c42ba0177b431a0cb6f15fe40efa5aab1bda516f6"
633633
dependencies = [
634-
"atty",
634+
"is-terminal",
635635
"lazy_static",
636-
"winapi",
636+
"windows-sys 0.48.0",
637637
]
638638

639639
[[package]]
@@ -1169,19 +1169,6 @@ dependencies = [
11691169
"termcolor",
11701170
]
11711171

1172-
[[package]]
1173-
name = "env_logger"
1174-
version = "0.9.3"
1175-
source = "registry+https://github.com/rust-lang/crates.io-index"
1176-
checksum = "a12e6657c4c97ebab115a42dcee77225f7f482cdd841cf7088c657a42e9e00e7"
1177-
dependencies = [
1178-
"atty",
1179-
"humantime 2.1.0",
1180-
"log",
1181-
"regex",
1182-
"termcolor",
1183-
]
1184-
11851172
[[package]]
11861173
name = "env_logger"
11871174
version = "0.10.0"
@@ -2454,7 +2441,7 @@ version = "0.1.0"
24542441
dependencies = [
24552442
"colored",
24562443
"ctrlc",
2457-
"env_logger 0.9.3",
2444+
"env_logger 0.10.0",
24582445
"getrandom",
24592446
"lazy_static",
24602447
"libc",
@@ -5591,11 +5578,11 @@ dependencies = [
55915578

55925579
[[package]]
55935580
name = "tracing-tree"
5594-
version = "0.2.3"
5581+
version = "0.2.4"
55955582
source = "registry+https://github.com/rust-lang/crates.io-index"
5596-
checksum = "4f9742d8df709837409dbb22aa25dd7769c260406f20ff48a2320b80a4a6aed0"
5583+
checksum = "92d6b63348fad3ae0439b8bebf8d38fb5bda0b115d7a8a7e6f165f12790c58c3"
55975584
dependencies = [
5598-
"atty",
5585+
"is-terminal",
55995586
"nu-ansi-term",
56005587
"tracing-core",
56015588
"tracing-log",

src/tools/miri/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ doctest = false # and no doc tests
1919

2020
[dependencies]
2121
getrandom = { version = "0.2", features = ["std"] }
22-
env_logger = "0.9"
22+
env_logger = "0.10"
2323
log = "0.4"
2424
rand = "0.8"
2525
smallvec = "1.7"

src/tools/tidy/src/deps.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,6 @@ const PERMITTED_RUSTC_DEPENDENCIES: &[&str] = &[
120120
"annotate-snippets",
121121
"ar_archive_writer",
122122
"arrayvec",
123-
"atty",
124123
"autocfg",
125124
"bitflags",
126125
"block-buffer",
@@ -181,6 +180,7 @@ const PERMITTED_RUSTC_DEPENDENCIES: &[&str] = &[
181180
"intl-memoizer",
182181
"intl_pluralrules",
183182
"io-lifetimes",
183+
"is-terminal",
184184
"itertools",
185185
"itoa",
186186
"jobserver",

0 commit comments

Comments
 (0)