diff options
| author | bors <bors@rust-lang.org> | 2022-11-19 15:40:04 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-11-19 15:40:04 +0000 |
| commit | 2a434286a96d61e9f55a3144004beec48206bb29 (patch) | |
| tree | 3d4039fc786f07f1da07322c110b258909d78c18 /compiler/rustc_driver/src/lib.rs | |
| parent | 62c627c7a3a9b3e193a5ae6e1ec7348bc5136301 (diff) | |
| parent | f69f4cb19cb315537b40468d061579f43b62dd8f (diff) | |
| download | rust-2a434286a96d61e9f55a3144004beec48206bb29.tar.gz rust-2a434286a96d61e9f55a3144004beec48206bb29.zip | |
Auto merge of #104607 - matthiaskrgr:rollup-9s589me, r=matthiaskrgr
Rollup of 10 pull requests Successful merges: - #103117 (Use `IsTerminal` in place of `atty`) - #103969 (Partial support for running UI tests with `download-rustc`) - #103989 (Fix build of std for thumbv7a-pc-windows-msvc) - #104076 (fix sysroot issue which appears for ci downloaded rustc) - #104469 (Make "long type" printing type aware and trim types in E0275) - #104497 (detect () to avoid redundant <> suggestion for type) - #104577 (Don't focus on notable trait parent when hiding it) - #104587 (Update cargo) - #104593 (Improve spans for RPITIT object-safety errors) - #104604 (Migrate top buttons style to CSS variables) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_driver/src/lib.rs')
| -rw-r--r-- | compiler/rustc_driver/src/lib.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/compiler/rustc_driver/src/lib.rs b/compiler/rustc_driver/src/lib.rs index e043368fdfe..8a712cec852 100644 --- a/compiler/rustc_driver/src/lib.rs +++ b/compiler/rustc_driver/src/lib.rs @@ -5,6 +5,7 @@ //! This API is completely unstable and subject to change. #![doc(html_root_url = "https://doc.rust-lang.org/nightly/nightly-rustc/")] +#![feature(is_terminal)] #![feature(once_cell)] #![feature(decl_macro)] #![recursion_limit = "256"] @@ -27,7 +28,6 @@ use rustc_feature::find_gated_cfg; use rustc_interface::util::{self, collect_crate_types, get_codegen_backend}; use rustc_interface::{interface, Queries}; use rustc_lint::LintStore; -use rustc_log::stdout_isatty; use rustc_metadata::locator; use rustc_save_analysis as save; use rustc_save_analysis::DumpHandler; @@ -48,7 +48,7 @@ use std::default::Default; use std::env; use std::ffi::OsString; use std::fs; -use std::io::{self, Read, Write}; +use std::io::{self, IsTerminal, Read, Write}; use std::panic::{self, catch_unwind}; use std::path::PathBuf; use std::process::{self, Command, Stdio}; @@ -515,7 +515,7 @@ fn handle_explain(registry: Registry, code: &str, output: ErrorOutputType) { } text.push('\n'); } - if stdout_isatty() { + if io::stdout().is_terminal() { show_content_with_pager(&text); } else { print!("{}", text); |
