Skip to content

Commit

Permalink
Auto merge of rust-lang#115975 - mkroening:reduce-atty, r=davidtwco
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
bors committed Sep 20, 2023
2 parents 78e74d9 + 4241f94 commit e3811a7
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 23 deletions.
29 changes: 8 additions & 21 deletions Cargo.lock
Original file line number Diff line number Diff line change
Expand Up @@ -627,13 +627,13 @@ checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7"

[[package]]
name = "colored"
version = "2.0.0"
version = "2.0.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b3616f750b84d8f0de8a58bda93e08e2a81ad3f523089b05f1dffecab48c6cbd"
checksum = "2674ec482fbc38012cf31e6c42ba0177b431a0cb6f15fe40efa5aab1bda516f6"
dependencies = [
"atty",
"is-terminal",
"lazy_static",
"winapi",
"windows-sys 0.48.0",
]

[[package]]
Expand Down Expand Up @@ -1169,19 +1169,6 @@ dependencies = [
"termcolor",
]

[[package]]
name = "env_logger"
version = "0.9.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a12e6657c4c97ebab115a42dcee77225f7f482cdd841cf7088c657a42e9e00e7"
dependencies = [
"atty",
"humantime 2.1.0",
"log",
"regex",
"termcolor",
]

[[package]]
name = "env_logger"
version = "0.10.0"
Expand Down Expand Up @@ -2454,7 +2441,7 @@ version = "0.1.0"
dependencies = [
"colored",
"ctrlc",
"env_logger 0.9.3",
"env_logger 0.10.0",
"getrandom",
"lazy_static",
"libc",
Expand Down Expand Up @@ -5591,11 +5578,11 @@ dependencies = [

[[package]]
name = "tracing-tree"
version = "0.2.3"
version = "0.2.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4f9742d8df709837409dbb22aa25dd7769c260406f20ff48a2320b80a4a6aed0"
checksum = "92d6b63348fad3ae0439b8bebf8d38fb5bda0b115d7a8a7e6f165f12790c58c3"
dependencies = [
"atty",
"is-terminal",
"nu-ansi-term",
"tracing-core",
"tracing-log",
Expand Down
2 changes: 1 addition & 1 deletion src/tools/miri/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ doctest = false # and no doc tests

[dependencies]
getrandom = { version = "0.2", features = ["std"] }
env_logger = "0.9"
env_logger = "0.10"
log = "0.4"
rand = "0.8"
smallvec = "1.7"
Expand Down
2 changes: 1 addition & 1 deletion src/tools/tidy/src/deps.rs
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,6 @@ const PERMITTED_RUSTC_DEPENDENCIES: &[&str] = &[
"annotate-snippets",
"ar_archive_writer",
"arrayvec",
"atty",
"autocfg",
"bitflags",
"block-buffer",
Expand Down Expand Up @@ -181,6 +180,7 @@ const PERMITTED_RUSTC_DEPENDENCIES: &[&str] = &[
"intl-memoizer",
"intl_pluralrules",
"io-lifetimes",
"is-terminal",
"itertools",
"itoa",
"jobserver",
Expand Down

0 comments on commit e3811a7

Please sign in to comment.