Auto merge of #116006 - GuillaumeGomez:rollup-elrbjd4, r=GuillaumeGomez
Rollup of 5 pull requests
Successful merges:
- #115566 (clean up unneeded `ToPredicate` impls)
- #115962 (coverage: Remove debug code from the instrumentor)
- #115988 (rustdoc: add test cases, and fix, search tabs layout jank)
- #115991 (Ensure `build/tmp` exists in `rustdoc_themes::get_themes`)
- #115997 (RELEASES.md: Add missing patch releases)
r? `@ghost`
`@rustbot` modify labels: rollup
diff --git a/Cargo.lock b/Cargo.lock
index 95ac313..d9aaedb 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -627,13 +627,13 @@
[[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]]
@@ -1171,19 +1171,6 @@
[[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"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "85cdab6a89accf66733ad5a1693a4dcced6aeff64602b634530dd73c1f3ee9f0"
@@ -2454,7 +2441,7 @@
dependencies = [
"colored",
"ctrlc",
- "env_logger 0.9.3",
+ "env_logger 0.10.0",
"getrandom",
"lazy_static",
"libc",
@@ -5591,11 +5578,11 @@
[[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",
diff --git a/src/tools/miri/Cargo.toml b/src/tools/miri/Cargo.toml
index 67a2aee..2ae6f92 100644
--- a/src/tools/miri/Cargo.toml
+++ b/src/tools/miri/Cargo.toml
@@ -19,7 +19,7 @@
[dependencies]
getrandom = { version = "0.2", features = ["std"] }
-env_logger = "0.9"
+env_logger = "0.10"
log = "0.4"
rand = "0.8"
smallvec = "1.7"
diff --git a/src/tools/tidy/src/deps.rs b/src/tools/tidy/src/deps.rs
index 410852b..843ffe2 100644
--- a/src/tools/tidy/src/deps.rs
+++ b/src/tools/tidy/src/deps.rs
@@ -120,7 +120,6 @@
"annotate-snippets",
"ar_archive_writer",
"arrayvec",
- "atty",
"autocfg",
"bitflags",
"block-buffer",
@@ -181,6 +180,7 @@
"intl-memoizer",
"intl_pluralrules",
"io-lifetimes",
+ "is-terminal",
"itertools",
"itoa",
"jobserver",
