Commit e3811a7

committed

Auto merge of #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` (#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 #94140.

2 parents 78e74d9 + 4241f94 commit e3811a7Copy full SHA for e3811a7

File tree

3 files changed

+10

-23

lines changed

Cargo.lock
src/tools
- miri
  - Cargo.toml
- tidy/src
  - deps.rs

3 files changed

+10

-23

lines changed

`‎Cargo.lock‎`

Lines changed: 8 additions & 21 deletions

Original file line number	Diff line number	Diff line change
`@@ -627,13 +627,13 @@ checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7"`
`627`	`627`
`628`	`628`	`[[package]]`
`629`	`629`	`name = "colored"`
`630`		`-version = "2.0.0"`
	`630`	`+version = "2.0.4"`
`631`	`631`	`source = "registry+https://github.com/rust-lang/crates.io-index"`
`632`		`-checksum = "b3616f750b84d8f0de8a58bda93e08e2a81ad3f523089b05f1dffecab48c6cbd"`
	`632`	`+checksum = "2674ec482fbc38012cf31e6c42ba0177b431a0cb6f15fe40efa5aab1bda516f6"`
`633`	`633`	`dependencies = [`
`634`		`- "atty",`
	`634`	`+ "is-terminal",`
`635`	`635`	`"lazy_static",`
`636`		`- "winapi",`
	`636`	`+ "windows-sys 0.48.0",`
`637`	`637`	`]`
`638`	`638`
`639`	`639`	`[[package]]`
`@@ -1169,19 +1169,6 @@ dependencies = [`
`1169`	`1169`	`"termcolor",`
`1170`	`1170`	`]`
`1171`	`1171`
`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`		`-`
`1185`	`1172`	`[[package]]`
`1186`	`1173`	`name = "env_logger"`
`1187`	`1174`	`version = "0.10.0"`
`@@ -2454,7 +2441,7 @@ version = "0.1.0"`
`2454`	`2441`	`dependencies = [`
`2455`	`2442`	`"colored",`
`2456`	`2443`	`"ctrlc",`
`2457`		`- "env_logger 0.9.3",`
	`2444`	`+ "env_logger 0.10.0",`
`2458`	`2445`	`"getrandom",`
`2459`	`2446`	`"lazy_static",`
`2460`	`2447`	`"libc",`
`@@ -5591,11 +5578,11 @@ dependencies = [`
`5591`	`5578`
`5592`	`5579`	`[[package]]`
`5593`	`5580`	`name = "tracing-tree"`
`5594`		`-version = "0.2.3"`
	`5581`	`+version = "0.2.4"`
`5595`	`5582`	`source = "registry+https://github.com/rust-lang/crates.io-index"`
`5596`		`-checksum = "4f9742d8df709837409dbb22aa25dd7769c260406f20ff48a2320b80a4a6aed0"`
	`5583`	`+checksum = "92d6b63348fad3ae0439b8bebf8d38fb5bda0b115d7a8a7e6f165f12790c58c3"`
`5597`	`5584`	`dependencies = [`
`5598`		`- "atty",`
	`5585`	`+ "is-terminal",`
`5599`	`5586`	`"nu-ansi-term",`
`5600`	`5587`	`"tracing-core",`
`5601`	`5588`	`"tracing-log",`

`‎src/tools/miri/Cargo.toml‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ doctest = false # and no doc tests`
`19`	`19`
`20`	`20`	`[dependencies]`
`21`	`21`	`getrandom = { version = "0.2", features = ["std"] }`
`22`		`-env_logger = "0.9"`
	`22`	`+env_logger = "0.10"`
`23`	`23`	`log = "0.4"`
`24`	`24`	`rand = "0.8"`
`25`	`25`	`smallvec = "1.7"`

`‎src/tools/tidy/src/deps.rs‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -120,7 +120,6 @@ const PERMITTED_RUSTC_DEPENDENCIES: &[&str] = &[`
`120`	`120`	`"annotate-snippets",`
`121`	`121`	`"ar_archive_writer",`
`122`	`122`	`"arrayvec",`
`123`		`- "atty",`
`124`	`123`	`"autocfg",`
`125`	`124`	`"bitflags",`
`126`	`125`	`"block-buffer",`
`@@ -181,6 +180,7 @@ const PERMITTED_RUSTC_DEPENDENCIES: &[&str] = &[`
`181`	`180`	`"intl-memoizer",`
`182`	`181`	`"intl_pluralrules",`
`183`	`182`	`"io-lifetimes",`
	`183`	`+ "is-terminal",`
`184`	`184`	`"itertools",`
`185`	`185`	`"itoa",`
`186`	`186`	`"jobserver",`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit e3811a7

File tree

3 files changed

3 files changed

`‎Cargo.lock‎`

`‎src/tools/miri/Cargo.toml‎`

`‎src/tools/tidy/src/deps.rs‎`

0 commit comments