about summary refs log tree commit diff
path: root/compiler/rustc_errors
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2023-08-31 06:02:49 +0000
committerbors <bors@rust-lang.org>2023-08-31 06:02:49 +0000
commit8cbd2c847b682a3ce460a79fa7576ee2eb461a00 (patch)
treed7c62bb4d32d32f0daa4bd7721231e9c74beb293 /compiler/rustc_errors
parent008c21c9779fd1e3632d9fe908b8afc0c421b26c (diff)
parent82675f6a39e87f6494da5ea9916feea358ce8202 (diff)
downloadrust-8cbd2c847b682a3ce460a79fa7576ee2eb461a00.tar.gz
rust-8cbd2c847b682a3ce460a79fa7576ee2eb461a00.zip
Auto merge of #115398 - matthiaskrgr:rollup-88lj9gk, r=matthiaskrgr
Rollup of 3 pull requests

Successful merges:

 - #115373 (Fix bors missing a commit when merging #115355)
 - #115378 (`ignore-cross-compile` remaining tests that run binaries)
 - #115393 (Make `termcolor` types public in `rustc_errors`)

r? `@ghost`
`@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_errors')
-rw-r--r--compiler/rustc_errors/src/lib.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/rustc_errors/src/lib.rs b/compiler/rustc_errors/src/lib.rs
index 39f440e31e0..c2fe942fe37 100644
--- a/compiler/rustc_errors/src/lib.rs
+++ b/compiler/rustc_errors/src/lib.rs
@@ -55,7 +55,7 @@ use std::num::NonZeroUsize;
 use std::panic;
 use std::path::{Path, PathBuf};
 
-use termcolor::{Color, ColorSpec};
+pub use termcolor::{Color, ColorSpec, WriteColor};
 
 pub mod annotate_snippet_emitter_writer;
 mod diagnostic;